Extracting Matching grouping classes

sf105 · sf105 · commit 6d0a579c441b · 2015-05-03T10:15: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
@@ -241,9 +241,10 @@ public static org.hamcrest.Matcher<java.lang.Object> anything(java.lang.String d
    * 
    * @param itemMatcher
    *     the matcher to apply to items provided by the examined {@link Iterable}
+   * @Deprecated use org.hamcrest.MatchingCollections instead
    */
   public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(org.hamcrest.Matcher<? super T> itemMatcher) {
-    return IsCollectionContaining.<T>hasItem(itemMatcher);
+    return MatchingCollections.hasItem(itemMatcher);
   }
 
   /**
@@ -256,9 +257,10 @@ public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(or
    * 
    * @param item
    *     the item to compare against the items provided by the examined {@link Iterable}
+   * @Deprecated use org.hamcrest.MatchingCollections instead
    */
   public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(T item) {
-    return IsCollectionContaining.<T>hasItem(item);
+    return MatchingCollections.hasItem(item);
   }
 
   /**
@@ -271,9 +273,10 @@ public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(T
    * 
    * @param itemMatchers
    *     the matchers to apply to items provided by the examined {@link Iterable}
+   * @Deprecated use org.hamcrest.MatchingCollections instead
    */
   public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(org.hamcrest.Matcher<? super T>... itemMatchers) {
-    return IsCollectionContaining.<T>hasItems(itemMatchers);
+    return MatchingCollections.hasItems(itemMatchers);
   }
 
   /**
@@ -286,9 +289,10 @@ public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(org.hamcr
    * 
    * @param items
    *     the items to compare against the items provided by the examined {@link Iterable}
+   * @Deprecated use org.hamcrest.MatchingCollections instead
    */
   public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(T... items) {
-    return IsCollectionContaining.<T>hasItems(items);
+    return MatchingCollections.hasItems(items);
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -241,9 +241,10 @@ public static org.hamcrest.Matcher<java.lang.Object> anything(java.lang.String d`
`241`	`241`	`*`
`242`	`242`	`* @param itemMatcher`
`243`	`243`	`* the matcher to apply to items provided by the examined {@link Iterable}`
	`244`	`+ * @Deprecated use org.hamcrest.MatchingCollections instead`
`244`	`245`	`*/`
`245`	`246`	`public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(org.hamcrest.Matcher<? super T> itemMatcher) {`
`246`		`- return IsCollectionContaining.<T>hasItem(itemMatcher);`
	`247`	`+ return MatchingCollections.hasItem(itemMatcher);`
`247`	`248`	`}`
`248`	`249`
`249`	`250`	`/**`
`@@ -256,9 +257,10 @@ public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(or`
`256`	`257`	`*`
`257`	`258`	`* @param item`
`258`	`259`	`* the item to compare against the items provided by the examined {@link Iterable}`
	`260`	`+ * @Deprecated use org.hamcrest.MatchingCollections instead`
`259`	`261`	`*/`
`260`	`262`	`public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(T item) {`
`261`		`- return IsCollectionContaining.<T>hasItem(item);`
	`263`	`+ return MatchingCollections.hasItem(item);`
`262`	`264`	`}`
`263`	`265`
`264`	`266`	`/**`
`@@ -271,9 +273,10 @@ public static <T> org.hamcrest.Matcher<java.lang.Iterable<? super T>> hasItem(T`
`271`	`273`	`*`
`272`	`274`	`* @param itemMatchers`
`273`	`275`	`* the matchers to apply to items provided by the examined {@link Iterable}`
	`276`	`+ * @Deprecated use org.hamcrest.MatchingCollections instead`
`274`	`277`	`*/`
`275`	`278`	`public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(org.hamcrest.Matcher<? super T>... itemMatchers) {`
`276`		`- return IsCollectionContaining.<T>hasItems(itemMatchers);`
	`279`	`+ return MatchingCollections.hasItems(itemMatchers);`
`277`	`280`	`}`
`278`	`281`
`279`	`282`	`/**`
`@@ -286,9 +289,10 @@ public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(org.hamcr`
`286`	`289`	`*`
`287`	`290`	`* @param items`
`288`	`291`	`* the items to compare against the items provided by the examined {@link Iterable}`
	`292`	`+ * @Deprecated use org.hamcrest.MatchingCollections instead`
`289`	`293`	`*/`
`290`	`294`	`public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(T... items) {`
`291`		`- return IsCollectionContaining.<T>hasItems(items);`
	`295`	`+ return MatchingCollections.hasItems(items);`
`292`	`296`	`}`
`293`	`297`
`294`	`298`	`/**`