commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ki...@apache.org
Subject svn commit: r1537906 [1/2] - in /commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor: adapter/ core/ core/algorithm/
Date Fri, 01 Nov 2013 11:47:34 GMT
Author: kinow
Date: Fri Nov  1 11:47:33 2013
New Revision: 1537906

URL: http://svn.apache.org/r1537906
Log:
FUNCTOR-29 removing serializable from the core, algorithms and adapter packages

Modified:
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryPredicate.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryProcedure.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryPredicate.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryProcedure.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryPredicate.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryProcedure.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicateNullaryFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicatePredicate.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureNullaryFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureProcedure.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Constant.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Identity.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsEqual.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsInstance.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotEqual.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotNull.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotSame.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNull.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsSame.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Limit.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/NoOp.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Offset.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/DoUntil.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/DoWhile.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/FindWithinGenerator.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/GeneratorContains.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/InPlaceTransform.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/IndexOfInGenerator.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/PredicatedLoop.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/UntilDo.java
    commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/algorithm/WhileDo.java

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java Fri Nov  1 11:47:33 2013
@@ -16,28 +16,18 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryFunction;
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.lang3.Validate;
 
 /**
  * Adapts a <code>Boolean</code>-valued {@link BinaryFunction BinaryFunction} to
- * the {@link BinaryPredicate BinaryPredicate} interface. <p> Note that although
- * this class implements {@link Serializable}, a given instance will only be
- * truly <code>Serializable</code> if the underlying functor is. Attempts to
- * serialize an instance whose delegate is not <code>Serializable</code> will
- * result in an exception. </p>
+ * the {@link BinaryPredicate BinaryPredicate} interface.
  * @param <L> the left argument type.
  * @param <R> the right argument type.
  * @version $Revision$ $Date$
  */
