graphql-java#172 Allow TypeReference as InputType

Bojan Tomic · Bojan Tomic · commit cdedf3b27037 · 2016-09-12T11:14:50.000+02:00
diff --git a/src/main/java/graphql/schema/GraphQLArgument.java b/src/main/java/graphql/schema/GraphQLArgument.java
@@ -1,6 +1,8 @@
 package graphql.schema;
 
 
+import java.util.Map;
+
 import static graphql.Assert.assertNotNull;
 
 public class GraphQLArgument {
@@ -24,6 +26,10 @@ public GraphQLArgument(String name, GraphQLInputType type) {
     }
 
 
+    void replaceTypeReferences(Map<String, GraphQLType> typeMap) {
+        type = (GraphQLInputType) new SchemaUtil().resolveTypeReference(type, typeMap);
+    }
+
     public String getName() {
         return name;
     }
diff --git a/src/main/java/graphql/schema/GraphQLInputFieldsContainer.java b/src/main/java/graphql/schema/GraphQLInputFieldsContainer.java
@@ -0,0 +1,10 @@
+package graphql.schema;
+
+import java.util.List;
+
+public interface GraphQLInputFieldsContainer extends GraphQLType {
+
+	GraphQLInputObjectField getFieldDefinition(String name);
+
+	List<GraphQLInputObjectField> getFieldDefinitions();
+}
diff --git a/src/main/java/graphql/schema/GraphQLInputObjectField.java b/src/main/java/graphql/schema/GraphQLInputObjectField.java
@@ -1,6 +1,8 @@
 package graphql.schema;
 
 
+import java.util.Map;
+
 import static graphql.Assert.assertNotNull;
 
 public class GraphQLInputObjectField {
@@ -23,6 +25,9 @@ public GraphQLInputObjectField(String name, String description, GraphQLInputType
         this.description = description;
     }
 
+    void replaceTypeReferences(Map<String, GraphQLType> typeMap) {
+        type = (GraphQLInputType) new SchemaUtil().resolveTypeReference(type, typeMap);
+    }
 
     public String getName() {
         return name;
diff --git a/src/main/java/graphql/schema/GraphQLInputObjectType.java b/src/main/java/graphql/schema/GraphQLInputObjectType.java
@@ -1,15 +1,15 @@
 package graphql.schema;
 
-import graphql.AssertException;
-
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import graphql.AssertException;
+
 import static graphql.Assert.assertNotNull;
 
-public class GraphQLInputObjectType implements GraphQLType, GraphQLInputType, GraphQLUnmodifiedType, GraphQLNullableType {
+public class GraphQLInputObjectType implements GraphQLType, GraphQLInputType, GraphQLUnmodifiedType, GraphQLNullableType, GraphQLInputFieldsContainer {
 
     private final String name;
     private final String description;
@@ -54,6 +54,16 @@ public static Builder newInputObject() {
         return new Builder();
     }
 
+    @Override
+    public GraphQLInputObjectField getFieldDefinition(String name) {
+        return fieldMap.get(name);
+    }
+
+    @Override
+    public List<GraphQLInputObjectField> getFieldDefinitions() {
+        return new ArrayList<GraphQLInputObjectField>(fieldMap.values());
+    }
+
     public static class Builder {
         private String name;
         private String description;
diff --git a/src/main/java/graphql/schema/GraphQLTypeReference.java b/src/main/java/graphql/schema/GraphQLTypeReference.java
@@ -7,7 +7,7 @@
  * A special type to allow a object/interface types to reference itself. It's replaced with the real type
  * object when the schema is build.
  */
-public class GraphQLTypeReference implements GraphQLType, GraphQLOutputType {
+public class GraphQLTypeReference implements GraphQLType, GraphQLOutputType, GraphQLInputType {
 
     private final String name;
 
diff --git a/src/main/java/graphql/schema/SchemaUtil.java b/src/main/java/graphql/schema/SchemaUtil.java
@@ -1,11 +1,15 @@
 package graphql.schema;
 
 
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import graphql.GraphQLException;
 import graphql.introspection.Introspection;
 
-import java.util.*;
-
 public class SchemaUtil {
 
     public boolean isLeafType(GraphQLType type) {
@@ -37,9 +41,9 @@ private void collectTypes(GraphQLType root, Map<String, GraphQLType> result) {
         } else if (root instanceof GraphQLList) {
             collectTypes(((GraphQLList) root).getWrappedType(), result);
         } else if (root instanceof GraphQLEnumType) {
-            result.put(((GraphQLEnumType) root).getName(), root);
+            result.put(root.getName(), root);
         } else if (root instanceof GraphQLScalarType) {
-            result.put(((GraphQLScalarType) root).getName(), root);
+            result.put(root.getName(), root);
         } else if (root instanceof GraphQLObjectType) {
             collectTypesForObjects((GraphQLObjectType) root, result);
         } else if (root instanceof GraphQLInterfaceType) {
@@ -136,12 +140,24 @@ void replaceTypeReferences(GraphQLSchema schema) {
             if (type instanceof GraphQLFieldsContainer) {
                 resolveTypeReferencesForFieldsContainer((GraphQLFieldsContainer) type, typeMap);
             }
+            if (type instanceof GraphQLInputFieldsContainer) {
+                resolveTypeReferencesForInputFieldsContainer((GraphQLInputFieldsContainer) type, typeMap);
+            }
         }
     }
 
     private void resolveTypeReferencesForFieldsContainer(GraphQLFieldsContainer fieldsContainer, Map<String, GraphQLType> typeMap) {
         for (GraphQLFieldDefinition fieldDefinition : fieldsContainer.getFieldDefinitions()) {
             fieldDefinition.replaceTypeReferences(typeMap);
+            for (GraphQLArgument argument : fieldDefinition.getArguments()) {
+                argument.replaceTypeReferences(typeMap);
+            }
+        }
+    }
+
+    private void resolveTypeReferencesForInputFieldsContainer(GraphQLInputFieldsContainer fieldsContainer, Map<String, GraphQLType> typeMap) {
+        for (GraphQLInputObjectField fieldDefinition : fieldsContainer.getFieldDefinitions()) {
+            fieldDefinition.replaceTypeReferences(typeMap);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package graphql.schema;`
`2`	`2`
`3`	`3`
	`4`	`+import java.util.Map;`
	`5`	`+`
`4`	`6`	`import static graphql.Assert.assertNotNull;`
`5`	`7`
`6`	`8`	`public class GraphQLArgument {`
`@@ -24,6 +26,10 @@ public GraphQLArgument(String name, GraphQLInputType type) {`
`24`	`26`	`}`
`25`	`27`
`26`	`28`
	`29`	`+ void replaceTypeReferences(Map<String, GraphQLType> typeMap) {`
	`30`	`+ type = (GraphQLInputType) new SchemaUtil().resolveTypeReference(type, typeMap);`
	`31`	`+ }`
	`32`	`+`
`27`	`33`	`public String getName() {`
`28`	`34`	`return name;`
`29`	`35`	`}`