Restored an "Input" prefix on InputTypes, added parameter in TypeFunction to choose if the returned type should be an input type

Thomas Draier · Thomas Draier · commit 9a5cccb5dd22 · 2017-10-18T12:08:31.000+02:00
diff --git a/src/main/java/graphql/annotations/BatchedTypeFunction.java b/src/main/java/graphql/annotations/BatchedTypeFunction.java
@@ -37,7 +37,7 @@ public boolean canBuildType(final Class<?> aClass, final AnnotatedType type) {
     }
 
     @Override
-    public graphql.schema.GraphQLType buildType(String typeName, final Class<?> aClass, final AnnotatedType annotatedType) {
+    public graphql.schema.GraphQLType buildType(final boolean inputType, final Class<?> aClass, final AnnotatedType annotatedType) {
         if (!aClass.isAssignableFrom(List.class)) {
             throw new IllegalArgumentException("Batched method should return a List");
         }
@@ -52,7 +52,6 @@ public graphql.schema.GraphQLType buildType(String typeName, final Class<?> aCla
         } else {
             klass = (Class<?>) arg.getType();
         }
-        typeName = klass.getSimpleName();
-        return defaultTypeFunction.buildType(typeName, klass, arg);
+        return defaultTypeFunction.buildType(inputType, klass, arg);
     }
 }
diff --git a/src/main/java/graphql/annotations/DefaultTypeFunction.java b/src/main/java/graphql/annotations/DefaultTypeFunction.java
@@ -80,7 +80,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
         }
 
         @Override
-        public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
+        public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
             return Scalars.GraphQLString;
         }
     }
@@ -98,7 +98,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
         }
 
         @Override
-        public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
+        public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
             return Scalars.GraphQLBoolean;
         }
     }
@@ -116,7 +116,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
         }
 
         @Override
-        public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
+        public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
             return Scalars.GraphQLFloat;
         }
     }
@@ -134,7 +134,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
         }
 
         @Override
-        public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
+        public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
             return Scalars.GraphQLInt;
         }
     }
@@ -152,7 +152,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
         }
 
         @Override
-        public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
+        public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
             return Scalars.GraphQLLong;
         }
     }
@@ -168,7 +168,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
         }
 
         @Override
-        public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
+        public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
             if (!(annotatedType instanceof AnnotatedParameterizedType)) {
                 throw new IllegalArgumentException("List type parameter should be specified");
             }
@@ -180,7 +180,7 @@ public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType ann
             } else {
                 klass = (Class<?>) arg.getType();
             }
-            return new GraphQLList(DefaultTypeFunction.this.buildType(klass, arg));
+            return new GraphQLList(DefaultTypeFunction.this.buildType(inputType, klass, arg));
         }
     }
 
@@ -192,7 +192,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
         }
 
         @Override
-        public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
+        public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
             if (!(annotatedType instanceof AnnotatedParameterizedType)) {
                 throw new IllegalArgumentException("Stream type parameter should be specified");
             }
@@ -204,7 +204,7 @@ public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType ann
             } else {
                 klass = (Class<?>) arg.getType();
             }
-            return new GraphQLList(DefaultTypeFunction.this.buildType(klass, arg));
+            return new GraphQLList(DefaultTypeFunction.this.buildType(inputType, klass, arg));
         }
     }
 
@@ -222,9 +222,9 @@ public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
         }
 
         @Override
-        public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
+        public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
             AnnotatedType arg = getAnnotatedType(annotatedType);
-            return DefaultTypeFunction.this.buildType(typeName, getClass(annotatedType), arg);
+            return DefaultTypeFunction.this.buildType(inputType, getClass(annotatedType), arg);
         }
 
         private AnnotatedType getAnnotatedType(AnnotatedType annotatedType) {
@@ -259,12 +259,11 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
         }
 
         @Override
-        public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
-            try {
-                return annotationsProcessor.getOutputTypeOrRef(aClass);
-            } catch (ClassCastException e) {
-                // Also try to resolve to input object
+        public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
+            if (inputType) {
                 return annotationsProcessor.getInputObject(aClass);
+            } else {
+                return annotationsProcessor.getOutputTypeOrRef(aClass);
             }
         }
     }
