From 30815cc0e0ace7c849fc58c61a079545c9805fd5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 17 Sep 2021 15:50:01 +0100 Subject: [PATCH] Upgrade to Spring Data 2021.1.0-M3 Closes gh-27932 --- .../ReactiveElasticsearchRestClientAutoConfiguration.java | 5 +++-- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRestClientAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRestClientAutoConfiguration.java index b690d5d4ba..3469c53347 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRestClientAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRestClientAutoConfiguration.java @@ -28,6 +28,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.elasticsearch.client.ClientConfiguration; import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients; +import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients.WebClientConfigurationCallback; import org.springframework.util.unit.DataSize; import org.springframework.web.reactive.function.client.ExchangeStrategies; import org.springframework.web.reactive.function.client.WebClient; @@ -63,11 +64,11 @@ public class ReactiveElasticsearchRestClientAutoConfiguration { ClientConfiguration.TerminalClientConfigurationBuilder builder, ReactiveElasticsearchRestClientProperties properties) { map.from(properties.getMaxInMemorySize()).asInt(DataSize::toBytes).to((maxInMemorySize) -> { - builder.withWebClientConfigurer((webClient) -> { + builder.withClientConfigurer(WebClientConfigurationCallback.from((webClient) -> { ExchangeStrategies exchangeStrategies = ExchangeStrategies.builder() .codecs((configurer) -> configurer.defaultCodecs().maxInMemorySize(maxInMemorySize)).build(); return webClient.mutate().exchangeStrategies(exchangeStrategies).build(); - }); + })); }); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index ea7749caef..25a9826dd0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1627,7 +1627,7 @@ bom { ] } } - library("Spring Data Bom", "2021.1.0-SNAPSHOT") { + library("Spring Data Bom", "2021.1.0-M3") { group("org.springframework.data") { imports = [ "spring-data-bom"