Skip to content

Commit ef2460c

Browse files
spencergibbmp911de
authored andcommitted
Updates to use new JsonMapper constructors in Spring Framework 7.0 M9.
Closes gh-934
1 parent b1460ca commit ef2460c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<netty.version>4.2.3.Final</netty.version>
4848
<nullaway.version>0.12.3</nullaway.version>
4949
<okhttp3.version>3.14.9</okhttp3.version>
50-
<spring.version>7.0.0-M7</spring.version>
50+
<spring.version>7.0.0-SNAPSHOT</spring.version>
5151
<spring-data-bom.version>2025.1.0-M4</spring-data-bom.version>
5252
<spring-security-bom.version>6.5.0</spring-security-bom.version>
5353
<reactor.version>2025.0.0-M5</reactor.version>

spring-vault-core/src/main/java/org/springframework/vault/support/JacksonCompat.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ static class Jackson3 extends JacksonCompat {
271271

272272
static final Jackson3 INSTANCE = new Jackson3();
273273

274+
static final tools.jackson.databind.json.JsonMapper JSON_MAPPER = JsonMapper.builder().build();
274275
static final tools.jackson.databind.ObjectMapper OBJECT_MAPPER = new tools.jackson.databind.ObjectMapper();
275276
static final tools.jackson.databind.ObjectMapper PRETTY_PRINT_OBJECT_MAPPER = JsonMapper.builder()
276277
.enable(tools.jackson.databind.SerializationFeature.INDENT_OUTPUT)
@@ -279,7 +280,7 @@ static class Jackson3 extends JacksonCompat {
279280
static final Jackson3ObjectMapperAccessor MAPPER_ACCESSOR = new Jackson3ObjectMapperAccessor(
280281
PRETTY_PRINT_OBJECT_MAPPER);
281282

282-
static final JacksonJsonHttpMessageConverter converter = new JacksonJsonHttpMessageConverter(OBJECT_MAPPER);
283+
static final JacksonJsonHttpMessageConverter converter = new JacksonJsonHttpMessageConverter(JSON_MAPPER);
283284

284285
public static boolean isAvailable() {
285286
return JACKSON_3_JSON_NODE != null;
@@ -293,8 +294,8 @@ public AbstractHttpMessageConverter<Object> createHttpMessageConverter() {
293294
@Override
294295
public void registerCodecs(Consumer<Object> messageConverters) {
295296

296-
messageConverters.accept(new JacksonJsonDecoder(OBJECT_MAPPER));
297-
messageConverters.accept(new JacksonJsonEncoder(OBJECT_MAPPER));
297+
messageConverters.accept(new JacksonJsonDecoder(JSON_MAPPER));
298+
messageConverters.accept(new JacksonJsonEncoder(JSON_MAPPER));
298299
}
299300

300301
@Override
@@ -324,7 +325,7 @@ public ObjectMapperAccessor getPrettyPrintObjectMapperAccessor() {
324325
.map(AbstractJacksonHttpMessageConverter.class::cast) //
325326
.findFirst();
326327

327-
return jackson3Converter.map(AbstractJacksonHttpMessageConverter::getObjectMapper)
328+
return jackson3Converter.map(AbstractJacksonHttpMessageConverter::getMapper)
328329
.map(Jackson3.Jackson3ObjectMapperAccessor::new)
329330
.orElse(null);
330331
}

0 commit comments

Comments
 (0)