Remove old methods from configuration.

Original Pull Request spring-projects#2513
Closes spring-projects#2512

Author: sothawo

src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java

@@ -163,11 +163,6 @@ static ClientConfiguration create(InetSocketAddress socketAddress) {
 	 */
 	Optional<String> getProxy();
 
-	/**
-	 * @return the function for configuring a WebClient.
-	 */
-	Function<WebClient, WebClient> getWebClientConfigurer();
-
 	/**
 	 * @return the client configuration callbacks
 	 * @since 4.3

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<WebClient, WebClient> webClientConfigurer = Function.identity();
 	private Supplier<HttpHeaders> headersSupplier = HttpHeaders::new;
 	@Deprecated private final HttpClientConfigCallback httpClientConfigurer = httpClientBuilder -> httpClientBuilder;
 	private final List<ClientConfiguration.ClientConfigurationCallback<?>> clientConfigurers = new ArrayList<>();
@@ -230,7 +229,7 @@ public ClientConfiguration build() {
 		}
 
 		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) {

src/main/java/org/springframework/data/elasticsearch/client/DefaultClientConfiguration.java

@@ -19,7 +19,6 @@
 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 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,16 +48,15 @@ class DefaultClientConfiguration implements ClientConfiguration {
 	private final @Nullable String pathPrefix;
 	private final @Nullable HostnameVerifier hostnameVerifier;
 	private final @Nullable String proxy;
-	private final Function<WebClient, WebClient> webClientConfigurer;
 	private final HttpClientConfigCallback httpClientConfigurer;
 	private final Supplier<HttpHeaders> headersSupplier;
 	private final List<ClientConfigurationCallback<?>> clientConfigurers;
 
 	DefaultClientConfiguration(List<InetSocketAddress> hosts, HttpHeaders headers, boolean useSsl,
 			@Nullable SSLContext sslContext, Duration soTimeout, Duration connectTimeout, @Nullable String pathPrefix,
 			@Nullable HostnameVerifier hostnameVerifier, @Nullable String proxy,
-			Function<WebClient, WebClient> webClientConfigurer, HttpClientConfigCallback httpClientConfigurer,
-			List<ClientConfigurationCallback<?>> clientConfigurers, Supplier<HttpHeaders> headersSupplier) {
+			HttpClientConfigCallback httpClientConfigurer, List<ClientConfigurationCallback<?>> clientConfigurers,
+			Supplier<HttpHeaders> 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 @@ public Optional<String> getProxy() {
 		return Optional.ofNullable(proxy);
 	}
 
-	@Override
-	public Function<WebClient, WebClient> getWebClientConfigurer() {
-		return webClientConfigurer;
-	}
-
 	@Override
 	public <T> List<ClientConfigurationCallback<?>> getClientConfigurers() {
 		return clientConfigurers;

src/test/java/org/springframework/data/elasticsearch/client/ClientConfigurationUnitTests.java

@@ -153,15 +153,6 @@ public void shouldCreateSslConfigurationWithHostnameVerifier() {
 		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() {