1 files changed, 3 insertions, 22 deletions
diff --git a/guava/src/com/google/common/hash/Funnel.java b/guava/src/com/google/common/hash/Funnel.java
index 6d62648..61cff7b 100644
--- a/guava/src/com/google/common/hash/Funnel.java
+++ b/guava/src/com/google/common/hash/Funnel.java
@@ -16,37 +16,18 @@ package com.google.common.hash;
 
 import com.google.common.annotations.Beta;
 
-import java.io.Serializable;
-
 /**
- * An object which can send data from an object of type {@code T} into a {@code PrimitiveSink}.
- *
- * <p>Note that serialization of {@linkplain BloomFilter bloom filters} requires the proper
- * serialization of funnels. When possible, it is recommended that funnels be implemented as a
- * single-element enum to maintain serialization guarantees. See Effective Java (2nd Edition),
- * Item 3: "Enforce the singleton property with a private constructor or an enum type". For example:
- * <pre>   {@code
- *   public enum PersonFunnel implements Funnel<Person> {
- *     INSTANCE;
- *     public void funnel(Person person, PrimitiveSink into) {
- *       into.putString(person.getFirstName())
- *           .putString(person.getLastName())
- *           .putInt(person.getAge());
- *     }
- *   }}</pre>
+ * An object which can send data from an object of type {@code T} into a {@code Sink}.
  * 
  * @author Dimitris Andreou
  * @since 11.0
  */
 @Beta
-public interface Funnel<T> extends Serializable {
-
+public interface Funnel<T> {
   /**
    * Sends a stream of data from the {@code from} object into the sink {@code into}. There
    * is no requirement that this data be complete enough to fully reconstitute the object
    * later.
-   *
-   * @since 12.0 (in Guava 11.0, {@code PrimitiveSink} was named {@code Sink})
    */
-  void funnel(T from, PrimitiveSink into);
+  void funnel(T from, Sink into);
 }