When creating schema, relay PageInfo is now added as an additional type.

Notice that the client should also provide page info in order for it to work properly

Author: yarinvak

src/main/java/graphql/annotations/AnnotationsSchemaCreator.java

@@ -16,6 +16,7 @@
 
 import graphql.annotations.processor.GraphQLAnnotations;
 import graphql.annotations.processor.typeFunctions.TypeFunction;
+import graphql.relay.Relay;
 import graphql.schema.GraphQLDirective;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.GraphQLType;
@@ -98,7 +99,7 @@ public GraphQLSchema build() {
             if (!this.directivesObjectList.isEmpty()) {
                 builder.additionalDirectives(directives);
             }
-            builder.additionalTypes(additionalTypes)
+            builder.additionalTypes(additionalTypes).additionalType(Relay.pageInfoType)
                     .codeRegistry(graphQLAnnotations.getContainer().getCodeRegistryBuilder().build());
             return builder.build();
         }

src/test/java/graphql/annotations/connection/GraphQLEnhancedConnectionTest.java

@@ -23,32 +23,26 @@
 import graphql.annotations.processor.GraphQLAnnotations;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
-import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
-import static graphql.schema.GraphQLSchema.newSchema;
+import static graphql.annotations.AnnotationsSchemaCreator.newAnnotationsSchema;
 import static org.testng.Assert.assertEquals;
 
 @SuppressWarnings("ALL")
 public class GraphQLEnhancedConnectionTest {
 
-    private static GraphQL graphQL;
+    private GraphQL graphQL;
     private GraphQLAnnotations graphQLAnnotations;
 
 
-    @BeforeClass
+    @BeforeMethod
     public void setUp() throws Exception {
         this.graphQLAnnotations = new GraphQLAnnotations();
-        GraphQLObjectType object = this.graphQLAnnotations.object(TestListField.class);
-        GraphQLSchema schema = newSchema().query(object).build();
-
+        GraphQLSchema schema = newAnnotationsSchema().query(TestListField.class).build();
         graphQL = GraphQL.newGraphQL(schema).build();
     }
 
@@ -156,7 +150,7 @@ public void validDatafetcher_queryForCursors_getValidCursors() throws Exception
     public void fetchConnectionAsync() throws Exception {
         //Arrange
         ExecutionInput executionInput = new ExecutionInput("{ objsAsync(first:2) { edges { cursor } } }",
-                null, "CONTEXT", null, null);
+                null, "CONTEXT", null, new HashMap<>());
         //Act
         ExecutionResult result = graphQL.execute(executionInput);
         Map<String, Map<String, List<Map<String, Map<String, Object>>>>> data = result.getData();
@@ -171,7 +165,7 @@ public void fetchConnectionAsync() throws Exception {
     public void validDatafetcher_queryForValues_returnsValidValues() throws Exception {
         //Arrange
         ExecutionInput executionInput = new ExecutionInput("{ objs(first:2) { edges { cursor node { id, val } } } }",
-                null, "CONTEXT", null, null);
+                null, "CONTEXT", null, new HashMap<>());
 
         //Act
         ExecutionResult result = graphQL.execute(executionInput);
@@ -188,7 +182,7 @@ public void validDatafetcher_queryForHasPreviousPage_returnsFalse() throws Excep
 
         //Arrange
         ExecutionInput executionInput = new ExecutionInput("{ objs(first:2) { pageInfo { hasPreviousPage } } }",
-                null, "CONTEXT", null, null);
+                null, "CONTEXT", null, new HashMap<>());
 
         //Act
         ExecutionResult result = graphQL.execute(executionInput);
@@ -203,7 +197,7 @@ public void validDatafetcher_queryForHasNextPage_returnsTrue() throws Exception
 
         //Arrange
         ExecutionInput executionInput = new ExecutionInput("{ objs(first:2) { pageInfo { hasNextPage } } }",
-                null, "CONTEXT", null, null);
+                null, "CONTEXT", null, new HashMap<>());
 
         //Act
         ExecutionResult result = graphQL.execute(executionInput);