fix for the fix: getValueByName of course

andimarek · andimarek · commit 28f792f87084 · 2015-11-04T22:06:58.000+01:00
diff --git a/src/main/java/graphql/schema/GraphQLEnumType.java b/src/main/java/graphql/schema/GraphQLEnumType.java
@@ -25,7 +25,7 @@ public Object coerce(Object input) {
 
         @Override
         public Object coerceValue(Object input) {
-            return getValueByValue(input);
+            return getValueByName(input);
         }
 
         @Override
@@ -38,10 +38,9 @@ public Object coerceLiteral(Object input) {
         }
     };
 
-    private Object getValueByValue(Object value) {
-        for (GraphQLEnumValueDefinition valueDefinition : valueDefinitionMap.values()) {
-            if (value.equals(valueDefinition.getValue())) return valueDefinition.getValue();
-        }
+    private Object getValueByName(Object value) {
+        GraphQLEnumValueDefinition enumValueDefinition = valueDefinitionMap.get(value);
+        if (enumValueDefinition.getValue() != null) return enumValueDefinition.getValue();
         throw new GraphQLException("");
     }
 
diff --git a/src/test/groovy/graphql/execution/ValuesResolverTest.groovy b/src/test/groovy/graphql/execution/ValuesResolverTest.groovy
@@ -201,7 +201,7 @@ class ValuesResolverTest extends Specification {
         where:
         inputValue   || outputValue
         "A_TEST"     || "A_TEST"
-        1 || 1
+        "VALUE_TEST" || 1
 
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public Object coerce(Object input) {`
`25`	`25`
`26`	`26`	`@Override`
`27`	`27`	`public Object coerceValue(Object input) {`
`28`		`- return getValueByValue(input);`
	`28`	`+ return getValueByName(input);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Override`
`@@ -38,10 +38,9 @@ public Object coerceLiteral(Object input) {`
`38`	`38`	`}`
`39`	`39`	`};`
`40`	`40`
`41`		`- private Object getValueByValue(Object value) {`
`42`		`- for (GraphQLEnumValueDefinition valueDefinition : valueDefinitionMap.values()) {`
`43`		`- if (value.equals(valueDefinition.getValue())) return valueDefinition.getValue();`
`44`		`- }`
	`41`	`+ private Object getValueByName(Object value) {`
	`42`	`+ GraphQLEnumValueDefinition enumValueDefinition = valueDefinitionMap.get(value);`
	`43`	`+ if (enumValueDefinition.getValue() != null) return enumValueDefinition.getValue();`
`45`	`44`	`throw new GraphQLException("");`
`46`	`45`	`}`
`47`	`46`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ class ValuesResolverTest extends Specification {`
`201`	`201`	`where:`
`202`	`202`	`inputValue \|\| outputValue`
`203`	`203`	`"A_TEST" \|\| "A_TEST"`
`204`		`- 1 \|\| 1`
	`204`	`+ "VALUE_TEST" \|\| 1`
`205`	`205`
`206`	`206`	`}`
`207`	`207`	`}`