Merge pull request graphql-java#60 from xuzb/master

andimarek · andimarek · commit 58edfd647f36 · 2016-01-02T09:30:34.000+01:00
Fix two NPEs and add test case
diff --git a/src/main/java/graphql/schema/GraphQLEnumType.java b/src/main/java/graphql/schema/GraphQLEnumType.java
@@ -33,6 +33,7 @@ public Object coerceLiteral(Object input) {
             if (!(input instanceof EnumValue)) return null;
             EnumValue enumValue = (EnumValue) input;
             GraphQLEnumValueDefinition enumValueDefinition = valueDefinitionMap.get(enumValue.getName());
+            if (enumValueDefinition == null) return null;
             if (enumValueDefinition.getValue() != null) return enumValueDefinition.getValue();
             return enumValueDefinition.getValue();
         }
diff --git a/src/main/java/graphql/validation/TraversalContext.java b/src/main/java/graphql/validation/TraversalContext.java
@@ -127,7 +127,8 @@ private void enterImpl(ObjectField objectField) {
         GraphQLInputType inputType = null;
         if (objectType instanceof GraphQLInputObjectType) {
             GraphQLInputObjectField inputField = ((GraphQLInputObjectType) objectType).getField(objectField.getName());
-            inputType = inputField.getType();
+            if (inputField != null)
+                inputType = inputField.getType();
         }
         addInputType(inputType);
     }
diff --git a/src/test/groovy/graphql/validation/ValidationUtilTest.groovy b/src/test/groovy/graphql/validation/ValidationUtilTest.groovy
@@ -98,13 +98,20 @@ class ValidationUtilTest extends Specification {
         validationUtil.isValidLiteralValue(new EnumValue("PLUTO"), enumType)
     }
 
-    def "invalid enum"() {
+    def "invalid enum value"() {
         given:
         def enumType = GraphQLEnumType.newEnum().name("enumType").value("PLUTO").build()
         expect:
         !validationUtil.isValidLiteralValue(new StringValue("MARS"), enumType)
     }
 
+    def "invalid enum name"() {
+        given:
+        def enumType = GraphQLEnumType.newEnum().name("enumType").value("PLUTO").build()
+        expect:
+        !validationUtil.isValidLiteralValue(new EnumValue("MARS"), enumType)
+    }
+
     def "a valid ObjectValue"() {
         given:
         def inputObjectType = GraphQLInputObjectType.newInputObject()

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public Object coerceLiteral(Object input) {`
`33`	`33`	`if (!(input instanceof EnumValue)) return null;`
`34`	`34`	`EnumValue enumValue = (EnumValue) input;`
`35`	`35`	`GraphQLEnumValueDefinition enumValueDefinition = valueDefinitionMap.get(enumValue.getName());`
	`36`	`+ if (enumValueDefinition == null) return null;`
`36`	`37`	`if (enumValueDefinition.getValue() != null) return enumValueDefinition.getValue();`
`37`	`38`	`return enumValueDefinition.getValue();`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,8 @@ private void enterImpl(ObjectField objectField) {`
`127`	`127`	`GraphQLInputType inputType = null;`
`128`	`128`	`if (objectType instanceof GraphQLInputObjectType) {`
`129`	`129`	`GraphQLInputObjectField inputField = ((GraphQLInputObjectType) objectType).getField(objectField.getName());`
`130`		`- inputType = inputField.getType();`
	`130`	`+ if (inputField != null)`
	`131`	`+ inputType = inputField.getType();`
`131`	`132`	`}`
`132`	`133`	`addInputType(inputType);`
`133`	`134`	`}`