Removed dependency to old version of graphql-java-annotations (#52)

Author: Thomas Draier

build.gradle

@@ -57,7 +57,6 @@ dependencies {
     // GraphQL
     compile 'com.graphql-java:graphql-java:6.0'
 
-    compileOnly 'com.graphql-java:graphql-java-annotations:0.13.1'
     testCompile 'com.graphql-java:graphql-java-annotations:0.13.1'
 
     // JSON

src/main/java/graphql/servlet/GraphQLServlet.java

@@ -66,7 +66,7 @@ public abstract class GraphQLServlet extends HttpServlet implements Servlet, Gra
     protected abstract Object createRootObject(Optional<HttpServletRequest> request, Optional<HttpServletResponse> response);
     protected abstract ExecutionStrategyProvider getExecutionStrategyProvider();
     protected abstract Instrumentation getInstrumentation();
-    protected abstract Map<String, Object> transformVariables(GraphQLSchema schema, String query, Map<String, Object> variables);
+
     protected abstract GraphQLErrorHandler getGraphQLErrorHandler();
     protected abstract PreparsedDocumentProvider getPreparsedDocumentProvider();
 
@@ -335,7 +335,7 @@ private void query(String query, String operationName, Map<String, Object> varia
         } else {
             List<GraphQLServletListener.OperationCallback> operationCallbacks = runListeners(l -> l.onOperation(context, operationName, query, variables));
 
-            final ExecutionResult executionResult = newGraphQL(schema).execute(new ExecutionInput(query, operationName, context, rootObject, transformVariables(schema, query, variables)));
+            final ExecutionResult executionResult = newGraphQL(schema).execute(new ExecutionInput(query, operationName, context, rootObject, variables));
             final List<GraphQLError> errors = executionResult.getErrors();
             final Object data = executionResult.getData();
 

src/main/java/graphql/servlet/GraphQLVariables.java

@@ -4,7 +4,6 @@
 import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLSchema;
 import graphql.schema.GraphQLType;
 import org.osgi.service.component.annotations.*;
 
@@ -13,7 +12,6 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
@@ -210,11 +208,6 @@ protected Instrumentation getInstrumentation() {
         return instrumentationProvider.getInstrumentation();
     }
 
-    @Override
-    protected Map<String, Object> transformVariables(GraphQLSchema schema, String query, Map<String, Object> variables) {
-        return new GraphQLVariables(schema, query, variables);
-    }
-
     @Override
     protected GraphQLErrorHandler getGraphQLErrorHandler() {
         return errorHandler;

src/main/java/graphql/servlet/OsgiGraphQLServlet.java

@@ -10,7 +10,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -104,11 +103,6 @@ protected Instrumentation getInstrumentation() {
         return instrumentation;
     }
 
-    @Override
-    protected Map<String, Object> transformVariables(GraphQLSchema schema, String query, Map<String, Object> variables) {
-        return variables;
-    }
-
     @Override
     protected GraphQLErrorHandler getGraphQLErrorHandler() {
         return errorHandler;