Manual merge of #984 changes

FasterXML · Apr 8, 2023 · 4f82b39 · 4f82b39
1 parent bea951a
commit 4f82b39
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 17 deletions.
diff --git a/src/main/java/tools/jackson/core/JsonGenerator.java b/src/main/java/tools/jackson/core/JsonGenerator.java
@@ -1760,6 +1760,7 @@ public void copyCurrentEvent(JsonParser p) throws JacksonException
             _copyCurrentIntValue(p);
             break;
         case ID_NUMBER_FLOAT:
+            // Different from "copyCurrentEventExact"!
             _copyCurrentFloatValue(p);
             break;
         case ID_TRUE:
@@ -1779,6 +1780,69 @@ public void copyCurrentEvent(JsonParser p) throws JacksonException
         }
     }
 
+    /**
+     * Same as {@link #copyCurrentEvent} with the exception that copying of numeric
+     * values tries to avoid any conversion losses; in particular for floating-point
+     * numbers. This usually matters when transcoding from textual format like JSON
+     * to a binary format.
+     * See {@link #_copyCurrentFloatValueExact} for details.
+     *
+     * @param p Parser that points to the event to copy
+     *
+     * @throws WrappedIOException if there is an underlying I/O problem (reading or writing)
+     * @throws StreamReadException for problems with decoding of token stream
+     * @throws StreamWriteException for problems in encoding token stream
+     */
+    public void copyCurrentEventExact(JsonParser p) throws JacksonException
+    {
+        JsonToken t = p.currentToken();
+        final int token = (t == null) ? ID_NOT_AVAILABLE : t.id();
+        switch (token) {
+        case ID_NOT_AVAILABLE:
+            _reportError("No current event to copy");
+            break; // never gets here
+        case ID_START_OBJECT:
+            writeStartObject();
+            break;
+        case ID_END_OBJECT:
+            writeEndObject();
+            break;
+        case ID_START_ARRAY:
+            writeStartArray();
+            break;
+        case ID_END_ARRAY:
+            writeEndArray();
+            break;
+        case ID_PROPERTY_NAME:
+            writeName(p.currentName());
+            break;
+        case ID_STRING:
+            _copyCurrentStringValue(p);
+            break;
+        case ID_NUMBER_INT:
+            _copyCurrentIntValue(p);
+            break;
+        case ID_NUMBER_FLOAT:
+            // Different from "copyCurrentEvent"!
+            _copyCurrentFloatValueExact(p);
+            break;
+        case ID_TRUE:
+            writeBoolean(true);
+            break;
+        case ID_FALSE:
+            writeBoolean(false);
+            break;
+        case ID_NULL:
+            writeNull();
+            break;
+        case ID_EMBEDDED_OBJECT:
+            writePOJO(p.getEmbeddedObject());
+            break;
+        default:
+            throw new IllegalStateException("Internal error: unknown current token, "+t);
+        }
+    }
+
     /**
      * Method for copying contents of the current event
      * <b>and following events that it encloses</b>

diff --git a/src/test/java/tools/jackson/core/read/ParserPrecisionLoss730Test.java b/src/test/java/tools/jackson/core/read/ParserPrecisionLoss730Test.java
@@ -21,25 +21,9 @@ public void testCopyCurrentEventBigDecimal() throws Exception {
         try (JsonParser parser = JSON_F.createParser(ObjectReadContext.empty(), input)) {
             parser.nextToken();
             try (JsonGenerator generator = JSON_F.createGenerator(ObjectWriteContext.empty(), stringWriter)) {
-                generator.copyCurrentEvent(parser);
+                generator.copyCurrentEventExact(parser);
             }
         }
         assertEquals(input, stringWriter.toString());
     }
-
-    // [jackson-core#730]
-    /**
-     * Same as {@link #testCopyCurrentEventBigDecimal()} using copyCurrentStructure instead.
-     */
-    public void testCopyCurrentStructureBigDecimal() throws Exception {
-        String input = "[1e999]";
-        StringWriter stringWriter = new StringWriter();
-        try (JsonParser parser = JSON_F.createParser(ObjectReadContext.empty(), input)) {
-            parser.nextToken();
-            try (JsonGenerator generator = JSON_F.createGenerator(ObjectWriteContext.empty(), stringWriter)) {
-                generator.copyCurrentStructure(parser);
-            }
-        }
-        assertEquals("[1E+999]", stringWriter.toString());
-    }
 }