From 5eea0a3fab86d1c3c5cfe0c477dab92505cef202 Mon Sep 17 00:00:00 2001 From: Ryan Gardner Date: Wed, 25 Apr 2018 17:09:36 -0400 Subject: [PATCH 1/2] Update to graphql-java 8.0 - Fix issue with the missing "NoOpInstrumentation" - Update the test dependency on the graphql annotations to fix issue with the OSGI test --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../java/graphql/servlet/NoOpInstrumentationProvider.java | 4 ++-- src/main/java/graphql/servlet/SimpleGraphQLServlet.java | 6 +++--- .../groovy/graphql/servlet/OsgiGraphQLServletSpec.groovy | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index d10f8ba1..e35d8a48 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ dependencies { compile 'commons-fileupload:commons-fileupload:1.3.1' // GraphQL - compile 'com.graphql-java:graphql-java:6.0' + compile 'com.graphql-java:graphql-java:8.0' testCompile 'com.graphql-java:graphql-java-annotations:0.13.1' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d0b3eabb..4bd878c2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Apr 24 13:12:01 EDT 2017 +#Wed Apr 25 17:03:16 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip diff --git a/src/main/java/graphql/servlet/NoOpInstrumentationProvider.java b/src/main/java/graphql/servlet/NoOpInstrumentationProvider.java index 8f3e98bd..a6771854 100644 --- a/src/main/java/graphql/servlet/NoOpInstrumentationProvider.java +++ b/src/main/java/graphql/servlet/NoOpInstrumentationProvider.java @@ -1,12 +1,12 @@ package graphql.servlet; import graphql.execution.instrumentation.Instrumentation; -import graphql.execution.instrumentation.NoOpInstrumentation; +import graphql.execution.instrumentation.SimpleInstrumentation; public class NoOpInstrumentationProvider implements InstrumentationProvider { @Override public Instrumentation getInstrumentation() { - return NoOpInstrumentation.INSTANCE; + return SimpleInstrumentation.INSTANCE; } } diff --git a/src/main/java/graphql/servlet/SimpleGraphQLServlet.java b/src/main/java/graphql/servlet/SimpleGraphQLServlet.java index 3c6f29e3..3ec22306 100644 --- a/src/main/java/graphql/servlet/SimpleGraphQLServlet.java +++ b/src/main/java/graphql/servlet/SimpleGraphQLServlet.java @@ -2,7 +2,7 @@ import graphql.execution.ExecutionStrategy; import graphql.execution.instrumentation.Instrumentation; -import graphql.execution.instrumentation.NoOpInstrumentation; +import graphql.execution.instrumentation.SimpleInstrumentation; import graphql.execution.preparsed.NoOpPreparsedDocumentProvider; import graphql.execution.preparsed.PreparsedDocumentProvider; import graphql.schema.GraphQLSchema; @@ -60,7 +60,7 @@ public SimpleGraphQLServlet(GraphQLSchemaProvider schemaProvider, ExecutionStrat this.executionStrategyProvider = executionStrategyProvider; if (instrumentation == null) { - this.instrumentation = NoOpInstrumentation.INSTANCE; + this.instrumentation = SimpleInstrumentation.INSTANCE; } else { this.instrumentation = instrumentation; } @@ -131,7 +131,7 @@ public static class Builder { private ExecutionStrategyProvider executionStrategyProvider = new DefaultExecutionStrategyProvider(); private ObjectMapperConfigurer objectMapperConfigurer; private List listeners; - private Instrumentation instrumentation = NoOpInstrumentation.INSTANCE; + private Instrumentation instrumentation = SimpleInstrumentation.INSTANCE; private GraphQLErrorHandler errorHandler = new DefaultGraphQLErrorHandler(); private GraphQLContextBuilder contextBuilder = new DefaultGraphQLContextBuilder(); private GraphQLRootObjectBuilder rootObjectBuilder = new DefaultGraphQLRootObjectBuilder(); diff --git a/src/test/groovy/graphql/servlet/OsgiGraphQLServletSpec.groovy b/src/test/groovy/graphql/servlet/OsgiGraphQLServletSpec.groovy index 6be4693d..559daf23 100644 --- a/src/test/groovy/graphql/servlet/OsgiGraphQLServletSpec.groovy +++ b/src/test/groovy/graphql/servlet/OsgiGraphQLServletSpec.groovy @@ -1,8 +1,8 @@ package graphql.servlet -import graphql.annotations.GraphQLAnnotations -import graphql.annotations.GraphQLField -import graphql.annotations.GraphQLName +import graphql.annotations.annotationTypes.GraphQLField +import graphql.annotations.annotationTypes.GraphQLName +import graphql.annotations.processor.GraphQLAnnotations import graphql.schema.GraphQLFieldDefinition import spock.lang.Specification From 33e060c0f85d22720231f9a79f720db2b595d43a Mon Sep 17 00:00:00 2001 From: Ryan Gardner Date: Wed, 25 Apr 2018 17:11:42 -0400 Subject: [PATCH 2/2] update test dependency for the annotations to match it's new coordinates --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e35d8a48..85a81185 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,7 @@ dependencies { // GraphQL compile 'com.graphql-java:graphql-java:8.0' - testCompile 'com.graphql-java:graphql-java-annotations:0.13.1' + testCompile 'io.github.graphql-java:graphql-java-annotations:5.2' // JSON compile 'com.fasterxml.jackson.core:jackson-core:2.8.4'