Fixed input types

Author: Thomas Draier

src/main/java/graphql/annotations/DefaultTypeFunction.java

@@ -260,7 +260,12 @@ public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {
 
         @Override
         public GraphQLType buildType(String typeName, Class<?> aClass, AnnotatedType annotatedType) {
-            return annotationsProcessor.getOutputTypeOrRef(aClass);
+            try {
+                return annotationsProcessor.getOutputTypeOrRef(aClass);
+            } catch (ClassCastException e) {
+                // Also try to resolve to input object
+                return annotationsProcessor.getInputObject(aClass);
+            }
         }
     }
 

src/main/java/graphql/annotations/GraphQLAnnotations.java

@@ -630,7 +630,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()), "Input");
+                    graphql.schema.GraphQLType graphQLType = getInputObject(finalTypeFunction.buildType(t, parameter.getAnnotatedType()), "");
                     return getArgument(parameter, graphQLType);
                 }).collect(Collectors.toList());
 
@@ -696,11 +696,23 @@ protected static GraphQLFieldDefinition field(Method method) throws Instantiatio
 
     }
 
+    public GraphQLInputObjectType getInputObject(Class<?> object) {
+        String typeName = getTypeName(object);
+        if (typeRegistry.containsKey(typeName)) {
+            return (GraphQLInputObjectType) typeRegistry.get(typeName);
+        } else {
+            graphql.schema.GraphQLType graphQLType = getObject(object);
+            GraphQLInputObjectType inputObject = (GraphQLInputObjectType) getInputObject(graphQLType, "");
+            typeRegistry.put(inputObject.getName(), inputObject);
+            return inputObject;
+        }
+    }
+
     @Override
     public GraphQLInputType getInputObject(graphql.schema.GraphQLType graphQLType, String newNamePrefix) {
         if (graphQLType instanceof GraphQLObjectType) {
             GraphQLObjectType object = (GraphQLObjectType) graphQLType;
-            if (typeRegistry.containsKey(newNamePrefix + object.getName())) {
+            if (typeRegistry.containsKey(newNamePrefix + object.getName()) && typeRegistry.get(newNamePrefix + object.getName()) instanceof GraphQLInputType) {
                 return (GraphQLInputType) typeRegistry.get(newNamePrefix + object.getName());
             }
             GraphQLInputObjectType inputObjectType = new GraphQLInputObjectType(newNamePrefix + object.getName(), object.getDescription(),

src/main/java/graphql/annotations/GraphQLAnnotationsProcessor.java

@@ -106,6 +106,17 @@ public interface GraphQLAnnotationsProcessor {
      */
     GraphQLObjectType.Builder getObjectBuilder(Class<?> object) throws GraphQLAnnotationsException;
 
+    /**
+     * This will examine the object class and return a {@link GraphQLInputType} representation
+     *
+     * @param object the object class to examine
+     *
+     * @return a {@link GraphQLInputType} that represents that object class
+     *
+     * @throws GraphQLAnnotationsException if the object class cannot be examined
+     */
+    GraphQLInputObjectType getInputObject(Class<?> object) throws GraphQLAnnotationsException;
+
     /**
      * This will turn a {@link GraphQLObjectType} into a corresponding {@link GraphQLInputObjectType}
      *