minor tidies, and moving to Java 6

sf105 · sf105 · commit 1bb58e4768ae · 2012-04-02T22:35:08.000+01:00
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,8 +51,9 @@ public void showMismatch() {
       assertThat(complicated, shouldBe("the wrong thing"));
     }
 
-    private Matcher<ComplicatedClass> shouldBe(@SuppressWarnings("unused") String string) {
+    private Matcher<ComplicatedClass> shouldBe(String string) {
       return new TypeSafeMatcher<ComplicatedClass>() {
+        @Override
         public void describeTo(Description description) { } // no op
         @Override
         public boolean matchesSafely(ComplicatedClass item) { return false; }
diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/ReflectiveFactoryReader.java
@@ -1,5 +1,6 @@
 package org.hamcrest.generator;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import static java.lang.reflect.Modifier.isPublic;
 import static java.lang.reflect.Modifier.isStatic;
@@ -36,12 +37,14 @@ public ReflectiveFactoryReader(Class<?> cls) {
         this.classLoader = cls.getClassLoader();
     }
 
+    @Override
     public Iterator<FactoryMethod> iterator() {
         return new Iterator<FactoryMethod>() {
 
             private int currentMethod = -1;
             private Method[] allMethods = cls.getMethods();
 
+            @Override
             public boolean hasNext() {
                 while (true) {
                     currentMethod++;
@@ -53,13 +56,15 @@ public boolean hasNext() {
                 }
             }
 
+            @Override
             public FactoryMethod next() {
                 if (outsideArrayBounds()) {
                   throw new IllegalStateException("next() called without hasNext() check.");
                 }
                 return buildFactoryMethod(allMethods[currentMethod]);
             }
 
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }
@@ -80,26 +85,38 @@ private boolean outsideArrayBounds() {
      * <p/>
      * <p>To use another set of rules, override this method.
      */
-    @SuppressWarnings({"unchecked"})
     protected boolean isFactoryMethod(Method javaMethod) {
         // We dynamically load these classes, to avoid a compile time
         // dependency on org.hamcrest.{Factory,Matcher}. This gets around
         // a circular bootstrap issue (because generator is required to
         // compile core).
-        Class factoryCls;
-        Class matcherCls;
-        try {
-            factoryCls = classLoader.loadClass("org.hamcrest.Factory");
-            matcherCls = classLoader.loadClass("org.hamcrest.Matcher");
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException("Cannot load hamcrest core", e);
-        }
         return isStatic(javaMethod.getModifiers())
                 && isPublic(javaMethod.getModifiers())
-                && javaMethod.getAnnotation(factoryCls) != null
-                && matcherCls.isAssignableFrom(javaMethod.getReturnType());
+                && hasFactoryAnnotation(javaMethod)
+                && matcherClass().isAssignableFrom(javaMethod.getReturnType());
+    }
+
+    private Class<?> matcherClass() {
+      try {
+          return classLoader.loadClass("org.hamcrest.Matcher");
+      } catch (ClassNotFoundException e) {
+          throw new RuntimeException("Cannot load hamcrest core", e);
+      }
     }
 
+    @SuppressWarnings("unchecked")
+    private boolean hasFactoryAnnotation(Method javaMethod) {
+      try {
+        final Class<?> factoryClass = classLoader.loadClass("org.hamcrest.Factory");
+        if (!Annotation.class.isAssignableFrom(factoryClass)) {
+          throw new RuntimeException("Not an annotation class: " + factoryClass.getCanonicalName());
+        }
+        return javaMethod.getAnnotation((Class<? extends Annotation>)factoryClass) != null;        
+      } catch (ClassNotFoundException e) {
+        throw new RuntimeException("Cannot load hamcrest core", e);
+      }
+    }
+    
     private FactoryMethod buildFactoryMethod(Method javaMethod) {
         FactoryMethod result = new FactoryMethod(
                 javaMethod.getDeclaringClass().getName(),
