Merge pull request #3 from Nosto/improvement/graphql-java-16-support

Updating to use graphql-java:16 library.

Author: anttip

build.gradle

@@ -56,7 +56,7 @@ gradle.projectsEvaluated {
 
 dependencies {
     compile 'javax.validation:validation-api:1.1.0.Final'
-    compile 'com.graphql-java:graphql-java:15.0'
+    compile 'com.graphql-java:graphql-java:16.2'
     implementation "jakarta.xml.bind:jakarta.xml.bind-api:2.3.2"
     implementation "org.glassfish.jaxb:jaxb-runtime:2.3.2"
 
@@ -70,6 +70,7 @@ dependencies {
     testCompile 'org.testng:testng:6.9.10'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
     testCompile 'org.mockito:mockito-core:2.+'
+    testCompile 'com.google.guava:guava:30.0-jre'
 }
 
 test.useTestNG()

gradle.properties

@@ -5,4 +5,4 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
 
-version = 8.3-nosto1
+version = 8.3-nosto2

src/main/java/graphql/annotations/strategies/EnhancedExecutionStrategy.java

@@ -54,7 +54,6 @@ protected CompletableFuture<ExecutionResult> resolveField(ExecutionContext execu
 
             ExecutionStepInfo fieldTypeInfo = ExecutionStepInfo.newExecutionStepInfo().type(fieldDef.getType()).parentInfo(parameters.getExecutionStepInfo()).build();
             ExecutionStrategyParameters newParameters = ExecutionStrategyParameters.newParameters()
-                    .arguments(parameters.getArguments())
                     .fields(parameters.getFields())
                     .nonNullFieldValidator(parameters.getNonNullFieldValidator())
                     .executionStepInfo(fieldTypeInfo)
@@ -88,7 +87,6 @@ protected FieldValueInfo completeValue(ExecutionContext executionContext, Execut
      */
     private ExecutionStrategyParameters withSource(ExecutionStrategyParameters parameters, Object source) {
         return ExecutionStrategyParameters.newParameters()
-                .arguments(parameters.getArguments())
                 .fields(parameters.getFields())
                 .nonNullFieldValidator(parameters.getNonNullFieldValidator())
                 .executionStepInfo(parameters.getExecutionStepInfo())

src/test/java/graphql/annotations/AnnotationsSchemaCreatorTest.java

@@ -220,6 +220,7 @@ public void build_directive_UsingDirectivesContainer_schemaIsCreatedWithDirectiv
 
     @GraphQLName("additional")
     public static class AdditionalTypeTest {
+        @GraphQLField
         public int getI() {
             return 4;
         }

src/test/java/graphql/annotations/GraphQLExtensionsTest.java

@@ -31,6 +31,8 @@
 import static graphql.annotations.AnnotationsSchemaCreator.newAnnotationsSchema;
 import static org.testng.Assert.*;
 
+import com.google.common.collect.ImmutableList;
+
 public class GraphQLExtensionsTest {
 
     @GraphQLDescription("TestObject object")
@@ -103,7 +105,7 @@ public void fields() {
         List<GraphQLFieldDefinition> fields = object.getFieldDefinitions();
         assertEquals(fields.size(), 5);
 
-        fields.sort(Comparator.comparing(GraphQLFieldDefinition::getName));
+        fields = ImmutableList.sortedCopyOf(Comparator.comparing(GraphQLFieldDefinition::getName), fields);
 
         assertEquals(fields.get(0).getName(), "field");
         assertEquals(fields.get(1).getName(), "field2");

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

@@ -48,6 +48,8 @@
 import static graphql.schema.GraphQLSchema.newSchema;
 import static org.testng.Assert.*;
 
+import com.google.common.collect.ImmutableList;
+
 @SuppressWarnings("unchecked")
 public class GraphQLObjectTest {
 
@@ -275,7 +277,7 @@ public void fields() {
         List<GraphQLFieldDefinition> fields = object.getFieldDefinitions();
         assertEquals(fields.size(), 8);
 
-        fields.sort((o1, o2) -> o1.getName().compareTo(o2.getName()));
+        fields = ImmutableList.sortedCopyOf((o1, o2) -> o1.getName().compareTo(o2.getName()), fields);
 
         assertEquals(fields.get(2).getName(), "field0");
         assertEquals(fields.get(2).getDescription(), "field");
@@ -407,7 +409,7 @@ public void accessors() {
         GraphQLObjectType object = this.graphQLAnnotations.object(TestAccessors.class);
         List<GraphQLFieldDefinition> fields = object.getFieldDefinitions();
         assertEquals(fields.size(), 2);
-        fields.sort(Comparator.comparing(GraphQLFieldDefinition::getName));
+        fields = ImmutableList.sortedCopyOf(Comparator.comparing(GraphQLFieldDefinition::getName), fields);
 
         assertEquals(fields.get(0).getName(), "getValue");
         assertEquals(fields.get(1).getName(), "setAnotherValue");