Finished up Java 6 conversion, plus some IDE warnings.

hamcrest · Apr 3, 2012 · aa3ddb6 · aa3ddb6
1 parent bca8f06
commit aa3ddb6
Show file tree

Hide file tree

Showing 38 changed files with 56 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/build.xml b/build.xml
@@ -197,7 +197,7 @@
 
 	<target name="javadoc" depends="library">
 		<mkdir dir="build/javadoc"/>
-		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
+		<javadoc destdir="build/javadoc" source="1.6" failonerror="yes"
 			overview="overview.html">
 
             <classpath>
@@ -215,9 +215,8 @@
 			<group title="Matcher Library" packages="org.hamcrest.*"/>
 			<group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
 
-			<link offline="false" href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
 			<link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
-			<link offline="false" href="http://junit.sourceforge.net/javadoc_40/"/>
+			<link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>
 		</javadoc>
 	</target>
 

diff --git a/hamcrest-core/src/main/java/org/hamcrest/CustomMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/CustomMatcher.java
@@ -30,6 +30,7 @@ public CustomMatcher(String description) {
         this.fixedDescription = description;
     }
 
+    @Override
     public final void describeTo(Description description) {
         description.appendText(fixedDescription);
     }

diff --git a/hamcrest-core/src/main/java/org/hamcrest/DiagnosingMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/DiagnosingMatcher.java
@@ -7,7 +7,8 @@
  */
 public abstract class DiagnosingMatcher<T> extends BaseMatcher<T> {
 
-	public final boolean matches(Object item) {
+	@Override
+  public final boolean matches(Object item) {
 		return matches(item, Description.NONE);
 	}
 

diff --git a/hamcrest-core/src/main/java/org/hamcrest/FeatureMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/FeatureMatcher.java
@@ -46,6 +46,7 @@ protected boolean matchesSafely(T actual, Description mismatchDescription) {
     return true;
   };
 
+  @Override
   public final void describeTo(Description description) {
     description.appendText(featureDescription).appendText(" ")
                .appendDescriptionOf(subMatcher);

diff --git a/hamcrest-core/src/main/java/org/hamcrest/TypeSafeDiagnosingMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/TypeSafeDiagnosingMatcher.java
@@ -49,6 +49,7 @@ protected TypeSafeDiagnosingMatcher() {
       this(TYPE_FINDER); 
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public final boolean matches(Object item) {
         return item != null

diff --git a/hamcrest-core/src/main/java/org/hamcrest/TypeSafeMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/TypeSafeMatcher.java
@@ -59,6 +59,7 @@ protected void describeMismatchSafely(T item, Description mismatchDescription) {
      * If you need to override this, there's no point on extending TypeSafeMatcher.
      * Instead, extend the {@link BaseMatcher}.
      */
+    @Override
     @SuppressWarnings({"unchecked"})
     public final boolean matches(Object item) {
         return item != null

diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/Every.java b/hamcrest-core/src/main/java/org/hamcrest/core/Every.java
@@ -24,7 +24,8 @@ public boolean matchesSafely(Iterable<T> collection, Description mismatchDescrip
 		return true;
 	}
 
-	public void describeTo(Description description) {
+	@Override
+  public void describeTo(Description description) {
 		description.appendText("every item is ").appendDescriptionOf(matcher);
 	}
 

diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsAnything.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsAnything.java
@@ -23,10 +23,12 @@ public IsAnything(String message) {
         this.message = message;
     }
 
+    @Override
     public boolean matches(Object o) {
         return true;
     }
 
+    @Override
     public void describeTo(Description description) {
         description.appendText(message);
     }

diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java
@@ -54,6 +54,7 @@ protected boolean matches(Object item, Description mismatchDescription) {
       return true;
     }
 
+    @Override
     public void describeTo(Description description) {
         description.appendText("an instance of ")
                 .appendText(expectedClass.getName());

diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsNull.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsNull.java
@@ -42,7 +42,7 @@ public static Matcher<Object> notNullValue() {
      * Matches if value is null. With type inference.
      */
     @Factory
-    public static <T> Matcher<T> nullValue(Class<T> type) {
+    public static <T> Matcher<T> nullValue(@SuppressWarnings("unused") Class<T> type) {
         return new IsNull<T>();
     }
 

diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsSame.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsSame.java
@@ -18,10 +18,12 @@ public IsSame(T object) {
         this.object = object;
     }
 
+    @Override
     public boolean matches(Object arg) {
         return arg == object;
     }
 
+    @Override
     public void describeTo(Description description) {
         description.appendText("sameInstance(")
                 .appendValue(object)

diff --git a/hamcrest-examples/src/main/java/org/hamcrest/examples/junit4/ExampleWithAssertThat.java b/hamcrest-examples/src/main/java/org/hamcrest/examples/junit4/ExampleWithAssertThat.java
@@ -51,14 +51,16 @@ public void showMismatch() {
       assertThat(complicated, shouldBe("the wrong thing"));
     }
 
-    private Matcher<ComplicatedClass> shouldBe(String string) {
+    private static Matcher<ComplicatedClass> shouldBe(final String string) {
       return new TypeSafeMatcher<ComplicatedClass>() {
         @Override
         public void describeTo(Description description) { } // no op
         @Override
         public boolean matchesSafely(ComplicatedClass item) { return false; }
         @Override
-        public void describeMismatchSafely(ComplicatedClass item, Description mismatchDescription) {} // no op
+        public void describeMismatchSafely(ComplicatedClass item, Description mismatchDescription) {
+          mismatchDescription.appendText(string);
+        } 
       };
     }
 

diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
@@ -94,7 +94,7 @@ private JavaMethod findMethodInSource(FactoryMethod factoryMethod) {
     /**
      * Reconstructs the JavaDoc as a string for a particular method.
      */
-    private String createJavaDocComment(JavaMethod methodSource) {
+    private static String createJavaDocComment(JavaMethod methodSource) {
         String comment = methodSource.getComment();
         DocletTag[] tags = methodSource.getTags();
         if ((comment == null || comment.trim().length() == 0) && tags.length == 0) {

diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/QuickReferenceWriter.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/QuickReferenceWriter.java
@@ -53,7 +53,7 @@ public void writeMethod(String generatedMethodName, FactoryMethod factoryMethod)
         out.println();
     }
 
-    private String removePackageNames(String in) {
+    private static String removePackageNames(String in) {
         // Simplify fully qualified names (allowing for trailing '...').
         return in == null ? "" : in.replaceAll("[^<>]*\\.([^\\.])", "$1");
     }

diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java
@@ -117,7 +117,7 @@ private boolean hasFactoryAnnotation(Method javaMethod) {
       }
     }
 
-    private FactoryMethod buildFactoryMethod(Method javaMethod) {
+    private static FactoryMethod buildFactoryMethod(Method javaMethod) {
         FactoryMethod result = new FactoryMethod(
                 javaMethod.getDeclaringClass().getName(),
                 javaMethod.getName(), 

diff --git a/hamcrest-library/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java b/hamcrest-library/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java
@@ -111,6 +111,7 @@ private Method findReadMethod(Object argument, Description mismatchDescription)
         return readMethod;
     }
 
+    @Override
     public void describeTo(Description description) {
         description.appendText("hasProperty(");
         description.appendValue(propertyName);

diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java
@@ -43,6 +43,7 @@ public void describeMismatchSafely(T[] actual, Description mismatchDescription)
       }
     }
 
+    @Override
     public void describeTo(Description description) {
         description.appendList(descriptionStart(), descriptionSeparator(), descriptionEnd(), 
                                Arrays.asList(elementMatchers));

diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContaining.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContaining.java
@@ -33,6 +33,7 @@ public void describeMismatchSafely(T[] item, Description mismatchDescription) {
       super.describeMismatch(Arrays.asList(item), mismatchDescription);
     };
 
+    @Override
     public void describeTo(Description description) {
         description
             .appendText("an array containing ")

diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIn.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIn.java
@@ -19,11 +19,12 @@ public IsIn(T[] elements) {
         collection = Arrays.asList(elements);
     }
 
-    @SuppressWarnings({"SuspiciousMethodCalls"})
+    @Override
     public boolean matches(Object o) {
         return collection.contains(o);
     }
 
+    @Override
     public void describeTo(Description buffer) {
         buffer.appendText("one of ");
         buffer.appendValueList("{", ", ", "}", collection);

diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java
@@ -35,6 +35,7 @@ public void describeMismatchSafely(Map<? extends K, ? extends V> map, Descriptio
       mismatchDescription.appendText("map was ").appendValueList("[", ", ", "]", map.entrySet());
     }
 
+    @Override
     public void describeTo(Description description) {
         description.appendText("map containing [")
                    .appendDescriptionOf(keyMatcher)

diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/IsCloseTo.java b/hamcrest-library/src/main/java/org/hamcrest/number/IsCloseTo.java
@@ -33,6 +33,7 @@ public void describeMismatchSafely(Double item, Description mismatchDescription)
                          .appendValue(actualDelta(item));
     }
 
+    @Override
     public void describeTo(Description description) {
         description.appendText("a numeric value within ")
                 .appendValue(delta)

diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java b/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java
@@ -48,7 +48,7 @@ public void describeTo(Description description) {
         description.appendText(" ").appendValue(expected);
     }
 
-    private String asText(int comparison) {
+    private static String asText(int comparison) {
         return comparisonDescriptions[comparison + 1];
     }
 

diff --git a/hamcrest-library/src/main/java/org/hamcrest/object/IsEventFrom.java b/hamcrest-library/src/main/java/org/hamcrest/object/IsEventFrom.java
@@ -41,6 +41,7 @@ private boolean eventHasSameSource(EventObject ev) {
         return ev.getSource() == source;
     }
 
+    @Override
     public void describeTo(Description description) {
         description.appendText("an event of type ")
                 .appendText(eventClass.getName())

diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsEmptyString.java b/hamcrest-library/src/main/java/org/hamcrest/text/IsEmptyString.java
@@ -17,10 +17,12 @@ public final class IsEmptyString extends BaseMatcher<String> {
     @SuppressWarnings("unchecked")
     private static final Matcher<String> NULL_OR_EMPTY_INSTANCE = anyOf(nullValue(), INSTANCE);
 
+    @Override
     public boolean matches(Object item) {
         return item != null && item instanceof String && ((String) item).equals("");
     }
 
+    @Override
     public void describeTo(Description description) {
         description.appendText("an empty string");
     }

diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java b/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java
@@ -34,6 +34,7 @@ public void describeMismatchSafely(String item, Description mismatchDescription)
       mismatchDescription.appendText("was ").appendText(item);
     }
 
+    @Override
     public void describeTo(Description description) {
         description.appendText("equalToIgnoringCase(")
                 .appendValue(string)

diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java b/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java
@@ -34,6 +34,7 @@ public void describeMismatchSafely(String item, Description mismatchDescription)
       mismatchDescription.appendText("was  ").appendText(stripSpace(item));
     }
 
+    @Override
     public void describeTo(Description description) {
         description.appendText("equalToIgnoringWhiteSpace(")
                 .appendValue(string)

diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/BaseMatcherTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/BaseMatcherTest.java
@@ -6,10 +6,12 @@ public class BaseMatcherTest extends TestCase {
 
     public void testDescribesItselfWithToStringMethod() {
         Matcher<Object> someMatcher = new BaseMatcher<Object>() {
+            @Override
             public boolean matches(Object item) {
                 throw new UnsupportedOperationException();
             }
 
+            @Override
             public void describeTo(Description description) {
                 description.appendText("SOME DESCRIPTION");
             }

diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/beans/HasPropertyWithValueTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/beans/HasPropertyWithValueTest.java
@@ -106,7 +106,7 @@ public void setProperty(String property) {
       this.property = property;
     }
 
-    public void setWriteOnlyProperty(float property) {
+    public void setWriteOnlyProperty(@SuppressWarnings("unused") float property) {
     }
 
     @Override

diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsCollectionContainingTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsCollectionContainingTest.java
@@ -84,7 +84,7 @@ public void testMatchesAllItemsInCollection() {
     }
 
 
-    private Matcher<? super String> mismatchable(final String string) {
+    private static Matcher<? super String> mismatchable(final String string) {
       return new TypeSafeDiagnosingMatcher<String>() {
         @Override
         protected boolean matchesSafely(String item, Description mismatchDescription) {

diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsEmptyCollectionTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/collection/IsEmptyCollectionTest.java
@@ -29,7 +29,7 @@ public void testHasAReadableDescription() {
         assertDescription("an empty collection", empty());
     }
 
-    private Collection<Object> collectionOfValues() {
+    private static Collection<Object> collectionOfValues() {
       return new ArrayList<Object>() {{ add("one"); add("three"); }};
     }
 }
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/core/AllOfTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/core/AllOfTest.java
@@ -34,7 +34,6 @@ public void testEvaluatesToTheTheLogicalConjunctionOfManyOtherMatchers() {
         assertThat("good", not(allOf(equalTo("good"), equalTo("good"), equalTo("bad"), equalTo("good"), equalTo("good"))));
     }
 
-    @SuppressWarnings("unchecked")
     public void testSupportsMixedTypes() {
         final Matcher<SampleSubClass> all = allOf(
                 equalTo(new SampleBaseClass("bad")),

diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/core/SampleBaseClass.java b/hamcrest-unit-test/src/main/java/org/hamcrest/core/SampleBaseClass.java
@@ -16,4 +16,9 @@ public String toString() {
     public boolean equals(Object obj) {
         return obj instanceof SampleBaseClass && value.equals(((SampleBaseClass) obj).value);
     }
+
+    @Override
+    public int hashCode() {
+      return value.hashCode();
+    }
 }
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/generator/QDoxFactoryReaderTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/generator/QDoxFactoryReaderTest.java
@@ -43,7 +43,7 @@ public void testExtractsOriginalJavaDocFromSource() {
                 factoryMethod.getJavaDoc());
     }
 
-    private FactoryMethod wrapUsingQDoxedSource(FactoryMethod originalMethod,
+    private static FactoryMethod wrapUsingQDoxedSource(FactoryMethod originalMethod,
                                                 String className, String input) {
         List<FactoryMethod> originalMethods = new ArrayList<FactoryMethod>();
         originalMethods.add(originalMethod);
@@ -56,7 +56,7 @@ private FactoryMethod wrapUsingQDoxedSource(FactoryMethod originalMethod,
         return getFirstFactoryMethod(qDoxFactoryReader);
     }
 
-    private FactoryMethod getFirstFactoryMethod(QDoxFactoryReader qDoxFactoryReader) {
+    private static FactoryMethod getFirstFactoryMethod(QDoxFactoryReader qDoxFactoryReader) {
         Iterator<FactoryMethod> iterator = qDoxFactoryReader.iterator();
         iterator.hasNext();
         return iterator.next();

diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/generator/ReflectiveFactoryReaderTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/generator/ReflectiveFactoryReaderTest.java
@@ -100,7 +100,7 @@ public static Matcher<Comparator<String>> generifiedType() {
             return null;
         }
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings("rawtypes")
         @Factory
         public static Matcher noGenerifiedType() {
             return null;
@@ -258,7 +258,7 @@ public void testCatchesSubclasses() {
         assertNotNull(readMethod(SubclassOfMatcher.class, "subclassMethod"));
     }
 
-    private FactoryMethod readMethod(Class<?> cls, String methodName) {
+    private static FactoryMethod readMethod(Class<?> cls, String methodName) {
         for (FactoryMethod method : new ReflectiveFactoryReader(cls)) {
             if (method.getName().equals(methodName)) {
                 return method;

diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/generator/config/XmlConfiguratorTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/generator/config/XmlConfiguratorTest.java
@@ -43,7 +43,7 @@ public void testAddsMatcherFactoryMethodsToConfiguration() throws Exception {
             hasItem(new FactoryMethod(AnotherMatcher.class.getName(), "matcher3", "org.hamcrest.CombinableMatcher")));
     }
 
-    private InputSource createXml(String xml) {
+    private static InputSource createXml(String xml) {
         return new InputSource(new StringReader(xml));
     }
 

diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/object/HasToStringTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/object/HasToStringTest.java
@@ -45,7 +45,7 @@ public void testMismatchContainsToStringValue() {
         assertMismatchDescription(expectedMismatchString, hasToString(TO_STRING_RESULT), "Cheese");
 	}
 
-    private String descriptionOf(Matcher<?> matcher) {
+    private static String descriptionOf(Matcher<?> matcher) {
         return StringDescription.asString(matcher);
     }
 }
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/xml/HasXPathTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/xml/HasXPathTest.java
@@ -38,14 +38,17 @@ protected void setUp() throws Exception {
                 + "</root>\n"
         );
         ns = new NamespaceContext() {
+          @Override
           public String getNamespaceURI(String prefix) {
               return ("cheese".equals(prefix) ? "http://cheese.com" : null);
           }
 
+          @Override
           public String getPrefix(String namespaceURI) {
               return ("http://cheese.com".equals(namespaceURI) ? "cheese" : null);
           }
 
+          @Override
           public Iterator<String> getPrefixes(String namespaceURI) {
               HashSet<String> prefixes = new HashSet<String>();
               String prefix = getPrefix(namespaceURI);