Merge branch '3.x' into 5405-map-format-shape-bug

cowtowncoder · web-flow · commit 58e8c48bd920 · 2025-12-02T20:35:40.000-08:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -23,16 +23,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
+      uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3.29.5
       with:
         languages: ${{ matrix.language }}
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
+      uses: github/codeql-action/autobuild@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3.29.5
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
+      uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3.29.5
diff --git a/.github/workflows/dep_build_v2.yml b/.github/workflows/dep_build_v2.yml
@@ -19,7 +19,7 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         ref: 2.x
     - name: Set up JDK
diff --git a/.github/workflows/dep_build_v3.yml b/.github/workflows/dep_build_v3.yml
@@ -19,7 +19,7 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         ref: 3.x
     - name: Set up JDK
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: Set up JDK
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/trigger_dep_builds_v2.yml b/.github/workflows/trigger_dep_builds_v2.yml
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Repository dispatch
-        uses: peter-evans/repository-dispatch@2c856c63feddee6147cab2f38801935b6a59a765 # v3.0.0
+        uses: peter-evans/repository-dispatch@d2c43ab06ec1cddd2c2a0aae659681b8465ce87a # v3.0.0
         with:
           token: ${{ secrets.token }}
           repository: ${{ matrix.repo }}
diff --git a/.github/workflows/trigger_dep_builds_v3.yml b/.github/workflows/trigger_dep_builds_v3.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Repository dispatch
-        uses: peter-evans/repository-dispatch@2c856c63feddee6147cab2f38801935b6a59a765 # v3.0.0
+        uses: peter-evans/repository-dispatch@d2c43ab06ec1cddd2c2a0aae659681b8465ce87a # v3.0.0
         with:
           token: ${{ secrets.token }}
           repository: ${{ matrix.repo }}
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -33,8 +33,11 @@ Versions: 3.x (for earlier see VERSION-2.x)
  (contributed by Hélios G)
 5442: Make `JsonMapper/ObjectMapper` fully proxyable by CGLIB
  (fix contributed by Fouad A)
+#5456: Additional configuration (`JsonNodeFeature.STRIP_TRAILING_BIGDECIMAL_ZEROES`: true)
+  to MapperBuilder#configureForJackson2 to closer match Jackson 2 behavior
+ (contributed by @nrayburn-tech)
 
-3.0.3 (not yet released)
+3.0.3 (28-Nov-2025)
 
 #5393: `@JsonAnyGetter` property gets included in generated schema
  (reported by @victor-noel-pfx)
diff --git a/src/main/java/tools/jackson/databind/JavaType.java b/src/main/java/tools/jackson/databind/JavaType.java
@@ -305,11 +305,8 @@ public final boolean isEnumImplType() {
         return ClassUtil.isEnumType(_class) && (_class != Enum.class);
     }
 
