fix tests & remove input retriever

Author: yarinvak

src/main/java/graphql/annotations/processor/graphQLProcessors/GraphQLInputProcessor.java

@@ -15,7 +15,6 @@
 package graphql.annotations.processor.graphQLProcessors;
 
 
-import graphql.annotations.processor.retrievers.GraphQLInputObjectRetriever;
 import graphql.annotations.processor.ProcessingElementsContainer;
 import graphql.annotations.processor.retrievers.GraphQLObjectInfoRetriever;
 import graphql.annotations.processor.retrievers.GraphQLTypeRetriever;
@@ -33,13 +32,13 @@ public class GraphQLInputProcessor {
     private GraphQLObjectInfoRetriever graphQLObjectInfoRetriever;
     private GraphQLTypeRetriever graphQLTypeRetriever;
 
-    public GraphQLInputProcessor(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever, GraphQLTypeRetriever graphQLTypeRetriever, GraphQLInputObjectRetriever graphQLInputObjectRetriever) {
+    public GraphQLInputProcessor(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever, GraphQLTypeRetriever graphQLTypeRetriever) {
         this.graphQLObjectInfoRetriever = graphQLObjectInfoRetriever;
         this.graphQLTypeRetriever = graphQLTypeRetriever;
     }
 
     public GraphQLInputProcessor() {
-        this(new GraphQLObjectInfoRetriever(), new GraphQLTypeRetriever(), new GraphQLInputObjectRetriever());
+        this(new GraphQLObjectInfoRetriever(), new GraphQLTypeRetriever());
     }
 
     /**

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

@@ -59,20 +59,18 @@ public class GraphQLFieldRetriever {
     private GraphQLObjectInfoRetriever graphQLObjectInfoRetriever;
     private BreadthFirstSearch breadthFirstSearch;
     private ParentalSearch parentalSearch;
-    private GraphQLInputObjectRetriever graphQLInputObjectRetriever;
     private DataFetcherConstructor dataFetcherConstructor;
 
     public GraphQLFieldRetriever(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever, BreadthFirstSearch breadthFirstSearch, ParentalSearch parentalSearch,
-                                 GraphQLInputObjectRetriever graphQLInputObjectRetriever, DataFetcherConstructor dataFetcherConstructor) {
+                                  DataFetcherConstructor dataFetcherConstructor) {
         this.graphQLObjectInfoRetriever = graphQLObjectInfoRetriever;
         this.breadthFirstSearch = breadthFirstSearch;
         this.parentalSearch = parentalSearch;
-        this.graphQLInputObjectRetriever = graphQLInputObjectRetriever;
         this.dataFetcherConstructor = dataFetcherConstructor;
     }
 
     public GraphQLFieldRetriever() {
-        this(new GraphQLObjectInfoRetriever(), new BreadthFirstSearch(new GraphQLObjectInfoRetriever()), new ParentalSearch(new GraphQLObjectInfoRetriever()), new GraphQLInputObjectRetriever(), new DataFetcherConstructor());
+        this(new GraphQLObjectInfoRetriever(), new BreadthFirstSearch(new GraphQLObjectInfoRetriever()), new ParentalSearch(new GraphQLObjectInfoRetriever()), new DataFetcherConstructor());
     }
 
     public List<GraphQLFieldDefinition> getExtensionFields(Class<?> object, List<String> fieldsDefined, ProcessingElementsContainer container) throws CannotCastMemberException {
@@ -112,7 +110,7 @@ public GraphQLFieldDefinition getField(Method method, ProcessingElementsContaine
         }
         builder.type(outputType);
         handleConnectionArgument(container, builder, isConnection);
-        List<GraphQLArgument> args = new ArgumentBuilder(method, typeFunction, graphQLInputObjectRetriever, builder, container, outputType).build();
+        List<GraphQLArgument> args = new ArgumentBuilder(method, typeFunction, builder, container, outputType).build();
         GraphQLFieldDefinition relayFieldDefinition = handleRelayArguments(method, container, builder, outputType, args);
         builder.description(new DescriptionBuilder(method).build())
                 .deprecate(new DeprecateBuilder(method).build())

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

@@ -19,8 +19,6 @@
 import graphql.annotations.annotationTypes.GraphQLName;
 import graphql.annotations.processor.ProcessingElementsContainer;
 import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;
-import graphql.annotations.processor.retrievers.GraphQLInputObjectRetriever;
-import graphql.annotations.processor.retrievers.fieldBuilders.Builder;
 import graphql.annotations.processor.typeFunctions.TypeFunction;
 import graphql.schema.*;
 
@@ -33,22 +31,17 @@
 import static graphql.annotations.processor.util.NamingKit.toGraphqlName;
 import static graphql.annotations.processor.util.ReflectionKit.newInstance;
 import static graphql.schema.GraphQLArgument.newArgument;
-import static graphql.schema.GraphQLInputObjectField.newInputObjectField;
 
 public class ArgumentBuilder implements Builder<List<GraphQLArgument>> {
-    private static final String DEFAULT_INPUT_PREFIX = "Input";
-
     private Method method;
     private TypeFunction typeFunction;
-    private GraphQLInputObjectRetriever graphQLInputObjectRetriever;
     private GraphQLFieldDefinition.Builder builder;
     private ProcessingElementsContainer container;
     private GraphQLOutputType outputType;
 
-    public ArgumentBuilder(Method method, TypeFunction typeFunction, GraphQLInputObjectRetriever graphQLInputObjectRetriever, GraphQLFieldDefinition.Builder builder, ProcessingElementsContainer container, GraphQLOutputType outputType) {
+    public ArgumentBuilder(Method method, TypeFunction typeFunction , GraphQLFieldDefinition.Builder builder, ProcessingElementsContainer container, GraphQLOutputType outputType) {
         this.method = method;
         this.typeFunction = typeFunction;
-        this.graphQLInputObjectRetriever = graphQLInputObjectRetriever;
         this.builder = builder;
         this.container = container;
         this.outputType = outputType;

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

@@ -4,7 +4,6 @@
 import graphql.annotations.processor.ProcessingElementsContainer;
 import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;
 import graphql.annotations.processor.retrievers.GraphQLFieldRetriever;
-import graphql.annotations.processor.retrievers.GraphQLInterfaceRetriever;
 import graphql.annotations.processor.retrievers.GraphQLObjectInfoRetriever;
 import graphql.annotations.processor.searchAlgorithms.BreadthFirstSearch;
 import graphql.annotations.processor.searchAlgorithms.ParentalSearch;

src/main/java/graphql/annotations/processor/typeBuilders/InputObjectBuilder.java

@@ -21,8 +21,12 @@
 import graphql.annotations.annotationTypes.GraphQLNonNull;
 import graphql.annotations.processor.GraphQLAnnotations;
 import graphql.annotations.processor.ProcessingElementsContainer;
-import graphql.annotations.processor.retrievers.GraphQLInputObjectRetriever;
+import graphql.annotations.processor.retrievers.GraphQLFieldRetriever;
 import graphql.annotations.processor.retrievers.GraphQLObjectHandler;
+import graphql.annotations.processor.retrievers.GraphQLObjectInfoRetriever;
+import graphql.annotations.processor.searchAlgorithms.BreadthFirstSearch;
+import graphql.annotations.processor.searchAlgorithms.ParentalSearch;
+import graphql.annotations.processor.typeBuilders.InputObjectBuilder;
 import graphql.annotations.processor.typeFunctions.TypeFunction;
 import graphql.schema.*;
 
@@ -634,6 +638,13 @@ public String test2(@GraphQLName("other") int other, @GraphQLName("arg") TestCom
         }
     }
 
+    public static class InputObject{
+        @GraphQLField
+        int a;
+
+        @GraphQLField
+        int b;
+    }
 
     @Test
     public void inputObjectArgument() {
@@ -665,11 +676,12 @@ public void complexInputObjectArgument() {
 
     @Test
     public void inputObject() {
-        GraphQLObjectType object = GraphQLAnnotations.object(TestObjectInput.class);
-        GraphQLInputObjectRetriever graphQLInputObjectRetrieve=new GraphQLInputObjectRetriever();
-        GraphQLInputObjectType inputObjectType = (GraphQLInputObjectType) graphQLInputObjectRetrieve.getInputObject(object, "input",
-                GraphQLAnnotations.getInstance().getContainer().getTypeRegistry());
-        assertEquals(inputObjectType.getFields().size(), object.getFieldDefinitions().size());
+        GraphQLObjectInfoRetriever graphQLObjectInfoRetriever = new GraphQLObjectInfoRetriever();
+        GraphQLInputObjectType type = new InputObjectBuilder(graphQLObjectInfoRetriever, new ParentalSearch(graphQLObjectInfoRetriever),
+                new BreadthFirstSearch(graphQLObjectInfoRetriever), new GraphQLFieldRetriever()).
+                getInputObjectBuilder(InputObject.class, GraphQLAnnotations.getInstance().getContainer()).build();
+
+        assertEquals(type.getFields().size(), InputObject.class.getDeclaredFields().length);
     }
 
     public static class UUIDTypeFunction implements TypeFunction {
@@ -732,9 +744,14 @@ public void queryOptional() {
     @Test
     public void optionalInput() {
         GraphQLObjectType object = GraphQLAnnotations.object(OptionalTest.class);
-        GraphQLInputObjectRetriever graphQLInputObjectRetriever=new GraphQLInputObjectRetriever();
-        GraphQLInputObjectType inputObject = (GraphQLInputObjectType) graphQLInputObjectRetriever.getInputObject(object, "input",
-                GraphQLAnnotations.getInstance().getTypeRegistry());
+//        GraphQLInputObjectRetriever graphQLInputObjectRetriever=new GraphQLInputObjectRetriever();
+//        GraphQLInputObjectType inputObject = (GraphQLInputObjectType) graphQLInputObjectRetriever.getInputObject(object, "input",
+//                GraphQLAnnotations.getInstance().getTypeRegistry());
+        GraphQLObjectInfoRetriever graphQLObjectInfoRetriever = new GraphQLObjectInfoRetriever();
+        GraphQLInputObjectType inputObject = new InputObjectBuilder(graphQLObjectInfoRetriever, new ParentalSearch(graphQLObjectInfoRetriever),
+                new BreadthFirstSearch(graphQLObjectInfoRetriever), new GraphQLFieldRetriever()).
+                getInputObjectBuilder(OptionalTest.class, GraphQLAnnotations.getInstance().getContainer()).build();
+
         GraphQLObjectType mutation = GraphQLObjectType.newObject().name("mut").field(newFieldDefinition().name("test").type(object).
                 argument(GraphQLArgument.newArgument().type(inputObject).name("input").build()).dataFetcher(environment -> {
             Map<String, String> input = environment.getArgument("input");