Simplified methods to create connection type

Author: Thomas Draier

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,24 +575,21 @@ 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 = ensureTypeUniqueness(relay.edgeType(connectionName, (GraphQLOutputType) wrappedType, null, Collections.<GraphQLFieldDefinition>emptyList()));
-        type = ensureTypeUniqueness(relay.connectionType(connectionName, edgeType, Collections.emptyList()));
-        builder.argument(relay.getConnectionFieldArguments());
-        return type;
+        GraphQLObjectType edgeType = ensureTypeUniqueness(relay.edgeType(connectionName, wrappedType, null, Collections.<GraphQLFieldDefinition>emptyList()));
+        return ensureTypeUniqueness(relay.connectionType(connectionName, edgeType, Collections.emptyList()));
     }
 
     private GraphQLObjectType ensureTypeUniqueness(GraphQLObjectType type) {
@@ -639,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

@@ -26,7 +26,6 @@
 import org.testng.annotations.Test;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
@@ -35,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 {
@@ -291,9 +291,12 @@ public void customConnection() {
 
     @Test
     public void duplicateConnection() {
-        GraphQLObjectType object = GraphQLAnnotations.object(DuplicateTest.class);
-        GraphQLSchema schema = newSchema().query(object).build();
-        System.out.println("ok");
+        try {
+            GraphQLObjectType object = GraphQLAnnotations.object(DuplicateTest.class);
+            GraphQLSchema schema = newSchema().query(object).build();
+        } catch (GraphQLAnnotationsException e) {
+            fail("Schema cannot be created",e);
+        }
     }
 
 }