Reverted merging of API sources for now. Some warning tidy-up.

sf105 · sf105 · commit dda4713d4706 · 2014-12-25T11:27:31.000+01:00
diff --git a/hamcrest-api/src/main/java/org/hamcrest/Description.java b/hamcrest-api/src/main/java/org/hamcrest/Description.java
@@ -69,8 +69,8 @@ public Description appendValue(Object value) {
         return this;
       }
 
-      @Override
-      public <T> Description appendValueList(String start, String separator,
+      @Override @SafeVarargs
+      public final <T> Description appendValueList(String start, String separator,
           String end, T... values) {
         return this;
       }
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/Is.java b/hamcrest-core/src/main/java/org/hamcrest/core/Is.java
@@ -46,7 +46,7 @@ public void describeMismatch(Object item, Description mismatchDescription) {
      * 
      */
     public static <T> Matcher<T> is(Matcher<T> matcher) {
-        return new Is<T>(matcher);
+        return new Is<>(matcher);
     }
 
     /**
diff --git a/hamcrest-core/src/test/java/org/hamcrest/AbstractMatcherTest.java b/hamcrest-core/src/test/java/org/hamcrest/AbstractMatcherTest.java
@@ -73,7 +73,7 @@ public void testCopesWithUnknownTypes() {
     assertUnknownTypeSafe(createMatcher());
   }
 
-  public static class UnknownType {
+  private static class UnknownType {
   }
 
 }
diff --git a/hamcrest-core/src/test/java/org/hamcrest/FeatureMatcherTest.java b/hamcrest-core/src/test/java/org/hamcrest/FeatureMatcherTest.java
@@ -52,7 +52,7 @@ public String getResult() {
         }
     }
 
-    public static class ShouldNotMatch {
+    private static class ShouldNotMatch {
         @Override public String toString() { return "ShouldNotMatch"; }
     } 
 
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/CombinableTest.java b/hamcrest-core/src/test/java/org/hamcrest/core/CombinableTest.java
@@ -60,6 +60,7 @@ public final class CombinableTest {
         assertMismatchDescription("was <6>", EITHER_3_OR_4, 6);
     }
 
+    @SuppressWarnings("UnusedAssignment")
     @Test public void
     picksUpTypeFromLeftHandSideOfExpression() {
         @SuppressWarnings("unused")
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsInstanceOfTest.java b/hamcrest-core/src/test/java/org/hamcrest/core/IsInstanceOfTest.java
@@ -51,12 +51,14 @@ public final class IsInstanceOfTest {
         assertMatches(any(short.class), (short)1);
     }
 
+    @SuppressWarnings("UnusedAssignment")
     @Test public void
     instanceOfRequiresACastToReturnTheCorrectTypeForUseInJMock() {
         @SuppressWarnings("unused")
         Integer anInteger = (Integer)with(instanceOf(Integer.class));
     }
 
+    @SuppressWarnings("UnusedAssignment")
     @Test public void
     anyWillReturnTheCorrectTypeForUseInJMock() {
         @SuppressWarnings("unused")
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
@@ -67,7 +67,7 @@ public static <E> Matcher<E[]> arrayContaining(E... items) {
      */
     @SafeVarargs
     public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
-        return arrayContaining(Wrapping.<E>nullSafe(itemMatchers));
+        return arrayContaining(Wrapping.nullSafe(itemMatchers));
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapWithSize.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapWithSize.java
@@ -30,7 +30,7 @@ protected Integer featureValueOf(Map<? extends K, ? extends V> actual) {
      *     a matcher for the size of an examined {@link java.util.Map}
      */
     public static <K, V> Matcher<Map<? extends K, ? extends V>> aMapWithSize(Matcher<? super Integer> sizeMatcher) {
-        return new IsMapWithSize<K, V>(sizeMatcher);
+        return new IsMapWithSize<>(sizeMatcher);
     }
 
     /**
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/HasSubsequenceTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/HasSubsequenceTest.java
@@ -81,11 +81,11 @@ public String toString() {
         }
     }
 
-    public static WithValue withValue(int value) {
+    private static WithValue withValue(int value) {
         return new WithValue(value);
     }
 
-    public static Matcher<WithValue> value(int value) {
+    private static Matcher<WithValue> value(int value) {
         return new FeatureMatcher<WithValue, Integer>(equalTo(value), "value with", "value") {
             @Override
             protected Integer featureValueOf(WithValue actual) {
diff --git a/hamcrest-library/src/test/java/org/hamcrest/comparator/ComparatorMatcherBuilderTest.java b/hamcrest-library/src/test/java/org/hamcrest/comparator/ComparatorMatcherBuilderTest.java
@@ -122,6 +122,7 @@ public CustomInt(int value) {
             this.value = value;
         }
 
+        @SuppressWarnings("NullableProblems")
         @Override
         public int compareTo(CustomInt other) {
             return value - other.value;
diff --git a/hamcrest-library/src/test/java/org/hamcrest/comparator/ComparatorMatcherTest.java b/hamcrest-library/src/test/java/org/hamcrest/comparator/ComparatorMatcherTest.java
@@ -82,6 +82,7 @@ public CustomInt(int value) {
             this.value = value;
         }
 
+        @SuppressWarnings("NullableProblems")
         @Override
         public int compareTo(CustomInt other) {
             return value - other.value;
diff --git a/hamcrest-library/src/test/java/org/hamcrest/number/OrderingComparisonTest.java b/hamcrest-library/src/test/java/org/hamcrest/number/OrderingComparisonTest.java
@@ -79,6 +79,7 @@ public CustomInt(int value) {
             this.value = value;
         }
 
+        @SuppressWarnings("NullableProblems")
         public int compareTo(CustomInt other) {
             return value - other.value;
         }

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ public Description appendValue(Object value) {`
`69`	`69`	`return this;`
`70`	`70`	`}`
`71`	`71`
`72`		`- @Override`
`73`		`- public <T> Description appendValueList(String start, String separator,`
	`72`	`+ @Override @SafeVarargs`
	`73`	`+ public final <T> Description appendValueList(String start, String separator,`
`74`	`74`	`String end, T... values) {`
`75`	`75`	`return this;`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void describeMismatch(Object item, Description mismatchDescription) {`
`46`	`46`	`*`
`47`	`47`	`*/`
`48`	`48`	`public static <T> Matcher<T> is(Matcher<T> matcher) {`
`49`		`- return new Is<T>(matcher);`
	`49`	`+ return new Is<>(matcher);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public void testCopesWithUnknownTypes() {`
`73`	`73`	`assertUnknownTypeSafe(createMatcher());`
`74`	`74`	`}`
`75`	`75`
`76`		`- public static class UnknownType {`
	`76`	`+ private static class UnknownType {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public String getResult() {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- public static class ShouldNotMatch {`
	`55`	`+ private static class ShouldNotMatch {`
`56`	`56`	`@Override public String toString() { return "ShouldNotMatch"; }`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ public final class CombinableTest {`
`60`	`60`	`assertMismatchDescription("was <6>", EITHER_3_OR_4, 6);`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ @SuppressWarnings("UnusedAssignment")`
`63`	`64`	`@Test public void`
`64`	`65`	`picksUpTypeFromLeftHandSideOfExpression() {`
`65`	`66`	`@SuppressWarnings("unused")`
Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,14 @@ public final class IsInstanceOfTest {`
`51`	`51`	`assertMatches(any(short.class), (short)1);`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ @SuppressWarnings("UnusedAssignment")`
`54`	`55`	`@Test public void`
`55`	`56`	`instanceOfRequiresACastToReturnTheCorrectTypeForUseInJMock() {`
`56`	`57`	`@SuppressWarnings("unused")`
`57`	`58`	`Integer anInteger = (Integer)with(instanceOf(Integer.class));`
`58`	`59`	`}`
`59`	`60`
	`61`	`+ @SuppressWarnings("UnusedAssignment")`
`60`	`62`	`@Test public void`
`61`	`63`	`anyWillReturnTheCorrectTypeForUseInJMock() {`
`62`	`64`	`@SuppressWarnings("unused")`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public static <E> Matcher<E[]> arrayContaining(E... items) {`
`67`	`67`	`*/`
`68`	`68`	`@SafeVarargs`
`69`	`69`	`public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {`
`70`		`- return arrayContaining(Wrapping.<E>nullSafe(itemMatchers));`
	`70`	`+ return arrayContaining(Wrapping.nullSafe(itemMatchers));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ protected Integer featureValueOf(Map<? extends K, ? extends V> actual) {`
`30`	`30`	`* a matcher for the size of an examined {@link java.util.Map}`
`31`	`31`	`*/`
`32`	`32`	`public static <K, V> Matcher<Map<? extends K, ? extends V>> aMapWithSize(Matcher<? super Integer> sizeMatcher) {`
`33`		`- return new IsMapWithSize<K, V>(sizeMatcher);`
	`33`	`+ return new IsMapWithSize<>(sizeMatcher);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,11 @@ public String toString() {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`84`		`- public static WithValue withValue(int value) {`
	`84`	`+ private static WithValue withValue(int value) {`
`85`	`85`	`return new WithValue(value);`
`86`	`86`	`}`
`87`	`87`
`88`		`- public static Matcher<WithValue> value(int value) {`
	`88`	`+ private static Matcher<WithValue> value(int value) {`
`89`	`89`	`return new FeatureMatcher<WithValue, Integer>(equalTo(value), "value with", "value") {`
`90`	`90`	`@Override`
`91`	`91`	`protected Integer featureValueOf(WithValue actual) {`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ public CustomInt(int value) {`
`122`	`122`	`this.value = value;`
`123`	`123`	`}`
`124`	`124`
	`125`	`+ @SuppressWarnings("NullableProblems")`
`125`	`126`	`@Override`
`126`	`127`	`public int compareTo(CustomInt other) {`
`127`	`128`	`return value - other.value;`