remove generic type from various meta-collection predicates

4 files changed, 21 insertions, 29 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/predicate/CollectionSizeEqualsPredicate.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/predicate/CollectionSizeEqualsPredicate.java
index b7c9ce5718..a6708c1d8c 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/predicate/CollectionSizeEqualsPredicate.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/predicate/CollectionSizeEqualsPredicate.java
@@ -17,11 +17,9 @@ import org.eclipse.jpt.common.utility.predicate.Predicate;
 /**
  * A predicate that will evaluate whether a collection's
  * size is equal to a specified size.
- * 
- * @param <E> the type of elements held by the collection
  */
-public class CollectionSizeEqualsPredicate<E>
-	implements Predicate<Collection<E>>, Serializable
+public class CollectionSizeEqualsPredicate
+	implements Predicate<Collection<?>>, Serializable
 {
 	private final int size;
 	private static final long serialVersionUID = 1L;
@@ -35,7 +33,7 @@ public class CollectionSizeEqualsPredicate<E>
 		this.size = size;
 	}
 
-	public boolean evaluate(Collection<E> collection) {
+	public boolean evaluate(Collection<?> collection) {
 		return collection.size() == this.size;
 	}
 
@@ -51,7 +49,7 @@ public class CollectionSizeEqualsPredicate<E>
 		if ((o == null) || (o.getClass() != this.getClass())) {
 			return false;
 		}
-		CollectionSizeEqualsPredicate<?> other = (CollectionSizeEqualsPredicate<?>) o;
+		CollectionSizeEqualsPredicate other = (CollectionSizeEqualsPredicate) o;
 		return this.size == other.size;
 	}
 
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/predicate/PredicateTools.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/predicate/PredicateTools.java
index ec7a0ec15d..4c2f198c76 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/predicate/PredicateTools.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/predicate/PredicateTools.java
@@ -377,45 +377,39 @@ public final class PredicateTools {
 
 	/**
 	 * Return a predicate that returns whether a collection is <em>not</em> empty.
-	 * @param <E> the type of elements in the collection
 	 */
-	public static <E> Predicate<Collection<E>> collectionIsNotEmptyPredicate() {
+	public static Predicate<Collection<?>> collectionIsNotEmptyPredicate() {
 		return not(collectionIsEmptyPredicate());
 	}
 
 	/**
 	 * Return a predicate that returns whether a collection is empty.
-	 * @param <E> the type of elements in the collection
 	 */
-	public static <E> Predicate<Collection<E>> collectionIsEmptyPredicate() {
+	public static Predicate<Collection<?>> collectionIsEmptyPredicate() {
 		return CollectionIsEmptyPredicate.instance();
 	}
 
 	/**
 	 * Return a predicate that returns whether a collection contains exactly one element.
-	 * @param <E> the type of elements in the collection
 	 */
-	@SuppressWarnings("unchecked")
-	public static <E> Predicate<Collection<E>> collectionContainsSingleElementPredicate() {
+	public static Predicate<Collection<?>> collectionContainsSingleElementPredicate() {
 		return COLLECTION_CONTAINS_SINGLE_ELEMENT_PREDICATE;
 	}
 
 	/**
 	 * A predicate that returns whether a collection contains exactly one element.
 	 */
-	@SuppressWarnings("rawtypes")
-	public static final Predicate COLLECTION_CONTAINS_SINGLE_ELEMENT_PREDICATE = collectionSizeEqualsPredicate_(1);
+	public static final Predicate<Collection<?>> COLLECTION_CONTAINS_SINGLE_ELEMENT_PREDICATE = collectionSizeEqualsPredicate_(1);
 
 	/**
 	 * Return a predicate that returns whether a collection's is the specified size.
-	 * @param <E> the type of elements in the collection
 	 */
-	public static <E> Predicate<Collection<E>> collectionSizeEqualsPredicate(int size) {
+	public static Predicate<Collection<?>> collectionSizeEqualsPredicate(int size) {
 		return (size == 0) ? collectionIsEmptyPredicate(): (size == 1) ? collectionContainsSingleElementPredicate() : collectionSizeEqualsPredicate_(size);
 	}
 
-	private static <E> Predicate<Collection<E>> collectionSizeEqualsPredicate_(int size) {
-		return new CollectionSizeEqualsPredicate<>(size);
+	private static Predicate<Collection<?>> collectionSizeEqualsPredicate_(int size) {
+		return new CollectionSizeEqualsPredicate(size);
 	}
 
 
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/predicate/CollectionIsEmptyPredicateTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/predicate/CollectionIsEmptyPredicateTests.java
index e4b0db7a66..054226847b 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/predicate/CollectionIsEmptyPredicateTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/predicate/CollectionIsEmptyPredicateTests.java
@@ -26,7 +26,7 @@ public class CollectionIsEmptyPredicateTests
 
 	public void testEvaluate() {
 		Collection<String> list = new ArrayList<>();
-		Predicate<Collection<String>> predicate = PredicateTools.collectionIsEmptyPredicate();
+		Predicate<Collection<?>> predicate = PredicateTools.collectionIsEmptyPredicate();
 		assertTrue(predicate.evaluate(list));
 		list.add("foo");
 		assertFalse(predicate.evaluate(list));
@@ -35,12 +35,12 @@ public class CollectionIsEmptyPredicateTests
 	}
 
 	public void testToString() {
-		Predicate<Collection<String>> predicate = PredicateTools.collectionIsEmptyPredicate();
+		Predicate<Collection<?>> predicate = PredicateTools.collectionIsEmptyPredicate();
 		assertEquals("CollectionIsEmptyPredicate", predicate.toString());
 	}
 
 	public void testSerialization() throws Exception {
-		Predicate<Collection<String>> predicate = PredicateTools.collectionIsEmptyPredicate();
+		Predicate<Collection<?>> predicate = PredicateTools.collectionIsEmptyPredicate();
 		assertSame(predicate, TestTools.serialize(predicate));
 	}
 }
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/predicate/CollectionSizeEqualsPredicateTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/predicate/CollectionSizeEqualsPredicateTests.java
index 334ccd72d5..f01e8d1e97 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/predicate/CollectionSizeEqualsPredicateTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/predicate/CollectionSizeEqualsPredicateTests.java
@@ -27,7 +27,7 @@ public class CollectionSizeEqualsPredicateTests
 
 	public void testEvaluate() {
 		Collection<String> list = new ArrayList<>();
-		Predicate<Collection<String>> predicate = PredicateTools.collectionSizeEqualsPredicate(2);
+		Predicate<Collection<?>> predicate = PredicateTools.collectionSizeEqualsPredicate(2);
 		assertFalse(predicate.evaluate(list));
 		list.add("foo");
 		assertFalse(predicate.evaluate(list));
@@ -44,14 +44,14 @@ public class CollectionSizeEqualsPredicateTests
 	}
 
 	public void testGetSize() throws Exception {
-		CollectionSizeEqualsPredicate<Collection<String>> predicate = (CollectionSizeEqualsPredicate<Collection<String>>) PredicateTools.<Collection<String>>collectionSizeEqualsPredicate(2);
+		CollectionSizeEqualsPredicate predicate = (CollectionSizeEqualsPredicate) PredicateTools.collectionSizeEqualsPredicate(2);
 		assertEquals(2, predicate.getSize());
 	}
 
 	public void testEquals() throws Exception {
-		Predicate<Collection<String>> predicate1 = PredicateTools.collectionSizeEqualsPredicate(2);
+		Predicate<Collection<?>> predicate1 = PredicateTools.collectionSizeEqualsPredicate(2);
 		assertFalse(predicate1.equals(null));
-		Predicate<Collection<String>> predicate2 = PredicateTools.collectionSizeEqualsPredicate(2);
+		Predicate<Collection<?>> predicate2 = PredicateTools.collectionSizeEqualsPredicate(2);
 		assertTrue(predicate1.equals(predicate2));
 		predicate2 = PredicateTools.collectionSizeEqualsPredicate(3);
 		assertFalse(predicate1.equals(predicate2));
@@ -60,17 +60,17 @@ public class CollectionSizeEqualsPredicateTests
 	}
 
 	public void testHashCode() throws Exception {
-		Predicate<Collection<String>> predicate = PredicateTools.collectionSizeEqualsPredicate(2);
+		Predicate<Collection<?>> predicate = PredicateTools.collectionSizeEqualsPredicate(2);
 		assertEquals(2, predicate.hashCode());
 	}
 
 	public void testToString() {
-		Predicate<Collection<String>> predicate = PredicateTools.collectionSizeEqualsPredicate(2);
+		Predicate<Collection<?>> predicate = PredicateTools.collectionSizeEqualsPredicate(2);
 		assertTrue(predicate.toString().indexOf("(2)") != -1);
 	}
 
 	public void testSerialization() throws Exception {
-		Predicate<Collection<String>> predicate = PredicateTools.collectionSizeEqualsPredicate(2);
+		Predicate<Collection<?>> predicate = PredicateTools.collectionSizeEqualsPredicate(2);
 		assertEquals(predicate, TestTools.serialize(predicate));
 	}
 }