Merge pull request #138 from guy120494/fix-input

guy120494 · web-flow · commit c14db62e593d · 2017-12-11T10:56:17.000+02:00
Fix input bug
diff --git a/src/main/java/graphql/annotations/processor/graphQLProcessors/GraphQLInputProcessor.java b/src/main/java/graphql/annotations/processor/graphQLProcessors/GraphQLInputProcessor.java
@@ -16,32 +16,32 @@
 
 
 import graphql.annotations.processor.retrievers.GraphQLInputObjectRetriever;
-import graphql.annotations.processor.retrievers.GraphQLObjectHandler;
 import graphql.annotations.processor.ProcessingElementsContainer;
 import graphql.annotations.processor.retrievers.GraphQLObjectInfoRetriever;
-import graphql.annotations.processor.retrievers.GraphQLOutputObjectRetriever;
+import graphql.annotations.processor.retrievers.GraphQLTypeRetriever;
 import graphql.schema.GraphQLInputObjectType;
 import graphql.schema.GraphQLInputType;
 import graphql.schema.GraphQLType;
 
 import java.util.Map;
 
+import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_PREFIX;
+
 public class GraphQLInputProcessor {
 
-    private static final String DEFAULT_INPUT_PREFIX = "Input";
 
     private GraphQLObjectInfoRetriever graphQLObjectInfoRetriever;
-    private GraphQLOutputObjectRetriever graphQLOutputObjectRetriever;
+    private GraphQLTypeRetriever graphQLOutputObjectRetriever;
     private GraphQLInputObjectRetriever graphQLInputObjectRetriever;
 
-    public GraphQLInputProcessor(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever, GraphQLOutputObjectRetriever graphQLOutputObjectRetriever, GraphQLInputObjectRetriever graphQLInputObjectRetriever) {
+    public GraphQLInputProcessor(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever, GraphQLTypeRetriever graphQLOutputObjectRetriever, GraphQLInputObjectRetriever graphQLInputObjectRetriever) {
         this.graphQLObjectInfoRetriever = graphQLObjectInfoRetriever;
         this.graphQLOutputObjectRetriever = graphQLOutputObjectRetriever;
         this.graphQLInputObjectRetriever = graphQLInputObjectRetriever;
     }
 
     public GraphQLInputProcessor() {
-        this(new GraphQLObjectInfoRetriever(), new GraphQLOutputObjectRetriever(), new GraphQLInputObjectRetriever());
+        this(new GraphQLObjectInfoRetriever(), new GraphQLTypeRetriever(), new GraphQLInputObjectRetriever());
     }
 
     /**
@@ -53,18 +53,26 @@ public GraphQLInputProcessor() {
      */
 
     public GraphQLInputType getInputType(Class<?> object, ProcessingElementsContainer container) {
-        String typeName = DEFAULT_INPUT_PREFIX + graphQLObjectInfoRetriever.getTypeName(object);
+        boolean considerAsInput = true;
+        if (Enum.class.isAssignableFrom(object)) {
+            considerAsInput = false;
+        }
+
+        String typeName = graphQLObjectInfoRetriever.getTypeName(object);
+
+        if (considerAsInput)
+            typeName = DEFAULT_INPUT_PREFIX + typeName;
+
         Map<String, GraphQLType> typeRegistry = container.getTypeRegistry();
 
         if (typeRegistry.containsKey(typeName)) {
-            return (GraphQLInputObjectType) container.getTypeRegistry().get(typeName);
+            return (GraphQLInputType) container.getTypeRegistry().get(typeName);
         } else {
-            graphql.schema.GraphQLType graphQLType = graphQLOutputObjectRetriever.getOutputType(object, container);
+
+            graphql.schema.GraphQLType graphQLType = graphQLOutputObjectRetriever.getGraphQLType(object, container, considerAsInput);
             GraphQLInputType inputObject = graphQLInputObjectRetriever.getInputObject(graphQLType, DEFAULT_INPUT_PREFIX, typeRegistry);
             typeRegistry.put(inputObject.getName(), inputObject);
             return inputObject;
         }
     }
-
-
 }
diff --git a/src/main/java/graphql/annotations/processor/graphQLProcessors/GraphQLOutputProcessor.java b/src/main/java/graphql/annotations/processor/graphQLProcessors/GraphQLOutputProcessor.java
@@ -18,23 +18,23 @@
 import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;
 import graphql.annotations.processor.ProcessingElementsContainer;
 import graphql.annotations.processor.retrievers.GraphQLObjectInfoRetriever;
-import graphql.annotations.processor.retrievers.GraphQLOutputObjectRetriever;
+import graphql.annotations.processor.retrievers.GraphQLTypeRetriever;
 import graphql.schema.GraphQLOutputType;
 import graphql.schema.GraphQLTypeReference;
 
 public class GraphQLOutputProcessor {
 
     private GraphQLObjectInfoRetriever graphQLObjectInfoRetriever;
-    private GraphQLOutputObjectRetriever outputObjectRetriever;
+    private GraphQLTypeRetriever outputObjectRetriever;
 
 
-    public GraphQLOutputProcessor(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever, GraphQLOutputObjectRetriever outputObjectRetriever) {
+    public GraphQLOutputProcessor(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever, GraphQLTypeRetriever outputObjectRetriever) {
         this.graphQLObjectInfoRetriever = graphQLObjectInfoRetriever;
         this.outputObjectRetriever = outputObjectRetriever;
     }
 
     public GraphQLOutputProcessor() {
-        this(new GraphQLObjectInfoRetriever(), new GraphQLOutputObjectRetriever());
+        this(new GraphQLObjectInfoRetriever(), new GraphQLTypeRetriever());
     }
 
     /**
@@ -55,7 +55,7 @@ public GraphQLOutputType getOutputTypeOrRef(Class<?> object, ProcessingElementsC
             return new GraphQLTypeReference(typeName);
         }
 
-        return outputObjectRetriever.getOutputType(object, container);
+        return (GraphQLOutputType) outputObjectRetriever.getGraphQLType(object, container, false);
     }
 
 }
diff --git a/src/main/java/graphql/annotations/processor/retrievers/GraphQLInputObjectRetriever.java b/src/main/java/graphql/annotations/processor/retrievers/GraphQLInputObjectRetriever.java
@@ -35,6 +35,7 @@ public class GraphQLInputObjectRetriever {
      */
 
     public GraphQLInputType getInputObject(graphql.schema.GraphQLType graphQLType, String newNamePrefix, Map<String, graphql.schema.GraphQLType> typeRegistry) {
+
         if (graphQLType instanceof GraphQLObjectType) {
             return handleGraphQLObjectType((GraphQLObjectType) graphQLType, newNamePrefix, typeRegistry);
         } else if (graphQLType instanceof GraphQLList) {
diff --git a/src/main/java/graphql/annotations/processor/retrievers/GraphQLInterfaceRetriever.java b/src/main/java/graphql/annotations/processor/retrievers/GraphQLInterfaceRetriever.java
@@ -17,17 +17,18 @@
 
 import graphql.annotations.processor.ProcessingElementsContainer;
 import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;
+import graphql.schema.GraphQLOutputType;
 
 public class GraphQLInterfaceRetriever {
 
-    private GraphQLOutputObjectRetriever graphQLOutputObjectRetriever;
+    private GraphQLTypeRetriever graphQLOutputObjectRetriever;
 
-    public GraphQLInterfaceRetriever(GraphQLOutputObjectRetriever graphQLOutputObjectRetriever) {
+    public GraphQLInterfaceRetriever(GraphQLTypeRetriever graphQLOutputObjectRetriever) {
         this.graphQLOutputObjectRetriever = graphQLOutputObjectRetriever;
     }
 
     public GraphQLInterfaceRetriever() {
-        this(new GraphQLOutputObjectRetriever());
+        this(new GraphQLTypeRetriever());
     }
 
     /**
@@ -39,6 +40,6 @@ public GraphQLInterfaceRetriever() {
      * @throws GraphQLAnnotationsException if the class cannot be examined
      */
     public graphql.schema.GraphQLOutputType getInterface(Class<?> iface, ProcessingElementsContainer container) throws GraphQLAnnotationsException {
-        return graphQLOutputObjectRetriever.getOutputType(iface, container);
+        return (GraphQLOutputType) graphQLOutputObjectRetriever.getGraphQLType(iface, container, false);
     }
 }
diff --git a/src/main/java/graphql/annotations/processor/retrievers/GraphQLObjectHandler.java b/src/main/java/graphql/annotations/processor/retrievers/GraphQLObjectHandler.java
@@ -22,18 +22,18 @@
 
 public class GraphQLObjectHandler {
 
-    private GraphQLOutputObjectRetriever outputObjectRetriever;
+    private GraphQLTypeRetriever outputObjectRetriever;
 
-    public GraphQLObjectHandler(GraphQLOutputObjectRetriever outputObjectRetriever) {
+    public GraphQLObjectHandler(GraphQLTypeRetriever outputObjectRetriever) {
         this.outputObjectRetriever = outputObjectRetriever;
     }
 
     public GraphQLObjectHandler() {
-        this(new GraphQLOutputObjectRetriever());
+        this(new GraphQLTypeRetriever());
     }
 
     public GraphQLObjectType getObject(Class<?> object, ProcessingElementsContainer container) throws GraphQLAnnotationsException, CannotCastMemberException {
-        GraphQLOutputType type = outputObjectRetriever.getOutputType(object, container);
+        GraphQLOutputType type = (GraphQLOutputType) outputObjectRetriever.getGraphQLType(object, container, false);
         if (type instanceof GraphQLObjectType) {
             return (GraphQLObjectType) type;
         } else {
diff --git a/src/main/java/graphql/annotations/processor/retrievers/GraphQLTypeRetriever.java b/src/main/java/graphql/annotations/processor/retrievers/GraphQLTypeRetriever.java
@@ -25,45 +25,54 @@
 import graphql.annotations.processor.typeBuilders.InterfaceBuilder;
 import graphql.annotations.processor.typeBuilders.ObjectBuilder;
 import graphql.annotations.processor.typeBuilders.UnionBuilder;
+import graphql.annotations.processor.util.InputPropertiesUtil;
 import graphql.schema.*;
 
-public class GraphQLOutputObjectRetriever {
+import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_PREFIX;
+
+public class GraphQLTypeRetriever {
 
     private GraphQLObjectInfoRetriever graphQLObjectInfoRetriever;
     private GraphQLFieldRetriever graphQLFieldRetriever;
 
-    public GraphQLOutputObjectRetriever(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever, GraphQLFieldRetriever graphQLFieldRetriever) {
+    public GraphQLTypeRetriever(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever, GraphQLFieldRetriever graphQLFieldRetriever) {
         this.graphQLObjectInfoRetriever = graphQLObjectInfoRetriever;
         this.graphQLFieldRetriever = graphQLFieldRetriever;
     }
 
-    public GraphQLOutputObjectRetriever() {
+    public GraphQLTypeRetriever() {
         this(new GraphQLObjectInfoRetriever(), new GraphQLFieldRetriever());
     }
 
     /**
-     * This will examine the object and will return a {@link GraphQLOutputType} based on the class type and annotationTypes.
+     * This will examine the object and will return a {@link GraphQLType} based on the class type and annotationTypes.
      * - If its annotated with {@link graphql.annotations.annotationTypes.GraphQLUnion} it will return a {@link GraphQLUnionType}
      * - If its annotated with {@link graphql.annotations.annotationTypes.GraphQLTypeResolver} it will return a {@link GraphQLInterfaceType}
      * - It it's an Enum it will return a {@link GraphQLEnumType},
      * otherwise it will return a {@link GraphQLObjectType}.
      *
      * @param object    the object class to examine*
      * @param container a class that hold several members that are required in order to build schema
-     * @return a {@link GraphQLOutputType} that represents that object class
+     * @return a {@link GraphQLType} that represents that object class
      * @throws graphql.annotations.processor.exceptions.GraphQLAnnotationsException if the object class cannot be examined
      * @throws graphql.annotations.processor.exceptions.CannotCastMemberException   if the object class cannot be examined
      */
-    public GraphQLOutputType getOutputType(Class<?> object, ProcessingElementsContainer container) throws GraphQLAnnotationsException, CannotCastMemberException {
+    public GraphQLType getGraphQLType(Class<?> object, ProcessingElementsContainer container, boolean isInput) throws GraphQLAnnotationsException, CannotCastMemberException {
         // because the TypeFunction can call back to this processor and
         // Java classes can be circular, we need to protect against
         // building the same type twice because graphql-java 3.x requires
         // all type instances to be unique singletons
         String typeName = graphQLObjectInfoRetriever.getTypeName(object);
-
-        GraphQLOutputType type = (GraphQLOutputType) container.getTypeRegistry().get(typeName);
-        if (type != null) { // type already exists, do not build a new new one
-            return type;
+        GraphQLType type;
+        if (isInput) {
+            String typeNameWithPrefix = DEFAULT_INPUT_PREFIX + typeName;
+            type = container.getTypeRegistry().get(typeNameWithPrefix);
+            if (type != null) return type;
+        } else {
+            type = container.getTypeRegistry().get(typeName);
+            if (type != null) { // type already exists, do not build a new new one
+                return type;
+            }
         }
 
         container.getProcessing().push(typeName);
@@ -77,6 +86,7 @@ public GraphQLOutputType getOutputType(Class<?> object, ProcessingElementsContai
             type = new ObjectBuilder(graphQLObjectInfoRetriever, new ParentalSearch(graphQLObjectInfoRetriever), new BreadthFirstSearch(graphQLObjectInfoRetriever), graphQLFieldRetriever, new GraphQLInterfaceRetriever()).getObjectBuilder(object, container).build();
         }
 
+        if (isInput) typeName = DEFAULT_INPUT_PREFIX + typeName;
         container.getTypeRegistry().put(typeName, type);
         container.getProcessing().pop();
 
diff --git a/src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/ArgumentBuilder.java b/src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/ArgumentBuilder.java
@@ -57,11 +57,11 @@ public ArgumentBuilder(Method method, TypeFunction typeFunction, GraphQLInputObj
     @Override
     public List<GraphQLArgument> build() {
         TypeFunction finalTypeFunction = typeFunction;
-        List<GraphQLArgument> args = Arrays.asList(method.getParameters()).stream().
+        List<GraphQLArgument> args = Arrays.stream(method.getParameters()).
                 filter(p -> !DataFetchingEnvironment.class.isAssignableFrom(p.getType())).
                 map(parameter -> {
                     Class<?> t = parameter.getType();
-                    graphql.schema.GraphQLInputType graphQLType = graphQLInputObjectRetriever.getInputObject(finalTypeFunction.buildType(true, t, parameter.getAnnotatedType(), container), DEFAULT_INPUT_PREFIX, container.getTypeRegistry());
+                    graphql.schema.GraphQLInputType graphQLType = (GraphQLInputType) finalTypeFunction.buildType(true, t, parameter.getAnnotatedType(), container);
                     return getArgument(parameter, graphQLType);
                 }).collect(Collectors.toList());
 
diff --git a/src/main/java/graphql/annotations/processor/util/InputPropertiesUtil.java b/src/main/java/graphql/annotations/processor/util/InputPropertiesUtil.java
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * 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
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.annotations.processor.util;
+
+public class InputPropertiesUtil {
+    public static final String DEFAULT_INPUT_PREFIX = "Input";
+}
diff --git a/src/test/java/graphql/annotations/GraphQLInputTest.java b/src/test/java/graphql/annotations/GraphQLInputTest.java
diff --git a/src/test/java/graphql/annotations/GraphQLObjectTest.java b/src/test/java/graphql/annotations/GraphQLObjectTest.java

Original file line number	Diff line number	Diff line change
`@@ -18,23 +18,23 @@`
`18`	`18`	`import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;`
`19`	`19`	`import graphql.annotations.processor.ProcessingElementsContainer;`
`20`	`20`	`import graphql.annotations.processor.retrievers.GraphQLObjectInfoRetriever;`
`21`		`-import graphql.annotations.processor.retrievers.GraphQLOutputObjectRetriever;`
	`21`	`+import graphql.annotations.processor.retrievers.GraphQLTypeRetriever;`
`22`	`22`	`import graphql.schema.GraphQLOutputType;`
`23`	`23`	`import graphql.schema.GraphQLTypeReference;`
`24`	`24`
`25`	`25`	`public class GraphQLOutputProcessor {`
`26`	`26`
`27`	`27`	`private GraphQLObjectInfoRetriever graphQLObjectInfoRetriever;`
`28`		`- private GraphQLOutputObjectRetriever outputObjectRetriever;`
	`28`	`+ private GraphQLTypeRetriever outputObjectRetriever;`
`29`	`29`
`30`	`30`
`31`		`- public GraphQLOutputProcessor(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever, GraphQLOutputObjectRetriever outputObjectRetriever) {`
	`31`	`+ public GraphQLOutputProcessor(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever, GraphQLTypeRetriever outputObjectRetriever) {`
`32`	`32`	`this.graphQLObjectInfoRetriever = graphQLObjectInfoRetriever;`
`33`	`33`	`this.outputObjectRetriever = outputObjectRetriever;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public GraphQLOutputProcessor() {`
`37`		`- this(new GraphQLObjectInfoRetriever(), new GraphQLOutputObjectRetriever());`
	`37`	`+ this(new GraphQLObjectInfoRetriever(), new GraphQLTypeRetriever());`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
`@@ -55,7 +55,7 @@ public GraphQLOutputType getOutputTypeOrRef(Class<?> object, ProcessingElementsC`
`55`	`55`	`return new GraphQLTypeReference(typeName);`
`56`	`56`	`}`
`57`	`57`
`58`		`- return outputObjectRetriever.getOutputType(object, container);`
	`58`	`+ return (GraphQLOutputType) outputObjectRetriever.getGraphQLType(object, container, false);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,17 +17,18 @@`
`17`	`17`
`18`	`18`	`import graphql.annotations.processor.ProcessingElementsContainer;`
`19`	`19`	`import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;`
	`20`	`+import graphql.schema.GraphQLOutputType;`
`20`	`21`
`21`	`22`	`public class GraphQLInterfaceRetriever {`
`22`	`23`
`23`		`- private GraphQLOutputObjectRetriever graphQLOutputObjectRetriever;`
	`24`	`+ private GraphQLTypeRetriever graphQLOutputObjectRetriever;`
`24`	`25`
`25`		`- public GraphQLInterfaceRetriever(GraphQLOutputObjectRetriever graphQLOutputObjectRetriever) {`
	`26`	`+ public GraphQLInterfaceRetriever(GraphQLTypeRetriever graphQLOutputObjectRetriever) {`
`26`	`27`	`this.graphQLOutputObjectRetriever = graphQLOutputObjectRetriever;`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`public GraphQLInterfaceRetriever() {`
`30`		`- this(new GraphQLOutputObjectRetriever());`
	`31`	`+ this(new GraphQLTypeRetriever());`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`/**`
`@@ -39,6 +40,6 @@ public GraphQLInterfaceRetriever() {`
`39`	`40`	`* @throws GraphQLAnnotationsException if the class cannot be examined`
`40`	`41`	`*/`
`41`	`42`	`public graphql.schema.GraphQLOutputType getInterface(Class<?> iface, ProcessingElementsContainer container) throws GraphQLAnnotationsException {`
`42`		`- return graphQLOutputObjectRetriever.getOutputType(iface, container);`
	`43`	`+ return (GraphQLOutputType) graphQLOutputObjectRetriever.getGraphQLType(iface, container, false);`
`43`	`44`	`}`
`44`	`45`	`}`