From 9df2843018363ec52587a0c09b7ec5b9ce4cb9bf Mon Sep 17 00:00:00 2001 From: mariofusco Date: Mon, 13 May 2024 08:45:01 +0200 Subject: [PATCH] Bump com.fasterxml.jackson:jackson-bom from 2.17.0 to 2.17.1 --- bom/application/pom.xml | 2 +- .../jackson/deployment/JacksonDefaultPoolTest.java | 14 -------------- .../VertxHybridPoolObjectMapperCustomizer.java | 5 +++-- .../extension-maven-plugin/pom.xml | 2 +- independent-projects/resteasy-reactive/pom.xml | 2 +- independent-projects/tools/pom.xml | 2 +- 6 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDefaultPoolTest.java diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 8363ef24622698..00ab25b384fedd 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -92,7 +92,7 @@ 23.1.2 1.8.0 - 2.17.0 + 2.17.1 1.0.0.Final 3.14.0 1.17.0 diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDefaultPoolTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDefaultPoolTest.java deleted file mode 100644 index 715f9d62ff3ba2..00000000000000 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDefaultPoolTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.quarkus.jackson.deployment; - -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; - -import com.fasterxml.jackson.core.util.JsonRecyclerPools; - -public class JacksonDefaultPoolTest { - - @Test - public void validateDefaultJacksonPool() { - Assertions.assertThat(JsonRecyclerPools.defaultPool()).isInstanceOf(JsonRecyclerPools.LockFreePool.class); - } -} diff --git a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/VertxHybridPoolObjectMapperCustomizer.java b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/VertxHybridPoolObjectMapperCustomizer.java index 3254837f6e54dd..eb3bf36158d06a 100644 --- a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/VertxHybridPoolObjectMapperCustomizer.java +++ b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/VertxHybridPoolObjectMapperCustomizer.java @@ -11,8 +11,9 @@ public class VertxHybridPoolObjectMapperCustomizer implements ObjectMapperCustom @Override public void customize(ObjectMapper objectMapper) { var existingMapperPool = objectMapper.getFactory()._getRecyclerPool(); - // JsonRecyclerPools.defaultPool() by default should create a LockFreePool - if (existingMapperPool instanceof JsonRecyclerPools.LockFreePool) { + // if the recycler pool in use is the default jackson one it means that user hasn't + // explicitly chosen any, so we can replace it with the vert.x virtual thread friendly one + if (existingMapperPool.getClass() == JsonRecyclerPools.defaultPool().getClass()) { objectMapper.getFactory().setRecyclerPool(HybridJacksonPool.getInstance()); } } diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml index ffacc3a198c404..c2425c2a431108 100644 --- a/independent-projects/extension-maven-plugin/pom.xml +++ b/independent-projects/extension-maven-plugin/pom.xml @@ -41,7 +41,7 @@ 3.12.1 3.2.1 3.2.5 - 2.17.0 + 2.17.1 1.4.1 5.10.2 diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index 9b8331da798594..8044bb8b654ab0 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -64,7 +64,7 @@ 4.5.7 5.4.0 1.0.0.Final - 2.17.0 + 2.17.1 2.6.0 3.0.2 3.0.3 diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index 7d96d416624d47..48ad30624fae53 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -49,7 +49,7 @@ 3.25.3 - 2.17.0 + 2.17.1 4.1.0 5.10.2 1.26.1