bugfix: float also accepts int input

andimarek · andimarek · commit 34145726d7a3 · 2016-01-23T09:28:01.000+01:00
diff --git a/src/main/java/graphql/Scalars.java b/src/main/java/graphql/Scalars.java
@@ -68,11 +68,13 @@ public Object parseLiteral(Object input) {
 
     public static GraphQLScalarType GraphQLFloat = new GraphQLScalarType("Float", "Built-in Float", new Coercing() {
         @Override
-        public Object serialize(Object input) {
+        public Float serialize(Object input) {
             if (input instanceof String) {
                 return Float.parseFloat((String) input);
             } else if (input instanceof Float) {
-                return input;
+                return (Float) input;
+            } else if (input instanceof Integer) {
+                return (float) (Integer) input;
             } else {
                 return null;
             }
diff --git a/src/test/groovy/graphql/ScalarsTest.groovy b/src/test/groovy/graphql/ScalarsTest.groovy
@@ -27,7 +27,7 @@ class ScalarsTest extends Specification {
         value         | result
         Boolean.FALSE | "false"
         "test"        | "test"
-        null| null
+        null          | null
     }
 
 
@@ -48,7 +48,7 @@ class ScalarsTest extends Specification {
         where:
         value                | result
         "5457486ABSBHS4w646" | "5457486ABSBHS4w646"
-        null | null
+        null                 | null
     }
 
     def "Long parse literal"() {
@@ -72,7 +72,7 @@ class ScalarsTest extends Specification {
         "42"                         | 42
         new Long(42345784398534785l) | 42345784398534785l
         new Integer(42)              | 42
-        null | null
+        null                         | null
     }
 
 
@@ -95,7 +95,7 @@ class ScalarsTest extends Specification {
         value           | result
         "42"            | 42
         new Integer(42) | 42
-        null | null
+        null            | null
     }
 
     def "Float parse literal"() {
@@ -117,7 +117,8 @@ class ScalarsTest extends Specification {
         "42.3"          | 42.3f
         "42.0"          | 42.0f
         new Float(42.3) | 42.3f
-        null | null
+        10              | 10.0f
+        null            | null
     }
 
     def "Boolean parse literal"() {
@@ -141,7 +142,7 @@ class ScalarsTest extends Specification {
         "true"  | true
         0       | false
         1       | true
-        null | null
+        null    | null
     }
 
 
