#84 - moves to graphql 3.0.0

Author: bbakerman

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Oct 27 10:18:00 ICT 2016
+#Tue Jun 06 14:52:40 AEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip

src/main/java/graphql/annotations/Connection.java

@@ -16,5 +16,5 @@
 
 import graphql.schema.DataFetcher;
 
-public interface Connection extends DataFetcher {
+public interface Connection<T> extends DataFetcher<T> {
 }

src/main/java/graphql/annotations/DefaultTypeFunction.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -45,6 +45,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static graphql.annotations.util.NamingKit.toGraphqlName;
 import static graphql.schema.GraphQLEnumType.newEnum;
 
 @Component(scope = ServiceScope.SINGLETON, property = "type=default")
@@ -226,7 +227,7 @@ private class EnumFunction implements TypeFunction {
         @Override
         public GraphQLType apply(Class<?> aClass, AnnotatedType annotatedType) {
             GraphQLName name = aClass.getAnnotation(GraphQLName.class);
-            String typeName = name == null ? aClass.getSimpleName() : name.value();
+            String typeName = toGraphqlName(name == null ? aClass.getSimpleName() : name.value());
 
             if (types.containsKey(typeName)) {
                 return types.get(typeName);
@@ -282,7 +283,7 @@ private class ObjectFunction implements TypeFunction {
         @Override
         public GraphQLType apply(Class<?> aClass, AnnotatedType annotatedType) {
             GraphQLName name = aClass.getAnnotation(GraphQLName.class);
-            String typeName = name == null ? aClass.getName() : name.value();
+            String typeName = toGraphqlName(name == null ? aClass.getName() : name.value());
             if (types.containsKey(typeName)) {
                 return types.get(typeName);
             } else if (processing.containsKey(typeName)) {
@@ -293,7 +294,7 @@ public GraphQLType apply(Class<?> aClass, AnnotatedType annotatedType) {
                 if (aClass.isInterface()) {
                     type = annotationsProcessor.getInterface(aClass);
                 } else {
-                    type = annotationsProcessor.getObject(aClass);
+                    type = annotationsProcessor.getObjectOrRef(aClass);
                 }
                 types.put(typeName, type);
                 processing.remove(typeName);

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,27 +14,35 @@
  */
 package graphql.annotations;
 
-import graphql.ExceptionWhileDataFetching;
 import graphql.ExecutionResult;
 import graphql.execution.ExecutionContext;
+import graphql.execution.ExecutionParameters;
 import graphql.execution.SimpleExecutionStrategy;
-import graphql.language.*;
-import graphql.schema.*;
+import graphql.execution.TypeInfo;
+import graphql.language.Argument;
+import graphql.language.Field;
+import graphql.language.ObjectValue;
+import graphql.language.StringValue;
+import graphql.language.VariableReference;
+import graphql.schema.GraphQLEnumType;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 
+import static graphql.execution.ExecutionParameters.newParameters;
+import static graphql.execution.TypeInfoWorkaround.newTypeInfo;
+
 public class EnhancedExecutionStrategy extends SimpleExecutionStrategy {
 
-    private static final Logger log = LoggerFactory.getLogger(EnhancedExecutionStrategy.class);
     private static final String CLIENT_MUTATION_ID = "clientMutationId";
 
     @Override
-    protected ExecutionResult resolveField(ExecutionContext executionContext, GraphQLObjectType parentType, Object source, List<Field> fields) {
+    protected ExecutionResult resolveField(ExecutionContext executionContext, ExecutionParameters parameters, List<Field> fields) {
+        GraphQLObjectType parentType = (GraphQLObjectType) parameters.typeInfo().type();
         GraphQLFieldDefinition fieldDef = getFieldDef(executionContext.getGraphQLSchema(), parentType, fields.get(0));
         if (fieldDef == null) return null;
 
@@ -43,7 +51,7 @@ protected ExecutionResult resolveField(ExecutionContext executionContext, GraphQ
             Argument argument = field.getArguments().get(0);
 
             Object clientMutationId;
-            if (argument.getValue() instanceof  VariableReference) {
+            if (argument.getValue() instanceof VariableReference) {
                 VariableReference ref = (VariableReference) argument.getValue();
                 HashMap mutationInputVariables = (HashMap) executionContext.getVariables().get(ref.getName());
                 clientMutationId = mutationInputVariables.get(CLIENT_MUTATION_ID);
@@ -55,20 +63,45 @@ protected ExecutionResult resolveField(ExecutionContext executionContext, GraphQ
                 clientMutationId = clientMutationIdVal.getValue();
             }
 
-            return completeValue(executionContext, fieldDef.getType(), fields, clientMutationId);
+            TypeInfo fieldTypeInfo = newTypeInfo(fieldDef.getType(), parameters.typeInfo());
+            ExecutionParameters newParameters = newParameters()
+                    .arguments(parameters.arguments())
+                    .fields(parameters.fields())
+                    .typeInfo(fieldTypeInfo)
+                    .source(clientMutationId)
+                    .build();
+
+
+            return completeValue(executionContext, newParameters, fields);
         } else {
-            return super.resolveField(executionContext, parentType, source, fields);
+            return super.resolveField(executionContext, parameters, fields);
         }
     }
 
     @Override
-    protected ExecutionResult completeValue(ExecutionContext executionContext, GraphQLType fieldType, List<Field> fields, Object result) {
+    protected ExecutionResult completeValue(ExecutionContext executionContext, ExecutionParameters parameters, List<Field> fields) {
+        GraphQLType fieldType = parameters.typeInfo().type();
+        Object result = parameters.source();
         if (result instanceof Enum && fieldType instanceof GraphQLEnumType) {
-            return super.completeValue(executionContext, fieldType, fields, ((GraphQLEnumType) fieldType).getCoercing().parseValue(((Enum) result).name()));
+            Object value = ((GraphQLEnumType) fieldType).getCoercing().parseValue(((Enum) result).name());
+            return super.completeValue(executionContext, withSource(parameters, value), fields);
         }
         if (result instanceof Optional) {
-            return completeValue(executionContext, fieldType, fields, ((Optional) result).orElse(null));
+            Object value = ((Optional<?>) result).orElse(null);
+            return completeValue(executionContext, withSource(parameters, value), fields);
         }
-        return super.completeValue(executionContext, fieldType, fields, result);
+        return super.completeValue(executionContext, parameters, fields);
+    }
+
+    /*
+      Creates a new parameters with the specified object as its source
+     */
+    private ExecutionParameters withSource(ExecutionParameters parameters, Object source) {
+        return newParameters()
+                .arguments(parameters.arguments())
+                .fields(parameters.fields())
+                .typeInfo(parameters.typeInfo())
+                .source(source)
+                .build();
     }
 }