@@ -322,13 +321,13 @@ public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
     }
 
     @Override
-    public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
+    public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
         TypeFunction typeFunction = getTypeFunction(aClass, annotatedType);
         if (typeFunction == null) {
             throw new IllegalArgumentException("unsupported type");
         }
 
-        GraphQLType result = typeFunction.buildType(typeName, aClass, annotatedType);
+        GraphQLType result = typeFunction.buildType(inputType, aClass, annotatedType);
         if (aClass.getAnnotation(GraphQLNonNull.class) != null ||
                 (annotatedType != null && annotatedType.getAnnotation(GraphQLNonNull.class) != null)) {
             result = new graphql.schema.GraphQLNonNull(result);
diff --git a/src/main/java/graphql/annotations/GraphQLAnnotations.java b/src/main/java/graphql/annotations/GraphQLAnnotations.java
@@ -51,6 +51,8 @@ public class GraphQLAnnotations implements GraphQLAnnotationsProcessor {
 
     private static final List<Class> TYPES_FOR_CONNECTION = Arrays.asList(GraphQLObjectType.class, GraphQLInterfaceType.class, GraphQLUnionType.class, GraphQLTypeReference.class);
 
+    private static final String DEFAULT_INPUT_PREFIX = "Input";
+
     private Map<String, graphql.schema.GraphQLType> typeRegistry = new HashMap<>();
     private Map<Class<?>, Set<Class<?>>> extensionsTypeRegistry = new HashMap<>();
     private final Stack<String> processing = new Stack<>();
@@ -630,7 +632,7 @@ protected GraphQLFieldDefinition getField(Method method) throws GraphQLAnnotatio
                 filter(p -> !DataFetchingEnvironment.class.isAssignableFrom(p.getType())).
                 map(parameter -> {
                     Class<?> t = parameter.getType();
-                    graphql.schema.GraphQLType graphQLType = getInputObject(finalTypeFunction.buildType(t, parameter.getAnnotatedType()), "");
+                    graphql.schema.GraphQLType graphQLType = getInputObject(finalTypeFunction.buildType(t, parameter.getAnnotatedType()), DEFAULT_INPUT_PREFIX);
                     return getArgument(parameter, graphQLType);
                 }).collect(Collectors.toList());
 
@@ -697,12 +699,12 @@ protected static GraphQLFieldDefinition field(Method method) throws Instantiatio
     }
 
     public GraphQLInputObjectType getInputObject(Class<?> object) {
-        String typeName = getTypeName(object);
+        String typeName = DEFAULT_INPUT_PREFIX + getTypeName(object);
         if (typeRegistry.containsKey(typeName)) {
             return (GraphQLInputObjectType) typeRegistry.get(typeName);
         } else {
             graphql.schema.GraphQLType graphQLType = getObject(object);
-            GraphQLInputObjectType inputObject = (GraphQLInputObjectType) getInputObject(graphQLType, "");
+            GraphQLInputObjectType inputObject = (GraphQLInputObjectType) getInputObject(graphQLType, DEFAULT_INPUT_PREFIX);
             typeRegistry.put(inputObject.getName(), inputObject);
             return inputObject;
         }
diff --git a/src/main/java/graphql/annotations/MethodDataFetcher.java b/src/main/java/graphql/annotations/MethodDataFetcher.java
@@ -70,7 +70,8 @@ private Object[] invocationArgs(DataFetchingEnvironment environment) {
                 result.add(environment);
                 continue;
             }
-            graphql.schema.GraphQLType graphQLType = typeFunction.buildType(paramType, p.getAnnotatedType());
+
+            graphql.schema.GraphQLType graphQLType = typeFunction.buildType(true, paramType, p.getAnnotatedType());
             Object arg = envArgs.next();
             result.add(buildArg(p.getParameterizedType(), graphQLType, arg));
         }
diff --git a/src/main/java/graphql/annotations/TypeFunction.java b/src/main/java/graphql/annotations/TypeFunction.java
@@ -43,21 +43,21 @@ default String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
 
     /**
      * Build a {@link GraphQLType} object from a java type.
-     * This is a convenience method for calling {@link #buildType(String, Class, AnnotatedType)} without a type name.
+     * This is a convenience method for calling {@link #buildType(boolean, Class, AnnotatedType)} without a type name.
      * @param aClass The java type to build the type name for
      * @param annotatedType The {@link AnnotatedType} of the java type, which may be a {link AnnotatedParameterizedType}
      * @return The built {@link GraphQLType}
      */
     default GraphQLType buildType(Class<?> aClass, AnnotatedType annotatedType) {
-        return buildType(getTypeName(aClass, annotatedType), aClass, annotatedType);
+        return buildType(false, aClass, annotatedType);
     }
 
     /**
      * Build a {@link GraphQLType} object from a java type.
-     * @param typeName The name to give the graphql type
+     * @param input is InputType
      * @param aClass The java type to build the type name for
      * @param annotatedType The {@link AnnotatedType} of the java type, which may be a {link AnnotatedParameterizedType}
      * @return The built {@link GraphQLType}
      */
-    GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType);
+    GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annotatedType);
 }
