Merge pull request #222 from Enigmatis/development

v7.1

Author: yarinvak

README.md

@@ -35,7 +35,7 @@ syntax for GraphQL schema definition.
 
 ```groovy
 dependencies {
-  compile "io.github.graphql-java:graphql-java-annotations:7.0.1"
+  compile "io.github.graphql-java:graphql-java-annotations:7.1"
 }
 ```
 
@@ -45,7 +45,7 @@ dependencies {
 <dependency>
     <groupId>io.github.graphql-java</groupId>
     <artifactId>graphql-java-annotations</artifactId>
-    <version>7.0</version>
+    <version>7.1</version>
 </dependency>
 ```
 

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'

gradle.properties

@@ -5,4 +5,4 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
 
-version = 7.0.1
+version = 7.1

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DeprecateBuilder.java

@@ -30,7 +30,7 @@ public DeprecateBuilder(AccessibleObject object) {
     public String build() {
         GraphQLDeprecate deprecate = object.getAnnotation(GraphQLDeprecate.class);
         if (deprecate != null) {
-            return deprecate.value();
+            return deprecate.value().isEmpty() ? DEFAULT_DEPRECATION_DESCRIPTION : deprecate.value();
         }
         if (object.getAnnotation(Deprecated.class) != null) {
             return DEFAULT_DEPRECATION_DESCRIPTION;

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<String, Map<String, List<Map<String, Map<String, Object>>>>> 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<String, Map<String, List<Map<String, Map<String, Object>>>>> 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);

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(

src/test/java/graphql/annotations/processor/retrievers/fieldBuilders/DeprecateBuilderTest.java

@@ -67,7 +67,7 @@ public void build_graphQLDeprecateAnnotationExistsWithNoValue_returnEmptyString(
         String deprecate = deprecateBuilder.build();
 
         // assert
-        assertEquals(deprecate, "");
+        assertEquals(deprecate, "Deprecated");
     }
 
     @Test

src/test/java/graphql/annotations/processor/typeFunctions/DefaultTypeFunctionTest.java

@@ -59,10 +59,10 @@ public void enumeration() {
         List<GraphQLEnumValueDefinition> 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"));
 
     }