Merge branch '3.x' into tatu-claude/3.1/1419-map-entry-shape-override

Author: cowtowncoder

.github/workflows/main.yml

@@ -11,6 +11,7 @@ on:
     - "release-notes/*"
 permissions:
   contents: read
+  pull-requests: write
 
 jobs:
   build:
@@ -60,16 +61,70 @@ jobs:
         CI_DEPLOY_PASSWORD: ${{ secrets.CENTRAL_DEPLOY_PASSWORD }}
         # MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
       run: ./mvnw -B -q -ff -DskipTests -ntp source:jar deploy
-    - name: Generate code coverage 
-      if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
-      run: ./mvnw -B -q -ff -ntp test
+    - name: Generate code coverage
+      if: ${{ matrix.release_build }}
+      run: ./mvnw -B -q -ff -ntp test jacoco:report
     - name: Publish code coverage
       if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
       uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./target/site/jacoco/jacoco.xml
         flags: unittests
+    - name: Generate coverage summary
+      if: ${{ matrix.release_build && github.event_name == 'pull_request' }}
+      id: jacoco
+      uses: cicirello/[email protected]
+      with:
+        jacoco-csv-file: target/site/jacoco/jacoco.csv
+        generate-coverage-badge: false
+        generate-branches-badge: false
+        generate-summary: true
+    - name: Add coverage comment to PR
+      if: ${{ matrix.release_build && github.event_name == 'pull_request' }}
+      continue-on-error: true
+      run: |
+        # Convert decimal to percentage and round to 1 decimal place
+        COVERAGE=$(awk -v cov="${{ steps.jacoco.outputs.coverage }}" 'BEGIN { printf "%.1f", cov * 100 }')
+        BRANCHES=$(awk -v br="${{ steps.jacoco.outputs.branches }}" 'BEGIN { printf "%.1f", br * 100 }')
+
+        # Determine color for coverage badge using awk (more portable than bc)
+        COV_COLOR=$(awk -v cov="$COVERAGE" 'BEGIN {
+          if (cov >= 80) print "brightgreen"
+          else if (cov >= 60) print "green"
+          else if (cov >= 40) print "yellow"
+          else print "red"
+        }')
+
+        BR_COLOR=$(awk -v br="$BRANCHES" 'BEGIN {
+          if (br >= 80) print "brightgreen"
+          else if (br >= 60) print "green"
+          else if (br >= 40) print "yellow"
+          else print "red"
+        }')
+
+        COMMENT_BODY="## :test_tube: Code Coverage Report
+
+        | Metric | Coverage |
+        |--------|----------|
+        | **Instructions** | ![coverage](https://img.shields.io/badge/coverage-${COVERAGE}%25-${COV_COLOR}) **${COVERAGE}%** |
+        | **Branches** | ![branches](https://img.shields.io/badge/branches-${BRANCHES}%25-${BR_COLOR}) **${BRANCHES}%** |
+
+        > Coverage data generated from JaCoCo test results
+
+        <!-- jacoco-coverage-comment -->"
+
+        # Find and delete existing coverage comment
+        COMMENT_ID=$(gh pr view ${{ github.event.pull_request.number }} --json comments --jq '.comments[] | select(.body | contains("<!-- jacoco-coverage-comment -->")) | .id' | head -1)
+
+        if [ -n "$COMMENT_ID" ]; then
+          gh api -X DELETE "repos/${{ github.repository }}/issues/comments/$COMMENT_ID" || true
+        fi
+
+        # Post new comment (may fail for PRs from forks due to permissions)
+        gh pr comment ${{ github.event.pull_request.number }} --body "$COMMENT_BODY"
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   trigger-dep-build-v2:
     name: Trigger v2 dep builds

release-notes/CREDITS

@@ -127,7 +127,15 @@ Oliver Drotbohm (@odrotbohm)
  * Contributed fix for #4629: `@JsonIncludeProperties` and `@JsonIgnoreProperties`
   ignored when deserializing Records
   [3.1.0]
-  
+ * Contributed fix for #5115: `@JsonUnwrapped` Record deserialization can't handle
+  name collision
+  [3.1.0]
+
+Viktor Szathmáry (@phraktle)
+ * Reported #5115: `@JsonUnwrapped` Record deserialization can't handle name collision
+ (reported by Viktor S)
+  [3.1.0]
+
 Hélios Gilles (@RoiSoleil)
  * Contributed #5413: Add/support forward reference resolution for array values
   [3.1.0]

release-notes/VERSION

@@ -11,6 +11,10 @@ Versions: 3.x (for earlier see VERSION-2.x)
 #1196: Add opt-in error collection for deserialization
  (requested by @odrotbohm)
  (contributed by @sri-adarsh-kumar)
+#1654: @JsonDeserialize(contentUsing=...) is ignored if content
+  type is determined by @JsonTypeInfo
+ (reported by @pdegoeje)
+ (fix by @cowtowncoder, @JacksonJang)
 #1980: Add method `remove(JsonPointer)` in `ContainerNode`
  (fix by @cowtowncoder, w/ Claude code)
 #3964: Deserialization issue: MismatchedInputException, Bean not
@@ -24,6 +28,12 @@ Versions: 3.x (for earlier see VERSION-2.x)
   creator property" when deserializing JSON with dup property to single-property Record
  (reported by @sseelmann)
  (fix contributed by @JacksonJang)
+#5115: `@JsonUnwrapped` Record deserialization can't handle name collision
+ (reported by Viktor S)
+ (fix contributed by @JacksonJang)
+#5184: `@JsonIgnore` on record method applied to record matching field
+  at deserialization
+ (reported by @emouty)
 #5350: Add `DeserializationFeature.USE_NULL_FOR_MISSING_REFERENCE_VALUES` for
   selecting `null` vs "empty/absent" value when deserializing missing `Optional` value
 #5361: Fix Maven SBOM publishing (worked in 3.0.0-rc4 but not in rc5 or later)
@@ -36,6 +46,8 @@ Versions: 3.x (for earlier see VERSION-2.x)
 #5456: Additional configuration (`JsonNodeFeature.STRIP_TRAILING_BIGDECIMAL_ZEROES`: true)
   to MapperBuilder#configureForJackson2 to closer match Jackson 2 behavior
  (contributed by @nrayburn-tech)
+#5475: Support `@JsonDeserializeAs` annotation
+ (implemented by @cowtowncoder, w/ Claude code)
 
 3.0.3 (28-Nov-2025)
 

release-notes/VERSION-2.x

@@ -30,6 +30,10 @@ Project: jackson-databind
  (contributed by Hélios G)
 #5429: Formatting and Parsing of Large ISO-8601 Dates is inconsistent
  (reported by @DavTurns)
+#5475: Support `@JsonDeserializeAs` annotation
+ (implemented by @cowtowncoder, w/ Claude code)
+#5476: Support `@JsonSerializeAs` annotation
+ (implemented by @cowtowncoder, w/ Claude code)
 
 2.20.2 (not yet released)
 

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

@@ -198,14 +198,22 @@ public AnnotatedMember findJsonKeyAccessor() {
      */
     public abstract AnnotatedMember findJsonValueAccessor();
 
+    /**
+     * Method used to locate the Method or Field of introspected class that
+     * is annotated with {@link com.fasterxml.jackson.annotation.JsonAnyGetter}
+     * (or equivalent annotation).
+     * If no such {@code AnnotatedMember} exists {@code null} is returned.
+     * If more than one are found, an exception is thrown.
+     */
     public abstract AnnotatedMember findAnyGetter();
 
     /**
      * Method used to locate a mutator (settable field, or 2-argument set method)
      * of introspected class that
-     * implements {@link com.fasterxml.jackson.annotation.JsonAnySetter}.
-     * If no such mutator exists null is returned. If more than one are found,
-     * an exception is thrown.
+     * is annotated with {@link com.fasterxml.jackson.annotation.JsonAnySetter}
+     * (or equivalent annotation).
+     * If no such mutator exists {@code null} is returned.
+     * If more than one are found an exception is thrown.
      * Additional checks are also made to see that method signature
      * is acceptable: needs to take 2 arguments, first one String or
      * Object; second any can be any type.

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

@@ -23,7 +23,7 @@
 /**
  * Shared base class for {@link DeserializationContext} and
  * {@link SerializationContext}, context objects passed through data-binding
- * process. Designed so that some of implementations can rely on shared
+ * process. Designed so that some of the implementations can rely on shared
  * aspects like access to secondary contextual objects like type factories
  * or handler instantiators.
  */

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

@@ -186,11 +186,7 @@ protected Object readResolve() {
      */
 
     /**
-     * Factory used for constructing per-call {@link SerializationContext}s.
-     *<p>
-     * Note: while serializers are only exposed {@link SerializationContext},
-     * mappers and readers need to access additional API defined by
-     * {@link SerializationContextExt}
+     * Factory used for constructing per-call {@link SerializationContext} instances.
      */
     protected final SerializationContexts _serializationContexts;
 
@@ -207,7 +203,7 @@ protected Object readResolve() {
      */
 
     /**
-     * Factory used for constructing per-call {@link DeserializationContext}s.
+     * Factory used for constructing per-call {@link DeserializationContext} instances.
      */
     protected final DeserializationContexts _deserializationContexts;
 

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

@@ -54,7 +54,7 @@ public class ObjectWriter
      * Factory used for constructing per-call {@link SerializationContext}s.
      *<p>
      * Note: while serializers are only exposed {@link SerializationContext},
-     * mappers and readers need to access additional API defined by
+     * writers need to access additional API defined by
      * {@link SerializationContextExt}
      */
     protected final SerializationContexts _serializationContexts;
@@ -80,7 +80,7 @@ public class ObjectWriter
      * We may pre-fetch serializer if root type
      * is known (has been explicitly declared), and if so, reuse it afterwards.
      * This allows avoiding further serializer lookups and increases
-     * performance a bit on cases where readers are reused.
+     * performance a bit on cases where writers are reused.
      */
     protected final Prefetch _prefetch;
 
@@ -367,7 +367,7 @@ public ObjectWriter withoutFeatures(FormatFeature... features) {
      * as the root type for serialization, instead of runtime dynamic
      * type of the root object itself.
      *<p>
-     * Note that method does NOT change state of this reader, but
+     * Note that the method does NOT change the state of this writer, but
      * rather construct and returns a newly configured instance.
      */
     public ObjectWriter forType(JavaType rootType) {
@@ -403,7 +403,7 @@ public ObjectWriter forType(TypeReference<?> rootType) {
      * use specified date format for serializing dates; or if null passed, one
      * that will serialize dates as numeric timestamps.
      *<p>
-     * Note that the method does NOT change state of this reader, but
+     * Note that the method does NOT change the state of this writer, but
      * rather construct and returns a newly configured instance.
      */
     public ObjectWriter with(DateFormat df) {
@@ -442,7 +442,7 @@ public ObjectWriter with(PrettyPrinter pp) {
      * specifies what root name to use for "root element wrapping".
      * See {@link SerializationConfig#withRootName(String)} for details.
      *<p>
-     * Note that method does NOT change state of this reader, but
+     * Note that the method does NOT change the state of this writer, but
      * rather construct and returns a newly configured instance.
      *
      * @param rootName Root name to use, if non-empty; `null` for "use defaults",
@@ -472,7 +472,7 @@ public ObjectWriter withoutRootName() {
      * Method that will construct a new instance that uses specific format schema
      * for serialization.
      *<p>
-     * Note that method does NOT change state of this reader, but
+     * Note that the method does NOT change the state of this writer, but
      * rather construct and returns a newly configured instance.
      */
     public ObjectWriter with(FormatSchema schema) {
@@ -485,7 +485,7 @@ public ObjectWriter with(FormatSchema schema) {
      * serialization view for serialization (with null basically disables
      * view processing)
      *<p>
-     * Note that the method does NOT change state of this reader, but
+     * Note that the method does NOT change the state of this writer, but
      * rather construct and returns a newly configured instance.
      */
     public ObjectWriter withView(Class<?> view) {
@@ -1279,7 +1279,7 @@ public final static class Prefetch
          * We may pre-fetch serializer if {@link #rootType}
          * is known, and if so, reuse it afterwards.
          * This allows avoiding further serializer lookups and increases
-         * performance a bit on cases where readers are reused.
+         * performance a bit on cases where writers are reused.
          */
         private final ValueSerializer<Object> valueSerializer;
 

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

@@ -4,6 +4,7 @@
 import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 
 import tools.jackson.core.*;
 import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
@@ -252,13 +253,20 @@ public void serializeWithType(T value, JsonGenerator gen, SerializationContext c
             TypeSerializer typeSer)
         throws JacksonException
     {
+        // 07-Dec-2025, tatu: [databind#1654] Check for "no-op" type serializer
+        //   indirectly
+        if (typeSer.getTypeInclusion() == As.NOTHING) {
+            serialize(value, gen, ctxt);
+            return;
+        }
+
         Class<?> clz = handledType();
         if (clz == null) {
             clz = value.getClass();
         }
         ctxt.reportBadDefinition(clz, String.format(
-                "Type id handling not implemented for type %s (by serializer of type %s)",
-                clz.getName(), getClass().getName()));
+"Type id handling (method `serializeWithType()`) not implemented for type %s (by serializer of type %s)",
+                ClassUtil.nameOf(clz), ClassUtil.nameOf(getClass())));
     }
 
     /*

src/main/java/tools/jackson/databind/cfg/MapperBuilder.java

@@ -1037,6 +1037,8 @@ public B withAllCoercionConfigs(Consumer<CoercionConfigs> handler) {
      */
     public B removeAllModules() {
         _modules = null;
+        // [databind#5481]: invalidate cached state when modules are modified
+        _savedState = null;
         return _this();
     }
 
@@ -1068,6 +1070,8 @@ public B addModule(JacksonModule module)
             _modules.putIfAbsent(dep.getRegistrationId(), dep);
         }
         _modules.put(moduleId, module);
+        // [databind#5481]: invalidate cached state when modules are modified
+        _savedState = null;
         return _this();
     }