Author: kinow Date: Fri Nov 1 11:30:19 2013 New Revision: 1537901 URL: http://svn.apache.org/r1537901 Log: FUNCTOR-29 removing serializable from the collection and comparator packages
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/Size.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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>(); Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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 final class IsEmpty<A> implements */ public static final IsEmpty<Object> INSTANCE = new IsEmpty<Object>(); - /** - * serialVersionUID declaration. - */ - private static final long serialVersionUID = 6555097970639642373L; - // constructor // ------------------------------------------------------------------------ /** Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/Size.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/Size.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/Size.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/collection/Size.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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>(); Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java Fri Nov 1 11:30:19 2013 @@ -16,7 +16,6 @@ */ package org.apache.commons.functor.core.comparator; -import java.io.Serializable; import java.util.Comparator; /** @@ -28,18 +27,13 @@ import java.util.Comparator; * @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() { Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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 final class ComparatorFunction<T> 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; Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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 final class IsEquivalent<T> imple 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; Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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 final class IsGreaterThan<T> impl 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; Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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 @@ public final class IsGreaterThanOrEqual< .<Comparable<?>> instance(); /** - * serialVersionUID declaration. - */ - private static final long serialVersionUID = 1550544203070228570L; - - /** * The wrapped comparator. */ private final Comparator<? super T> comparator; Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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 final class IsLessThan<T> impleme 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; Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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 final class IsLessThanOrEqual<T> 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; Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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 final class IsNotEquivalent<T> im 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; Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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(); Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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 final class Max<T> implements Bin 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; Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java?rev=1537901&r1=1537900&r2=1537901&view=diff ============================================================================== --- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java (original) +++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java Fri Nov 1 11:30:19 2013 @@ -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 @@ import org.apache.commons.lang3.Validate * @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 final class Min<T> implements Bin 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;