diff --git a/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java b/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java index d9d08da65..a210cd851 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java @@ -163,11 +163,6 @@ public interface ClientConfiguration { */ Optional getProxy(); - /** - * @return the function for configuring a WebClient. - */ - Function getWebClientConfigurer(); - /** * @return the client configuration callbacks * @since 4.3 diff --git a/src/main/java/org/springframework/data/elasticsearch/client/ClientConfigurationBuilder.java b/src/main/java/org/springframework/data/elasticsearch/client/ClientConfigurationBuilder.java index 5fab82df0..886491bbd 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/ClientConfigurationBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/ClientConfigurationBuilder.java @@ -59,7 +59,6 @@ class ClientConfigurationBuilder private @Nullable String password; private @Nullable String pathPrefix; private @Nullable String proxy; - private final Function webClientConfigurer = Function.identity(); private Supplier headersSupplier = HttpHeaders::new; @Deprecated private final HttpClientConfigCallback httpClientConfigurer = httpClientBuilder -> httpClientBuilder; private final List> clientConfigurers = new ArrayList<>(); @@ -230,7 +229,7 @@ class ClientConfigurationBuilder } return new DefaultClientConfiguration(hosts, headers, useSsl, sslContext, soTimeout, connectTimeout, pathPrefix, - hostnameVerifier, proxy, webClientConfigurer, httpClientConfigurer, clientConfigurers, headersSupplier); + hostnameVerifier, proxy, httpClientConfigurer, clientConfigurers, headersSupplier); } private static InetSocketAddress parse(String hostAndPort) { diff --git a/src/main/java/org/springframework/data/elasticsearch/client/DefaultClientConfiguration.java b/src/main/java/org/springframework/data/elasticsearch/client/DefaultClientConfiguration.java index 5eb181ead..ad768187a 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/DefaultClientConfiguration.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/DefaultClientConfiguration.java @@ -19,7 +19,6 @@ import java.net.InetSocketAddress; import java.time.Duration; import java.util.List; import java.util.Optional; -import java.util.function.Function; import java.util.function.Supplier; import javax.net.ssl.HostnameVerifier; @@ -28,7 +27,6 @@ import javax.net.ssl.SSLContext; import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback; import org.springframework.data.elasticsearch.support.HttpHeaders; import org.springframework.lang.Nullable; -import org.springframework.web.reactive.function.client.WebClient; /** * Default {@link ClientConfiguration} implementation. @@ -50,7 +48,6 @@ class DefaultClientConfiguration implements ClientConfiguration { private final @Nullable String pathPrefix; private final @Nullable HostnameVerifier hostnameVerifier; private final @Nullable String proxy; - private final Function webClientConfigurer; private final HttpClientConfigCallback httpClientConfigurer; private final Supplier headersSupplier; private final List> clientConfigurers; @@ -58,8 +55,8 @@ class DefaultClientConfiguration implements ClientConfiguration { DefaultClientConfiguration(List hosts, HttpHeaders headers, boolean useSsl, @Nullable SSLContext sslContext, Duration soTimeout, Duration connectTimeout, @Nullable String pathPrefix, @Nullable HostnameVerifier hostnameVerifier, @Nullable String proxy, - Function webClientConfigurer, HttpClientConfigCallback httpClientConfigurer, - List> clientConfigurers, Supplier headersSupplier) { + HttpClientConfigCallback httpClientConfigurer, List> clientConfigurers, + Supplier headersSupplier) { this.hosts = List.copyOf(hosts); this.headers = headers; @@ -70,7 +67,6 @@ class DefaultClientConfiguration implements ClientConfiguration { this.pathPrefix = pathPrefix; this.hostnameVerifier = hostnameVerifier; this.proxy = proxy; - this.webClientConfigurer = webClientConfigurer; this.httpClientConfigurer = httpClientConfigurer; this.clientConfigurers = clientConfigurers; this.headersSupplier = headersSupplier; @@ -122,11 +118,6 @@ class DefaultClientConfiguration implements ClientConfiguration { return Optional.ofNullable(proxy); } - @Override - public Function getWebClientConfigurer() { - return webClientConfigurer; - } - @Override public List> getClientConfigurers() { return clientConfigurers; diff --git a/src/test/java/org/springframework/data/elasticsearch/client/ClientConfigurationUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/client/ClientConfigurationUnitTests.java index b1c53e4e8..0a35453e6 100644 --- a/src/test/java/org/springframework/data/elasticsearch/client/ClientConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/client/ClientConfigurationUnitTests.java @@ -153,15 +153,6 @@ public class ClientConfigurationUnitTests { assertThat(clientConfiguration.getHostNameVerifier()).contains(NoopHostnameVerifier.INSTANCE); } - @Test // DATAES-719 - void shouldHaveDefaultWebClientConfigurer() { - ClientConfiguration clientConfiguration = ClientConfiguration.builder() // - .connectedTo("foo", "bar") // - .build(); - - assertThat(clientConfiguration.getWebClientConfigurer()).isEqualTo(Function.identity()); - } - @Test // #1885 @DisplayName("should use configured httpClientConfigurer as client configurer") void shouldUseConfiguredHttpClientConfigurerAsClientConfigurer() {