Merge branch '2.x' into 3.x

Author: cowtowncoder

.github/workflows/main.yml

@@ -55,7 +55,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@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
+      uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./target/site/jacoco/jacoco.xml

afterburner/src/test/java/tools/jackson/module/afterburner/deser/convert/CoerceToBooleanTest.java

@@ -9,8 +9,10 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import tools.jackson.core.JsonParser;
 import tools.jackson.core.JsonToken;
+import tools.jackson.core.StreamReadFeature;
 
 import tools.jackson.databind.*;
 import tools.jackson.databind.cfg.CoercionAction;
@@ -55,6 +57,7 @@ public BooleanWrapper(@JsonProperty("ctor") Boolean foo) {
 
     private final ObjectMapper LEGACY_NONCOERCING_MAPPER = afterburnerMapperBuilder()
             .disable(MapperFeature.ALLOW_COERCION_OF_SCALARS)
+            .disable(StreamReadFeature.CLEAR_CURRENT_TOKEN_ON_CLOSE)
             .build();
 
     private final ObjectMapper MAPPER_INT_TO_EMPTY = afterburnerMapperBuilder()
@@ -416,10 +419,10 @@ private void _verifyBooleanCoerceFailReason(MismatchedInputException e,
     {
         verifyException(e, "Cannot coerce ", "Cannot deserialize value of type ");
 
+        // 01-Jun-2025, tatu: Now available via exception
+        assertToken(tokenType, e.getCurrentToken());
         JsonParser p = (JsonParser) e.processor();
 
-        assertToken(tokenType, p.currentToken());
-
         final String text = p.getString();
         if (!tokenValue.equals(text)) {
             String textDesc = (text == null) ? "NULL" : quote(text);

blackbird/src/test/java/tools/jackson/module/blackbird/deser/convert/CoerceToBooleanTest.java

@@ -9,8 +9,10 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import tools.jackson.core.JsonParser;
 import tools.jackson.core.JsonToken;
+import tools.jackson.core.StreamReadFeature;
 
 import tools.jackson.databind.*;
 import tools.jackson.databind.cfg.CoercionAction;
@@ -55,6 +57,7 @@ public BooleanWrapper(@JsonProperty("ctor") Boolean foo) {
 
     private final ObjectMapper LEGACY_NONCOERCING_MAPPER = blackbirdMapperBuilder()
             .disable(MapperFeature.ALLOW_COERCION_OF_SCALARS)
+            .disable(StreamReadFeature.CLEAR_CURRENT_TOKEN_ON_CLOSE)
             .build();
 
     private final ObjectMapper MAPPER_INT_TO_EMPTY = blackbirdMapperBuilder()
@@ -416,10 +419,10 @@ private void _verifyBooleanCoerceFailReason(MismatchedInputException e,
     {
         verifyException(e, "Cannot coerce ", "Cannot deserialize value of type ");
 
-        JsonParser p = (JsonParser) e.processor();
-
-        assertToken(tokenType, p.currentToken());
+        // 01-Jun-2025, tatu: Now available via exception
+        assertToken(tokenType, e.getCurrentToken());
 
+        JsonParser p = (JsonParser) e.processor();
         final String text = p.getString();
         if (!tokenValue.equals(text)) {
             String textDesc = (text == null) ? "NULL" : quote(text);