Collapsing factory methods hasItemInArray

sf105 · sf105 · commit 67c72cfc278f · 2014-12-26T11:24:32.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
@@ -499,7 +499,7 @@ public static <T> org.hamcrest.collection.IsArray<T> array(org.hamcrest.Matcher<
      * @param elementMatcher the matcher to apply to elements in examined arrays
      */
     public static <T> org.hamcrest.Matcher<T[]> hasItemInArray(org.hamcrest.Matcher<? super T> elementMatcher) {
-        return org.hamcrest.collection.IsArrayContaining.hasItemInArray(elementMatcher);
+        return MatchArrays.hasItemInArray(elementMatcher);
     }
 
     /**
@@ -512,7 +512,7 @@ public static <T> org.hamcrest.Matcher<T[]> hasItemInArray(org.hamcrest.Matcher<
      * @param element the element that should be present in examined arrays
      */
     public static <T> org.hamcrest.Matcher<T[]> hasItemInArray(T element) {
-        return org.hamcrest.collection.IsArrayContaining.hasItemInArray(element);
+        return MatchArrays.hasItemInArray(element);
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContaining.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContaining.java
@@ -6,8 +6,6 @@
 
 import java.util.Arrays;
 
-import static org.hamcrest.core.IsEqual.equalTo;
-
 /**
  * Matches if an array contains an item satisfying a nested matcher.
  */
@@ -40,32 +38,4 @@ public void describeTo(Description description) {
             .appendDescriptionOf(elementMatcher);
     }
 
-    /**
-     * Creates a matcher for arrays that matches when the examined array contains at least one item
-     * that is matched by the specified <code>elementMatcher</code>.  Whilst matching, the traversal
-     * of the examined array will stop as soon as a matching element is found.
-     * For example:
-     * <pre>assertThat(new String[] {"foo", "bar"}, hasItemInArray(startsWith("ba")))</pre>
-     * 
-     * @param elementMatcher
-     *     the matcher to apply to elements in examined arrays
-     */
-    public static <T> Matcher<T[]> hasItemInArray(Matcher<? super T> elementMatcher) {
-        return new IsArrayContaining<>(elementMatcher);
-    }
-
-    /**
-     * A shortcut to the frequently used <code>hasItemInArray(equalTo(x))</code>.
-     * For example:
-     * <pre>assertThat(hasItemInArray(x))</pre>
-     * instead of:
-     * <pre>assertThat(hasItemInArray(equalTo(x)))</pre>
-     * 
-     * @param element
-     *     the element that should be present in examined arrays
-     */
-    public static <T> Matcher<T[]> hasItemInArray(T element) {
-        Matcher<? super T> matcher = equalTo(element);
-        return IsArrayContaining.hasItemInArray(matcher);
-    }
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/MatchArrays.java b/hamcrest-library/src/main/java/org/hamcrest/collection/MatchArrays.java
@@ -36,7 +36,7 @@ public static <T> IsArray<T> array(Matcher<? super T>... elementMatchers) {
      * @param elementMatcher the matcher to apply to elements in examined arrays
      */
     public static <T> Matcher<T[]> hasItemInArray(Matcher<? super T> elementMatcher) {
-        return IsArrayContaining.hasItemInArray(elementMatcher);
+        return new IsArrayContaining<>(elementMatcher);
     }
 
     /**
@@ -49,7 +49,7 @@ public static <T> Matcher<T[]> hasItemInArray(Matcher<? super T> elementMatcher)
      * @param element the element that should be present in examined arrays
      */
     public static <T> Matcher<T[]> hasItemInArray(T element) {
-        return IsArrayContaining.hasItemInArray(element);
+        return hasItemInArray(equalTo(element));
     }
 
     /**
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayContainingTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayContainingTest.java
@@ -3,7 +3,8 @@
 import org.hamcrest.AbstractMatcherTest;
 import org.hamcrest.Matcher;
 
-import static org.hamcrest.collection.IsArrayContaining.hasItemInArray;
+import static org.hamcrest.collection.MatchArrays.hasItemInArray;
+
 
 public class IsArrayContainingTest extends AbstractMatcherTest {
 
