diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java index 9815b38707d..9e52a2919f6 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java @@ -25,8 +25,8 @@ public class MyHttpMessageConvertersConfiguration { @Bean public ClientHttpMessageConvertersCustomizer myClientConvertersCustomizer() { - return (clientBuilder) -> clientBuilder.customMessageConverter(new AdditionalHttpMessageConverter()) - .customMessageConverter(new AnotherHttpMessageConverter()); + return (clientBuilder) -> clientBuilder.addCustomConverter(new AdditionalHttpMessageConverter()) + .addCustomConverter(new AnotherHttpMessageConverter()); } } diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.kt index 65f8a851979..f88e1917944 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.kt @@ -28,8 +28,8 @@ class MyHttpMessageConvertersConfiguration { fun myClientConvertersCustomizer(): ClientHttpMessageConvertersCustomizer { return ClientHttpMessageConvertersCustomizer { clientBuilder: HttpMessageConverters.ClientBuilder -> clientBuilder - .customMessageConverter(AdditionalHttpMessageConverter()) - .customMessageConverter(AnotherHttpMessageConverter()) + .addCustomConverter(AdditionalHttpMessageConverter()) + .addCustomConverter(AnotherHttpMessageConverter()) } } diff --git a/gradle.properties b/gradle.properties index f6f9ad463e7..c8857da60cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ mavenVersion=3.9.10 mockitoVersion=5.20.0 nativeBuildToolsVersion=0.11.2 snakeYamlVersion=2.5 -springFrameworkVersion=7.0.0-RC3 +springFrameworkVersion=7.0.0-SNAPSHOT springFramework60xVersion=6.0.23 tomcatVersion=11.0.13 nullabilityPluginVersion=0.0.8 diff --git a/module/spring-boot-http-client/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java b/module/spring-boot-http-client/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java index cb6b404ca22..f34c515adaf 100644 --- a/module/spring-boot-http-client/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java +++ b/module/spring-boot-http-client/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java @@ -59,12 +59,6 @@ class ClientHttpRequestFactoryRuntimeHintsTests { RuntimeHints hints = new RuntimeHints(); new ClientHttpRequestFactoryRuntimeHints().registerHints(hints, getClass().getClassLoader()); ReflectionHintsPredicates reflection = RuntimeHintsPredicates.reflection(); - assertThat(reflection - .onMethodInvocation(method(HttpComponentsClientHttpRequestFactory.class, "setConnectTimeout", int.class))) - .accepts(hints); - assertThat(reflection.onMethodInvocation( - method(HttpComponentsClientHttpRequestFactory.class, "setConnectTimeout", Duration.class))) - .accepts(hints); assertThat(reflection .onMethodInvocation(method(HttpComponentsClientHttpRequestFactory.class, "setReadTimeout", int.class))) .accepts(hints); diff --git a/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/DefaultClientHttpMessageConvertersCustomizer.java b/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/DefaultClientHttpMessageConvertersCustomizer.java index cc81d8fd201..99bb1862f29 100644 --- a/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/DefaultClientHttpMessageConvertersCustomizer.java +++ b/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/DefaultClientHttpMessageConvertersCustomizer.java @@ -43,22 +43,22 @@ class DefaultClientHttpMessageConvertersCustomizer implements ClientHttpMessageC @Override public void customize(ClientBuilder builder) { if (this.legacyConverters != null) { - this.legacyConverters.forEach(builder::customMessageConverter); + this.legacyConverters.forEach(builder::addCustomConverter); } else { builder.registerDefaults(); this.converters.forEach((converter) -> { if (converter instanceof StringHttpMessageConverter) { - builder.stringMessageConverter(converter); + builder.withStringConverter(converter); } else if (converter instanceof KotlinSerializationJsonHttpMessageConverter) { - builder.customMessageConverter(converter); + builder.addCustomConverter(converter); } else if (converter.getSupportedMediaTypes().contains(MediaType.APPLICATION_JSON)) { - builder.jsonMessageConverter(converter); + builder.withJsonConverter(converter); } else { - builder.customMessageConverter(converter); + builder.addCustomConverter(converter); } }); } diff --git a/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/DefaultServerHttpMessageConvertersCustomizer.java b/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/DefaultServerHttpMessageConvertersCustomizer.java index 102ec3434e7..dbc1f2a72d5 100644 --- a/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/DefaultServerHttpMessageConvertersCustomizer.java +++ b/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/DefaultServerHttpMessageConvertersCustomizer.java @@ -43,22 +43,22 @@ class DefaultServerHttpMessageConvertersCustomizer implements ServerHttpMessageC @Override public void customize(ServerBuilder builder) { if (this.legacyConverters != null) { - this.legacyConverters.forEach(builder::customMessageConverter); + this.legacyConverters.forEach(builder::addCustomConverter); } else { builder.registerDefaults(); this.converters.forEach((converter) -> { if (converter instanceof StringHttpMessageConverter) { - builder.stringMessageConverter(converter); + builder.withStringConverter(converter); } else if (converter instanceof KotlinSerializationJsonHttpMessageConverter) { - builder.customMessageConverter(converter); + builder.addCustomConverter(converter); } else if (converter.getSupportedMediaTypes().contains(MediaType.APPLICATION_JSON)) { - builder.jsonMessageConverter(converter); + builder.withJsonConverter(converter); } else { - builder.customMessageConverter(converter); + builder.addCustomConverter(converter); } }); } diff --git a/module/spring-boot-http-converter/src/test/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersTests.java b/module/spring-boot-http-converter/src/test/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersTests.java index e5590d40885..82b7d679552 100644 --- a/module/spring-boot-http-converter/src/test/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersTests.java +++ b/module/spring-boot-http-converter/src/test/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersTests.java @@ -58,8 +58,8 @@ class HttpMessageConvertersTests { assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class, StringHttpMessageConverter.class, ResourceHttpMessageConverter.class, ResourceRegionHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class, - JacksonJsonHttpMessageConverter.class, JacksonCborHttpMessageConverter.class, - JacksonXmlHttpMessageConverter.class); + KotlinSerializationJsonHttpMessageConverter.class, JacksonJsonHttpMessageConverter.class, + JacksonCborHttpMessageConverter.class, JacksonXmlHttpMessageConverter.class); } @Test @@ -87,8 +87,8 @@ class HttpMessageConvertersTests { GsonHttpMessageConverter converter1 = new GsonHttpMessageConverter(); HttpMessageConverters converters = new HttpMessageConverters(converter1); Stream> converterClasses = converters.getConverters().stream().map(HttpMessageConverter::getClass); - assertThat(converterClasses).containsSequence(GsonHttpMessageConverter.class, - JacksonJsonHttpMessageConverter.class); + assertThat(converterClasses).containsSequence(KotlinSerializationJsonHttpMessageConverter.class, + GsonHttpMessageConverter.class, JacksonJsonHttpMessageConverter.class); } @Test @@ -106,8 +106,8 @@ class HttpMessageConvertersTests { KotlinSerializationJsonHttpMessageConverter converter2 = new KotlinSerializationJsonHttpMessageConverter(); HttpMessageConverters converters = new HttpMessageConverters(converter1, converter2); Stream> converterClasses = converters.getConverters().stream().map(HttpMessageConverter::getClass); - assertThat(converterClasses).containsSequence(GsonHttpMessageConverter.class, - KotlinSerializationJsonHttpMessageConverter.class, JacksonJsonHttpMessageConverter.class); + assertThat(converterClasses).containsSequence(KotlinSerializationJsonHttpMessageConverter.class, + GsonHttpMessageConverter.class, JacksonJsonHttpMessageConverter.class); } @Test @@ -147,7 +147,8 @@ class HttpMessageConvertersTests { assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class, StringHttpMessageConverter.class, ResourceHttpMessageConverter.class, ResourceRegionHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class, - JacksonJsonHttpMessageConverter.class, JacksonCborHttpMessageConverter.class); + KotlinSerializationJsonHttpMessageConverter.class, JacksonJsonHttpMessageConverter.class, + JacksonCborHttpMessageConverter.class); } @Test @@ -168,7 +169,8 @@ class HttpMessageConvertersTests { } assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class, StringHttpMessageConverter.class, ResourceHttpMessageConverter.class, - JacksonJsonHttpMessageConverter.class, JacksonCborHttpMessageConverter.class); + KotlinSerializationJsonHttpMessageConverter.class, JacksonJsonHttpMessageConverter.class, + JacksonCborHttpMessageConverter.class); } private List> extractFormPartConverters(List> converters) { diff --git a/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/HttpMessageConvertersRestClientCustomizerTests.java b/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/HttpMessageConvertersRestClientCustomizerTests.java index 3d419a45769..335603a3d92 100644 --- a/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/HttpMessageConvertersRestClientCustomizerTests.java +++ b/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/HttpMessageConvertersRestClientCustomizerTests.java @@ -37,8 +37,8 @@ class HttpMessageConvertersRestClientCustomizerTests { void customizeConfiguresMessageConverters() { HttpMessageConverter c0 = mock(); HttpMessageConverter c1 = mock(); - ClientHttpMessageConvertersCustomizer customizer = (clientBuilder) -> clientBuilder.customMessageConverter(c0) - .customMessageConverter(c1); + ClientHttpMessageConvertersCustomizer customizer = (clientBuilder) -> clientBuilder.addCustomConverter(c0) + .addCustomConverter(c1); RestClient.Builder builder = RestClient.builder(); new HttpMessageConvertersRestClientCustomizer(customizer).customize(builder);