Fix #2513

FasterXML · Oct 20, 2019 · c7ff8f6 · c7ff8f6
1 parent 0a47e54
commit c7ff8f6
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 8 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -16,6 +16,8 @@ Project: jackson-databind
  (reported by Ryan B)
 #2485: Add `uses` for `Module` in module-info
  (contributed by Marc M)
+#2513: BigDecimalAsStringSerializer in NumberSerializer throws IllegalStateException in 2.10
+ (reported by Johan H)
 
 2.10.0 (26-Sep-2019)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/NumberSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/NumberSerializer.java
@@ -129,7 +129,9 @@ public BigDecimalAsStringSerializer() {
 
         @Override
         public boolean isEmpty(SerializerProvider prov, Object value) {
-            return valueToString(value).isEmpty();
+            // As per [databind#2513], should not delegate; also, never empty (numbers do
+            // have "default value" to filter by, just not "empty"
+            return false;
         }
 
         @Override

diff --git a/src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java b/src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java
@@ -215,7 +215,7 @@ protected ObjectMapper sharedMapper() {
         }
         return SHARED_MAPPER;
     }
-    
+
     protected ObjectMapper objectMapper() {
         return sharedMapper();
     }

diff --git a/src/test/java/com/fasterxml/jackson/databind/contextual/TestContextAttributeWithDeser.java b/src/test/java/com/fasterxml/jackson/databind/contextual/TestContextAttributeWithDeser.java
@@ -45,7 +45,7 @@ static class TestPOJO
     /**********************************************************
      */
 
-    final ObjectMapper MAPPER = objectMapper();
+    final ObjectMapper MAPPER = sharedMapper();
 
     public void testSimplePerCall() throws Exception
     {

diff --git a/src/test/java/com/fasterxml/jackson/databind/contextual/TestContextAttributeWithSer.java b/src/test/java/com/fasterxml/jackson/databind/contextual/TestContextAttributeWithSer.java
@@ -47,7 +47,7 @@ static class TestPOJO
     /**********************************************************
      */
 
-    final ObjectMapper MAPPER = objectMapper();
+    final ObjectMapper MAPPER = sharedMapper();
 
     public void testSimplePerCall() throws Exception
     {

diff --git a/src/test/java/com/fasterxml/jackson/databind/convert/NumericConversionTest.java b/src/test/java/com/fasterxml/jackson/databind/convert/NumericConversionTest.java
@@ -5,7 +5,7 @@
 
 public class NumericConversionTest extends BaseMapTest
 {
-    private final ObjectMapper MAPPER = objectMapper();
+    private final ObjectMapper MAPPER = sharedMapper();
     private final ObjectReader R = MAPPER.reader().without(DeserializationFeature.ACCEPT_FLOAT_AS_INT);
 
     public void testDoubleToInt() throws Exception

diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/creators/DelegatingArrayCreatorsTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/creators/DelegatingArrayCreatorsTest.java
@@ -72,9 +72,9 @@ static class WithBagOfValues2324 {
         public Bag2324<Value2324> getValues() { return this.bagOfValues; }
         public void setValues(Bag2324<Value2324> bagOfValues) { this.bagOfValues = bagOfValues; }
         private Bag2324<Value2324> bagOfValues;
-    }    
+    }
 
-    private final ObjectMapper MAPPER = objectMapper();
+    private final ObjectMapper MAPPER = sharedMapper();
 
     // [databind#1804]
     public void testDelegatingArray1804() throws Exception {

diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/jdk/NumberSerTest.java b/src/test/java/com/fasterxml/jackson/databind/ser/jdk/NumberSerTest.java
@@ -4,6 +4,7 @@
 import java.math.BigInteger;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.fasterxml.jackson.databind.BaseMapTest;
@@ -16,7 +17,11 @@
  */
 public class NumberSerTest extends BaseMapTest
 {
-    private final ObjectMapper MAPPER = objectMapper();
+    private final ObjectMapper MAPPER = sharedMapper();
+
+    private final ObjectMapper NON_EMPTY_MAPPER = newJsonMapper()
+            .setDefaultPropertyInclusion(JsonInclude.Include.NON_EMPTY)
+            ;
 
     static class IntWrapper {
         public int i;
@@ -114,6 +119,15 @@ public void testNumbersAsString() throws Exception
         assertEquals(aposToQuotes("{'value':'123456'}"), MAPPER.writeValueAsString(new BigIntegerAsString()));
     }
 
+    public void testNumbersAsStringNonEmpty() throws Exception
+    {
+        assertEquals(aposToQuotes("{'value':'3'}"), NON_EMPTY_MAPPER.writeValueAsString(new IntAsString()));
+        assertEquals(aposToQuotes("{'value':'4'}"), NON_EMPTY_MAPPER.writeValueAsString(new LongAsString()));
+        assertEquals(aposToQuotes("{'value':'-0.5'}"), NON_EMPTY_MAPPER.writeValueAsString(new DoubleAsString()));
+        assertEquals(aposToQuotes("{'value':'0.25'}"), NON_EMPTY_MAPPER.writeValueAsString(new BigDecimalAsString()));
+        assertEquals(aposToQuotes("{'value':'123456'}"), NON_EMPTY_MAPPER.writeValueAsString(new BigIntegerAsString()));
+    }
+
     public void testConfigOverridesForNumbers() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();