factory methods for empty collections

sf105 · sf105 · commit f95655951df5 · 2014-12-26T12:43:07.000+01:00
diff --git a/hamcrest-library/src/main/java/org/hamcrest/Matchers.java b/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
@@ -1,6 +1,7 @@
 package org.hamcrest;
 
 import org.hamcrest.collection.MatchArrays;
+import org.hamcrest.collection.MatchCollections;
 import org.hamcrest.collection.MatchIterables;
 import org.hamcrest.number.MatchNumbers;
 import org.hamcrest.object.MatchObjects;
@@ -725,7 +726,7 @@ public static <E> org.hamcrest.Matcher<java.util.Collection<? extends E>> hasSiz
      * <pre>assertThat(new ArrayList&lt;String&gt;(), is(empty()))</pre>
      */
     public static <E> org.hamcrest.Matcher<java.util.Collection<? extends E>> empty() {
-        return org.hamcrest.collection.IsEmptyCollection.empty();
+        return MatchCollections.empty();
     }
 
     /**
@@ -737,7 +738,7 @@ public static <E> org.hamcrest.Matcher<java.util.Collection<? extends E>> empty(
      * @param unusedToForceReturnType the type of the collection's content
      */
     public static <E> org.hamcrest.Matcher<java.util.Collection<E>> emptyCollectionOf(java.lang.Class<E> unusedToForceReturnType) {
-        return org.hamcrest.collection.IsEmptyCollection.emptyCollectionOf(unusedToForceReturnType);
+        return MatchCollections.emptyCollectionOf(unusedToForceReturnType);
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsEmptyCollection.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsEmptyCollection.java
@@ -1,7 +1,6 @@
 package org.hamcrest.collection;
 
 import org.hamcrest.Description;
-import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
 import java.util.Collection;
@@ -26,28 +25,4 @@ public void describeTo(Description description) {
         description.appendText("an empty collection");
     }
 
-    /**
-     * Creates a matcher for {@link java.util.Collection}s matching examined collections whose <code>isEmpty</code>
-     * method returns <code>true</code>.
-     * For example:
-     * <pre>assertThat(new ArrayList&lt;String&gt;(), is(empty()))</pre>
-     * 
-     */
-    public static <E> Matcher<Collection<? extends E>> empty() {
-        return new IsEmptyCollection<>();
-    }
-
-    /**
-     * Creates a matcher for {@link java.util.Collection}s matching examined collections whose <code>isEmpty</code>
-     * method returns <code>true</code>.
-     * For example:
-     * <pre>assertThat(new ArrayList&lt;String&gt;(), is(emptyCollectionOf(String.class)))</pre>
-     * 
-     * @param unusedToForceReturnType
-     *     the type of the collection's content
-     */
-    @SuppressWarnings({"unchecked", "UnusedParameters"})
-    public static <E> Matcher<Collection<E>> emptyCollectionOf(Class<E> unusedToForceReturnType) {
-      return (Matcher)empty();
-    }
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/MatchCollections.java b/hamcrest-library/src/main/java/org/hamcrest/collection/MatchCollections.java
@@ -52,7 +52,8 @@ public static <E> Matcher<Collection<? extends E>> empty() {
    *
    * @param unusedToForceReturnType the type of the collection's content
    */
-  public static <E> Matcher<Collection<? extends E>> emptyCollectionOf(Class<E> unusedToForceReturnType) {
-      return new IsEmptyCollection<>();
+  @SuppressWarnings("unchecked")
+  public static <E> Matcher<Collection<E>> emptyCollectionOf(Class<E> unusedToForceReturnType) {
+      return (Matcher)empty();
   }
 }
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsEmptyCollectionTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsEmptyCollectionTest.java
@@ -7,7 +7,7 @@
 import java.util.Collection;
 
 import static java.util.Arrays.asList;
-import static org.hamcrest.collection.IsEmptyCollection.empty;
+import static org.hamcrest.collection.MatchCollections.empty;
 import static org.hamcrest.core.Is.is;
 
 public class IsEmptyCollectionTest extends AbstractMatcherTest {
@@ -30,7 +30,7 @@ public void testHasAReadableDescription() {
     }
 
     public void testCompiles() {
-        needs(IsEmptyCollection.emptyCollectionOf(String.class));
+        needs(MatchCollections.emptyCollectionOf(String.class));
     }
 
     private void needs(@SuppressWarnings("unused") Matcher<Collection<String>> bar) { }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ public static <E> Matcher<Collection<? extends E>> empty() {`
`52`	`52`	`*`
`53`	`53`	`* @param unusedToForceReturnType the type of the collection's content`
`54`	`54`	`*/`
`55`		`- public static <E> Matcher<Collection<? extends E>> emptyCollectionOf(Class<E> unusedToForceReturnType) {`
`56`		`- return new IsEmptyCollection<>();`
	`55`	`+ @SuppressWarnings("unchecked")`
	`56`	`+ public static <E> Matcher<Collection<E>> emptyCollectionOf(Class<E> unusedToForceReturnType) {`
	`57`	`+ return (Matcher)empty();`
`57`	`58`	`}`
`58`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`import java.util.Collection;`
`8`	`8`
`9`	`9`	`import static java.util.Arrays.asList;`
`10`		`-import static org.hamcrest.collection.IsEmptyCollection.empty;`
	`10`	`+import static org.hamcrest.collection.MatchCollections.empty;`
`11`	`11`	`import static org.hamcrest.core.Is.is;`
`12`	`12`
`13`	`13`	`public class IsEmptyCollectionTest extends AbstractMatcherTest {`
`@@ -30,7 +30,7 @@ public void testHasAReadableDescription() {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public void testCompiles() {`
`33`		`- needs(IsEmptyCollection.emptyCollectionOf(String.class));`
	`33`	`+ needs(MatchCollections.emptyCollectionOf(String.class));`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`private void needs(@SuppressWarnings("unused") Matcher<Collection<String>> bar) { }`