Merge pull request #114 from Jahia/duplicate-relay-types

Avoid duplicate definitions of the same types when using connections

Author: guy120494

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

@@ -473,7 +473,8 @@ protected GraphQLFieldDefinition getField(Field field) throws GraphQLAnnotations
 
         boolean isConnection = isConnection(field, outputType);
         if (isConnection) {
-            outputType = getGraphQLConnection(field, outputType, builder);
+            outputType = getGraphQLConnection(field, outputType);
+            builder.argument(relay.getConnectionFieldArguments());
         }
 
         builder.type(outputType);
@@ -574,23 +575,29 @@ private boolean checkIfPrefixGetterExists(Class c, String prefix, String propert
         return true;
     }
 
-    private GraphQLOutputType getGraphQLConnection(AccessibleObject field, GraphQLOutputType type, GraphQLFieldDefinition.Builder builder) {
+    private GraphQLOutputType getGraphQLConnection(AccessibleObject field, GraphQLOutputType type) {
         if (type instanceof GraphQLNonNull) {
-            type = (GraphQLOutputType) ((GraphQLNonNull) type).getWrappedType();
-            return new GraphQLNonNull(internalGetGraphQLConnection(field, type, builder));
+            GraphQLList listType = (GraphQLList) ((GraphQLNonNull) type).getWrappedType();
+            return new GraphQLNonNull(internalGetGraphQLConnection(field, listType));
         } else {
-            return internalGetGraphQLConnection(field, type, builder);
+            return internalGetGraphQLConnection(field, (GraphQLList) type);
         }
     }
 
-    private GraphQLOutputType internalGetGraphQLConnection(AccessibleObject field, GraphQLOutputType type, GraphQLFieldDefinition.Builder builder) {
-        graphql.schema.GraphQLType wrappedType = ((GraphQLList) type).getWrappedType();
-        assert wrappedType instanceof GraphQLObjectType;
+    private GraphQLOutputType internalGetGraphQLConnection(AccessibleObject field, GraphQLList listType) {
+        GraphQLOutputType wrappedType = (GraphQLOutputType) listType.getWrappedType();
         String connectionName = field.getAnnotation(GraphQLConnection.class).name();
         connectionName = connectionName.isEmpty() ? wrappedType.getName() : connectionName;
-        GraphQLObjectType edgeType = relay.edgeType(connectionName, (GraphQLOutputType) wrappedType, null, Collections.<GraphQLFieldDefinition>emptyList());
-        type = relay.connectionType(connectionName, edgeType, Collections.emptyList());
-        builder.argument(relay.getConnectionFieldArguments());
+        GraphQLObjectType edgeType = getActualType(relay.edgeType(connectionName, wrappedType, null, Collections.<GraphQLFieldDefinition>emptyList()));
+        return getActualType(relay.connectionType(connectionName, edgeType, Collections.emptyList()));
+    }
+
+    private GraphQLObjectType getActualType(GraphQLObjectType type) {
+        if (typeRegistry.containsKey(type.getName())) {
+            type = (GraphQLObjectType) typeRegistry.get(type.getName());
+        } else {
+            typeRegistry.put(type.getName(), type);
+        }
         return type;
     }
 
@@ -630,7 +637,8 @@ protected GraphQLFieldDefinition getField(Method method) throws GraphQLAnnotatio
 
         boolean isConnection = isConnection(method, outputType);
         if (isConnection) {
-            outputType = getGraphQLConnection(method, outputType, builder);
+            outputType = getGraphQLConnection(method, outputType);
+            builder.argument(relay.getConnectionFieldArguments());
         }
 
         builder.type(outputType);

src/test/java/graphql/annotations/GraphQLConnectionTest.java

@@ -34,6 +34,7 @@
 import static graphql.schema.GraphQLSchema.newSchema;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
 @SuppressWarnings("unchecked")
 public class GraphQLConnectionTest {
@@ -55,6 +56,14 @@ public Obj(String id, String val) {
         }
     }
 
+    public static class DuplicateTest {
+        @GraphQLField
+        public TestListField field1;
+
+        @GraphQLField
+        public TestListField2 field2;
+    }
+
     public static class TestListField {
         @GraphQLField
         @GraphQLConnection
@@ -65,6 +74,16 @@ public TestListField(List<Obj> objs) {
         }
     }
 
+    public static class TestListField2 {
+        @GraphQLField
+        @GraphQLConnection
+        public List<Obj> objs;
+
+        public TestListField2(List<Obj> objs) {
+            this.objs = objs;
+        }
+    }
+
     @Test
     public void fieldList() {
         GraphQLObjectType object = GraphQLAnnotations.object(TestListField.class);
@@ -270,4 +289,14 @@ public void customConnection() {
         assertEquals(edges.size(), 0);
     }
 
+    @Test
+    public void duplicateConnection() {
+        try {
+            GraphQLObjectType object = GraphQLAnnotations.object(DuplicateTest.class);
+            GraphQLSchema schema = newSchema().query(object).build();
+        } catch (GraphQLAnnotationsException e) {
+            fail("Schema cannot be created",e);
+        }
+    }
+
 }