feature: update to gql-java-14

Author: yarinvak

build.gradle

@@ -63,7 +63,7 @@ gradle.projectsEvaluated {
 
 dependencies {
     compile 'javax.validation:validation-api:1.1.0.Final'
-    compile 'com.graphql-java:graphql-java:13.0'
+    compile 'com.graphql-java:graphql-java:14.0'
 
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'

src/main/java/graphql/annotations/processor/retrievers/GraphQLFieldRetriever.java

@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Yurii Rashkovskii
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,6 +49,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static graphql.annotations.processor.util.GraphQLTypeNameResolver.getName;
 import static graphql.annotations.processor.util.ReflectionKit.newInstance;
 import static graphql.schema.FieldCoordinates.coordinates;
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
@@ -154,10 +155,10 @@ private GraphQLFieldDefinition handleRelayArguments(Method method, ProcessingEle
             relayFieldDefinition = buildRelayMutation(method, container, builder, outputType, args);
 
             // Getting the data fetcher from the old field type and putting it as the new type
-            String newParentType = relayFieldDefinition.getType().getName();
+            String newParentType = (getName(relayFieldDefinition.getType()));
             relayFieldDefinition.getType().getChildren().forEach(field -> {
-                DataFetcher dataFetcher = CodeRegistryUtil.getDataFetcher(container.getCodeRegistryBuilder(), outputType.getName(), (GraphQLFieldDefinition) field);
-                container.getCodeRegistryBuilder().dataFetcher(coordinates(newParentType, field.getName()), dataFetcher);
+                DataFetcher dataFetcher = CodeRegistryUtil.getDataFetcher(container.getCodeRegistryBuilder(), getName(outputType), (GraphQLFieldDefinition) field);
+                container.getCodeRegistryBuilder().dataFetcher(coordinates(newParentType, getName(field)), dataFetcher);
             });
 
         } else {
@@ -217,10 +218,10 @@ private GraphQLOutputType getGraphQLConnection(AccessibleObject field, graphql.s
     }
 
     private GraphQLOutputType internalGetGraphQLConnection(AccessibleObject field, GraphQLList listType, Relay relay, Map<String, graphql.schema.GraphQLType> typeRegistry) {
-        GraphQLOutputType wrappedType = (GraphQLOutputType) listType.getWrappedType();
+        GraphQLType wrappedType = listType.getWrappedType();
         String connectionName = field.getAnnotation(GraphQLConnection.class).name();
-        connectionName = connectionName.isEmpty() ? wrappedType.getName() : connectionName;
-        GraphQLObjectType edgeType = getActualType(relay.edgeType(connectionName, wrappedType, null, Collections.emptyList()), typeRegistry);
+        connectionName = connectionName.isEmpty() ? getName(wrappedType) : connectionName;
+        GraphQLObjectType edgeType = getActualType(relay.edgeType(connectionName, (GraphQLOutputType) wrappedType, null, Collections.emptyList()), typeRegistry);
         return getActualType(relay.connectionType(connectionName, edgeType, Collections.emptyList()), typeRegistry);
     }
 

src/main/java/graphql/annotations/processor/retrievers/GraphQLTypeRetriever.java

@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Yurii Rashkovskii
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,6 +23,7 @@
 import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;
 import graphql.annotations.processor.searchAlgorithms.SearchAlgorithm;
 import graphql.annotations.processor.typeBuilders.*;
+import graphql.annotations.processor.util.GraphQLTypeNameResolver;
 import graphql.schema.*;
 import org.osgi.service.component.annotations.*;
 
@@ -90,11 +91,11 @@ public GraphQLType getGraphQLType(Class<?> object, ProcessingElementsContainer c
         DirectiveWirer directiveWirer = new DirectiveWirer();
 
         // wire the type with the directives and change the original type
-        type = directiveWirer.wire((GraphQLDirectiveContainer) type,
+        type = (GraphQLType) directiveWirer.wire((GraphQLDirectiveContainer) type,
                 new DirectiveWiringMapRetriever().getDirectiveWiringMap(object, container),
                 container.getCodeRegistryBuilder(), null);
 
-        container.getTypeRegistry().put(type.getName(), type);
+        container.getTypeRegistry().put(GraphQLTypeNameResolver.getName(type), type);
         container.getProcessing().pop();
 
         return type;

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

@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Yurii Rashkovskii
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,16 +17,19 @@
 import graphql.annotations.annotationTypes.GraphQLDefaultValue;
 import graphql.annotations.annotationTypes.GraphQLDescription;
 import graphql.annotations.annotationTypes.GraphQLName;
+import graphql.annotations.directives.AnnotationsDirectiveWiring;
 import graphql.annotations.directives.DirectiveWirer;
 import graphql.annotations.directives.DirectiveWiringMapRetriever;
 import graphql.annotations.processor.ProcessingElementsContainer;
 import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;
 import graphql.annotations.processor.typeFunctions.TypeFunction;
+import graphql.annotations.processor.util.GraphQLTypeNameResolver;
 import graphql.schema.*;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -81,9 +84,11 @@ private GraphQLArgument getArgument(Parameter parameter, graphql.schema.GraphQLI
             argumentBuilder.name(toGraphqlName(parameter.getName()));
         }
         argumentBuilder.withDirectives(new DirectivesBuilder(parameter, container).build());
-        return (GraphQLArgument) new DirectiveWirer().wire(argumentBuilder.build(),
-                new DirectiveWiringMapRetriever().getDirectiveWiringMap(parameter, container), container.getCodeRegistryBuilder(),
-                inputType.getName());
+        GraphQLArgument builtArgument = argumentBuilder.build();
+        HashMap<GraphQLDirective, AnnotationsDirectiveWiring> directiveWiringMap = new DirectiveWiringMapRetriever().getDirectiveWiringMap(parameter, container);
+        return (GraphQLArgument) new DirectiveWirer().wire(builtArgument,
+                directiveWiringMap, container.getCodeRegistryBuilder(),
+                GraphQLTypeNameResolver.getName(inputType));
     }
 
 }

src/main/java/graphql/annotations/processor/util/GraphQLTypeNameResolver.java

@@ -0,0 +1,23 @@
+package graphql.annotations.processor.util;
+
+import graphql.schema.*;
+
+public class GraphQLTypeNameResolver {
+    public static String getName(GraphQLSchemaElement graphQLSchemaElement) {
+        try {
+            return ((GraphQLNamedSchemaElement) graphQLSchemaElement).getName();
+        } catch (Exception exception) {
+            if (graphQLSchemaElement instanceof GraphQLNonNull) {
+                return getName(((GraphQLNonNull) graphQLSchemaElement).getWrappedType());
+            } else if (graphQLSchemaElement instanceof GraphQLList) {
+                GraphQLType iterator = (GraphQLType) graphQLSchemaElement;
+                do {
+                    iterator = ((GraphQLList) iterator).getWrappedType();
+                } while (iterator instanceof GraphQLList);
+                return getName(iterator);
+            } else {
+                throw new RuntimeException("Cannot determine name for schema element");
+            }
+        }
+    }
+}

src/test/java/graphql/annotations/GraphQLInputTest.java

@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Yurii Rashkovskii
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,10 +22,7 @@
 import graphql.annotations.annotationTypes.GraphQLTypeResolver;
 import graphql.annotations.processor.GraphQLAnnotations;
 import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;
-import graphql.schema.GraphQLInputObjectType;
-import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLSchema;
-import graphql.schema.TypeResolver;
+import graphql.schema.*;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -297,19 +294,19 @@ public void testInputAndOutputWithSameName() {
         // arrange + act
         GraphQLSchema schema = newSchema().query(this.graphQLAnnotations.object(QueryInputAndOutput.class)).build();
         // assert
-        assertEquals(schema.getQueryType().getFieldDefinition("getHero").getType().getName(), "hero");
-        assertEquals(schema.getQueryType().getFieldDefinition("getString").getArgument("input").getType().getName(), "Inputhero");
-        assertEquals(((GraphQLInputObjectType) schema.getQueryType().getFieldDefinition("getString")
-                .getArgument("input").getType()).getField("skill").getType().getName(), "InputSkill");
+        assertEquals(((GraphQLNamedType) (schema.getQueryType().getFieldDefinition("getHero").getType())).getName(), "hero");
+        assertEquals(((GraphQLNamedType) schema.getQueryType().getFieldDefinition("getString").getArgument("input").getType()).getName(), "Inputhero");
+        assertEquals(((GraphQLNamedType) ((GraphQLInputObjectType) schema.getQueryType().getFieldDefinition("getString")
+                .getArgument("input").getType()).getField("skill").getType()).getName(), "InputSkill");
     }
 
     @Test
     public void testInputAndOutputSameClass() {
         // arrange + act
         GraphQLSchema schema = newSchema().query(this.graphQLAnnotations.object(QueryInputAndOutput2.class)).build();
         // assert
-        assertEquals(schema.getQueryType().getFieldDefinition("getSkill").getType().getName(), "Skill");
-        assertEquals(schema.getQueryType().getFieldDefinition("getA").getArgument("skill").getType().getName(), "InputSkill");
+        assertEquals(((GraphQLNamedType) schema.getQueryType().getFieldDefinition("getSkill").getType()).getName(), "Skill");
+        assertEquals(((GraphQLNamedType) schema.getQueryType().getFieldDefinition("getA").getArgument("skill").getType()).getName(), "InputSkill");
     }
 
     @GraphQLName("A")
@@ -366,11 +363,11 @@ public void testInputAndOutputWithSameNameWithChildrenWithSameName() {
         // arrange + act
         GraphQLSchema schema = newSchema().query(this.graphQLAnnotations.object(QuerySameNameWithChildren.class)).build();
         // assert
-        assertEquals(schema.getQueryType().getFieldDefinition("getAout").getType().getName(), "A");
-        assertEquals(schema.getQueryType().getFieldDefinition("getAout").getType().getClass(), GraphQLObjectType.class);
-        assertEquals(schema.getQueryType().getFieldDefinition("getBout").getType().getName(), "B");
+        assertEquals(((GraphQLNamedType) schema.getQueryType().getFieldDefinition("getAout").getType()).getName(), "A");
+        assertEquals(((GraphQLNamedType) schema.getQueryType().getFieldDefinition("getAout").getType()).getClass(), GraphQLObjectType.class);
+        assertEquals(((GraphQLNamedType) schema.getQueryType().getFieldDefinition("getBout").getType()).getName(), "B");
         assertEquals(schema.getQueryType().getFieldDefinition("getBout").getType().getClass(), GraphQLObjectType.class);
-        assertEquals(schema.getQueryType().getFieldDefinition("getA").getArgument("input").getType().getName(), "InputA");
+        assertEquals(((GraphQLNamedType) schema.getQueryType().getFieldDefinition("getA").getArgument("input").getType()).getName(), "InputA");
         assertEquals(schema.getQueryType().getFieldDefinition("getA").getArgument("input").getType().getClass(), GraphQLInputObjectType.class);
         assertEquals(schema.getQueryType().getFieldDefinition("getB").getArgument("input").getType().getClass(), GraphQLInputObjectType.class);
 

src/test/java/graphql/annotations/GraphQLInterfaceTest.java

@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Yurii Rashkovskii
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -129,7 +129,7 @@ public void testUnion() {
     @Test
     public void testInterfaces() {
         GraphQLObjectType object = this.graphQLAnnotations.object(TestObject.class);
-        List<GraphQLOutputType> ifaces = object.getInterfaces();
+        List<GraphQLNamedOutputType> ifaces = object.getInterfaces();
         assertEquals(ifaces.size(), 1);
         assertEquals(ifaces.get(0).getName(), "TestIface");
     }

src/test/java/graphql/annotations/connection/GraphQLConnectionTest.java

@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Yurii Rashkovskii
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,10 +24,7 @@
 import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;
 import graphql.annotations.processor.util.CustomRelay;
 import graphql.relay.Relay;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLList;
-import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLSchema;
+import graphql.schema.*;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -162,7 +159,7 @@ public void customRelayMethodList() {
             graphql.schema.GraphQLObjectType f = (GraphQLObjectType) schema.getType("ObjConnection");
             assertTrue(f.getFieldDefinitions().size() == 4);
             assertTrue(f.getFieldDefinition("nodes").getType() instanceof GraphQLList);
-            assertEquals(((GraphQLList) f.getFieldDefinition("nodes").getType()).getWrappedType().getName(), "Obj");
+            assertEquals(((GraphQLNamedType) ((GraphQLList) f.getFieldDefinition("nodes").getType()).getWrappedType()).getName(), "Obj");
 
             GraphQLObjectType pageInfo = (GraphQLObjectType) schema.getType("PageInfo");
             assertTrue(pageInfo.getFieldDefinition("additionalInfo") != null);

src/test/java/graphql/annotations/connection/GraphQLSimpleConnectionTest.java

@@ -23,6 +23,7 @@
 import graphql.annotations.processor.GraphQLAnnotations;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLNamedType;
 import graphql.schema.GraphQLSchema;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -50,7 +51,7 @@ public void init() {
     public void simpleConnection_buildSchema_TypeOfSimpleConnectionIsGraphQLList() throws Exception {
         GraphQLSchema schema = newAnnotationsSchema().query(MainConnection.class).build();
 
-        String objsTypeName = schema.getQueryType().getFieldDefinition("objs").getType().getName();
+        String objsTypeName = ((GraphQLNamedType)schema.getQueryType().getFieldDefinition("objs").getType()).getName();
 
         assertThat(objsTypeName, is("ObjChunk"));
     }