Skip to content

Update to work with graphql-java 8.0 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 25, 2018
Merged

Update to work with graphql-java 8.0 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5eea0a3
Update to graphql-java 8.0
ryangardner Apr 25, 2018
33e060c
update test dependency for the annotations to match it's new coordinates
ryangardner Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ 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'
testCompile 'io.github.graphql-java:graphql-java-annotations:5.2'

// JSON
compile 'com.fasterxml.jackson.core:jackson-core:2.8.4'
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions src/main/java/graphql/servlet/NoOpInstrumentationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
6 changes: 3 additions & 3 deletions src/main/java/graphql/servlet/SimpleGraphQLServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -131,7 +131,7 @@ public static class Builder {
private ExecutionStrategyProvider executionStrategyProvider = new DefaultExecutionStrategyProvider();
private ObjectMapperConfigurer objectMapperConfigurer;
private List<GraphQLServletListener> 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();
Expand Down
6 changes: 3 additions & 3 deletions src/test/groovy/graphql/servlet/OsgiGraphQLServletSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down