Java 7 Clean Up

Explicit type argument T can be replaced with <>
hamcrest · Feb 13, 2022 · 3929ae3 · 3929ae3
1 parent 0ba3f59
commit 3929ae3
Show file tree

Hide file tree

Showing 27 changed files with 55 additions and 55 deletions.
diff --git a/hamcrest/src/main/java/org/hamcrest/Condition.java b/hamcrest/src/main/java/org/hamcrest/Condition.java
@@ -11,7 +11,7 @@
  */
 public abstract class Condition<T> {
 
-    public static final NotMatched<Object> NOT_MATCHED = new NotMatched<Object>();
+    public static final NotMatched<Object> NOT_MATCHED = new NotMatched<>();
 
     public interface Step<I, O> {
         Condition<O> apply(I value, Description mismatch);
@@ -31,7 +31,7 @@ public static <T> Condition<T> notMatched() {
     }
 
     public static <T> Condition<T> matched(final T theValue, final Description mismatch) {
-        return new Matched<T>(theValue, mismatch);
+        return new Matched<>(theValue, mismatch);
     }
 
     private static final class Matched<T> extends Condition<T> {

diff --git a/hamcrest/src/main/java/org/hamcrest/beans/HasProperty.java b/hamcrest/src/main/java/org/hamcrest/beans/HasProperty.java
@@ -53,7 +53,7 @@ public void describeTo(Description description) {
      * @return The matcher.
      */
     public static <T> Matcher<T> hasProperty(String propertyName) {
-        return new HasProperty<T>(propertyName);
+        return new HasProperty<>(propertyName);
     }
 
 }
diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArray.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArray.java
@@ -101,7 +101,7 @@ protected String descriptionEnd() {
      * @return The matcher.
      */
     public static <T> IsArray<T> array(Matcher<? super T>... elementMatchers) {
-        return new IsArray<T>(elementMatchers);
+        return new IsArray<>(elementMatchers);
     }
 
 }
diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
@@ -21,7 +21,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
     private final Collection<Matcher<? super E>> matchers;
 
     public IsArrayContainingInAnyOrder(Collection<Matcher<? super E>> matchers) {
-        this.iterableMatcher = new IsIterableContainingInAnyOrder<E>(matchers);
+        this.iterableMatcher = new IsIterableContainingInAnyOrder<>(matchers);
         this.matchers = matchers;
     }
 
@@ -86,7 +86,7 @@ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... i
      * @return The matcher.
      */
     public static <E> Matcher<E[]> arrayContainingInAnyOrder(Collection<Matcher<? super E>> itemMatchers) {
-        return new IsArrayContainingInAnyOrder<E>(itemMatchers);
+        return new IsArrayContainingInAnyOrder<>(itemMatchers);
     }
 
     /**
@@ -110,11 +110,11 @@ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Collection<Matcher<? su
      * @return The matcher.
      */
     public static <E> Matcher<E[]> arrayContainingInAnyOrder(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));
       }
-      return new IsArrayContainingInAnyOrder<E>(matchers);
+      return new IsArrayContainingInAnyOrder<>(matchers);
     }
 
 }
diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
@@ -20,7 +20,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
     private final IsIterableContainingInOrder<E> iterableMatcher;
 
     public IsArrayContainingInOrder(List<Matcher<? super E>> matchers) {
-        this.iterableMatcher = new IsIterableContainingInOrder<E>(matchers);
+        this.iterableMatcher = new IsIterableContainingInOrder<>(matchers);
         this.matchers = matchers;
     }
 
@@ -55,7 +55,7 @@ public void describeTo(Description description) {
      * @return The matcher.
      */
     public static <E> Matcher<E[]> arrayContaining(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));
         }
@@ -97,7 +97,7 @@ public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatcher
      * @return The matcher.
      */
     public static <E> Matcher<E[]> arrayContaining(List<Matcher<? super E>> itemMatchers) {
-        return new IsArrayContainingInOrder<E>(itemMatchers);
+        return new IsArrayContainingInOrder<>(itemMatchers);
     }
 
 }
diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java b/hamcrest/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java
@@ -34,7 +34,7 @@ protected Integer featureValueOf(Collection<? extends E> actual) {
      * @return The matcher.
      */
     public static <E> Matcher<Collection<? extends E>> hasSize(Matcher<? super Integer> sizeMatcher) {
-        return new IsCollectionWithSize<E>(sizeMatcher);
+        return new IsCollectionWithSize<>(sizeMatcher);
     }
 
     /**

diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsEmptyCollection.java b/hamcrest/src/main/java/org/hamcrest/collection/IsEmptyCollection.java
@@ -37,7 +37,7 @@ public void describeTo(Description description) {
      * @return The matcher.
      */
     public static <E> Matcher<Collection<? extends E>> empty() {
-        return new IsEmptyCollection<E>();
+        return new IsEmptyCollection<>();
     }
 
     /**

diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsEmptyIterable.java b/hamcrest/src/main/java/org/hamcrest/collection/IsEmptyIterable.java
@@ -33,7 +33,7 @@ public void describeTo(Description description) {
      * @return The matcher.
      */
     public static <E> Matcher<Iterable<? extends E>> emptyIterable() {
-        return new IsEmptyIterable<E>();
+        return new IsEmptyIterable<>();
     }
 
     /**

diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableWithSize.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableWithSize.java
@@ -36,7 +36,7 @@ protected Integer featureValueOf(Iterable<E> actual) {
      * @return The matcher.
      */
     public static <E> Matcher<Iterable<E>> iterableWithSize(Matcher<? super Integer> sizeMatcher) {
-        return new IsIterableWithSize<E>(sizeMatcher);
+        return new IsIterableWithSize<>(sizeMatcher);
     }
 
     /**

diff --git a/hamcrest/src/main/java/org/hamcrest/comparator/ComparatorMatcherBuilder.java b/hamcrest/src/main/java/org/hamcrest/comparator/ComparatorMatcherBuilder.java
@@ -23,7 +23,7 @@ public final class ComparatorMatcherBuilder<T> {
      * @return The matcher.
      */
     public static <T extends Comparable<T>> ComparatorMatcherBuilder<T> usingNaturalOrdering() {
-        return new ComparatorMatcherBuilder<T>(new Comparator<T>() {
+        return new ComparatorMatcherBuilder<>(new Comparator<T>() {
             @Override
             public int compare(T o1, T o2) {
                 return o1.compareTo(o2);
@@ -47,7 +47,7 @@ public int compare(T o1, T o2) {
      * @return The matcher.
      */
     public static <T> ComparatorMatcherBuilder<T> comparedBy(Comparator<T> comparator) {
-        return new ComparatorMatcherBuilder<T>(comparator, true);
+        return new ComparatorMatcherBuilder<>(comparator, true);
     }
 
     private ComparatorMatcherBuilder(Comparator<T> comparator, boolean includeComparatorInDescription) {
@@ -128,7 +128,7 @@ private static String asText(int comparison) {
      * @return The matcher.
      */
     public Matcher<T> comparesEqualTo(T value) {
-        return new ComparatorMatcher<T>(comparator, value, ComparatorMatcher.EQUAL, ComparatorMatcher.EQUAL, includeComparatorInDescription);
+        return new ComparatorMatcher<>(comparator, value, ComparatorMatcher.EQUAL, ComparatorMatcher.EQUAL, includeComparatorInDescription);
     }
 
     /**
@@ -143,7 +143,7 @@ public Matcher<T> comparesEqualTo(T value) {
      * @return The matcher.
      */
     public Matcher<T> greaterThan(T value) {
-        return new ComparatorMatcher<T>(comparator, value, ComparatorMatcher.GREATER_THAN, ComparatorMatcher.GREATER_THAN, includeComparatorInDescription);
+        return new ComparatorMatcher<>(comparator, value, ComparatorMatcher.GREATER_THAN, ComparatorMatcher.GREATER_THAN, includeComparatorInDescription);
     }
 
     /**
@@ -158,7 +158,7 @@ public Matcher<T> greaterThan(T value) {
      * @return The matcher.
      */
     public Matcher<T> greaterThanOrEqualTo(T value) {
-        return new ComparatorMatcher<T>(comparator, value, ComparatorMatcher.EQUAL, ComparatorMatcher.GREATER_THAN, includeComparatorInDescription);
+        return new ComparatorMatcher<>(comparator, value, ComparatorMatcher.EQUAL, ComparatorMatcher.GREATER_THAN, includeComparatorInDescription);
     }
 
     /**
@@ -173,7 +173,7 @@ public Matcher<T> greaterThanOrEqualTo(T value) {
      * @return The matcher.
      */
     public Matcher<T> lessThan(T value) {
-        return new ComparatorMatcher<T>(comparator, value, ComparatorMatcher.LESS_THAN, ComparatorMatcher.LESS_THAN, includeComparatorInDescription);
+        return new ComparatorMatcher<>(comparator, value, ComparatorMatcher.LESS_THAN, ComparatorMatcher.LESS_THAN, includeComparatorInDescription);
     }
 
     /**
@@ -188,7 +188,7 @@ public Matcher<T> lessThan(T value) {
      * @return The matcher.
      */
     public Matcher<T> lessThanOrEqualTo(T value) {
-        return new ComparatorMatcher<T>(comparator, value, ComparatorMatcher.LESS_THAN, ComparatorMatcher.EQUAL, includeComparatorInDescription);
+        return new ComparatorMatcher<>(comparator, value, ComparatorMatcher.LESS_THAN, ComparatorMatcher.EQUAL, includeComparatorInDescription);
     }
 
 }
diff --git a/hamcrest/src/main/java/org/hamcrest/core/DescribedAs.java b/hamcrest/src/main/java/org/hamcrest/core/DescribedAs.java
@@ -68,7 +68,7 @@ public void describeMismatch(Object item, Description description) {
      * @return The matcher.
      */
     public static <T> Matcher<T> describedAs(String description, Matcher<T> matcher, Object... values) {
-        return new DescribedAs<T>(description, matcher, values);
+        return new DescribedAs<>(description, matcher, values);
     }
 
 }
diff --git a/hamcrest/src/main/java/org/hamcrest/core/IsNot.java b/hamcrest/src/main/java/org/hamcrest/core/IsNot.java
@@ -40,7 +40,7 @@ public void describeTo(Description description) {
      * @return The matcher.
      */
     public static <T> Matcher<T> not(Matcher<T> matcher) {
-        return new IsNot<T>(matcher);
+        return new IsNot<>(matcher);
     }
 
     /**

diff --git a/hamcrest/src/main/java/org/hamcrest/core/IsNull.java b/hamcrest/src/main/java/org/hamcrest/core/IsNull.java
@@ -29,7 +29,7 @@ public void describeTo(Description description) {
      * @return The matcher.
      */
     public static Matcher<Object> nullValue() {
-        return new IsNull<Object>();
+        return new IsNull<>();
     }
 
     /**
@@ -58,7 +58,7 @@ public static Matcher<Object> notNullValue() {
      * @return The matcher.
      */
     public static <T> Matcher<T> nullValue(Class<T> type) {
-        return new IsNull<T>();
+        return new IsNull<>();
     }
 
     /**

diff --git a/hamcrest/src/main/java/org/hamcrest/core/IsSame.java b/hamcrest/src/main/java/org/hamcrest/core/IsSame.java
@@ -38,7 +38,7 @@ public void describeTo(Description description) {
      * @return The matcher.
      */
     public static <T> Matcher<T> sameInstance(T target) {
-        return new IsSame<T>(target);
+        return new IsSame<>(target);
     }
 
     /**
@@ -52,7 +52,7 @@ public static <T> Matcher<T> sameInstance(T target) {
      * @return The matcher.
      */
     public static <T> Matcher<T> theInstance(T target) {
-        return new IsSame<T>(target);
+        return new IsSame<>(target);
     }
 
 }
diff --git a/hamcrest/src/main/java/org/hamcrest/internal/NullSafety.java b/hamcrest/src/main/java/org/hamcrest/internal/NullSafety.java
@@ -10,7 +10,7 @@ public class NullSafety {
 
     @SuppressWarnings("unchecked")
     public static <E> List<Matcher<? super E>> nullSafe(Matcher<? super E>[] itemMatchers) {
-        final List<Matcher<? super E>> matchers = new ArrayList<Matcher<? super E>>(itemMatchers.length);
+        final List<Matcher<? super E>> matchers = new ArrayList<>(itemMatchers.length);
         for (final Matcher<? super E> itemMatcher : itemMatchers) {
             matchers.add((Matcher<? super E>) (itemMatcher == null ? IsNull.nullValue() : itemMatcher));
         }

diff --git a/hamcrest/src/main/java/org/hamcrest/object/HasToString.java b/hamcrest/src/main/java/org/hamcrest/object/HasToString.java
@@ -29,7 +29,7 @@ protected String featureValueOf(T actual) {
      * @return The matcher.
      */
     public static <T> Matcher<T> hasToString(Matcher<? super String> toStringMatcher) {
-        return new HasToString<T>(toStringMatcher);
+        return new HasToString<>(toStringMatcher);
     }
 
     /**
@@ -45,7 +45,7 @@ public static <T> Matcher<T> hasToString(Matcher<? super String> toStringMatcher
      * @return The matcher.
      */
     public static <T> Matcher<T> hasToString(String expectedToString) {
-        return new HasToString<T>(equalTo(expectedToString));
+        return new HasToString<>(equalTo(expectedToString));
     }
 
 }
diff --git a/hamcrest/src/main/java/org/hamcrest/object/IsCompatibleType.java b/hamcrest/src/main/java/org/hamcrest/object/IsCompatibleType.java
@@ -40,7 +40,7 @@ public void describeTo(Description description) {
      * @return The matcher.
      */
     public static <T> Matcher<Class<?>> typeCompatibleWith(Class<T> baseType) {
-        return new IsCompatibleType<T>(baseType);
+        return new IsCompatibleType<>(baseType);
     }
 
 }
diff --git a/hamcrest/src/main/java/org/hamcrest/xml/HasXPath.java b/hamcrest/src/main/java/org/hamcrest/xml/HasXPath.java
@@ -24,7 +24,7 @@
 public class HasXPath extends TypeSafeDiagnosingMatcher<Node> {
 
     public static final NamespaceContext NO_NAMESPACE_CONTEXT = null;
-    private static final IsAnything<String> WITH_ANY_CONTENT = new IsAnything<String>("");
+    private static final IsAnything<String> WITH_ANY_CONTENT = new IsAnything<>("");
     private static final Condition.Step<Object, String> NODE_EXISTS = nodeExists();
     private final Matcher<String> valueMatcher;
     private final XPathExpression compiledXPath;

diff --git a/hamcrest/src/test/java/org/hamcrest/collection/IsCollectionWithSizeTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsCollectionWithSizeTest.java
@@ -71,7 +71,7 @@ public void testHasAReadableDescription() {
 
     public void testCompilesWithATypedCollection() {
       // To prove Issue 43
-      ArrayList<String> arrayList = new ArrayList<String>();
+      ArrayList<String> arrayList = new ArrayList<>();
       MatcherAssert.assertThat(arrayList, hasSize(0));
     }
 

diff --git a/hamcrest/src/test/java/org/hamcrest/collection/IsEmptyCollectionTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsEmptyCollectionTest.java
@@ -36,11 +36,11 @@ public void testCompiles() {
     private void needs(@SuppressWarnings("unused") Matcher<Collection<String>> bar) { }
 
     private static Collection<String> collectionOfValues() {
-        return new ArrayList<String>(asList("one", "three"));
+        return new ArrayList<>(asList("one", "three"));
     }
 
     private static Collection<Integer> emptyCollection() {
-        return new ArrayList<Integer>();
+        return new ArrayList<>();
     }
 
 }
diff --git a/hamcrest/src/test/java/org/hamcrest/collection/IsEmptyIterableTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsEmptyIterableTest.java
@@ -35,11 +35,11 @@ public void testCompiles() {
     private void needs(@SuppressWarnings("unused") Matcher<Iterable<String>> bar) { }
 
     private static Collection<String> collectionOfValues() {
-        return new ArrayList<String>(asList("one", "three"));
+        return new ArrayList<>(asList("one", "three"));
     }
 
     private static Collection<Integer> emptyCollection() {
-        return new ArrayList<Integer>();
+        return new ArrayList<>();
     }
 
 }
diff --git a/hamcrest/src/test/java/org/hamcrest/collection/IsInTest.java b/hamcrest/src/test/java/org/hamcrest/collection/IsInTest.java
@@ -13,12 +13,12 @@ public class IsInTest extends AbstractMatcherTest {
 
     @Override
     protected Matcher<?> createMatcher() {
-        return new IsIn<String>(elements);
+        return new IsIn<>(elements);
     }
 
     public void testReturnsTrueIfArgumentIsInCollection() {
         Collection<String> collection = Arrays.asList(elements);
-        Matcher<String> isIn = new IsIn<String>(collection);
+        Matcher<String> isIn = new IsIn<>(collection);
 
         assertMatches("a", isIn, "a");
         assertMatches("b", isIn, "b");
@@ -27,7 +27,7 @@ public void testReturnsTrueIfArgumentIsInCollection() {
     }
 
     public void testReturnsTrueIfArgumentIsInArray() {
-        Matcher<String> isIn = new IsIn<String>(elements);
+        Matcher<String> isIn = new IsIn<>(elements);
 
         assertMatches("a", isIn, "a");
         assertMatches("b", isIn, "b");
@@ -36,7 +36,7 @@ public void testReturnsTrueIfArgumentIsInArray() {
     }
 
     public void testHasReadableDescription() {
-        Matcher<String> isIn = new IsIn<String>(elements);
+        Matcher<String> isIn = new IsIn<>(elements);
 
         assertEquals("description",
             "one of {\"a\", \"b\", \"c\"}",