Cleanups (templating etc) for Java 7

sf105 · sf105 · commit cafc6a253eb6 · 2016-04-06T15:49:31.000+02:00
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
@@ -19,7 +19,7 @@ public IsIterableContainingInRelativeOrder(List<Matcher<? super E>> matchers) {
 
     @Override
     protected boolean matchesSafely(Iterable<? extends E> iterable, Description mismatchDescription) {
-        MatchSeriesInRelativeOrder<E> matchSeriesInRelativeOrder = new MatchSeriesInRelativeOrder<E>(matchers, mismatchDescription);
+        MatchSeriesInRelativeOrder<E> matchSeriesInRelativeOrder = new MatchSeriesInRelativeOrder<>(matchers, mismatchDescription);
         matchSeriesInRelativeOrder.processItems(iterable);
         return matchSeriesInRelativeOrder.isFinished();
     }
@@ -77,8 +77,9 @@ public boolean isFinished() {
      * @param items
      *     the items that must be contained within items provided by an examined {@link Iterable} in the same relative order
      */
+    @SafeVarargs
     public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(E... items) {
-        List<Matcher<? super E>> matchers = new ArrayList<Matcher<? super E>>();
+        List<Matcher<? super E>> matchers = new ArrayList<>();
         for (E item : items) {
             matchers.add(equalTo(item));
         }
@@ -96,6 +97,7 @@ public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(E... it
      * @param itemMatchers
      *     the matchers that must be satisfied by the items provided by an examined {@link Iterable} in the same relative order
      */
+    @SafeVarargs
     public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) {
         return containsInRelativeOrder(asList(itemMatchers));
     }
@@ -112,6 +114,6 @@ public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher
      *     an examined {@link Iterable} in the same relative order
      */
     public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(List<Matcher<? super E>> itemMatchers) {
-        return new IsIterableContainingInRelativeOrder<E>(itemMatchers);
+        return new IsIterableContainingInRelativeOrder<>(itemMatchers);
     }
 }
