Upgrade to Jackson 3.

Closes gh-754
This commit is contained in:
Mark Paluch
2025-06-12 09:02:59 +02:00
parent e2586dde9a
commit 5cb9736b07
4 changed files with 27 additions and 3 deletions

13
pom.xml
View File

@@ -48,6 +48,7 @@
<google-api-services-iam.version>v1-rev20201112-1.31.0</google-api-services-iam.version>
<google-cloud-iamcredentials.version>1.2.2</google-cloud-iamcredentials.version>
<google-auth-library-oauth2-http.version>0.22.2</google-auth-library-oauth2-http.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
</properties>
<dependencyManagement>
@@ -76,6 +77,18 @@
<type>pom</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>3.0-rc5</version>
</dependency>
<dependency>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>3.0.0-rc5</version>
</dependency>
<!-- HTTP Client Libraries -->
<!-- BouncyCastle -->

View File

@@ -92,6 +92,16 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<!-- Reactor -->
<dependency>

View File

@@ -21,7 +21,6 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
import reactor.core.publisher.Mono;
import org.springframework.boot.actuate.health.AbstractReactiveHealthIndicator;
@@ -30,6 +29,7 @@ import org.springframework.boot.actuate.health.Health.Builder;
import org.springframework.lang.Nullable;
import org.springframework.vault.client.VaultHttpHeaders;
import org.springframework.vault.core.ReactiveVaultOperations;
import org.springframework.vault.support.JacksonCompat;
import org.springframework.vault.support.VaultHealth;
import org.springframework.web.reactive.function.client.WebClientResponseException;
@@ -51,9 +51,9 @@ public class VaultReactiveHealthIndicator extends AbstractReactiveHealthIndicato
private static Mono<? extends VaultHealthImpl> deserializeError(WebClientResponseException e) {
try {
ObjectMapper mapper = new ObjectMapper();
JacksonCompat.ObjectMapperAccessor mapper = JacksonCompat.instance().getObjectMapperAccessor();
// Response is already materialized so not blocking here.
return Mono.just(mapper.readValue(e.getResponseBodyAsByteArray(), VaultHealthImpl.class));
return Mono.just(mapper.deserialize(e.getResponseBodyAsByteArray(), VaultHealthImpl.class));
}
catch (Exception jsonError) {
UndeclaredThrowableException t = new UndeclaredThrowableException(jsonError);

View File

@@ -21,6 +21,7 @@
<properties>
<spring-vault.version>4.0.0-SNAPSHOT</spring-vault.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
</properties>
<dependencyManagement>