Merge branch '2.x' into 2.x

Author: cowtowncoder

.github/workflows/codeql-analysis.yml

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

.github/workflows/main.yml

@@ -65,7 +65,7 @@ jobs:
       run: ./mvnw -B -q -ff -ntp test
     - name: Publish code coverage
       if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
-      uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./target/site/jacoco/jacoco.xml

.github/workflows/trigger_dep_builds_v2.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Repository dispatch
-        uses: peter-evans/repository-dispatch@0ee9de00feb82e6165438c503f0bc29f628b8317 # v3.0.0
+        uses: peter-evans/repository-dispatch@de78ac1a711fc6f29e77338f843065faf5335227 # v3.0.0
         with:
           token: ${{ secrets.token }}
           repository: ${{ matrix.repo }}

.github/workflows/trigger_dep_builds_v3.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Repository dispatch
-        uses: peter-evans/repository-dispatch@0ee9de00feb82e6165438c503f0bc29f628b8317 # v3.0.0
+        uses: peter-evans/repository-dispatch@de78ac1a711fc6f29e77338f843065faf5335227 # v3.0.0
         with:
           token: ${{ secrets.token }}
           repository: ${{ matrix.repo }}

release-notes/VERSION-2.x

@@ -6,6 +6,7 @@ Project: jackson-databind
 
 2.21.0 (not yet released)
 
+#1547: Un-deprecate `SerializationFeature.WRITE_EMPTY_JSON_ARRAYS`
 #5045: If there is a no-parameter constructor marked as `JsonCreator` and
   a constructor reported as `DefaultCreator`, latter is incorrectly used
  (reported by  @wrongwrong)

src/main/java/com/fasterxml/jackson/databind/MappingJsonFactory.java

@@ -13,6 +13,10 @@
  * The only addition to regular {@link JsonFactory} currently
  * is that {@link ObjectMapper} is constructed and passed as
  * the codec to use.
+ *<p>
+ * NOTE: this class is removed from Jackson 3.0 as it is no longer
+ * needed (nor can implementation as-is be supported due to changes
+ * in {@code JsonFactory}/{@code ObjectMapper} interfaces).
  */
 public class MappingJsonFactory
     extends JsonFactory

src/main/java/com/fasterxml/jackson/databind/SerializationFeature.java

@@ -355,17 +355,18 @@ public enum SerializationFeature implements ConfigFeature
      * dynamically changed on per-call basis, because its effect is considered during
      * construction of serializers and property handlers.
      *<p>
-     * Feature is enabled by default.
-     *
-     * @deprecated Since 2.8 there are better mechanism for specifying filtering; specifically
+     * NOTE: Since 2.8 there are better mechanism for specifying filtering; specifically
      *   using {@link com.fasterxml.jackson.annotation.JsonInclude} or configuration overrides.
+     *  This feature was deprecated from 2.8 through to 2.20 but no longer deprecated
+     *  since 2.21 / 3.0.
+     *<p>
+     * Feature is enabled by default.
      */
-    @Deprecated // since 2.8
     WRITE_EMPTY_JSON_ARRAYS(true),
 
     /**
-     * Feature added for interoperability, to work with oddities of
-     * so-called "BadgerFish" convention.
+     * Feature added for inter-operability (originally to work with oddities of
+     * so-called "BadgerFish" convention).
      * Feature determines handling of single element {@link java.util.Collection}s
      * and arrays: if enabled, {@link java.util.Collection}s and arrays that contain exactly
      * one element will be serialized as if that element itself was serialized.

src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/JsonIncludeNonDefaultOnRecord5312Test.java

@@ -0,0 +1,53 @@
+package com.fasterxml.jackson.databind.tofix;
+
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.cfg.MutableConfigOverride;
+
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_DEFAULT;
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+
+// [databind#5312] Include.NON_DEFAULT regression for objects with @JsonValue
+public class JsonIncludeNonDefaultOnRecord5312Test
+{
+    record StringValue(String value) {
+        @Override
+        @JsonValue
+        public String value() {
+            return value;
+        }
+    }
+
+    record Pojo1(StringValue value) { }
+
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+    record Pojo2(StringValue value) { }
+
+    record Pojo3(@JsonInclude(JsonInclude.Include.NON_DEFAULT) StringValue value) { }
+
+
+    @JacksonTestFailureExpected
+    @Test
+    void testSerialization()
+        throws Exception
+    {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.setSerializationInclusion(NON_DEFAULT);
+
+        //might be relevant for analysis, but does not affect test outcome
+        MutableConfigOverride objectStringConfigOverride = objectMapper.configOverride(String.class);
+        objectStringConfigOverride.setIncludeAsProperty(JsonInclude.Value.construct(NON_NULL, NON_NULL));
+
+        //FAIL on jackson 2.18.2 / 2.20.0
+        Assertions.assertEquals("{\"value\":\"\"}", objectMapper.writeValueAsString(new Pojo1(new StringValue(""))));
+        //PASS
+        Assertions.assertEquals("{\"value\":\"\"}", objectMapper.writeValueAsString(new Pojo2(new StringValue(""))));
+        //FAIL on jackson 2.18.2 / 2.20.0
+        Assertions.assertEquals("{\"value\":\"\"}", objectMapper.writeValueAsString(new Pojo3(new StringValue(""))));
+    }
+}