Improve number strategy implementation (#1987)

Marcono1234 · web-flow · commit bda2e3d16af7 · 2021-10-11T16:14:47.000-07:00
* Fix GsonBuilder not copying number strategies from Gson

* Improve ToNumberPolicy exception messages
diff --git a/gson/src/main/java/com/google/gson/GsonBuilder.java b/gson/src/main/java/com/google/gson/GsonBuilder.java
@@ -130,6 +130,8 @@ public GsonBuilder() {
     this.timeStyle = gson.timeStyle;
     this.factories.addAll(gson.builderFactories);
     this.hierarchyFactories.addAll(gson.builderHierarchyFactories);
+    this.objectToNumberStrategy = gson.objectToNumberStrategy;
+    this.numberToNumberStrategy = gson.numberToNumberStrategy;
   }
 
   /**
diff --git a/gson/src/main/java/com/google/gson/ToNumberPolicy.java b/gson/src/main/java/com/google/gson/ToNumberPolicy.java
@@ -71,11 +71,11 @@ public enum ToNumberPolicy implements ToNumberStrategy {
         try {
           Double d = Double.valueOf(value);
           if ((d.isInfinite() || d.isNaN()) && !in.isLenient()) {
-            throw new MalformedJsonException("JSON forbids NaN and infinities: " + d + in);
+            throw new MalformedJsonException("JSON forbids NaN and infinities: " + d + "; at path " + in.getPath());
           }
           return d;
         } catch (NumberFormatException doubleE) {
-          throw new JsonParseException("Cannot parse " + value, doubleE);
+          throw new JsonParseException("Cannot parse " + value + "; at path " + in.getPath(), doubleE);
         }
       }
     }
@@ -91,7 +91,7 @@ public enum ToNumberPolicy implements ToNumberStrategy {
       try {
         return new BigDecimal(value);
       } catch (NumberFormatException e) {
-        throw new JsonParseException("Cannot parse " + value, e);
+        throw new JsonParseException("Cannot parse " + value + "; at path " + in.getPath(), e);
       }
     }
   }
diff --git a/gson/src/main/java/com/google/gson/internal/bind/JsonTreeReader.java b/gson/src/main/java/com/google/gson/internal/bind/JsonTreeReader.java
@@ -283,7 +283,7 @@ JsonElement nextJsonElement() throws IOException {
   }
 
   @Override public String toString() {
-    return getClass().getSimpleName();
+    return getClass().getSimpleName() + locationString();
   }
 
   public void promoteNameToValue() throws IOException {
diff --git a/gson/src/test/java/com/google/gson/ToNumberPolicyTest.java b/gson/src/test/java/com/google/gson/ToNumberPolicyTest.java
@@ -33,6 +33,12 @@ public void testDouble() throws IOException {
       strategy.readNumber(fromString("1e400"));
       fail();
     } catch (MalformedJsonException expected) {
+      assertEquals("JSON forbids NaN and infinities: Infinity at line 1 column 6 path $", expected.getMessage());
+    }
+    try {
+      strategy.readNumber(fromString("\"not-a-number\""));
+      fail();
+    } catch (NumberFormatException expected) {
     }
   }
 
@@ -52,24 +58,35 @@ public void testLongOrDouble() throws IOException {
       strategy.readNumber(fromString("1e400"));
       fail();
     } catch (MalformedJsonException expected) {
+      assertEquals("JSON forbids NaN and infinities: Infinity; at path $", expected.getMessage());
+    }
+    try {
+      strategy.readNumber(fromString("\"not-a-number\""));
+      fail();
+    } catch (JsonParseException expected) {
+      assertEquals("Cannot parse not-a-number; at path $", expected.getMessage());
     }
+
     assertEquals(Double.NaN, strategy.readNumber(fromStringLenient("NaN")));
     assertEquals(Double.POSITIVE_INFINITY, strategy.readNumber(fromStringLenient("Infinity")));
     assertEquals(Double.NEGATIVE_INFINITY, strategy.readNumber(fromStringLenient("-Infinity")));
     try {
       strategy.readNumber(fromString("NaN"));
       fail();
     } catch (MalformedJsonException expected) {
+      assertEquals("Use JsonReader.setLenient(true) to accept malformed JSON at line 1 column 1 path $", expected.getMessage());
     }
     try {
       strategy.readNumber(fromString("Infinity"));
       fail();
     } catch (MalformedJsonException expected) {
+      assertEquals("Use JsonReader.setLenient(true) to accept malformed JSON at line 1 column 1 path $", expected.getMessage());
     }
     try {
       strategy.readNumber(fromString("-Infinity"));
       fail();
     } catch (MalformedJsonException expected) {
+      assertEquals("Use JsonReader.setLenient(true) to accept malformed JSON at line 1 column 1 path $", expected.getMessage());
     }
   }
 
@@ -78,6 +95,13 @@ public void testBigDecimal() throws IOException {
     assertEquals(new BigDecimal("10.1"), strategy.readNumber(fromString("10.1")));
     assertEquals(new BigDecimal("3.141592653589793238462643383279"), strategy.readNumber(fromString("3.141592653589793238462643383279")));
     assertEquals(new BigDecimal("1e400"), strategy.readNumber(fromString("1e400")));
+
+    try {
+      strategy.readNumber(fromString("\"not-a-number\""));
+      fail();
+    } catch (JsonParseException expected) {
+      assertEquals("Cannot parse not-a-number; at path $", expected.getMessage());
+    }
   }
 
   public void testNullsAreNeverExpected() throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,8 @@ public GsonBuilder() {`
`130`	`130`	`this.timeStyle = gson.timeStyle;`
`131`	`131`	`this.factories.addAll(gson.builderFactories);`
`132`	`132`	`this.hierarchyFactories.addAll(gson.builderHierarchyFactories);`
	`133`	`+ this.objectToNumberStrategy = gson.objectToNumberStrategy;`
	`134`	`+ this.numberToNumberStrategy = gson.numberToNumberStrategy;`
`133`	`135`	`}`
`134`	`136`
`135`	`137`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,11 @@ public enum ToNumberPolicy implements ToNumberStrategy {`
`71`	`71`	`try {`
`72`	`72`	`Double d = Double.valueOf(value);`
`73`	`73`	`if ((d.isInfinite() \|\| d.isNaN()) && !in.isLenient()) {`
`74`		`- throw new MalformedJsonException("JSON forbids NaN and infinities: " + d + in);`
	`74`	`+ throw new MalformedJsonException("JSON forbids NaN and infinities: " + d + "; at path " + in.getPath());`
`75`	`75`	`}`
`76`	`76`	`return d;`
`77`	`77`	`} catch (NumberFormatException doubleE) {`
`78`		`- throw new JsonParseException("Cannot parse " + value, doubleE);`
	`78`	`+ throw new JsonParseException("Cannot parse " + value + "; at path " + in.getPath(), doubleE);`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`}`
`@@ -91,7 +91,7 @@ public enum ToNumberPolicy implements ToNumberStrategy {`
`91`	`91`	`try {`
`92`	`92`	`return new BigDecimal(value);`
`93`	`93`	`} catch (NumberFormatException e) {`
`94`		`- throw new JsonParseException("Cannot parse " + value, e);`
	`94`	`+ throw new JsonParseException("Cannot parse " + value + "; at path " + in.getPath(), e);`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ JsonElement nextJsonElement() throws IOException {`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`@Override public String toString() {`
`286`		`- return getClass().getSimpleName();`
	`286`	`+ return getClass().getSimpleName() + locationString();`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`public void promoteNameToValue() throws IOException {`