Fix npe when enum name is invalid.

xuzb · xuzb · commit e8e6e437001e · 2015-12-30T17:26:47.000+08:00
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/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`	`}`