Merge pull request #113 from Macroz/floatfix

Support parsing IntValue literals into GraphQLFloat
graphql-java · Apr 2, 2016 · 018bd2e · 018bd2e
2 parents 4a908db + f5a5fe4
commit 018bd2e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/graphql/Scalars.java b/src/main/java/graphql/Scalars.java
@@ -100,7 +100,13 @@ public Object parseValue(Object input) {
 
         @Override
         public Object parseLiteral(Object input) {
-            return ((FloatValue) input).getValue().doubleValue();
+            if (input instanceof IntValue) {
+                return ((IntValue) input).getValue().doubleValue();
+            } else if (input instanceof FloatValue) {
+                return ((FloatValue) input).getValue().doubleValue();
+            } else {
+                return null;
+            }
         }
     });
 

diff --git a/src/test/groovy/graphql/ScalarsTest.groovy b/src/test/groovy/graphql/ScalarsTest.groovy
@@ -115,8 +115,10 @@ class ScalarsTest extends Specification {
         Scalars.GraphQLFloat.getCoercing().parseLiteral(literal) == result
 
         where:
-        literal              | result
-        new FloatValue(42.3) | 42.3d
+        literal                | result
+        new FloatValue(42.3)   | 42.3d
+        new IntValue(42)       | 42.0d
+        new StringValue("foo") | null
     }
 
     @Unroll