From f32c539e7268363d9b272e564b644ca696bdd512 Mon Sep 17 00:00:00 2001 From: Yarin Date: Wed, 14 Aug 2019 22:56:02 +0300 Subject: [PATCH] upgrade to graphql-java-13 and remove some deprecated usages --- build.gradle | 2 +- .../GraphQLEnhancedConnectionTest.java | 17 +++++++--------- .../directives/DirectiveWirerTest.java | 20 +++++-------------- .../DefaultTypeFunctionTest.java | 4 ++-- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 0945d8ba..3b8ad3ba 100644 --- a/build.gradle +++ b/build.gradle @@ -63,7 +63,7 @@ gradle.projectsEvaluated { dependencies { compile 'javax.validation:validation-api:1.1.0.Final' - compile 'com.graphql-java:graphql-java:12.0' + compile 'com.graphql-java:graphql-java:13.0' // OSGi compileOnly 'org.osgi:org.osgi.core:6.0.0' diff --git a/src/test/java/graphql/annotations/connection/GraphQLEnhancedConnectionTest.java b/src/test/java/graphql/annotations/connection/GraphQLEnhancedConnectionTest.java index 53a748ce..061ddbc3 100644 --- a/src/test/java/graphql/annotations/connection/GraphQLEnhancedConnectionTest.java +++ b/src/test/java/graphql/annotations/connection/GraphQLEnhancedConnectionTest.java @@ -134,8 +134,7 @@ public void ConnectionFieldDoesntReturnPaginatedData_tryToBuildSchema_getExcepti @Test public void validDatafetcher_queryForCursors_getValidCursors() throws Exception { //Arrange - ExecutionInput executionInput = new ExecutionInput("{ objs(first:2) { edges { cursor } } }", - null, "CONTEXT", null, new HashMap<>()); + ExecutionInput executionInput = ExecutionInput.newExecutionInput().query("{ objs(first:2) { edges { cursor } } }").build(); //Act ExecutionResult result = graphQL.execute(executionInput); Map>>>> data = result.getData(); @@ -149,8 +148,7 @@ public void validDatafetcher_queryForCursors_getValidCursors() throws Exception @Test public void fetchConnectionAsync() throws Exception { //Arrange - ExecutionInput executionInput = new ExecutionInput("{ objsAsync(first:2) { edges { cursor } } }", - null, "CONTEXT", null, new HashMap<>()); + ExecutionInput executionInput = ExecutionInput.newExecutionInput().query("{ objsAsync(first:2) { edges { cursor } } }").build(); //Act ExecutionResult result = graphQL.execute(executionInput); Map>>>> data = result.getData(); @@ -164,8 +162,9 @@ public void fetchConnectionAsync() throws Exception { @Test public void validDatafetcher_queryForValues_returnsValidValues() throws Exception { //Arrange - ExecutionInput executionInput = new ExecutionInput("{ objs(first:2) { edges { cursor node { id, val } } } }", - null, "CONTEXT", null, new HashMap<>()); + ExecutionInput executionInput = ExecutionInput.newExecutionInput().query("{ objs(first:2) { edges { cursor node { id, val } } } }") + .context("CONTEXT").root(null).operationName(null).variables(new HashMap<>()) + .build(); //Act ExecutionResult result = graphQL.execute(executionInput); @@ -181,8 +180,7 @@ public void validDatafetcher_queryForValues_returnsValidValues() throws Exceptio public void validDatafetcher_queryForHasPreviousPage_returnsFalse() throws Exception { //Arrange - ExecutionInput executionInput = new ExecutionInput("{ objs(first:2) { pageInfo { hasPreviousPage } } }", - null, "CONTEXT", null, new HashMap<>()); + ExecutionInput executionInput = ExecutionInput.newExecutionInput().query("{ objs(first:2) { pageInfo { hasPreviousPage } } }").build(); //Act ExecutionResult result = graphQL.execute(executionInput); @@ -196,8 +194,7 @@ public void validDatafetcher_queryForHasPreviousPage_returnsFalse() throws Excep public void validDatafetcher_queryForHasNextPage_returnsTrue() throws Exception { //Arrange - ExecutionInput executionInput = new ExecutionInput("{ objs(first:2) { pageInfo { hasNextPage } } }", - null, "CONTEXT", null, new HashMap<>()); + ExecutionInput executionInput = ExecutionInput.newExecutionInput().query("{ objs(first:2) { pageInfo { hasNextPage } } }").build(); //Act ExecutionResult result = graphQL.execute(executionInput); diff --git a/src/test/java/graphql/annotations/directives/DirectiveWirerTest.java b/src/test/java/graphql/annotations/directives/DirectiveWirerTest.java index 46b42862..937a0d67 100644 --- a/src/test/java/graphql/annotations/directives/DirectiveWirerTest.java +++ b/src/test/java/graphql/annotations/directives/DirectiveWirerTest.java @@ -188,16 +188,11 @@ public void wireGraphQLArgument_invalidLocations_exceptionIsThrown() throws Exce // GraphQLInterfaceType @Test - public void wireGraphQLInterfaceType_validLocations_correctMethodIsCalled() throws Exception { + public void wireGraphQLInterfaceType_validLocations_correctMethodIsCalled() { // Arrange AnnotationsDirectiveWiring upperWiring = mock(AnnotationsDirectiveWiring.class); - GraphQLInterfaceType directiveContainer = GraphQLInterfaceType.newInterface().name("asdf").typeResolver(new TypeResolver() { - @Override - public GraphQLObjectType getType(TypeResolutionEnvironment env) { - return null; - } - }).build(); + GraphQLInterfaceType directiveContainer = GraphQLInterfaceType.newInterface().name("asdf").build(); AnnotationsWiringEnvironmentImpl upperCaseEnv = new AnnotationsWiringEnvironmentImpl(directiveContainer, directiveContainer.getDirective("upperCase"), parentName, builder); @@ -221,12 +216,7 @@ public void wireGraphQLInterfaceType_invalidLocations_exceptionIsThrown() throws // Arrange AnnotationsDirectiveWiring upperWiring = mock(AnnotationsDirectiveWiring.class); - GraphQLInterfaceType directiveContainer = GraphQLInterfaceType.newInterface().name("asdf").typeResolver(new TypeResolver() { - @Override - public GraphQLObjectType getType(TypeResolutionEnvironment env) { - return null; - } - }).build(); + GraphQLInterfaceType directiveContainer = GraphQLInterfaceType.newInterface().name("asdf").build(); AnnotationsWiringEnvironmentImpl upperCaseEnv = new AnnotationsWiringEnvironmentImpl(directiveContainer, directiveContainer.getDirective("upperCase"), parentName, builder); @@ -249,7 +239,7 @@ public void wireGraphQLUnionType_validLocations_correctMethodIsCalled() throws E AnnotationsDirectiveWiring upperWiring = mock(AnnotationsDirectiveWiring.class); GraphQLUnionType directiveContainer = GraphQLUnionType.newUnionType().name("asdf") - .possibleType(GraphQLObjectType.newObject().name("Asdfaaaa").build()).typeResolver(env -> null).build(); + .possibleType(GraphQLObjectType.newObject().name("Asdfaaaa").build()).build(); AnnotationsWiringEnvironmentImpl upperCaseEnv = new AnnotationsWiringEnvironmentImpl( directiveContainer, directiveContainer.getDirective("upperCase"), parentName, builder); @@ -274,7 +264,7 @@ public void wireGraphQLUnionType_invalidLocations_exceptionIsThrown() throws Exc AnnotationsDirectiveWiring upperWiring = mock(AnnotationsDirectiveWiring.class); GraphQLUnionType directiveContainer = GraphQLUnionType.newUnionType().name("asdf") - .possibleType(GraphQLObjectType.newObject().name("Asdfaaaa").build()).typeResolver(env -> null).build(); + .possibleType(GraphQLObjectType.newObject().name("Asdfaaaa").build()).build(); AnnotationsWiringEnvironmentImpl upperCaseEnv = new AnnotationsWiringEnvironmentImpl( diff --git a/src/test/java/graphql/annotations/processor/typeFunctions/DefaultTypeFunctionTest.java b/src/test/java/graphql/annotations/processor/typeFunctions/DefaultTypeFunctionTest.java index 5f9ac57d..4c5314e1 100644 --- a/src/test/java/graphql/annotations/processor/typeFunctions/DefaultTypeFunctionTest.java +++ b/src/test/java/graphql/annotations/processor/typeFunctions/DefaultTypeFunctionTest.java @@ -59,10 +59,10 @@ public void enumeration() { List values = ((GraphQLEnumType) enumeration).getValues(); assertEquals(values.stream(). map(GraphQLEnumValueDefinition::getName).collect(Collectors.toList()), - Arrays.asList("B", "someA")); + Arrays.asList("someA", "B")); assertEquals(values.stream(). map(GraphQLEnumValueDefinition::getDescription).collect(Collectors.toList()), - Arrays.asList("B", "a")); + Arrays.asList("a", "B")); }