-public final class BinaryFunctionBinaryPredicate<L, R> implements BinaryPredicate<L, R>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -5150315320718936186L;
+public final class BinaryFunctionBinaryPredicate<L, R> implements BinaryPredicate<L, R> {
     /** The {@link BinaryFunction BinaryFunction} I'm wrapping. */
     private final BinaryFunction<? super L, ? super R, Boolean> function;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryFunction;
 import org.apache.commons.functor.BinaryProcedure;
 import org.apache.commons.lang3.Validate;
@@ -27,24 +25,13 @@ import org.apache.commons.lang3.Validate
  * to the {@link BinaryProcedure BinaryProcedure}
  * interface by ignoring the value returned
  * by the function.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying function is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <L> the left argument type.
  * @param <R> the right argument type.
  * @version $Revision$ $Date$
  */
-public final class BinaryFunctionBinaryProcedure<L, R> implements BinaryProcedure<L, R>, Serializable {
+public final class BinaryFunctionBinaryProcedure<L, R> implements BinaryProcedure<L, R> {
 
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 4498276997127058865L;
     /** The {@link BinaryFunction BinaryFunction} I'm wrapping. */
     private final BinaryFunction<? super L, ? super R, ?> function;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryFunction;
 import org.apache.commons.functor.BinaryPredicate;
 
@@ -26,23 +24,12 @@ import org.apache.commons.functor.Binary
  * {@link BinaryPredicate BinaryPredicate}
  * to the
  * {@link BinaryFunction BinaryFunction} interface.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying predicate is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <L> the left argument type.
  * @param <R> the right argument type.
  * @version $Revision$ $Date$
  */
-public final class BinaryPredicateBinaryFunction<L, R> implements BinaryFunction<L, R, Boolean>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 207209665276797678L;
+public final class BinaryPredicateBinaryFunction<L, R> implements BinaryFunction<L, R, Boolean> {
     /** The {@link BinaryPredicate BinaryPredicate} I'm wrapping. */
     private final BinaryPredicate<? super L, ? super R> predicate;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryFunction;
 import org.apache.commons.functor.BinaryProcedure;
 import org.apache.commons.lang3.Validate;
@@ -28,24 +26,13 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link BinaryFunction BinaryFunction} interface
  * by always returning <code>null</code>.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying procedure is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <L> the left argument type.
  * @param <R> the right argument type.
  * @param <T> the returned value type.
  * @version $Revision$ $Date$
  */
-public final class BinaryProcedureBinaryFunction<L, R, T> implements BinaryFunction<L, R, T>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 2099210273403668624L;
+public final class BinaryProcedureBinaryFunction<L, R, T> implements BinaryFunction<L, R, T> {
     /** The {@link BinaryProcedure BinaryProcedure} I'm wrapping. */
     private final BinaryProcedure<? super L, ? super R> procedure;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.NullaryFunction;
 import org.apache.commons.functor.Function;
 import org.apache.commons.lang3.Validate;
@@ -28,22 +26,11 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link NullaryFunction NullaryFunction} interface
  * using a constant unary argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <T> the returned value type.
  * @version $Revision: 1345136 $ $Date: 2012-06-01 09:47:06 -0300 (Fri, 01 Jun 2012) $
  */
-public final class BoundNullaryFunction<T> implements NullaryFunction<T>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 8873081237760986490L;
+public final class BoundNullaryFunction<T> implements NullaryFunction<T> {
     /** The {@link Function Function} I'm wrapping. */
     private final Function<Object, ? extends T> function;
     /** The argument to pass to {@code function}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryPredicate.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryPredicate.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.NullaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.lang3.Validate;
@@ -28,21 +26,10 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link NullaryPredicate NullaryPredicate} interface
  * using a constant unary argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class BoundNullaryPredicate implements NullaryPredicate, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -5721164265625291834L;
+public final class BoundNullaryPredicate implements NullaryPredicate {
     /** The {@link Predicate Predicate} I'm wrapping. */
     private final Predicate<Object> predicate;
     /** The parameter to pass to {@code predicate}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryProcedure.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryProcedure.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.NullaryProcedure;
 import org.apache.commons.functor.Procedure;
 import org.apache.commons.lang3.Validate;
@@ -28,21 +26,10 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link NullaryProcedure NullaryProcedure} interface
  * using a constant unary argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class BoundNullaryProcedure implements NullaryProcedure, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -6010802933400471747L;
+public final class BoundNullaryProcedure implements NullaryProcedure {
     /** The {@link Procedure Procedure} I'm wrapping. */
     private final Procedure<Object> procedure;
     /** The parameter to pass to {@code procedure}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryFunction;
 import org.apache.commons.functor.NullaryFunction;
 import org.apache.commons.lang3.Validate;
@@ -28,22 +26,11 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link NullaryFunction NullaryFunction} interface
  * using constant arguments.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <T> the returned value type.
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class FullyBoundNullaryFunction<T> implements NullaryFunction<T>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -8588331452137525985L;
+public final class FullyBoundNullaryFunction<T> implements NullaryFunction<T> {
     /** The {@link BinaryFunction BinaryFunction} I'm wrapping. */
     private final BinaryFunction<Object, Object, ? extends T> function;
     /** The left parameter to pass to {@code function}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryPredicate.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryPredicate.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.NullaryPredicate;
 import org.apache.commons.lang3.Validate;
@@ -28,22 +26,11 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link org.apache.commons.functor.NullaryPredicate NullaryPredicate} interface
  * using a constant left-side argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class FullyBoundNullaryPredicate implements NullaryPredicate, Serializable {
+public final class FullyBoundNullaryPredicate implements NullaryPredicate {
 
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 7676235030688391839L;
     /** The {@link BinaryPredicate BinaryPredicate} I'm wrapping. */
     private final BinaryPredicate<Object, Object> predicate;
     /** The left parameter to pass to {@code predicate}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryProcedure.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryProcedure.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryProcedure;
 import org.apache.commons.functor.NullaryProcedure;
 import org.apache.commons.lang3.Validate;
@@ -28,21 +26,10 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link NullaryProcedure NullaryProcedure} interface
  * using a constant left-side argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class FullyBoundNullaryProcedure implements NullaryProcedure, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -904891610081737737L;
+public final class FullyBoundNullaryProcedure implements NullaryProcedure {
     /** The {@link BinaryProcedure BinaryProcedure} I'm wrapping. */
     private final BinaryProcedure<Object, Object> procedure;
     /** The left parameter to pass to {@code procedure}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.Function;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.lang3.Validate;
@@ -27,22 +25,11 @@ import org.apache.commons.lang3.Validate
  * {@link Function Function}
  * to the {@link Predicate Predicate}
  * interface.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying function is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @version $Revision$ $Date$
  */
-public final class FunctionPredicate<A> implements Predicate<A>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -9211927278252224707L;
+public final class FunctionPredicate<A> implements Predicate<A> {
     /** The {@link Function Function} I'm wrapping. */
     private final Function<? super A, Boolean> function;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.Function;
 import org.apache.commons.functor.Procedure;
 import org.apache.commons.lang3.Validate;
@@ -27,23 +25,12 @@ import org.apache.commons.lang3.Validate
  * to the {@link Procedure Procedure}
  * interface by ignoring the value returned
  * by the function.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying function is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @version $Revision$ $Date$
  */
-public final class FunctionProcedure<A> implements Procedure<A>, Serializable {
+public final class FunctionProcedure<A> implements Procedure<A> {
 
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -3578673875995684811L;
     /** The {@link Function Function} I'm wrapping. */
     private final Function<? super A, ?> function;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryFunction;
 import org.apache.commons.functor.Function;
 import org.apache.commons.lang3.Validate;
@@ -28,24 +26,13 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link BinaryFunction BinaryFunction} interface
  * by ignoring the first binary argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying functor is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <L> the left argument type.
  * @param <R> the right argument type.
  * @param <T> the returned value type.
  * @version $Revision$ $Date$
  */
-public final class IgnoreLeftFunction<L, R, T> implements BinaryFunction<L, R, T>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 4677703245851183542L;
+public final class IgnoreLeftFunction<L, R, T> implements BinaryFunction<L, R, T> {
     /** The {@link Function Function} I'm wrapping. */
     private final Function<? super R, ? extends T> function;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.lang3.Validate;
@@ -28,23 +26,12 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link BinaryPredicate BinaryPredicate} interface
  * by ignoring the first binary argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying functor is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <L> the left argument type.
  * @param <R> the right argument type.
  * @version $Revision$ $Date$
  */
-public final class IgnoreLeftPredicate<L, R> implements BinaryPredicate<L, R>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -3200352647509255939L;
+public final class IgnoreLeftPredicate<L, R> implements BinaryPredicate<L, R> {
     /** The {@link Predicate Predicate} I'm wrapping. */
     private final Predicate<? super R> predicate;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryProcedure;
 import org.apache.commons.functor.Procedure;
 import org.apache.commons.lang3.Validate;
@@ -28,23 +26,12 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link BinaryProcedure BinaryProcedure} interface
  * by ignoring the first binary argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying functor is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <L> the left argument type.
  * @param <R> the right argument type.
  * @version $Revision$ $Date$
  */
-public final class IgnoreLeftProcedure<L, R> implements BinaryProcedure<L, R>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 513435556181843298L;
+public final class IgnoreLeftProcedure<L, R> implements BinaryProcedure<L, R> {
     /** The {@link Procedure Procedure} I'm wrapping. */
     private final Procedure<? super R> procedure;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryFunction;
 import org.apache.commons.functor.Function;
 import org.apache.commons.lang3.Validate;
@@ -28,24 +26,13 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link BinaryFunction BinaryFunction} interface
  * by ignoring the second binary argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying functor is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <L> the left argument type.
  * @param <R> the right argument type.
  * @param <T> the returned value type.
  * @version $Revision$ $Date$
  */
-public final class IgnoreRightFunction<L, R, T> implements BinaryFunction<L, R, T>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -1564814716024791395L;
+public final class IgnoreRightFunction<L, R, T> implements BinaryFunction<L, R, T> {
     /** The {@link Function Function} I'm wrapping. */
     private final Function<? super L, ? extends T> function;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.lang3.Validate;
@@ -28,23 +26,12 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link BinaryPredicate BinaryPredicate} interface
  * by ignoring the second binary argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying functor is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <L> the left argument type.
  * @param <R> the right argument type.
  * @version $Revision$ $Date$
  */
-public final class IgnoreRightPredicate<L, R> implements BinaryPredicate<L, R>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -4236624667788627722L;
+public final class IgnoreRightPredicate<L, R> implements BinaryPredicate<L, R> {
     /** The {@link Predicate Predicate} I'm wrapping. */
     private final Predicate<? super L> predicate;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryProcedure;
 import org.apache.commons.functor.Procedure;
 import org.apache.commons.lang3.Validate;
@@ -28,23 +26,12 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link BinaryProcedure BinaryProcedure} interface
  * by ignoring the second binary argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying functor is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <L> the left argument type.
  * @param <R> the right argument type.
  * @version $Revision$ $Date$
  */
-public final class IgnoreRightProcedure<L, R> implements BinaryProcedure<L, R>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -7374293905310619206L;
+public final class IgnoreRightProcedure<L, R> implements BinaryProcedure<L, R> {
     /** The {@link Procedure Procedure} I'm wrapping. */
     private final Procedure<? super L> procedure;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryFunction;
 import org.apache.commons.functor.Function;
 import org.apache.commons.lang3.Validate;
@@ -28,23 +26,12 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link Function Function} interface
  * using a constant left-side argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @param <T> the returned value type.
  * @version $Revision$ $Date$
  */
-public final class LeftBoundFunction<A, T> implements Function<A, T>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -7456827102718911769L;
+public final class LeftBoundFunction<A, T> implements Function<A, T> {
     /** The {@link BinaryFunction BinaryFunction} I'm wrapping. */
     private final BinaryFunction<Object, ? super A, ? extends T> function;
     /** The parameter to pass to {@code function}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.lang3.Validate;
@@ -28,23 +26,12 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link Predicate Predicate} interface
  * using a constant left-side argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @version $Revision$ $Date$
  */
-public final class LeftBoundPredicate<A> implements Predicate<A>, Serializable {
+public final class LeftBoundPredicate<A> implements Predicate<A> {
 
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 3851481216909573294L;
     /** The {@link BinaryPredicate BinaryPredicate} I'm wrapping. */
     private final BinaryPredicate<Object, ? super A> predicate;
     /** The parameter to pass to {@code predicate}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryProcedure;
 import org.apache.commons.functor.Procedure;
 import org.apache.commons.lang3.Validate;
@@ -28,22 +26,11 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link Procedure Procedure} interface
  * using a constant left-side argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @version $Revision$ $Date$
  */
-public final class LeftBoundProcedure<A> implements Procedure<A>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 7650992440581629785L;
+public final class LeftBoundProcedure<A> implements Procedure<A> {
     /** The {@link BinaryProcedure BinaryProcedure} I'm wrapping. */
     private final BinaryProcedure<Object, ? super A> procedure;
     /** The parameter to pass to {@code procedure}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.NullaryFunction;
 import org.apache.commons.functor.Function;
 import org.apache.commons.lang3.Validate;
@@ -28,23 +26,12 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link Function Function} interface
  * by ignoring the unary argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying functor is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @param <T> the returned value type.
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class NullaryFunctionFunction<A, T> implements Function<A, T>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 1993899041200996524L;
+public final class NullaryFunctionFunction<A, T> implements Function<A, T> {
     /** The {@link NullaryFunction NullaryFunction} I'm wrapping. */
     private final NullaryFunction<? extends T> function;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryPredicate.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryPredicate.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.NullaryFunction;
 import org.apache.commons.functor.NullaryPredicate;
 import org.apache.commons.lang3.Validate;
@@ -26,22 +24,11 @@ import org.apache.commons.lang3.Validate
  * Adapts a <code>Boolean</code>-valued
  * {@link NullaryFunction NullaryFunction} to the
  * {@link NullaryPredicate NullaryPredicate} interface.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying functor is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class NullaryFunctionNullaryPredicate implements NullaryPredicate, Serializable {
+public final class NullaryFunctionNullaryPredicate implements NullaryPredicate {
 
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 6564796937660102222L;
     /** The {@link NullaryFunction NullaryFunction} I'm wrapping. */
     private final NullaryFunction<Boolean> function;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryProcedure.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryProcedure.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.NullaryFunction;
 import org.apache.commons.functor.NullaryProcedure;
 import org.apache.commons.lang3.Validate;
@@ -27,21 +25,10 @@ import org.apache.commons.lang3.Validate
  * to the {@link NullaryProcedure NullaryProcedure}
  * interface by ignoring the value returned
  * by the function.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying function is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class NullaryFunctionNullaryProcedure implements NullaryProcedure, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -7300031015086684901L;
+public final class NullaryFunctionNullaryProcedure implements NullaryProcedure {
     /** The {@link NullaryFunction NullaryFunction} I'm wrapping. */
     private final NullaryFunction<?> function;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicateNullaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicateNullaryFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicateNullaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicateNullaryFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.NullaryFunction;
 import org.apache.commons.functor.NullaryPredicate;
 import org.apache.commons.lang3.Validate;
@@ -27,21 +25,10 @@ import org.apache.commons.lang3.Validate
  * {@link NullaryPredicate Predicate}
  * to the
  * {@link NullaryFunction NullaryFunction} interface.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying predicate is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class NullaryPredicateNullaryFunction implements NullaryFunction<Boolean>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -8858981355549412629L;
+public final class NullaryPredicateNullaryFunction implements NullaryFunction<Boolean> {
     /** The {@link NullaryPredicate NullaryPredicate} I'm wrapping. */
     private final NullaryPredicate predicate;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicatePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicatePredicate.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicatePredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicatePredicate.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.NullaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.lang3.Validate;
@@ -28,22 +26,11 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link Predicate Predicate} interface
  * by ignoring the given argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying functor is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class NullaryPredicatePredicate<A> implements Predicate<A>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -5168896606842881702L;
+public final class NullaryPredicatePredicate<A> implements Predicate<A> {
     /** The {@link NullaryPredicate NullaryPredicate} I'm wrapping. */
     private final NullaryPredicate predicate;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureNullaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureNullaryFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureNullaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureNullaryFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.NullaryFunction;
 import org.apache.commons.functor.NullaryProcedure;
 import org.apache.commons.lang3.Validate;
@@ -28,22 +26,11 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link NullaryFunction NullaryFunction} interface
  * by always returning <code>null</code>.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying nullary procedure is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <T> the returned value type.
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class NullaryProcedureNullaryFunction<T> implements NullaryFunction<T>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -655207616317672341L;
+public final class NullaryProcedureNullaryFunction<T> implements NullaryFunction<T> {
     /** The {@link NullaryProcedure NullaryProcedure} I'm wrapping. */
     private final NullaryProcedure procedure;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureProcedure.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureProcedure.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.NullaryProcedure;
 import org.apache.commons.functor.Procedure;
 import org.apache.commons.lang3.Validate;
@@ -28,22 +26,11 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link Procedure Procedure} interface
  * by ignoring the arguments.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying functor is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @version $Revision: 1365377 $ $Date: 2012-07-24 21:59:23 -0300 (Tue, 24 Jul 2012) $
  */
-public final class NullaryProcedureProcedure<A> implements Procedure<A>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 501530698794315412L;
+public final class NullaryProcedureProcedure<A> implements Procedure<A> {
     /** The {@link NullaryProcedure Procedure} I'm wrapping. */
     private final NullaryProcedure procedure;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.Function;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.lang3.Validate;
@@ -27,22 +25,11 @@ import org.apache.commons.lang3.Validate
  * {@link Predicate Predicate}
  * to the
  * {@link Function Function} interface.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying predicate is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @version $Revision$ $Date$
  */
-public final class PredicateFunction<A> implements Function<A, Boolean>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 5660724725036398625L;
+public final class PredicateFunction<A> implements Function<A, Boolean> {
     /** The {@link Predicate Predicate} I'm wrapping. */
     private final Predicate<? super A> predicate;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.Function;
 import org.apache.commons.functor.Procedure;
 import org.apache.commons.lang3.Validate;
@@ -28,23 +26,12 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link Function Function} interface
  * by always returning <code>null</code>.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying procedure is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @param <T> the returned value type.
  * @version $Revision$ $Date$
  */
-public final class ProcedureFunction<A, T> implements Function<A, T>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 6153848695167906659L;
+public final class ProcedureFunction<A, T> implements Function<A, T> {
     /** The {@link Procedure Procedure} I'm wrapping. */
     private final Procedure<? super A> procedure;
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryFunction;
 import org.apache.commons.functor.Function;
 import org.apache.commons.lang3.Validate;
@@ -28,23 +26,12 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link Function Function} interface
  * using a constant right-side argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @param <T> the returned value type.
  * @version $Revision$ $Date$
  */
-public final class RightBoundFunction<A, T> implements Function<A, T>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -1313775632123661422L;
+public final class RightBoundFunction<A, T> implements Function<A, T> {
     /** The {@link BinaryFunction BinaryFunction} I'm wrapping. */
     private final BinaryFunction<? super A, Object, ? extends T> function;
     /** The parameter to pass to {@code function}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.lang3.Validate;
@@ -28,22 +26,11 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link Predicate Predicate} interface
  * using a constant left-side argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @version $Revision$ $Date$
  */
-public final class RightBoundPredicate<A> implements Predicate<A>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -1768544281714574302L;
+public final class RightBoundPredicate<A> implements Predicate<A> {
     /** The {@link BinaryPredicate BinaryPredicate} I'm wrapping. */
     private final BinaryPredicate<? super A, Object> predicate;
     /** The parameter to pass to {@code predicate}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.adapter;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryProcedure;
 import org.apache.commons.functor.Procedure;
 import org.apache.commons.lang3.Validate;
@@ -28,22 +26,11 @@ import org.apache.commons.lang3.Validate
  * to the
  * {@link Procedure Procedure} interface
  * using a constant left-side argument.
- * <p/>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying objects are.  Attempts to serialize
- * an instance whose delegates are not
- * <code>Serializable</code> will result in an exception.
  *
  * @param <A> the argument type.
  * @version $Revision$ $Date$
  */
-public final class RightBoundProcedure<A> implements Procedure<A>, Serializable {
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 3267188080481758226L;
+public final class RightBoundProcedure<A> implements Procedure<A> {
     /** The {@link BinaryProcedure BinaryProcedure} I'm wrapping. */
     private final BinaryProcedure<? super A, Object> procedure;
     /** The parameter to pass to {@code procedure}. */

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Constant.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Constant.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Constant.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Constant.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryFunction;
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Function;
@@ -30,19 +28,12 @@ import org.apache.commons.functor.Predic
  * <p>
  * {@link #test Tests} to a constant value, assuming
  * a boolean of Boolean value is supplied.
- *
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * constant <code>Object</code> is.  Attempts to serialize
- * an instance whose value is not
- * <code>Serializable</code> will result in an exception.
  * </p>
  * @param <T> the returned value type.
  * @version $Revision$ $Date$
  */
 public final class Constant<T> implements NullaryFunction<T>, Function<Object, T>, BinaryFunction<Object, Object, T>,
-        NullaryPredicate, Predicate<Object>, BinaryPredicate<Object, Object>, Serializable {
+        NullaryPredicate, Predicate<Object>, BinaryPredicate<Object, Object> {
 
     // static attributes
     // ------------------------------------------------------------------------
@@ -56,11 +47,6 @@ public final class Constant<T> implement
      */
     public static final Constant<Boolean> FALSE = of(Boolean.FALSE);
 
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -8754373778528773039L;
-
     // attributes
     // ------------------------------------------------------------------------
     /**

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Identity.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Identity.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Identity.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Identity.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.Function;
 import org.apache.commons.functor.Predicate;
 
@@ -33,7 +31,7 @@ import org.apache.commons.functor.Predic
  * @param <T> the returned value type.
  * @version $Revision$ $Date$
  */
-public final class Identity<T> implements Function<T, T>, Predicate<T>, Serializable {
+public final class Identity<T> implements Function<T, T>, Predicate<T> {
     // static attributes
     // ------------------------------------------------------------------------
     /**
@@ -41,11 +39,6 @@ public final class Identity<T> implement
      */
     public static final Identity<Object> INSTANCE = new Identity<Object>();
 
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 4145504259013789494L;
-
     // constructor
     // ------------------------------------------------------------------------
 

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsEqual.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsEqual.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsEqual.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsEqual.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.functor.adapter.RightBoundPredicate;
@@ -38,17 +36,13 @@ import org.apache.commons.functor.adapte
  * @param <R> the right argument type.
  * @version $Revision$ $Date$
  */
-public final class IsEqual<L, R> implements BinaryPredicate<L, R>, Serializable {
+public final class IsEqual<L, R> implements BinaryPredicate<L, R> {
     // static attributes
     // ------------------------------------------------------------------------
     /**
      * Basic IsEqual<Object, Object> instance.
      */
     public static final IsEqual<Object, Object> INSTANCE = IsEqual.<Object, Object>instance();
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -6777016236280121159L;
 
     // constructor
     // ------------------------------------------------------------------------

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsInstance.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsInstance.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsInstance.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsInstance.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.functor.adapter.RightBoundPredicate;
@@ -31,16 +29,12 @@ import org.apache.commons.functor.adapte
  * @param <T> the object instance has to be tested against the input class.
  * @version $Revision$ $Date$
  */
-public final class IsInstance<T> implements BinaryPredicate<T, Class<?>>, Serializable {
+public final class IsInstance<T> implements BinaryPredicate<T, Class<?>> {
     /**
      * Basic IsInstanceOf instance.
      */
     public static final IsInstance<Object> INSTANCE = IsInstance.<Object>instance();
     /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 9104265415387129627L;
-    /**
      * The non zero number used to shift the initial hashcode.
      */
     private static final int NONZERO_SHIFT_NUMBER = 4;

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotEqual.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotEqual.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotEqual.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotEqual.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.functor.adapter.RightBoundPredicate;
@@ -35,17 +33,13 @@ import org.apache.commons.functor.adapte
  * @param <R> the right argument type.
  * @version $Revision$ $Date$
  */
-public final class IsNotEqual<L, R> implements BinaryPredicate<L, R>, Serializable {
+public final class IsNotEqual<L, R> implements BinaryPredicate<L, R> {
     // static attributes
     // ------------------------------------------------------------------------
     /**
      * Basic IsNotEqual<Object, Object> instance.
      */
     public static final IsNotEqual<Object, Object> INSTANCE = IsNotEqual.<Object, Object>instance();
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -7303588338955281317L;
 
     // constructor
     // ------------------------------------------------------------------------

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotNull.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotNull.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotNull.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotNull.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.functor.adapter.IgnoreLeftPredicate;
@@ -31,7 +29,7 @@ import org.apache.commons.functor.adapte
  * @param <T> the argument type.
  * @version $Revision$ $Date$
  */
-public final class IsNotNull<T> implements Predicate<T>, Serializable {
+public final class IsNotNull<T> implements Predicate<T> {
 
     // static attributes
     // ------------------------------------------------------------------------
@@ -50,11 +48,6 @@ public final class IsNotNull<T> implemen
      */
     public static final BinaryPredicate<Object, Object> RIGHT = IsNotNull.<Object>right();
 
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = -6856387958371590330L;
-
     // constructor
     // ------------------------------------------------------------------------
     /**

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotSame.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotSame.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotSame.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNotSame.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.functor.adapter.RightBoundPredicate;
@@ -29,17 +27,13 @@ import org.apache.commons.functor.adapte
  * @param <R> the right argument type.
  * @version $Revision$ $Date$
  */
-public final class IsNotSame<L, R> implements BinaryPredicate<L, R>, Serializable {
+public final class IsNotSame<L, R> implements BinaryPredicate<L, R> {
     // static attributes
     // ------------------------------------------------------------------------
     /**
      * Basic IsNotSame<Object, Object> instance.
      */
     public static final IsNotSame<Object, Object> INSTANCE = IsNotSame.<Object, Object>instance();
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 5566555980860979281L;
 
     // constructor
     // ------------------------------------------------------------------------

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNull.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNull.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNull.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsNull.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.functor.adapter.IgnoreLeftPredicate;
@@ -31,7 +29,7 @@ import org.apache.commons.functor.adapte
  * @param <A> the argument type.
  * @version $Revision$ $Date$
  */
-public final class IsNull<A> implements Predicate<A>, Serializable {
+public final class IsNull<A> implements Predicate<A> {
 
     // static attributes
     // ------------------------------------------------------------------------
@@ -50,11 +48,6 @@ public final class IsNull<A> implements 
      */
     public static final BinaryPredicate<Object, Object> RIGHT = IsNull.<Object>right();
 
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 6001380107746171952L;
-
     // constructor
     // ------------------------------------------------------------------------
     /**

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsSame.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsSame.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsSame.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/IsSame.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.functor.adapter.RightBoundPredicate;
@@ -29,17 +27,13 @@ import org.apache.commons.functor.adapte
  * @param <R> the right argument type.
  * @version $Revision$ $Date$
  */
-public final class IsSame<L, R> implements BinaryPredicate<L, R>, Serializable {
+public final class IsSame<L, R> implements BinaryPredicate<L, R> {
     // static attributes
     // ------------------------------------------------------------------------
     /**
      * Basic IsSame<Object, Object> instance.
      */
     public static final IsSame<Object, Object> INSTANCE = IsSame.<Object, Object>instance();
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 7024585699909734072L;
 
     // constructor
     // ------------------------------------------------------------------------

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Limit.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Limit.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Limit.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Limit.java Fri Nov  1 11:47:33 2013
@@ -17,8 +17,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.NullaryPredicate;
 import org.apache.commons.functor.Predicate;
@@ -31,13 +29,7 @@ import org.apache.commons.functor.Predic
  * @since 1.0
  * @version $Revision$ $Date$
  */
-public final class Limit implements NullaryPredicate, Predicate<Object>, BinaryPredicate<Object, Object>, Serializable {
-    // static attributes
-    // ------------------------------------------------------------------------
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 8974528922587619067L;
+public final class Limit implements NullaryPredicate, Predicate<Object>, BinaryPredicate<Object, Object> {
     // instance variables
     //---------------------------------------------------------------
     /**

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/NoOp.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/NoOp.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/NoOp.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/NoOp.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryProcedure;
 import org.apache.commons.functor.NullaryProcedure;
 import org.apache.commons.functor.Procedure;
@@ -30,17 +28,13 @@ import org.apache.commons.functor.Proced
  * </p>
  * @version $Revision$ $Date$
  */
-public final class NoOp implements NullaryProcedure, Procedure<Object>, BinaryProcedure<Object, Object>, Serializable {
+public final class NoOp implements NullaryProcedure, Procedure<Object>, BinaryProcedure<Object, Object> {
     // static attributes
     // ------------------------------------------------------------------------
     /**
      * Basic NoOp instance.
      */
     public static final NoOp INSTANCE = new NoOp();
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 3768926349922273291L;
 
     // constructor
     // ------------------------------------------------------------------------

Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Offset.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Offset.java?rev=1537906&r1=1537905&r2=1537906&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Offset.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Offset.java Fri Nov  1 11:47:33 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.functor.core;
 
-import java.io.Serializable;
-
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.NullaryPredicate;
 import org.apache.commons.functor.Predicate;
@@ -31,14 +29,7 @@ import org.apache.commons.functor.Predic
  * @version $Revision$ $Date$
  */
 public final class Offset implements NullaryPredicate, Predicate<Object>,
-        BinaryPredicate<Object, Object>, Serializable {
-    // static attributes
-    // ------------------------------------------------------------------------
-    /**
-     * serialVersionUID declaration.
-     */
-    private static final long serialVersionUID = 5800706757874735854L;
-
+        BinaryPredicate<Object, Object> {
     // instance variables
     //---------------------------------------------------------------
     /**



Mime
View raw message