Skip to content

Commit 3f8d1a4

Browse files
committed
Adapt to Spring Framework 7 changes.
Closes gh-949
1 parent 6e6a216 commit 3f8d1a4

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
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.7.Final</netty.version>
4848
<nullaway.version>0.12.10</nullaway.version>
4949
<okhttp3.version>3.14.9</okhttp3.version>
50-
<spring.version>7.0.0-RC3</spring.version>
50+
<spring.version>7.0.0-SNAPSHOT</spring.version>
5151
<spring-data-bom.version>2025.1.0-RC2</spring-data-bom.version>
5252
<spring-security-bom.version>7.0.0-M3</spring-security-bom.version>
5353
<reactor.version>2025.0.0-RC1</reactor.version>

spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springframework.http.HttpHeaders;
2626
import org.springframework.http.client.ClientHttpRequestFactory;
2727
import org.springframework.http.client.ClientHttpRequestInterceptor;
28+
import org.springframework.http.converter.AbstractHttpMessageConverter;
2829
import org.springframework.http.converter.ByteArrayHttpMessageConverter;
2930
import org.springframework.http.converter.HttpMessageConverter;
3031
import org.springframework.http.converter.StringHttpMessageConverter;
@@ -119,9 +120,12 @@ public static RestClient createRestClient(VaultEndpointProvider endpointProvider
119120
.uriBuilderFactory(createUriBuilderFactory(endpointProvider))
120121
.configureMessageConverters(clientBuilder -> {
121122

122-
clientBuilder.customMessageConverter(new ByteArrayHttpMessageConverter());
123-
clientBuilder.customMessageConverter(new StringHttpMessageConverter());
124-
clientBuilder.jsonMessageConverter(JacksonCompat.instance().createHttpMessageConverter());
123+
AbstractHttpMessageConverter<Object> converter = JacksonCompat.instance().createHttpMessageConverter();
124+
125+
clientBuilder.addCustomConverter(new ByteArrayHttpMessageConverter());
126+
clientBuilder.addCustomConverter(new StringHttpMessageConverter());
127+
clientBuilder.addCustomConverter(converter);
128+
clientBuilder.withJsonConverter(converter);
125129
});
126130

127131
builderCustomizer.accept(builder);

0 commit comments

Comments
 (0)