Merge branch 'lazy'

2 files changed, 83 insertions, 5 deletions

diff --git a/sangria-core/src/main/java/com/tavianator/sangria/core/PotentialAnnotation.java b/sangria-core/src/main/java/com/tavianator/sangria/core/PotentialAnnotation.java
index 302e5e1..7c3680f 100644
--- a/sangria-core/src/main/java/com/tavianator/sangria/core/PotentialAnnotation.java
+++ b/sangria-core/src/main/java/com/tavianator/sangria/core/PotentialAnnotation.java
@@ -29,7 +29,7 @@ import com.google.inject.spi.Message;
  * A record of stored annotations, perfect for builders with {@code annotatedWith()} methods.
  *
  * @author Tavian Barnes (tavianator@tavianator.com)
- * @version 1.1
+ * @version 1.2
  * @since 1.1
  */
 public abstract class PotentialAnnotation {
@@ -75,6 +75,24 @@ public abstract class PotentialAnnotation {
         return NONE;
     }
 
+    /**
+     * @return A {@link PotentialAnnotation} with the annotation from a {@link Key}.
+     * @since 1.2
+     */
+    public static PotentialAnnotation from(Key<?> key) {
+        Annotation instance = key.getAnnotation();
+        if (instance != null) {
+            return none().annotatedWith(instance);
+        }
+
+        Class<? extends Annotation> type = key.getAnnotationType();
+        if (type != null) {
+            return none().annotatedWith(type);
+        }
+
+        return none();
+    }
+
     private PotentialAnnotation() {
     }
 
@@ -140,6 +158,12 @@ public abstract class PotentialAnnotation {
     public abstract <T> T accept(Visitor<T> visitor);
 
     @Override
+    public abstract boolean equals(Object o);
+
+    @Override
+    public abstract int hashCode();
+
+    @Override
     public abstract String toString();
 
     /**
@@ -172,6 +196,16 @@ public abstract class PotentialAnnotation {
         }
 
         @Override
+        public boolean equals(Object o) {
+            return o == this || o instanceof NoAnnotation;
+        }
+
+        @Override
+        public int hashCode() {
+            return NoAnnotation.class.hashCode();
+        }
+
+        @Override
         public String toString() {
             return "[no annotation]";
         }
@@ -203,6 +237,23 @@ public abstract class PotentialAnnotation {
         }
 
         @Override
+        public boolean equals(Object o) {
+            if (o == this) {
+                return true;
+            } else if (!(o instanceof AnnotationType)) {
+                return false;
+            }
+
+            AnnotationType other = (AnnotationType)o;
+            return annotationType.equals(other.annotationType);
+        }
+
+        @Override
+        public int hashCode() {
+            return annotationType.hashCode();
+        }
+
+        @Override
         public String toString() {
             return "@" + annotationType.getCanonicalName();
         }
@@ -234,6 +285,23 @@ public abstract class PotentialAnnotation {
         }
 
         @Override
+        public boolean equals(Object o) {
+            if (o == this) {
+                return true;
+            } else if (!(o instanceof AnnotationInstance)) {
+                return false;
+            }
+
+            AnnotationInstance other = (AnnotationInstance)o;
+            return annotation.equals(other.annotation);
+        }
+
+        @Override
+        public int hashCode() {
+            return annotation.hashCode();
+        }
+
+        @Override
         public String toString() {
             return annotation.toString();
         }
diff --git a/sangria-core/src/test/java/com/tavianator/sangria/core/PotentialAnnotationTest.java b/sangria-core/src/test/java/com/tavianator/sangria/core/PotentialAnnotationTest.java
index c4ccc36..4c53ef4 100644
--- a/sangria-core/src/test/java/com/tavianator/sangria/core/PotentialAnnotationTest.java
+++ b/sangria-core/src/test/java/com/tavianator/sangria/core/PotentialAnnotationTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
  * Tests for {@link PotentialAnnotation}s.
  *
  * @author Tavian Barnes (tavianator@tavianator.com)
- * @version 1.1
+ * @version 1.2
  * @since 1.1
  */
 public class PotentialAnnotationTest {
@@ -63,8 +63,8 @@ public class PotentialAnnotationTest {
 
     @Test(expected = CreationException.class)
     public void testInvalidAnnotatedWithInstance() {
-        none.annotatedWith(Names.named("name"))
-                .annotatedWith(Names.named("name"));
+        none.annotatedWith(nameAnnotation)
+                .annotatedWith(nameAnnotation);
     }
 
     @Test
@@ -78,6 +78,16 @@ public class PotentialAnnotationTest {
     }
 
     @Test
+    public void testFromKey() {
+        assertThat(PotentialAnnotation.from(new Key<String>() { }),
+                equalTo(none));
+        assertThat(PotentialAnnotation.from(new Key<String>(Simple.class) { }),
+                equalTo(none.annotatedWith(Simple.class)));
+        assertThat(PotentialAnnotation.from(new Key<String>(nameAnnotation) { }),
+                equalTo(none.annotatedWith(nameAnnotation)));
+    }
+
+    @Test
     public void testVisitor() {
         PotentialAnnotation.Visitor<String> visitor = new PotentialAnnotation.Visitor<String>() {
             @Override
@@ -114,7 +124,7 @@ public class PotentialAnnotationTest {
     }
 
     /**
-     * Needed to avoid compilation error to to inferred type being anonymous class.
+     * Needed to avoid compilation error due to inferred type being anonymous class.
      */
     private static <T> Matcher<Key<T>> equalTo(Key<T> key) {
         return Matchers.equalTo(key);