FUNCTOR-29 removing serializable from the collection and comparator packages
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/functor/trunk@1537901 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java b/core/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java
index 5832bac..bfe11b6 100644
--- a/core/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java
+++ b/core/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.collection;
-import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.Collection;
@@ -35,15 +34,11 @@
* @since 1.0
* @version $Revision$ $Date$
*/
-public final class IsElementOf<L, R> implements BinaryPredicate<L, R>, Serializable {
+public final class IsElementOf<L, R> implements BinaryPredicate<L, R> {
// static members
//---------------------------------------------------------------
- /**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = -7639051806015321070L;
- /**
+ /**
* A static {@link IsElementOf} instance reference.
*/
private static final IsElementOf<Object, Object> INSTANCE = new IsElementOf<Object, Object>();
diff --git a/core/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java b/core/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java
index ec8d3cd..9bb54bb 100644
--- a/core/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java
+++ b/core/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.collection;
-import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Map;
@@ -28,7 +27,7 @@
* @param <A> the predicate argument type.
* @version $Revision$ $Date$
*/
-public final class IsEmpty<A> implements Predicate<A>, Serializable {
+public final class IsEmpty<A> implements Predicate<A> {
// class variables
// ------------------------------------------------------------------------
@@ -38,11 +37,6 @@
*/
public static final IsEmpty<Object> INSTANCE = new IsEmpty<Object>();
- /**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = 6555097970639642373L;
-
// constructor
// ------------------------------------------------------------------------
/**
diff --git a/core/src/main/java/org/apache/commons/functor/core/collection/Size.java b/core/src/main/java/org/apache/commons/functor/core/collection/Size.java
index d95f6cd..ddbe3b3 100644
--- a/core/src/main/java/org/apache/commons/functor/core/collection/Size.java
+++ b/core/src/main/java/org/apache/commons/functor/core/collection/Size.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.collection;
-import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.Collection;
@@ -30,13 +29,9 @@
* @param <A> the function argument type.
* @version $Revision$ $Date$
*/
-public final class Size<A> implements Function<A, Integer>, Serializable {
+public final class Size<A> implements Function<A, Integer> {
/**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = -12374650738412129L;
- /**
* A static {@code Size} instance reference.
*/
private static final Size<Object> INSTANCE = new Size<Object>();
diff --git a/core/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java b/core/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
index 838c96c..2cb6156 100644
--- a/core/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
+++ b/core/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.comparator;
-import java.io.Serializable;
import java.util.Comparator;
/**
@@ -28,18 +27,13 @@
* @param <E> the comparable type
* @version $Revision$ $Date$
*/
-final class ComparableComparator<E extends Comparable<? super E>> implements Comparator<E>, Serializable {
+final class ComparableComparator<E extends Comparable<? super E>> implements Comparator<E> {
/** Singleton. */
@SuppressWarnings("rawtypes")
public static final ComparableComparator<?> INSTANCE = new ComparableComparator();
/**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = 9098756963321230038L;
-
- /**
* Create a new ComparableComparator.
*/
public ComparableComparator() {
diff --git a/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java b/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java
index c8daf53..f955c9e 100644
--- a/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java
+++ b/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.comparator;
-import java.io.Serializable;
import java.util.Comparator;
import org.apache.commons.functor.BinaryFunction;
@@ -29,7 +28,7 @@
* @param <T> the binary function input types
* @version $Revision$ $Date$
*/
-public final class ComparatorFunction<T> implements BinaryFunction<T, T, Integer>, Serializable {
+public final class ComparatorFunction<T> implements BinaryFunction<T, T, Integer> {
/**
* Basic ComparatorFunction instance.
@@ -37,11 +36,6 @@
public static final ComparatorFunction<Comparable<?>> INSTANCE = ComparatorFunction.<Comparable<?>>instance();
/**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = 1642024869929206095L;
-
- /**
* The comparator to wrap.
*/
private final Comparator<? super T> comparator;
diff --git a/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java b/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
index fef2625..48b70ec 100644
--- a/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
+++ b/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.comparator;
-import java.io.Serializable;
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
@@ -35,7 +34,7 @@
* @param <T> the binary predicate input types
* @version $Revision$ $Date$
*/
-public final class IsEquivalent<T> implements BinaryPredicate<T, T>, Serializable {
+public final class IsEquivalent<T> implements BinaryPredicate<T, T> {
/**
* Basic IsEquivalent instance.
@@ -43,11 +42,6 @@
public static final IsEquivalent<Comparable<?>> INSTANCE = IsEquivalent.<Comparable<?>> instance();
/**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = 1884411899682486777L;
-
- /**
* The wrapped comparator.
*/
private final Comparator<? super T> comparator;
diff --git a/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java b/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
index 4eb0ab2..b1a4b23 100644
--- a/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
+++ b/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.comparator;
-import java.io.Serializable;
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
@@ -34,7 +33,7 @@
* @param <T> the binary predicate input types
* @version $Revision$ $Date$
*/
-public final class IsGreaterThan<T> implements BinaryPredicate<T, T>, Serializable {
+public final class IsGreaterThan<T> implements BinaryPredicate<T, T> {
/**
* Basic IsGreaterThan instance.
@@ -42,11 +41,6 @@
public static final IsGreaterThan<Comparable<?>> INSTANCE = IsGreaterThan.<Comparable<?>>instance();
/**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = 377027098765821021L;
-
- /**
* The wrapped comparator.
*/
private final Comparator<? super T> comparator;
diff --git a/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java b/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
index ab38de9..5a4d501 100644
--- a/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
+++ b/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.comparator;
-import java.io.Serializable;
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
@@ -34,7 +33,7 @@
* @param <T> the binary predicate input types
* @version $Revision$ $Date$
*/
-public final class IsGreaterThanOrEqual<T> implements BinaryPredicate<T, T>, Serializable {
+public final class IsGreaterThanOrEqual<T> implements BinaryPredicate<T, T> {
/**
* Basic IsGreaterThanOrEqual instance.
@@ -43,11 +42,6 @@
.<Comparable<?>> instance();
/**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = 1550544203070228570L;
-
- /**
* The wrapped comparator.
*/
private final Comparator<? super T> comparator;
diff --git a/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java b/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
index 91ba1ad..97a9984 100644
--- a/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
+++ b/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.comparator;
-import java.io.Serializable;
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
@@ -34,7 +33,7 @@
* @param <T> the binary predicate input types
* @version $Revision$ $Date$
*/
-public final class IsLessThan<T> implements BinaryPredicate<T, T>, Serializable {
+public final class IsLessThan<T> implements BinaryPredicate<T, T> {
/**
* Basic IsLessThan instance.
@@ -42,11 +41,6 @@
public static final IsLessThan<Comparable<?>> INSTANCE = IsLessThan.<Comparable<?>>instance();
/**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = 6948263958172180877L;;
-
- /**
* The wrapped comparator.
*/
private final Comparator<? super T> comparator;
diff --git a/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java b/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
index c42c462..3d1bc85 100644
--- a/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
+++ b/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.comparator;
-import java.io.Serializable;
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
@@ -34,7 +33,7 @@
* @param <T> the binary predicate input types
* @version $Revision$ $Date$
*/
-public final class IsLessThanOrEqual<T> implements BinaryPredicate<T, T>, Serializable {
+public final class IsLessThanOrEqual<T> implements BinaryPredicate<T, T> {
/**
* Basic IsLessThanOrEqual instance.
@@ -42,11 +41,6 @@
public static final IsLessThanOrEqual<Comparable<?>> INSTANCE = IsLessThanOrEqual.<Comparable<?>>instance();
/**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = -5791636848361450563L;
-
- /**
* The wrapped comparator.
*/
private final Comparator<? super T> comparator;
diff --git a/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java b/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
index 84df0b7..3a9a2c6 100644
--- a/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
+++ b/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.comparator;
-import java.io.Serializable;
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
@@ -35,7 +34,7 @@
* @param <T> the binary predicate input types
* @version $Revision$ $Date$
*/
-public final class IsNotEquivalent<T> implements BinaryPredicate<T, T>, Serializable {
+public final class IsNotEquivalent<T> implements BinaryPredicate<T, T> {
/**
* Basic IsNotEquivalent instance.
@@ -43,11 +42,6 @@
public static final IsNotEquivalent<Comparable<?>> INSTANCE = IsNotEquivalent.<Comparable<?>>instance();
/**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = 1021154684877529051L;
-
- /**
* The wrapped comparator.
*/
private final Comparator<? super T> comparator;
diff --git a/core/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java b/core/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
index 71fb2bb..c0c3857 100644
--- a/core/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
+++ b/core/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.comparator;
-import java.io.Serializable;
import org.apache.commons.functor.Predicate;
import org.apache.commons.lang3.Validate;
@@ -28,11 +27,7 @@
* @param <A> the predicate argument type.
* @version $Revision$ $Date$
*/
-public class IsWithinRange<A extends Comparable<A>> implements Predicate<A>, Serializable {
- /**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = -7584005207181667878L;
+public class IsWithinRange<A extends Comparable<A>> implements Predicate<A> {
/** Hashcode of the name of this Predicate. */
private static final int NAME_HASH_CODE = "IsWithinRange".hashCode();
diff --git a/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java b/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java
index 218a0a9..1552871 100644
--- a/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java
+++ b/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.comparator;
-import java.io.Serializable;
import java.util.Comparator;
import org.apache.commons.functor.BinaryFunction;
@@ -31,7 +30,7 @@
* @param <T> the binary function arguments and return types.
* @version $Revision$ $Date$
*/
-public final class Max<T> implements BinaryFunction<T, T, T>, Serializable {
+public final class Max<T> implements BinaryFunction<T, T, T> {
/**
* Basic Max instance.
@@ -39,11 +38,6 @@
public static final Max<Comparable<?>> INSTANCE = Max.<Comparable<?>>instance();
/**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = 6514424464263828685L;
-
- /**
* The wrapped comparator.
*/
private final Comparator<T> comparator;
diff --git a/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java b/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java
index 4cf0039..a408df3 100644
--- a/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java
+++ b/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.functor.core.comparator;
-import java.io.Serializable;
import java.util.Comparator;
import org.apache.commons.functor.BinaryFunction;
@@ -31,7 +30,7 @@
* @param <T> the binary function arguments and return types.
* @version $Revision$ $Date$
*/
-public final class Min<T> implements BinaryFunction<T, T, T>, Serializable {
+public final class Min<T> implements BinaryFunction<T, T, T> {
/**
* Basic Min instance.
@@ -39,11 +38,6 @@
public static final Min<Comparable<?>> INSTANCE = Min.<Comparable<?>>instance();
/**
- * serialVersionUID declaration.
- */
- private static final long serialVersionUID = -3538911698805767997L;
-
- /**
* The wrapped comparator.
*/
private final Comparator<T> comparator;
