Fix #117

cowtowncoder · cowtowncoder · commit 7a138c78e1d5 · 2020-11-20T20:19:42.000-08:00
diff --git a/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/ser/SerializerModifier.java b/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/ser/SerializerModifier.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
 import com.fasterxml.jackson.databind.ser.*;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 import com.fasterxml.jackson.module.afterburner.util.MyClassLoader;
 
@@ -119,7 +120,6 @@ protected PropertyAccessorCollector findProperties(Class<?> beanClass,
             
             if (type.isPrimitive()) {
                 if (type == Integer.TYPE) {
-
                     if (isMethod) {
                         it.set(collector.addIntGetter(bpw));
                     } else {
@@ -165,6 +165,14 @@ protected PropertyAccessorCollector findProperties(Class<?> beanClass,
     protected boolean isDefaultSerializer(SerializationConfig config,
             JsonSerializer<?> ser)
     {
-        return ClassUtil.isJacksonStdImpl(ser);
+        if (ClassUtil.isJacksonStdImpl(ser)) {
+            // 20-Nov-2020, tatu: As per [modules-base#117], need to consider
+            //   one standard serializer that should not be replaced...
+            if (ser instanceof ToStringSerializer) {
+                return false;
+            }
+            return true;
+        }
+        return false;
     }
 }
diff --git a/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/AfterburnerTestBase.java b/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/AfterburnerTestBase.java
@@ -156,6 +156,11 @@ protected static JsonMapper.Builder mapperBuilder() {
                 .addModule(new AfterburnerModule());
     }
 
+    // One withOUT afterburner module
+    protected static JsonMapper newVanillaJSONMapper() {
+        return new JsonMapper();
+    }
+
     @Deprecated
     protected ObjectMapper mapperWithModule()
     {
diff --git a/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/jdk/JDKScalarsDeserTest.java b/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/deser/jdk/JDKScalarsDeserTest.java
@@ -15,7 +15,7 @@
  * Unit tests for verifying handling of simple basic non-structured
  * types; primitives (and/or their wrappers), Strings.
  */
-public class JDKScalarsTest
+public class JDKScalarsDeserTest
     extends AfterburnerTestBase
 {
     final static String NAN_STRING = "NaN";
@@ -103,7 +103,7 @@ static class WrappersBean
         public Double doubleValue;
     }
 
-    private final ObjectMapper MAPPER = new ObjectMapper();
+    private final ObjectMapper MAPPER = newObjectMapper();
 
     /*
     /**********************************************************
diff --git a/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/failing/JsonFormatForSer117Test.java b/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/failing/JsonFormatForSer117Test.java
@@ -0,0 +1,26 @@
+package com.fasterxml.jackson.module.afterburner.failing;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import com.fasterxml.jackson.module.afterburner.AfterburnerTestBase;
+
+public class JsonFormatForSer117Test extends AfterburnerTestBase
+{
+    static class Bean117UsingJsonFormat {
+        @JsonFormat(shape = JsonFormat.Shape.STRING)
+        public int value = 42;
+    }
+
+    private final ObjectMapper MAPPER = newObjectMapper();
+    private final ObjectMapper VANILLA_MAPPER = newVanillaJSONMapper();
+
+    public void testIntAsStringWithJsonFormat() throws Exception
+    {
+        final String EXP_JSON = "{\"value\":\"42\"}";
+        final Object input = new Bean117UsingJsonFormat();
+        assertEquals(EXP_JSON, VANILLA_MAPPER.writeValueAsString(input));
+        assertEquals(EXP_JSON, MAPPER.writeValueAsString(input));
+    }
+}
diff --git a/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/ser/JDKScalarsSerTest.java b/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/ser/JDKScalarsSerTest.java
@@ -0,0 +1,30 @@
+package com.fasterxml.jackson.module.afterburner.ser;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import com.fasterxml.jackson.module.afterburner.AfterburnerTestBase;
+
+// [modules-base#117]
+public class JDKScalarsSerTest extends AfterburnerTestBase
+{
+    static class Bean117UsingJsonSerialize {
+        @JsonSerialize(using = ToStringSerializer.class)
+        public int getValue() {
+            return 42;
+        }
+    }
+
+    private final ObjectMapper MAPPER = newObjectMapper();
+    private final ObjectMapper VANILLA_MAPPER = newVanillaJSONMapper();
+
+    // [modules-base#117]
+    public void testIntAsStringWithJsonSerialize() throws Exception
+    {
+        final String EXP_JSON = "{\"value\":\"42\"}";
+        final Object input = new Bean117UsingJsonSerialize();
+        assertEquals(EXP_JSON, VANILLA_MAPPER.writeValueAsString(input));
+        assertEquals(EXP_JSON, MAPPER.writeValueAsString(input));
+    }
+}
diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/ser/BBSerializerModifier.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/ser/BBSerializerModifier.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
 import com.fasterxml.jackson.databind.ser.*;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 import com.fasterxml.jackson.module.blackbird.util.ReflectionHack;
 import com.fasterxml.jackson.module.blackbird.util.Unchecked;
@@ -82,7 +83,7 @@ protected void createProperty(ListIterator<BeanPropertyWriter> it, Lookup lookup
         // (although, interestingly enough, can seem to access private classes...)
 
         // 30-Jul-2012, tatu: [#6]: Needs to skip custom serializers, if any.
-        if (bpw.hasSerializer() && !ClassUtil.isJacksonStdImpl(bpw.getSerializer())) {
+        if (bpw.hasSerializer() && !isDefaultSerializer(config, bpw.getSerializer())) {
             return;
         }
         // [#9]: also skip unwrapping stuff...
@@ -160,4 +161,23 @@ protected void createProperty(ListIterator<BeanPropertyWriter> it, Lookup lookup
             }
         }
     }
+
+    /**
+     * Helper method used to check whether given serializer is the default
+     * serializer implementation: this is necessary to avoid overriding other
+     * kinds of serializers.
+     */
+    protected boolean isDefaultSerializer(SerializationConfig config,
+            JsonSerializer<?> ser)
+    {
+        if (ClassUtil.isJacksonStdImpl(ser)) {
+            // 20-Nov-2020, tatu: As per [modules-base#117], need to consider
+            //   one standard serializer that should not be replaced...
+            if (ser instanceof ToStringSerializer) {
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/BlackbirdTestBase.java b/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/BlackbirdTestBase.java
@@ -157,6 +157,10 @@ protected static JsonMapper.Builder mapperBuilder() {
                 .addModule(new BlackbirdModule(MethodHandles::lookup));
     }
 
+    protected static JsonMapper newVanillaJSONMapper() {
+        return new JsonMapper();
+    }
+
     /*
     /**********************************************************
     /* Helper methods; assertions
diff --git a/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/ser/JDKScalarsSerTest.java b/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/ser/JDKScalarsSerTest.java
@@ -0,0 +1,30 @@
+package com.fasterxml.jackson.module.blackbird.ser;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import com.fasterxml.jackson.module.blackbird.BlackbirdTestBase;
+
+// [modules-base#117]
+public class JDKScalarsSerTest extends BlackbirdTestBase
+{
+    static class Bean117UsingJsonSerialize {
+        @JsonSerialize(using = ToStringSerializer.class)
+        public int getValue() {
+            return 42;
+        }
+    }
+
+    private final ObjectMapper MAPPER = newObjectMapper();
+    private final ObjectMapper VANILLA_MAPPER = newVanillaJSONMapper();
+
+    // [modules-base#117]
+    public void testIntAsStringWithJsonSerialize() throws Exception
+    {
+        final String EXP_JSON = "{\"value\":\"42\"}";
+        final Object input = new Bean117UsingJsonSerialize();
+        assertEquals(EXP_JSON, VANILLA_MAPPER.writeValueAsString(input));
+        assertEquals(EXP_JSON, MAPPER.writeValueAsString(input));
+    }
+}
diff --git a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/Issue117Test.java b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/Issue117Test.java
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -20,6 +20,8 @@ Modules:
 #100: (mrbean) Prevent "double-prefixing" Mr Bean generated classes
 #115: (jaxb) Remove ` java.beans.Introspector` dependency from JAXB module (to
    get rid of `java.desktop` module dep)
+#117: Use of `ToStringSerializer` via `@JsonSerialize` on `int`/`long` property does not work
+ (reported by wujimin@github)
 - Add Gradle Module Metadata (https://blog.gradle.org/alignment-with-gradle-module-metadata)
 
 2.11.3 (02-Oct-2020)

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,11 @@ protected static JsonMapper.Builder mapperBuilder() {`
`156`	`156`	`.addModule(new AfterburnerModule());`
`157`	`157`	`}`
`158`	`158`
	`159`	`+ // One withOUT afterburner module`
	`160`	`+ protected static JsonMapper newVanillaJSONMapper() {`
	`161`	`+ return new JsonMapper();`
	`162`	`+ }`
	`163`	`+`
`159`	`164`	`@Deprecated`
`160`	`165`	`protected ObjectMapper mapperWithModule()`
`161`	`166`	`{`