diff --git a/src/test/java/graphql/annotations/GraphQLObjectTest.java b/src/test/java/graphql/annotations/GraphQLObjectTest.java
@@ -625,7 +625,7 @@ public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
         }
 
         @Override
-        public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
+        public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {
             return GraphQLString;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public boolean canBuildType(final Class<?> aClass, final AnnotatedType type) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`		`- public graphql.schema.GraphQLType buildType(String typeName, final Class<?> aClass, final AnnotatedType annotatedType) {`
	`40`	`+ public graphql.schema.GraphQLType buildType(final boolean inputType, final Class<?> aClass, final AnnotatedType annotatedType) {`
`41`	`41`	`if (!aClass.isAssignableFrom(List.class)) {`
`42`	`42`	`throw new IllegalArgumentException("Batched method should return a List");`
`43`	`43`	`}`
`@@ -52,7 +52,6 @@ public graphql.schema.GraphQLType buildType(String typeName, final Class<?> aCla`
`52`	`52`	`} else {`
`53`	`53`	`klass = (Class<?>) arg.getType();`
`54`	`54`	`}`
`55`		`- typeName = klass.getSimpleName();`
`56`		`- return defaultTypeFunction.buildType(typeName, klass, arg);`
	`55`	`+ return defaultTypeFunction.buildType(inputType, klass, arg);`
`57`	`56`	`}`
`58`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Override`
`83`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
	`83`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
`84`	`84`	`return Scalars.GraphQLString;`
`85`	`85`	`}`
`86`	`86`	`}`
`@@ -98,7 +98,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`101`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
	`101`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
`102`	`102`	`return Scalars.GraphQLBoolean;`
`103`	`103`	`}`
`104`	`104`	`}`
`@@ -116,7 +116,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`@Override`
`119`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
	`119`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
`120`	`120`	`return Scalars.GraphQLFloat;`
`121`	`121`	`}`
`122`	`122`	`}`
`@@ -134,7 +134,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`@Override`
`137`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
	`137`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
`138`	`138`	`return Scalars.GraphQLInt;`
`139`	`139`	`}`
`140`	`140`	`}`
`@@ -152,7 +152,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`@Override`
`155`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
	`155`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
`156`	`156`	`return Scalars.GraphQLLong;`
`157`	`157`	`}`
`158`	`158`	`}`
`@@ -168,7 +168,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`@Override`
`171`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
	`171`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
`172`	`172`	`if (!(annotatedType instanceof AnnotatedParameterizedType)) {`
`173`	`173`	`throw new IllegalArgumentException("List type parameter should be specified");`
`174`	`174`	`}`
`@@ -180,7 +180,7 @@ public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType ann`
`180`	`180`	`} else {`
`181`	`181`	`klass = (Class<?>) arg.getType();`
`182`	`182`	`}`
`183`		`- return new GraphQLList(DefaultTypeFunction.this.buildType(klass, arg));`
	`183`	`+ return new GraphQLList(DefaultTypeFunction.this.buildType(inputType, klass, arg));`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
`@@ -192,7 +192,7 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`@Override`
`195`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
	`195`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
