Merge branch 'master' into flat-writer

amazon-ion · Jun 16, 2021 · b102d59 · b102d59
2 parents aaff53a + 64a5b8e
commit b102d59
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 9 deletions.
diff --git a/src/com/amazon/ion/impl/IonWriterSystemText.java b/src/com/amazon/ion/impl/IonWriterSystemText.java
@@ -604,7 +604,7 @@ public void writeFloat(double value)
         throws IOException
     {
         startValue();
-        _output.printFloat(value);
+        _output.printFloat(_options, value);
         closeValue();
     }
 

diff --git a/src/com/amazon/ion/impl/_Private_IonTextAppender.java b/src/com/amazon/ion/impl/_Private_IonTextAppender.java
@@ -798,7 +798,7 @@ else if (adjustedExponent >= -6)
     }
 
 
-    public void printFloat(double value)
+    public void printFloat(_Private_IonTextWriterBuilder _options, double value)
         throws IOException
     {
         // shortcut zero cases
@@ -815,15 +815,27 @@ public void printFloat(double value)
         }
         else if (Double.isNaN(value))
         {
-            appendAscii("nan");
+            if (_options._float_nan_and_inf_as_null) {
+                appendAscii("null");
+            } else {
+                appendAscii("nan");
+            }
         }
         else if (value == Double.POSITIVE_INFINITY)
         {
-            appendAscii("+inf");
+            if (_options._float_nan_and_inf_as_null) {
+                appendAscii("null");
+            } else {
+                appendAscii("+inf");
+            }
         }
         else if (value == Double.NEGATIVE_INFINITY)
         {
-            appendAscii("-inf");
+            if (_options._float_nan_and_inf_as_null) {
+                appendAscii("null");
+            } else {
+                appendAscii("-inf");
+            }
         }
         else
         {
@@ -846,7 +858,7 @@ else if (value == Double.NEGATIVE_INFINITY)
         }
     }
 
-    public void printFloat(Double value)
+    public void printFloat(_Private_IonTextWriterBuilder _options, Double value)
         throws IOException
     {
         if (value == null)
@@ -855,7 +867,7 @@ public void printFloat(Double value)
         }
         else
         {
-            printFloat(value.doubleValue());
+            printFloat(_options, value.doubleValue());
         }
     }
 

diff --git a/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java b/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
@@ -47,16 +47,20 @@ public static _Private_IonTextWriterBuilder standard()
     //=========================================================================
 
     private boolean _pretty_print;
+
+    // These options control whether the IonTextWriter will write standard ion or ion that is down-converted json.
     public boolean _blob_as_string;
     public boolean _clob_as_string;
     public boolean _decimal_as_float;
+    public boolean _float_nan_and_inf_as_null;
     public boolean _sexp_as_list;
     public boolean _skip_annotations;
     public boolean _string_as_json;
     public boolean _symbol_as_string;
     public boolean _timestamp_as_millis;
     public boolean _timestamp_as_string;
     public boolean _untyped_nulls;
+
     private _Private_CallbackBuilder _callback_builder;
 
 
@@ -73,6 +77,7 @@ private _Private_IonTextWriterBuilder(_Private_IonTextWriterBuilder that)
         this._blob_as_string      = that._blob_as_string     ;
         this._clob_as_string      = that._clob_as_string     ;
         this._decimal_as_float    = that._decimal_as_float   ;
+        this._float_nan_and_inf_as_null = that._float_nan_and_inf_as_null;
         this._sexp_as_list        = that._sexp_as_list       ;
         this._skip_annotations    = that._skip_annotations   ;
         this._string_as_json      = that._string_as_json     ;
@@ -123,6 +128,7 @@ public final IonTextWriterBuilder withJsonDowngrade()
         _clob_as_string      = true;
         // datagramAsList    = true; // TODO
         _decimal_as_float    = true;
+        _float_nan_and_inf_as_null = true;
         _sexp_as_list        = true;
         _skip_annotations    = true;
         // skipSystemValues  = true; // TODO

diff --git a/src/com/amazon/ion/util/IonTextUtils.java b/src/com/amazon/ion/util/IonTextUtils.java
@@ -876,7 +876,7 @@ public static void printFloat(Appendable out, double value)
     {
         _Private_IonTextAppender appender =
             _Private_IonTextAppender.forAppendable(out);
-        appender.printFloat(value);
+        appender.printFloat(STANDARD, value);
     }
 
     public static String printFloat(double value)
@@ -900,7 +900,7 @@ public static void printFloat(Appendable out, Double value)
     {
         _Private_IonTextAppender appender =
             _Private_IonTextAppender.forAppendable(out);
-        appender.printFloat(value);
+        appender.printFloat(STANDARD, value);
     }
 
     public static String printFloat(Double value)

diff --git a/test/com/amazon/ion/impl/TextWriterTest.java b/test/com/amazon/ion/impl/TextWriterTest.java
@@ -487,6 +487,57 @@ public void testWritingJsonLongClobs()
         assertEquals("\"a\\\"'\\nc\\u007f\"", actual);
     }
 
+    @Test
+    public void testWritingFloatNanToJson()
+            throws Exception
+    {
+        options = IonTextWriterBuilder.json();
+        options.setInitialIvmHandling(SUPPRESS);
+
+        IonDatagram dg = system().newDatagram();
+        dg.add().newFloat(Double.NaN);
+
+        iw = makeWriter();
+        dg.writeTo(iw);
+
+        String actual = outputString();
+        assertEquals("null", actual);
+    }
+
+    @Test
+    public void testWritingFloatPositiveInfinityToJson()
+            throws Exception
+    {
+        options = IonTextWriterBuilder.json();
+        options.setInitialIvmHandling(SUPPRESS);
+
+        IonDatagram dg = system().newDatagram();
+        dg.add().newFloat(Double.POSITIVE_INFINITY);
+
+        iw = makeWriter();
+        dg.writeTo(iw);
+
+        String actual = outputString();
+        assertEquals("null", actual);
+    }
+
+    @Test
+    public void testWritingFloatNegativeInfinityToJson()
+            throws Exception
+    {
+        options = IonTextWriterBuilder.json();
+        options.setInitialIvmHandling(SUPPRESS);
+
+        IonDatagram dg = system().newDatagram();
+        dg.add().newFloat(Double.NEGATIVE_INFINITY);
+
+        iw = makeWriter();
+        dg.writeTo(iw);
+
+        String actual = outputString();
+        assertEquals("null", actual);
+    }
+
     @Test
     public void testSuppressInitialIvm()
         throws Exception