implement parseValue for Scalars and actual use it for resolving values

andimarek · andimarek · commit ac51ae3573b3 · 2016-01-17T17:03:26.000+01:00
Default Implementation is the same as serialize
diff --git a/src/main/java/graphql/Scalars.java b/src/main/java/graphql/Scalars.java
@@ -25,7 +25,7 @@ public Object serialize(Object input) {
 
         @Override
         public Object parseValue(Object input) {
-            return null;
+            return serialize(input);
         }
 
         @Override
@@ -52,7 +52,7 @@ public Object serialize(Object input) {
 
         @Override
         public Object parseValue(Object input) {
-            return null;
+            return serialize(input);
         }
 
         @Override
@@ -76,7 +76,7 @@ public Object serialize(Object input) {
 
         @Override
         public Object parseValue(Object input) {
-            return null;
+            return serialize(input);
         }
 
         @Override
@@ -93,7 +93,7 @@ public Object serialize(Object input) {
 
         @Override
         public Object parseValue(Object input) {
-            return null;
+            return serialize(input);
         }
 
         @Override
@@ -120,7 +120,7 @@ public Object serialize(Object input) {
 
         @Override
         public Object parseValue(Object input) {
-            return null;
+            return serialize(input);
         }
 
         @Override
@@ -143,7 +143,7 @@ public Object serialize(Object input) {
 
         @Override
         public Object parseValue(Object input) {
-            return null;
+            return serialize(input);
         }
 
         @Override
diff --git a/src/main/java/graphql/execution/ValuesResolver.java b/src/main/java/graphql/execution/ValuesResolver.java
@@ -89,7 +89,7 @@ private Object coerceValueForInputObjectField(GraphQLInputObjectType inputObject
     }
 
     private Object coerceValueForScalar(GraphQLScalarType graphQLScalarType, Object value) {
-        return graphQLScalarType.getCoercing().serialize(value);
+        return graphQLScalarType.getCoercing().parseValue(value);
     }
 
     private Object coerceValueForEnum(GraphQLEnumType graphQLEnumType, Object value) {
diff --git a/src/main/java/graphql/schema/Coercing.java b/src/main/java/graphql/schema/Coercing.java
@@ -6,6 +6,7 @@ public interface Coercing {
 
     /**
      * Called to convert a result of a DataFetcher to a valid runtime value.
+     *
      * @param input
      * @return
      */

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ private Object coerceValueForInputObjectField(GraphQLInputObjectType inputObject`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`private Object coerceValueForScalar(GraphQLScalarType graphQLScalarType, Object value) {`
`92`		`- return graphQLScalarType.getCoercing().serialize(value);`
	`92`	`+ return graphQLScalarType.getCoercing().parseValue(value);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`private Object coerceValueForEnum(GraphQLEnumType graphQLEnumType, Object value) {`