`196`	`196`	`if (!(annotatedType instanceof AnnotatedParameterizedType)) {`
`197`	`197`	`throw new IllegalArgumentException("Stream type parameter should be specified");`
`198`	`198`	`}`
`@@ -204,7 +204,7 @@ public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType ann`
`204`	`204`	`} else {`
`205`	`205`	`klass = (Class<?>) arg.getType();`
`206`	`206`	`}`
`207`		`- return new GraphQLList(DefaultTypeFunction.this.buildType(klass, arg));`
	`207`	`+ return new GraphQLList(DefaultTypeFunction.this.buildType(inputType, klass, arg));`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`@@ -222,9 +222,9 @@ public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`@Override`
`225`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
	`225`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
`226`	`226`	`AnnotatedType arg = getAnnotatedType(annotatedType);`
`227`		`- return DefaultTypeFunction.this.buildType(typeName, getClass(annotatedType), arg);`
	`227`	`+ return DefaultTypeFunction.this.buildType(inputType, getClass(annotatedType), arg);`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`private AnnotatedType getAnnotatedType(AnnotatedType annotatedType) {`
`@@ -259,12 +259,11 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`@Override`
`262`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
`263`		`- try {`
`264`		`- return annotationsProcessor.getOutputTypeOrRef(aClass);`
`265`		`- } catch (ClassCastException e) {`
`266`		`- // Also try to resolve to input object`
	`262`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
	`263`	`+ if (inputType) {`
`267`	`264`	`return annotationsProcessor.getInputObject(aClass);`
	`265`	`+ } else {`
	`266`	`+ return annotationsProcessor.getOutputTypeOrRef(aClass);`
`268`	`267`	`}`
`269`	`268`	`}`
`270`	`269`	`}`
`@@ -322,13 +321,13 @@ public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {`
`322`	`321`	`}`
`323`	`322`
`324`	`323`	`@Override`
`325`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
	`324`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
`326`	`325`	`TypeFunction typeFunction = getTypeFunction(aClass, annotatedType);`
`327`	`326`	`if (typeFunction == null) {`
`328`	`327`	`throw new IllegalArgumentException("unsupported type");`
`329`	`328`	`}`
`330`	`329`
`331`		`- GraphQLType result = typeFunction.buildType(typeName, aClass, annotatedType);`
	`330`	`+ GraphQLType result = typeFunction.buildType(inputType, aClass, annotatedType);`
`332`	`331`	`if (aClass.getAnnotation(GraphQLNonNull.class) != null \|\|`
`333`	`332`	`(annotatedType != null && annotatedType.getAnnotation(GraphQLNonNull.class) != null)) {`
`334`	`333`	`result = new graphql.schema.GraphQLNonNull(result);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ private Object[] invocationArgs(DataFetchingEnvironment environment) {`
`70`	`70`	`result.add(environment);`
`71`	`71`	`continue;`
`72`	`72`	`}`
`73`		`- graphql.schema.GraphQLType graphQLType = typeFunction.buildType(paramType, p.getAnnotatedType());`
	`73`	`+`
	`74`	`+ graphql.schema.GraphQLType graphQLType = typeFunction.buildType(true, paramType, p.getAnnotatedType());`
`74`	`75`	`Object arg = envArgs.next();`
`75`	`76`	`result.add(buildArg(p.getParameterizedType(), graphQLType, arg));`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,7 @@ public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {`
`625`	`625`	`}`
`626`	`626`
`627`	`627`	`@Override`
`628`		`- public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {`
	`628`	`+ public GraphQLType buildType(boolean inputType, Class<?> aClass, AnnotatedType annotatedType) {`
`629`	`629`	`return GraphQLString;`
`630`	`630`	`}`
`631`	`631`	`}`