You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2014/11/24 17:41:54 UTC

incubator-johnzon git commit: JOHNZON-27 JOHNZON-26 writeObjectAsString and skipping Nan values when serializing

Repository: incubator-johnzon
Updated Branches:
  refs/heads/master 4dabbb17f -> aaae17743


JOHNZON-27 JOHNZON-26 writeObjectAsString and skipping Nan values when serializing


Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/aaae1774
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/aaae1774
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/aaae1774

Branch: refs/heads/master
Commit: aaae17743a2cf9f75d9744010438c8889374b743
Parents: 4dabbb1
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Nov 24 17:41:40 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Nov 24 17:41:40 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/johnzon/mapper/Mapper.java  | 19 +++++++++++++++--
 .../org/apache/johnzon/mapper/LiteralTest.java  | 22 ++------------------
 .../org/apache/johnzon/mapper/MapperTest.java   | 20 ++++++++++++++++++
 3 files changed, 39 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/aaae1774/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
index 065ebed..0883b57 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
@@ -38,6 +38,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
+import java.io.StringWriter;
 import java.io.Writer;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
@@ -108,7 +109,11 @@ public class Mapper {
         } else if (isInt(type)) {
             return generator.write(Integer.class.cast(value).intValue());
         } else if (isFloat(type)) {
-            return generator.write(Number.class.cast(value).doubleValue());
+            final double doubleValue = Number.class.cast(value).doubleValue();
+            if (Double.isNaN(doubleValue)) {
+                return generator;
+            }
+            return generator.write(doubleValue);
         } else if (type == boolean.class || type == Boolean.class) {
             return generator.write(Boolean.class.cast(value));
         } else if (type == BigDecimal.class) {
@@ -129,7 +134,11 @@ public class Mapper {
         } else if (isInt(type)) {
             return generator.write(key, Number.class.cast(value).intValue());
         } else if (isFloat(type)) {
-            return generator.write(key, Number.class.cast(value).doubleValue());
+            final double doubleValue = Number.class.cast(value).doubleValue();
+            if (Double.isNaN(doubleValue)) {
+                return generator;
+            }
+            return generator.write(key, doubleValue);
         } else if (type == boolean.class || type == Boolean.class) {
             return generator.write(key, Boolean.class.cast(value));
         } else if (type == BigDecimal.class) {
@@ -265,6 +274,12 @@ public class Mapper {
         doWriteHandlingNullObject(object, generator);
     }
 
+    public String writeObjectAsString(final Object instance) {
+        final StringWriter writer = new StringWriter();
+        writeObject(instance, writer);
+        return writer.toString();
+    }
+
     private void doWriteHandlingNullObject(final Object object, final JsonGenerator generator) {
         if (object == null) {
             generator.writeStartObject().writeEnd().close();

http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/aaae1774/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LiteralTest.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LiteralTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LiteralTest.java
index 147f71f..228cd28 100644
--- a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LiteralTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LiteralTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.johnzon.mapper;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
 
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -26,7 +26,7 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Comparator;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 public class LiteralTest {
     @Test
@@ -77,24 +77,6 @@ public class LiteralTest {
 
     }
 
-    @Test(expected = NumberFormatException.class)
-    public void writeReadNumbersNaN() {
-        final NumberClass nc = new NumberClass();
-        final StringWriter sw = new StringWriter();
-        nc.setBg(new BigDecimal("123.123"));
-        nc.setBi(new BigInteger("123"));
-        nc.setDoubleNumber(Double.NaN);
-        nc.setBool(true);
-        nc.setByteNumber((byte) 1);
-        nc.setFloatNumber(123);
-        nc.setShortNumber((short) 1);
-        nc.setLongNumber(123L);
-        nc.setIntNumber(123);
-
-        new MapperBuilder().build().writeObject(nc, sw);
-
-    }
-
     public static class NumberClass {
         private BigDecimal bg;
         private BigInteger bi;

http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/aaae1774/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
index f7949b9..f17eec3 100644
--- a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
@@ -284,6 +284,26 @@ public class MapperTest {
         assertEquals(1, value.value);
     }
 
+
+    @Test
+    public void nan() {
+        final String value = new MapperBuilder().build()
+                .writeObjectAsString(new NanHolder());
+        assertEquals("{}", value);
+    }
+
+    public static class NanHolder {
+        private Double nan = Double.NaN;
+
+        public Double getNan() {
+            return nan;
+        }
+
+        public void setNan(Double nan) {
+            this.nan = nan;
+        }
+    }
+
     public static class TheObject {
         private String name;
         private int integer;