Repository: commons-collections Updated Branches: refs/heads/master b9e2a9775 -> 1bcfa1cc8
Remove unnecessary casts Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/1bcfa1cc Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/1bcfa1cc Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/1bcfa1cc Branch: refs/heads/master Commit: 1bcfa1cc87889cd97e62a9402079f5bc70a0f563 Parents: b9e2a97 Author: Gary Gregory <ggreg...@apache.org> Authored: Wed Oct 11 16:39:20 2017 -0600 Committer: Gary Gregory <ggreg...@apache.org> Committed: Wed Oct 11 16:39:20 2017 -0600 ---------------------------------------------------------------------- src/main/java/org/apache/commons/collections4/BagUtils.java | 2 +- src/main/java/org/apache/commons/collections4/QueueUtils.java | 2 +- .../apache/commons/collections4/functors/ConstantFactory.java | 2 +- .../commons/collections4/functors/ConstantTransformer.java | 2 +- .../org/apache/commons/collections4/functors/DefaultEquator.java | 2 +- .../apache/commons/collections4/functors/ExceptionClosure.java | 2 +- .../apache/commons/collections4/functors/ExceptionFactory.java | 2 +- .../apache/commons/collections4/functors/ExceptionPredicate.java | 2 +- .../commons/collections4/functors/ExceptionTransformer.java | 2 +- .../org/apache/commons/collections4/functors/FalsePredicate.java | 2 +- .../org/apache/commons/collections4/functors/NOPClosure.java | 2 +- .../org/apache/commons/collections4/functors/NOPTransformer.java | 2 +- .../apache/commons/collections4/functors/NotNullPredicate.java | 2 +- .../org/apache/commons/collections4/functors/NullPredicate.java | 2 +- .../org/apache/commons/collections4/functors/TruePredicate.java | 2 +- .../org/apache/commons/collections4/iterators/EmptyIterator.java | 4 ++-- .../apache/commons/collections4/iterators/EmptyListIterator.java | 4 ++-- .../apache/commons/collections4/iterators/EmptyMapIterator.java | 2 +- .../commons/collections4/iterators/EmptyOrderedIterator.java | 2 +- .../commons/collections4/iterators/EmptyOrderedMapIterator.java | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/BagUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/BagUtils.java b/src/main/java/org/apache/commons/collections4/BagUtils.java index deac7e6..c9bfed7 100644 --- a/src/main/java/org/apache/commons/collections4/BagUtils.java +++ b/src/main/java/org/apache/commons/collections4/BagUtils.java @@ -245,7 +245,7 @@ public class BagUtils { */ @SuppressWarnings("unchecked") // OK, empty bag is compatible with any type public static <E> Bag<E> emptyBag() { - return (Bag<E>) EMPTY_BAG; + return EMPTY_BAG; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/QueueUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/QueueUtils.java b/src/main/java/org/apache/commons/collections4/QueueUtils.java index 44b50d8..053581c 100644 --- a/src/main/java/org/apache/commons/collections4/QueueUtils.java +++ b/src/main/java/org/apache/commons/collections4/QueueUtils.java @@ -102,6 +102,6 @@ public class QueueUtils { */ @SuppressWarnings("unchecked") // OK, empty queue is compatible with any type public static <E> Queue<E> emptyQueue() { - return (Queue<E>) EMPTY_QUEUE; + return EMPTY_QUEUE; } } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java index 21ea059..1e1fd83 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java +++ b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java @@ -51,7 +51,7 @@ public class ConstantFactory<T> implements Factory<T>, Serializable { @SuppressWarnings("unchecked") // The null factory works for all object types public static <T> Factory<T> constantFactory(final T constantToReturn) { if (constantToReturn == null) { - return (Factory<T>) NULL_INSTANCE; + return NULL_INSTANCE; } return new ConstantFactory<>(constantToReturn); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java index 826a526..faaedf1 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java @@ -50,7 +50,7 @@ public class ConstantTransformer<I, O> implements Transformer<I, O>, Serializabl */ @SuppressWarnings("unchecked") // The null transformer works for all object types public static <I, O> Transformer<I, O> nullTransformer() { - return (Transformer<I, O>) NULL_INSTANCE; + return NULL_INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java index bf265e0..36c116d 100644 --- a/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java +++ b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java @@ -48,7 +48,7 @@ public class DefaultEquator<T> implements Equator<T>, Serializable { */ @SuppressWarnings("unchecked") // the static instance works for all types public static <T> DefaultEquator<T> defaultEquator() { - return (DefaultEquator<T>) DefaultEquator.INSTANCE; + return DefaultEquator.INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java index 7369298..ce6843e 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java @@ -44,7 +44,7 @@ public final class ExceptionClosure<E> implements Closure<E>, Serializable { */ @SuppressWarnings("unchecked") // the static instance works for all types public static <E> Closure<E> exceptionClosure() { - return (Closure<E>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java index 898b2fc..a40b553 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java @@ -44,7 +44,7 @@ public final class ExceptionFactory<T> implements Factory<T>, Serializable { */ @SuppressWarnings("unchecked") // the static instance works for all types public static <T> Factory<T> exceptionFactory() { - return (Factory<T>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java index 5399eaf..6d8f2aa 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java @@ -44,7 +44,7 @@ public final class ExceptionPredicate<T> implements Predicate<T>, Serializable { */ @SuppressWarnings("unchecked") // the static instance works for all types public static <T> Predicate<T> exceptionPredicate() { - return (Predicate<T>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java index f9b55f0..3626fb9 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java @@ -45,7 +45,7 @@ public final class ExceptionTransformer<I, O> implements Transformer<I, O>, Seri */ @SuppressWarnings("unchecked") // the static instance works for all types public static <I, O> Transformer<I, O> exceptionTransformer() { - return (Transformer<I, O>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java index 26aaca3..f88f018 100644 --- a/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java @@ -43,7 +43,7 @@ public final class FalsePredicate<T> implements Predicate<T>, Serializable { */ @SuppressWarnings("unchecked") // the static instance works for all types public static <T> Predicate<T> falsePredicate() { - return (Predicate<T>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java index 96b464c..1ec9d15 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java @@ -43,7 +43,7 @@ public final class NOPClosure<E> implements Closure<E>, Serializable { */ @SuppressWarnings("unchecked") public static <E> Closure<E> nopClosure() { - return (Closure<E>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java index c2c4f6d..439902d 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java @@ -43,7 +43,7 @@ public class NOPTransformer<T> implements Transformer<T, T>, Serializable { */ @SuppressWarnings("unchecked") public static <T> Transformer<T, T> nopTransformer() { - return (Transformer<T, T>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java index eab2f67..e6a47c4 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java @@ -43,7 +43,7 @@ public final class NotNullPredicate<T> implements Predicate<T>, Serializable { */ @SuppressWarnings("unchecked") public static <T> Predicate<T> notNullPredicate() { - return (Predicate<T>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java index 1609c37..5c9c43a 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java @@ -43,7 +43,7 @@ public final class NullPredicate<T> implements Predicate<T>, Serializable { */ @SuppressWarnings("unchecked") public static <T> Predicate<T> nullPredicate() { - return (Predicate<T>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java index a04b334..2a899a4 100644 --- a/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java @@ -43,7 +43,7 @@ public final class TruePredicate<T> implements Predicate<T>, Serializable { */ @SuppressWarnings("unchecked") public static <T> Predicate<T> truePredicate() { - return (Predicate<T>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java index 1ba2f88..b381b57 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java @@ -52,7 +52,7 @@ public class EmptyIterator<E> extends AbstractEmptyIterator<E> implements Resett */ @SuppressWarnings("unchecked") public static <E> ResettableIterator<E> resettableEmptyIterator() { - return (ResettableIterator<E>) RESETTABLE_INSTANCE; + return RESETTABLE_INSTANCE; } /** @@ -62,7 +62,7 @@ public class EmptyIterator<E> extends AbstractEmptyIterator<E> implements Resett */ @SuppressWarnings("unchecked") public static <E> Iterator<E> emptyIterator() { - return (Iterator<E>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java index 92c431c..f54e1e9 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java @@ -53,7 +53,7 @@ public class EmptyListIterator<E> extends AbstractEmptyIterator<E> implements */ @SuppressWarnings("unchecked") public static <E> ResettableListIterator<E> resettableEmptyListIterator() { - return (ResettableListIterator<E>) RESETTABLE_INSTANCE; + return RESETTABLE_INSTANCE; } /** @@ -63,7 +63,7 @@ public class EmptyListIterator<E> extends AbstractEmptyIterator<E> implements */ @SuppressWarnings("unchecked") public static <E> ListIterator<E> emptyListIterator() { - return (ListIterator<E>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java index 3b97508..a890811 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java @@ -42,7 +42,7 @@ public class EmptyMapIterator<K, V> extends AbstractEmptyMapIterator<K, V> imple */ @SuppressWarnings("unchecked") public static <K, V> MapIterator<K, V> emptyMapIterator() { - return (MapIterator<K, V>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java index ff9d386..3f5664e 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java @@ -41,7 +41,7 @@ public class EmptyOrderedIterator<E> extends AbstractEmptyIterator<E> */ @SuppressWarnings("unchecked") public static <E> OrderedIterator<E> emptyOrderedIterator() { - return (OrderedIterator<E>) INSTANCE; + return INSTANCE; } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1bcfa1cc/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java index 598c77a..dab9aed 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java @@ -42,7 +42,7 @@ public class EmptyOrderedMapIterator<K, V> extends AbstractEmptyMapIterator<K, V */ @SuppressWarnings("unchecked") public static <K, V> OrderedMapIterator<K, V> emptyOrderedMapIterator() { - return (OrderedMapIterator<K, V>) INSTANCE; + return INSTANCE; } /**