Merge pull request #169 from yarinvak/upgrade-to-gql-java-8

Upgrade to gql java 8

Author: guy120494

build.gradle

@@ -69,7 +69,7 @@ gradle.projectsEvaluated {
 
 dependencies {
     compile 'javax.validation:validation-api:1.1.0.Final'
-    compile 'com.graphql-java:graphql-java:7.0'
+    compile 'com.graphql-java:graphql-java:8.0'
 
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'

gradle.properties

@@ -7,3 +7,4 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8
 
 bintray.user=DUMMY_USER
 bintray.key=DUMMY_KEY
+version = 5.2

src/main/java/graphql/annotations/GraphQLFieldDefinitionWrapper.java

@@ -18,11 +18,13 @@
 import graphql.schema.DataFetcherFactories;
 import graphql.schema.GraphQLFieldDefinition;
 
-public  class GraphQLFieldDefinitionWrapper extends GraphQLFieldDefinition {
+public class GraphQLFieldDefinitionWrapper extends GraphQLFieldDefinition {
 
     public GraphQLFieldDefinitionWrapper(GraphQLFieldDefinition fieldDefinition) {
         super(fieldDefinition.getName(), fieldDefinition.getDescription(), fieldDefinition.getType(),
-                DataFetcherFactories.useDataFetcher((DataFetcher<?>)fieldDefinition.getDataFetcher()), fieldDefinition.getArguments(), fieldDefinition.getDeprecationReason(),
+                DataFetcherFactories.useDataFetcher((DataFetcher<?>) fieldDefinition.getDataFetcher()),
+                fieldDefinition.getArguments(), fieldDefinition.getDeprecationReason(),
+                fieldDefinition.getDirectives(),
                 fieldDefinition.getDefinition());
     }
 

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

@@ -31,8 +31,8 @@ public class EnhancedExecutionStrategy extends AsyncSerialExecutionStrategy {
 
     @Override
     protected CompletableFuture<ExecutionResult> resolveField(ExecutionContext executionContext, ExecutionStrategyParameters parameters) {
-        GraphQLObjectType parentType = (GraphQLObjectType) parameters.typeInfo().getType();
-        GraphQLFieldDefinition fieldDef = getFieldDef(executionContext.getGraphQLSchema(), parentType, parameters.field().get(0));
+        GraphQLObjectType parentType = (GraphQLObjectType) parameters.getTypeInfo().getType();
+        GraphQLFieldDefinition fieldDef = getFieldDef(executionContext.getGraphQLSchema(), parentType, parameters.getField().get(0));
         if (fieldDef == null) return null;
 
         if (fieldDef.getName().contentEquals(CLIENT_MUTATION_ID)) {
@@ -52,11 +52,11 @@ protected CompletableFuture<ExecutionResult> resolveField(ExecutionContext execu
                 clientMutationId = clientMutationIdVal.getValue();
             }
 
-            ExecutionTypeInfo fieldTypeInfo = ExecutionTypeInfo.newTypeInfo().type(fieldDef.getType()).parentInfo(parameters.typeInfo()).build();
+            ExecutionTypeInfo fieldTypeInfo = ExecutionTypeInfo.newTypeInfo().type(fieldDef.getType()).parentInfo(parameters.getTypeInfo()).build();
             ExecutionStrategyParameters newParameters = ExecutionStrategyParameters.newParameters()
-                    .arguments(parameters.arguments())
-                    .fields(parameters.fields())
-                    .nonNullFieldValidator(parameters.nonNullFieldValidator())
+                    .arguments(parameters.getArguments())
+                    .fields(parameters.getFields())
+                    .nonNullFieldValidator(parameters.getNonNullFieldValidator())
                     .typeInfo(fieldTypeInfo)
                     .source(clientMutationId)
                     .build();
@@ -70,8 +70,8 @@ protected CompletableFuture<ExecutionResult> resolveField(ExecutionContext execu
 
     @Override
     protected CompletableFuture<ExecutionResult> completeValue(ExecutionContext executionContext, ExecutionStrategyParameters parameters) throws NonNullableFieldWasNullException {
-        graphql.schema.GraphQLType fieldType = parameters.typeInfo().getType();
-        Object result = parameters.source();
+        graphql.schema.GraphQLType fieldType = parameters.getTypeInfo().getType();
+        Object result = parameters.getSource();
         if (result instanceof Enum && fieldType instanceof GraphQLEnumType) {
             Object value = ((GraphQLEnumType) fieldType).getCoercing().parseValue(((Enum) result).name());
             return super.completeValue(executionContext, withSource(parameters, value));
@@ -88,10 +88,10 @@ protected CompletableFuture<ExecutionResult> completeValue(ExecutionContext exec
      */
     private ExecutionStrategyParameters withSource(ExecutionStrategyParameters parameters, Object source) {
         return ExecutionStrategyParameters.newParameters()
-                .arguments(parameters.arguments())
-                .fields(parameters.fields())
-                .nonNullFieldValidator(parameters.nonNullFieldValidator())
-                .typeInfo(parameters.typeInfo())
+                .arguments(parameters.getArguments())
+                .fields(parameters.getFields())
+                .nonNullFieldValidator(parameters.getNonNullFieldValidator())
+                .typeInfo(parameters.getTypeInfo())
                 .source(source)
                 .build();
     }