-    /**
-     * @since 2.12
-     */
     public final boolean isRecordType() {
-        return ClassUtil.isRecordType(_class);
+        return _class.isRecord();
     }
 
     /**
diff --git a/src/main/java/tools/jackson/databind/cfg/MapperBuilder.java b/src/main/java/tools/jackson/databind/cfg/MapperBuilder.java
@@ -807,6 +807,7 @@ public B configure(DatatypeFeature feature, boolean state) {
      * <li>{@link DateTimeFeature}s</li>
      * <li>{@link DeserializationFeature}s</li>
      * <li>{@link EnumFeature}s</li>
+     * <li>{@link JsonNodeFeature}s</li>
      * <li>{@link MapperFeature}s</li>
      * <li>{@link SerializationFeature}s</li>
      *  </ul>
@@ -824,6 +825,7 @@ public B configureForJackson2() {
                 .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
                 .disable(EnumFeature.READ_ENUMS_USING_TO_STRING)
                 .disable(EnumFeature.WRITE_ENUMS_USING_TO_STRING)
+                .enable(JsonNodeFeature.STRIP_TRAILING_BIGDECIMAL_ZEROES)
                 .enable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
                 .disable(MapperFeature.DETECT_PARAMETER_NAMES) // [databind#5314]
                 .disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
diff --git a/src/main/java/tools/jackson/databind/cfg/MapperConfigBase.java b/src/main/java/tools/jackson/databind/cfg/MapperConfigBase.java
@@ -622,7 +622,7 @@ public final VisibilityChecker getDefaultVisibilityChecker(Class<?> baseType,
 
         if (ClassUtil.isJDKClass(baseType)) {
             vc = VisibilityChecker.allPublicInstance();
-        } else if (ClassUtil.isRecordType(baseType)) {
+        } else if (baseType.isRecord()) {
             // 15-Jan-2023, tatu: [databind#3724] Records require slightly different defaults
             vc = _configOverrides.getDefaultRecordVisibility();
         } else {
diff --git a/src/main/java/tools/jackson/databind/deser/bean/BeanDeserializer.java b/src/main/java/tools/jackson/databind/deser/bean/BeanDeserializer.java
@@ -564,9 +564,10 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
             : creator.startBuilding(p, ctxt, _objectIdReader);
         TokenBuffer unknown = null;
         final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
-
         JsonToken t = p.currentToken();
         List<BeanReferring> referrings = null;
+        final boolean isRecord = _beanType.isRecordType();
+
         for (; t == JsonToken.PROPERTY_NAME; t = p.nextToken()) {
             String propName = p.currentName();
             p.nextToken(); // to point to value
@@ -576,14 +577,6 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
                 continue;
             }
 
-            // [databind#4629] Need to check for ignored properties BEFORE checking for Creator properties.
-            // Records (and other creator-based types) will have a valid 'creatorProp', so if we don't
-            // check for ignore first, the ignore configuration will be bypassed.
-            if (IgnorePropertiesUtil.shouldIgnore(propName, _ignorableProps, _includableProps)) {
-                handleIgnoredProperty(p, ctxt, handledType(), propName);
-                continue;
-            }
-
             // Creator property?
             if (creatorProp != null) {
                 if ((activeView != null) && !creatorProp.visibleInView(activeView)) {
@@ -596,13 +589,21 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
                     p.skipChildren();
                     continue;
                 }
+                // [databind#4629] Need to check for ignored properties for Creator properties since
+                // Records will have a valid 'creatorProp', so if we don't
+                // check for ignore first, the ignore configuration will be bypassed.
+                if (isRecord && IgnorePropertiesUtil.shouldIgnore(propName, _ignorableProps, _includableProps)) {
+                    handleIgnoredProperty(p, ctxt, handledType(), propName);
+                    continue;
+                }
                 // Last creator property to set?
                 // [databind#4690] cannot quit early as optimization any more
                 // if (buffer.assignParameter(creatorProp, value)) { ... build ... }
                 buffer.assignParameter(creatorProp,
                         _deserializeWithErrorWrapping(p, ctxt, creatorProp));
                 continue;
             }
+
             // regular property? needs buffering
             int ix = _propNameMatcher.matchName(propName);
             if (ix >= 0) {
@@ -1017,6 +1018,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri
         TokenBuffer tokens = ctxt.bufferForInputBuffering(p);
         tokens.writeStartObject();
 
+        final boolean isRecord = _beanType.isRecordType();
         JsonToken t = p.currentToken();
         for (; t == JsonToken.PROPERTY_NAME; t = p.nextToken()) {
             String propName = p.currentName();
@@ -1028,21 +1030,20 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri
                 continue;
             }
 
-            // Things marked as ignorable should not be passed to any setter
-            // [databind#4629] Need to check for ignored properties BEFORE checking
-            // for Creator properties.
-            if (IgnorePropertiesUtil.shouldIgnore(propName, _ignorableProps, _includableProps)) {
-                handleIgnoredProperty(p, ctxt, handledType(), propName);
-                continue;
-            }
             if (creatorProp != null) {
                 // [databind#1381]: if useInput=FALSE, skip deserialization from input
                 if (creatorProp.isInjectionOnly()) {
                     // Skip the input value, will be injected later in PropertyValueBuffer
                     p.skipChildren();
                     continue;
                 }
-
+                // [databind#4629] Need to check for ignored properties for Creator properties since
+                // Records will have a valid 'creatorProp', so if we don't
+                // check for ignore first, the ignore configuration will be bypassed.
+                if (isRecord && IgnorePropertiesUtil.shouldIgnore(propName, _ignorableProps, _includableProps)) {
+                    handleIgnoredProperty(p, ctxt, handledType(), propName);
+                    continue;
+                }
                 // Last creator property to set?
                 // [databind#4690] cannot quit early as optimization any more
                 // if (buffer.assignParameter(creatorProp, value)) { ... build ... }
diff --git a/src/main/java/tools/jackson/databind/introspect/POJOPropertiesCollector.java b/src/main/java/tools/jackson/databind/introspect/POJOPropertiesCollector.java
@@ -348,13 +348,9 @@ protected Map<String, POJOPropertyBuilder> getPropertyMap() {
      */
     public JsonFormat.Value getFormatOverrides() {
         if (_formatOverrides == null) {
-            JsonFormat.Value format = null;
-
             // Let's check both per-type defaults and annotations;
             // per-type defaults having higher precedence, so start with annotations
-            if (_annotationIntrospector != null) {
-                format = _annotationIntrospector.findFormat(_config, _classDef);
-            }
+            JsonFormat.Value format = _annotationIntrospector.findFormat(_config, _classDef);
             JsonFormat.Value v = _config.getDefaultPropertyFormat(_type.getRawClass());
             if (v != null) {
                 if (format == null) {
@@ -948,8 +944,7 @@ private boolean _isExplicitlyAnnotatedCreatorPropsBased(PotentialCreator ctor,
                 }
             }
             // Second: injectable also suffices
-            if ((_annotationIntrospector != null)
-                    && _annotationIntrospector.findInjectableValue(_config, ctor.param(0)) != null) {
+            if (_annotationIntrospector.findInjectableValue(_config, ctor.param(0)) != null) {
                 return true;
             }
             return false;
@@ -1019,8 +1014,7 @@ private boolean _addImplicitConstructor(PotentialCreators collector,
             }
         } else {
             // First things first: if only param has Injectable, must be Props-based
-            if ((_annotationIntrospector != null)
-                    && _annotationIntrospector.findInjectableValue(_config, ctor.param(0)) != null) {
+            if (_annotationIntrospector.findInjectableValue(_config, ctor.param(0)) != null) {
                 // props-based, continue
             } else {
                 // may have explicit preference
diff --git a/src/main/java/tools/jackson/databind/util/ClassUtil.java b/src/main/java/tools/jackson/databind/util/ClassUtil.java
@@ -238,7 +238,10 @@ public static boolean isBogusClass(Class<?> cls) {
 
     /**
      * Helper method for detecting Java14-added {@code Record} types
+     *
+     * @deprecated Since 3.1 Just call {@code Class.isRecord()}
      */
+    @Deprecated
     public static boolean isRecordType(Class<?> cls) {
         return cls.isRecord();
     }
diff --git a/src/main/java/tools/jackson/databind/util/NativeImageUtil.java b/src/main/java/tools/jackson/databind/util/NativeImageUtil.java
@@ -60,7 +60,7 @@ public static boolean needsReflectionConfiguration(Class<?> cl) {
             return false;
         }
         // records list their fields but not other members
-        return (cl.getDeclaredFields().length == 0 || ClassUtil.isRecordType(cl)) &&
+        return (cl.getDeclaredFields().length == 0 || cl.isRecord()) &&
                 cl.getDeclaredMethods().length == 0 &&
                 cl.getDeclaredConstructors().length == 0;
     }
diff --git a/src/test/java/tools/jackson/databind/interop/KotlinIssue308JsonIgnoreTest.java b/src/test/java/tools/jackson/databind/interop/KotlinIssue308JsonIgnoreTest.java
@@ -0,0 +1,52 @@
+package tools.jackson.databind.interop;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import tools.jackson.databind.ObjectMapper;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static tools.jackson.databind.testutil.DatabindTestUtil.*;
+
+// From https://github.com/FasterXML/jackson-module-kotlin/issues/308
+/**
+ * Test for verifying that {@link JsonIgnore} on a field combined with
+ * {@link JsonProperty} on a private setter method works correctly.
+ * The private method "unpacks" the JSON property value to a different field.
+ */
+public class KotlinIssue308JsonIgnoreTest
+{
+    static class TestDto
+    {
+        @JsonIgnore
+        Integer id;
+
+        Integer cityId;
+
+        @JsonCreator
+        public TestDto(Integer id, Integer cityId) {
+            this.id = id;
+            this.cityId = cityId;
+        }
+
+        @JsonProperty("id")
+        void unpackId(Integer idObj) {
+            cityId = idObj;
+        }
+    }
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    @Test
+    public void testJsonIgnoreWithJsonPropertyUnpacker() throws Exception
+    {
+        TestDto dto = MAPPER.readValue("{\"id\":12345}", TestDto.class);
+
+        assertNotNull(dto);
+        assertNull(dto.id);
+        assertEquals(Integer.valueOf(12345), dto.cityId);
+    }
+}
diff --git a/src/test/java/tools/jackson/databind/objectid/ObjectId3838Test.java b/src/test/java/tools/jackson/databind/objectid/ObjectId3838Test.java
@@ -196,7 +196,12 @@ public void testUniformHandlingForMissingObjectId() throws Exception
 
             // 2. but works with non-empty JSON object
             ResultGetter nonEmptyObj = (ResultGetter) MAPPER.readValue(a2q(jsonStr), cls);
-            assertEquals("great", nonEmptyObj.result());
+            String result = nonEmptyObj.result();
+            if (!"great".equals(result)) {
+                fail("Class '"+cls.getName()+", json "+jsonStr
+                        +" : should get 'great', got "
+                        +((result == null) ? "null" : String.format("'%s'", result)));
+            }
         }
     }
 }
diff --git a/src/test/java/tools/jackson/databind/records/RecordBasicsTest.java b/src/test/java/tools/jackson/databind/records/RecordBasicsTest.java
@@ -14,7 +14,6 @@
 import tools.jackson.databind.json.JsonMapper;
 import tools.jackson.databind.testutil.DatabindTestUtil;
 import tools.jackson.databind.type.TypeFactory;
-import tools.jackson.databind.util.ClassUtil;
 import tools.jackson.databind.util.Converter;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -67,15 +66,6 @@ record RecordAllWriteOnly(
     /**********************************************************************
      */
 
-    @Test
-    public void testClassUtil() {
-        assertFalse(ClassUtil.isRecordType(getClass()));
-
-        assertTrue(ClassUtil.isRecordType(SimpleRecord.class));
-        assertTrue(ClassUtil.isRecordType(RecordOfRecord.class));
-        assertTrue(ClassUtil.isRecordType(RecordWithRename.class));
-    }
-
     @Test
     public void testRecordJavaType() {
         assertFalse(MAPPER.constructType(getClass()).isRecordType());

Original file line number	Diff line number	Diff line change
`@@ -305,11 +305,8 @@ public final boolean isEnumImplType() {`
`305`	`305`	`return ClassUtil.isEnumType(_class) && (_class != Enum.class);`
`306`	`306`	`}`
`307`	`307`
`308`		`- /**`
`309`		`- * @since 2.12`
`310`		`- */`
`311`	`308`	`public final boolean isRecordType() {`
`312`		`- return ClassUtil.isRecordType(_class);`
	`309`	`+ return _class.isRecord();`
`313`	`310`	`}`
`314`	`311`
`315`	`312`	`/**`