Merge branch '2.18'

Author: cowtowncoder

.github/workflows/cifuzz.yml

@@ -30,7 +30,7 @@ jobs:
         dry-run: false
         language: jvm
     - name: Upload Crash
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/codeql-analysis.yml

@@ -27,12 +27,12 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+      uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
       with:
         languages: ${{ matrix.language }}
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+      uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+      uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15

src/main/java/tools/jackson/databind/JacksonModule.java

@@ -183,6 +183,7 @@ public static interface SetupContext
          *
          * @param d Object that can be called to find deserializer for types supported
          *   by module (null returned for non-supported types)
+         * @see #addKeyDeserializers is used to register key deserializers (for Map keys)
          */
         public SetupContext addDeserializers(Deserializers d);
 
@@ -223,6 +224,7 @@ public static interface SetupContext
          *
          * @param s Object that can be called to find serializer for types supported
          *   by module (null returned for non-supported types)
+         * @see #addKeySerializers is used to register key serializers (for Map keys)
          */
         public SetupContext addSerializers(Serializers s);
 

src/main/java/tools/jackson/databind/module/SimpleModule.java

@@ -285,6 +285,7 @@ protected SimpleModule setNamingStrategy(PropertyNamingStrategy naming) {
      * Possible earlier addition of a serializer for a given Class will be replaced.
      * <p>
      * NOTE: This method registers "default" (de)serializers only. See a note on precedence in class JavaDoc.
+     * @see #addKeySerializer(Class, JsonSerializer) is used to register key serializers (for Map keys)
      */
     public SimpleModule addSerializer(ValueSerializer<?> ser)
     {
@@ -309,6 +310,7 @@ public SimpleModule addSerializer(ValueSerializer<?> ser)
      * Possible earlier addition of a serializer for a given Class will be replaced.
      * <p>
      * NOTE: This method registers "default" (de)serializers only. See a note on precedence in class JavaDoc.
+     * @see #addKeySerializer(Class, JsonSerializer) is used to register key serializers (for Map keys)
      */
     public <T> SimpleModule addSerializer(Class<? extends T> type, ValueSerializer<T> ser)
     {
@@ -352,6 +354,7 @@ public <T> SimpleModule addKeySerializer(Class<? extends T> type, ValueSerialize
      * Possible earlier addition of a serializer for a given Class will be replaced.
      * <p>
      * NOTE: This method registers "default" (de)serializers only. See a note on precedence in class JavaDoc.
+     * @see #addKeyDeserializer(Class, KeyDeserializer)  is used to register key deserializers (for Map keys)
      */
     public <T> SimpleModule addDeserializer(Class<T> type, ValueDeserializer<? extends T> deser)
     {

src/test/java/tools/jackson/databind/ser/jdk/NumberSerTest.java

@@ -1,15 +1,21 @@
 package tools.jackson.databind.ser.jdk;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.text.DecimalFormat;
 
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.databind.module.SimpleModule;
 import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.SerializerProvider;
+import tools.jackson.databind.ValueSerializer;
 import tools.jackson.databind.annotation.JsonSerialize;
 import tools.jackson.databind.testutil.DatabindTestUtil;
 
@@ -80,6 +86,36 @@ static class NumberWrapper {
         public NumberWrapper(Number v) { value = v; }
     }
 
+    static class BigDecimalHolder {
+        private final BigDecimal value;
+
+        public BigDecimalHolder(String num) {
+            value = new BigDecimal(num);
+        }
+
+        public BigDecimal getValue() {
+            return value;
+        }
+    }
+
+    static class BigDecimalAsStringSerializer extends ValueSerializer<BigDecimal> {
+        private final DecimalFormat df = new DecimalFormat("0.0");
+
+        @Override
+        public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers) {
+            gen.writeString(df.format(value));
+        }
+    }
+
+    static class BigDecimalAsNumberSerializer extends ValueSerializer<BigDecimal> {
+        private final DecimalFormat df = new DecimalFormat("0.0");
+
+        @Override
+        public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers) {
+            gen.writeNumber(df.format(value));
+        }
+    }
+
     /*
     /**********************************************************
     /* Test methods
@@ -171,4 +207,20 @@ public void testNumberType() throws Exception
         assertEquals(a2q("{'value':123}"), MAPPER.writeValueAsString(new NumberWrapper(BigInteger.valueOf(123))));
         assertEquals(a2q("{'value':0.025}"), MAPPER.writeValueAsString(new NumberWrapper(BigDecimal.valueOf(0.025))));
     }
+
+    @Test
+    public void testCustomSerializationBigDecimalAsString() throws Exception {
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(BigDecimal.class, new BigDecimalAsStringSerializer());
+        ObjectMapper mapper = jsonMapperBuilder().addModule(module).build();
+        assertEquals(a2q("{'value':'2.0'}"), mapper.writeValueAsString(new BigDecimalHolder("2")));
+    }
+
+    @Test
+    public void testCustomSerializationBigDecimalAsNumber() throws Exception {
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(BigDecimal.class, new BigDecimalAsNumberSerializer());
+        ObjectMapper mapper = jsonMapperBuilder().addModule(module).build();
+        assertEquals(a2q("{'value':2.0}"), mapper.writeValueAsString(new BigDecimalHolder("2")));
+    }
 }