Merge branch 'okorz001-allow-longs'

andimarek · andimarek · commit 644dcce532d8 · 2016-03-13T08:33:02.000+01:00
diff --git a/src/main/java/graphql/Scalars.java b/src/main/java/graphql/Scalars.java
@@ -8,6 +8,8 @@
 import graphql.schema.Coercing;
 import graphql.schema.GraphQLScalarType;
 
+import java.math.BigInteger;
+
 public class Scalars {
 
 
@@ -31,7 +33,8 @@ public Object parseValue(Object input) {
         @Override
         public Object parseLiteral(Object input) {
             if (!(input instanceof IntValue)) return null;
-            return ((IntValue) input).getValue();
+            BigInteger value = ((IntValue) input).getValue();
+            return value.intValue();
         }
     });
 
@@ -60,7 +63,10 @@ public Object parseLiteral(Object input) {
             if (input instanceof StringValue) {
                 return Long.parseLong(((StringValue) input).getValue());
             } else if (input instanceof IntValue) {
-                return ((IntValue) input).getValue();
+                BigInteger value = ((IntValue) input).getValue();
+                // Check if out of bounds.
+                Long.parseLong(value.toString());
+                return value.longValue();
             }
             return null;
         }
diff --git a/src/main/java/graphql/language/IntValue.java b/src/main/java/graphql/language/IntValue.java
@@ -1,22 +1,23 @@
 package graphql.language;
 
 
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
 public class IntValue extends AbstractNode implements Value {
 
-    private int value;
+    private BigInteger value;
 
-    public IntValue(int value) {
+    public IntValue(BigInteger value) {
         this.value = value;
     }
 
-    public int getValue() {
+    public BigInteger getValue() {
         return value;
     }
 
-    public void setValue(int value) {
+    public void setValue(BigInteger value) {
         this.value = value;
     }
 
@@ -30,9 +31,9 @@ public boolean isEqualTo(Node o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        IntValue intValue = (IntValue) o;
+        IntValue that = (IntValue) o;
 
-        return value == intValue.value;
+        return !(value != null ? !value.equals(that.value) : that.value != null);
 
     }
 
diff --git a/src/main/java/graphql/parser/GraphqlAntlrToLanguage.java b/src/main/java/graphql/parser/GraphqlAntlrToLanguage.java
@@ -8,6 +8,7 @@
 import org.antlr.v4.runtime.ParserRuleContext;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.ArrayDeque;
 import java.util.Deque;
 
@@ -321,7 +322,7 @@ public Void visitDirective(GraphqlParser.DirectiveContext ctx) {
 
     private Value getValue(GraphqlParser.ValueWithVariableContext ctx) {
         if (ctx.IntValue() != null) {
-            IntValue intValue = new IntValue(Integer.parseInt(ctx.IntValue().getText()));
+            IntValue intValue = new IntValue(new BigInteger(ctx.IntValue().getText()));
             newNode(intValue, ctx);
             return intValue;
         } else if (ctx.FloatValue() != null) {
@@ -366,7 +367,7 @@ private Value getValue(GraphqlParser.ValueWithVariableContext ctx) {
 
     private Value getValue(GraphqlParser.ValueContext ctx) {
         if (ctx.IntValue() != null) {
-            IntValue intValue = new IntValue(Integer.parseInt(ctx.IntValue().getText()));
+            IntValue intValue = new IntValue(new BigInteger(ctx.IntValue().getText()));
             newNode(intValue, ctx);
             return intValue;
         } else if (ctx.FloatValue() != null) {
diff --git a/src/test/groovy/graphql/ScalarsTest.groovy b/src/test/groovy/graphql/ScalarsTest.groovy
@@ -56,9 +56,10 @@ class ScalarsTest extends Specification {
         Scalars.GraphQLLong.getCoercing().parseLiteral(literal) == result
 
         where:
-        literal               | result
-        new StringValue("42") | 42
-        new IntValue(42)      | 42
+        literal                          | result
+        new StringValue("42")            | 42
+        new IntValue(new BigInteger("42"))                | 42
+        new IntValue(new BigInteger("42345784398534785")) | 42345784398534785l
     }
 
 
