Allow GraphQLLong parsing from large numeric literals

okorz001 · okorz001 · commit 4542c357d183 · 2016-02-28T13:04:17.000-08:00
IntValue now stores BigInteger instead of int. GraphQLInt and
GraphQLLong parseLiteral will throw if the value overflows int or long
respectively.

StringValue parsing for GraphQLLong is still supported for backwards
compatibility.

Add a test for parsing GraphQLLong larger than INT_MAX.
diff --git a/src/main/java/graphql/Scalars.java b/src/main/java/graphql/Scalars.java
@@ -31,7 +31,7 @@ public Object parseValue(Object input) {
         @Override
         public Object parseLiteral(Object input) {
             if (!(input instanceof IntValue)) return null;
-            return ((IntValue) input).getValue();
+            return ((IntValue) input).getValue().intValueExact();
         }
     });
 
@@ -60,7 +60,7 @@ public Object parseLiteral(Object input) {
             if (input instanceof StringValue) {
                 return Long.parseLong(((StringValue) input).getValue());
             } else if (input instanceof IntValue) {
-                return ((IntValue) input).getValue();
+                return ((IntValue) input).getValue().longValueExact();
             }
             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(42)                 | 42
+        new IntValue(42345784398534785l) | 42345784398534785l
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public Object parseValue(Object input) {`
`31`	`31`	`@Override`
`32`	`32`	`public Object parseLiteral(Object input) {`
`33`	`33`	`if (!(input instanceof IntValue)) return null;`
`34`		`- return ((IntValue) input).getValue();`
	`34`	`+ return ((IntValue) input).getValue().intValueExact();`
`35`	`35`	`}`
`36`	`36`	`});`
`37`	`37`
`@@ -60,7 +60,7 @@ public Object parseLiteral(Object input) {`
`60`	`60`	`if (input instanceof StringValue) {`
`61`	`61`	`return Long.parseLong(((StringValue) input).getValue());`
`62`	`62`	`} else if (input instanceof IntValue) {`
`63`		`- return ((IntValue) input).getValue();`
	`63`	`+ return ((IntValue) input).getValue().longValueExact();`
`64`	`64`	`}`
`65`	`65`	`return null;`
`66`	`66`	`}`