Problem: extending generic class duplicate field definition (#36)

Solution: exclude bridge methods

Author: sebasjm

.gitignore

@@ -3,3 +3,4 @@
 *.iml
 *.ipr
 *.iws
+/.nb-gradle/

src/main/java/graphql/annotations/GraphQLAnnotations.java

@@ -200,8 +200,9 @@ public boolean equals(Object obj) {
 
             Class<?> declaringClass = getDeclaringClass(method);
 
-            boolean valid = (method.getAnnotation(GraphQLField.class) != null ||
-                     declaringClass.getMethod(method.getName(), method.getParameterTypes()).getAnnotation(GraphQLField.class) != null);
+            boolean valid =  (method.getAnnotation(GraphQLField.class) != null ||
+                     declaringClass.getMethod(method.getName(), method.getParameterTypes()).getAnnotation(GraphQLField.class) != null)
+                    && !method.isBridge();
 
             if (valid) {
                 builder.field(getField(method));

src/test/java/graphql/annotations/GraphQLObjectTest.java

@@ -188,6 +188,38 @@ public void methodInheritance() {
         assertEquals(((Map<String, Object>)result.getData()).get("field1"), "inherited");
     }
 
+    private static class TestObjectBridgMethodParent<Type> {
+        private final Type id;
+        public TestObjectBridgMethodParent(Type id) {
+            this.id = id;
+        }
+        public Type id() {
+            return id;
+        }
+    }
+    
+    private static class TestObjectBridgMethod extends TestObjectBridgMethodParent<Long> {
+
+        public TestObjectBridgMethod() {
+            super(1l);
+        }
+        
+        @Override @GraphQLField
+        public Long id() {
+            return super.id();
+        }
+    }
+    
+    @Test @SneakyThrows
+    public void methodInheritanceWithGenerics() {
+        GraphQLObjectType object = GraphQLAnnotations.object(TestObjectBridgMethod.class);
+
+        GraphQLSchema schema = newSchema().query(object).build();
+
+        ExecutionResult result = new GraphQL(schema).execute("{id}", new TestObjectBridgMethod());
+        assertEquals(((Map<String, Object>)result.getData()).get("id"), 1l);
+    }
+    
     public interface Iface {
         @GraphQLField
         default String field() {