VariablesAreInputTypes

andimarek · andimarek · commit c2cee8904fc2 · 2015-07-17T02:58:13.000+02:00
diff --git a/src/main/java/graphql/schema/SchemaUtil.java b/src/main/java/graphql/schema/SchemaUtil.java
@@ -11,8 +11,16 @@ public class SchemaUtil {
     public static boolean isLeafType(GraphQLType type) {
         GraphQLUnmodifiedType unmodifiedType = getUnmodifiedType(type);
         return
-                unmodifiedType instanceof GraphQLScalarType ||
-                        unmodifiedType instanceof GraphQLEnumType;
+                unmodifiedType instanceof GraphQLScalarType
+                        || unmodifiedType instanceof GraphQLEnumType;
+    }
+
+    public static boolean isInputType(GraphQLType graphQLType) {
+        GraphQLUnmodifiedType unmodifiedType = getUnmodifiedType(graphQLType);
+        return
+                unmodifiedType instanceof GraphQLScalarType
+                        || unmodifiedType instanceof GraphQLEnumType
+                    || unmodifiedType instanceof  GraphQLInputObjectType;
     }
 
     public static GraphQLUnmodifiedType getUnmodifiedType(GraphQLType graphQLType) {
diff --git a/src/main/java/graphql/validation/ValidationErrorType.java b/src/main/java/graphql/validation/ValidationErrorType.java
@@ -14,6 +14,7 @@ public enum ValidationErrorType {
     InlineFragmentTypeConditionInvalid,
     FragmentTypeConditionInvalid,
     UnknownArgument,
-    UndefinedFragment
+    UndefinedFragment,
+    NonInputTypeOnVariable
 
 }
diff --git a/src/main/java/graphql/validation/ValidationUtil.java b/src/main/java/graphql/validation/ValidationUtil.java
@@ -1,6 +1,7 @@
 package graphql.validation;
 
 
+import graphql.ShouldNotHappenException;
 import graphql.language.*;
 import graphql.schema.*;
 
@@ -9,13 +10,15 @@
 
 public class ValidationUtil {
 
-    public Type getUnmodifiedType(Type type) {
+    public TypeName getUnmodifiedType(Type type) {
         if (type instanceof ListType) {
             return getUnmodifiedType(((ListType) type).getType());
         } else if (type instanceof NonNullType) {
             return getUnmodifiedType(((NonNullType) type).getType());
+        } else if (type instanceof TypeName) {
+            return (TypeName) type;
         }
-        return type;
+        throw new ShouldNotHappenException();
     }
 
     public boolean isValidLiteralValue(Value value, GraphQLType type) {
diff --git a/src/main/java/graphql/validation/rules/VariablesAreInputTypes.java b/src/main/java/graphql/validation/rules/VariablesAreInputTypes.java
@@ -1,13 +1,26 @@
 package graphql.validation.rules;
 
 
-import graphql.validation.AbstractRule;
-import graphql.validation.ErrorCollector;
-import graphql.validation.ValidationContext;
+import graphql.language.TypeName;
+import graphql.language.VariableDefinition;
+import graphql.schema.GraphQLType;
+import graphql.schema.SchemaUtil;
+import graphql.validation.*;
 
-public class VariablesAreInputTypes extends AbstractRule{
+public class VariablesAreInputTypes extends AbstractRule {
 
     public VariablesAreInputTypes(ValidationContext validationContext, ErrorCollector errorCollector) {
         super(validationContext, errorCollector);
     }
+
+    @Override
+    public void checkVariableDefinition(VariableDefinition variableDefinition) {
+        TypeName unmodifiedAstType = getValidationUtil().getUnmodifiedType(variableDefinition.getType());
+
+        GraphQLType type = SchemaUtil.findType(getValidationContext().getSchema(), unmodifiedAstType.getName());
+        if (type == null) return;
+        if (!SchemaUtil.isInputType(type)) {
+            addError(new ValidationError(ValidationErrorType.NonInputTypeOnVariable));
+        }
+    }
 }
diff --git a/src/test/groovy/graphql/validation/rules/VariablesAreInputTypesTest.groovy b/src/test/groovy/graphql/validation/rules/VariablesAreInputTypesTest.groovy
@@ -0,0 +1,33 @@
+package graphql.validation.rules
+
+import graphql.StarWarsSchema
+import graphql.language.ListType
+import graphql.language.NonNullType
+import graphql.language.TypeName
+import graphql.language.VariableDefinition
+import graphql.validation.ErrorCollector
+import graphql.validation.ValidationContext
+import graphql.validation.ValidationErrorType
+import spock.lang.Specification
+
+
+class VariablesAreInputTypesTest extends Specification {
+
+    ValidationContext validationContext = Mock(ValidationContext)
+    ErrorCollector errorCollector = new ErrorCollector()
+    VariablesAreInputTypes variablesAreInputTypes = new VariablesAreInputTypes(validationContext, errorCollector)
+
+
+    def "the unmodified ast type is not a schema input type"() {
+        given:
+        def astType = new NonNullType(new ListType(new TypeName(StarWarsSchema.droidType.getName())))
+        VariableDefinition variableDefinition = new VariableDefinition("var", astType)
+        validationContext.getSchema() >> StarWarsSchema.starWarsSchema
+
+        when:
+        variablesAreInputTypes.checkVariableDefinition(variableDefinition)
+
+        then:
+        errorCollector.containsError(ValidationErrorType.NonInputTypeOnVariable)
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public enum ValidationErrorType {`
`14`	`14`	`InlineFragmentTypeConditionInvalid,`
`15`	`15`	`FragmentTypeConditionInvalid,`
`16`	`16`	`UnknownArgument,`
`17`		`- UndefinedFragment`
	`17`	`+ UndefinedFragment,`
	`18`	`+ NonInputTypeOnVariable`
`18`	`19`
`19`	`20`	`}`