Merge pull request #95 from Jahia/connections-fixes

Relay connections : support recursive and interfaces connection, pass arguments to DataFetcher

Author: guy120494

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

@@ -82,6 +82,8 @@ public class GraphQLAnnotations implements GraphQLAnnotationsProcessor {
 
     private static final Relay RELAY_TYPES = new Relay();
 
+    private static final List<Class> TYPES_FOR_CONNECTION = Arrays.asList(GraphQLObjectType.class, GraphQLInterfaceType.class, GraphQLUnionType.class, GraphQLTypeReference.class);
+
     private Map<String, graphql.schema.GraphQLType> typeRegistry = new HashMap<>();
     private final Stack<String> processing = new Stack<>();
 
@@ -510,8 +512,7 @@ private GraphQLOutputType getGraphQLConnection(boolean isConnection, AccessibleO
 
     private boolean isConnection(AccessibleObject obj, Class<?> klass, GraphQLOutputType type) {
         return obj.isAnnotationPresent(GraphQLConnection.class) &&
-                type instanceof GraphQLList &&
-                ((GraphQLList) type).getWrappedType() instanceof GraphQLObjectType;
+                type instanceof GraphQLList && TYPES_FOR_CONNECTION.stream().anyMatch(aClass -> aClass.isInstance(((GraphQLList) type).getWrappedType()));
     }
 
     protected GraphQLFieldDefinition getField(Method method) throws GraphQLAnnotationsException {
@@ -707,8 +708,10 @@ public ConnectionDataFetcher(Class<? extends Connection> connection, DataFetcher
 
         @Override
         public Object get(DataFetchingEnvironment environment) {
-            // Exclude arguments
-            DataFetchingEnvironment env = new DataFetchingEnvironmentImpl(environment.getSource(), new HashMap<>(), environment.getContext(),
+            // Create a list of arguments with connection specific arguments excluded
+            HashMap<String, Object> arguments = new HashMap<>(environment.getArguments());
+            arguments.keySet().removeAll(Arrays.asList("first", "last", "before", "after"));
+            DataFetchingEnvironment env = new DataFetchingEnvironmentImpl(environment.getSource(), arguments, environment.getContext(),
                     environment.getFields(), environment.getFieldType(), environment.getParentType(), environment.getGraphQLSchema(),
                     environment.getFragmentsByName(), environment.getExecutionId(), environment.getSelectionSet());
             Connection conn = constructNewInstance(constructor, actualDataFetcher.get(env));

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

@@ -88,6 +88,14 @@ public Stream<Obj> getObjStream() {
             Obj[] a = new Obj[objs.size()];
             return Stream.of(objs.toArray(a));
         }
+
+        @GraphQLField
+        @GraphQLConnection(name = "objStreamWithParam")
+        public Stream<Obj> getObjStreamWithParam(@GraphQLName("filter") String filter) {
+            return this.objs.stream().filter( obj -> obj.val.startsWith(filter));
+        }
+
+
     }
 
     @Test
@@ -128,6 +136,27 @@ public void methodStream() {
         testResult("objStream", result);
     }
 
+    @Test
+    public void methodListWithParam() {
+        GraphQLObjectType object = GraphQLAnnotations.object(TestConnections.class);
+        GraphQLSchema schema = newSchema().query(object).build();
+
+        GraphQL graphQL = GraphQL.newGraphQL(schema).build();
+        ExecutionResult result = graphQL.execute("{ objStreamWithParam(first: 2, filter:\"hel\") { edges { cursor node { id, val } } } }",
+                new TestConnections(Arrays.asList(new Obj("1", "test"), new Obj("2", "hello"), new Obj("3", "world"), new Obj("4", "hello world"), new Obj("5", "hello again"))));
+
+        assertTrue(result.getErrors().isEmpty());
+
+        Map<String, Map<String, List<Map<String, Map<String, Object>>>>> data = result.getData();
+        List<Map<String, Map<String, Object>>> edges = data.get("objStreamWithParam").get("edges");
+
+        assertEquals(edges.size(), 2);
+        assertEquals(edges.get(0).get("node").get("id"), "2");
+        assertEquals(edges.get(0).get("node").get("val"), "hello");
+        assertEquals(edges.get(1).get("node").get("id"), "4");
+        assertEquals(edges.get(1).get("node").get("val"), "hello world");
+    }
+
 
     public static class CustomConnection implements Connection {