Applied design & implementation level refactoring techniques to improve code readability & maintainability

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

@@ -37,6 +37,7 @@
  * @author Peter-Josef Meisch
  * @author Huw Ayling-Miller
  * @author Henrique Amaral
+ * @author Taranjot Singh
  * @since 3.2
  */
 public interface ClientConfiguration {
@@ -163,6 +164,11 @@ 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
@@ -329,7 +335,7 @@ default TerminalClientConfigurationBuilder withSocketTimeout(long millis) {
 		 * @param proxy a proxy formatted as String {@literal host:port}.
 		 * @return the {@link TerminalClientConfigurationBuilder}.
 		 */
-		TerminalClientConfigurationBuilder withProxy(String proxy);
+		TerminalClientConfigurationBuilder setProxy(String proxy);
 
 		/**
 		 * Register a {@link ClientConfigurationCallback} to configure the client.

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

@@ -43,6 +43,7 @@
  * @author Peter-Josef Meisch
  * @author Huw Ayling-Miller
  * @author Henrique Amaral
+ * @author Taranjot Singh
  * @since 3.2
  */
 class ClientConfigurationBuilder
@@ -59,6 +60,7 @@ 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<>();
@@ -71,7 +73,6 @@ class ClientConfigurationBuilder
 	public MaybeSecureClientConfigurationBuilder connectedTo(String... hostAndPorts) {
 
 		Assert.notEmpty(hostAndPorts, "At least one host is required");
-
 		this.hosts.addAll(Arrays.stream(hostAndPorts).map(ClientConfigurationBuilder::parse).toList());
 		return this;
 	}
@@ -91,7 +92,7 @@ public MaybeSecureClientConfigurationBuilder connectedTo(InetSocketAddress... en
 	}
 
 	@Override
-	public MaybeSecureClientConfigurationBuilder withProxy(String proxy) {
+	public MaybeSecureClientConfigurationBuilder setProxy(String proxy) {
 		Assert.hasLength(proxy, "proxy must not be null or empty");
 		this.proxy = proxy;
 		return this;
@@ -229,11 +230,10 @@ public ClientConfiguration build() {
 		}
 
 		return new DefaultClientConfiguration(hosts, headers, useSsl, sslContext, soTimeout, connectTimeout, pathPrefix,
-				hostnameVerifier, proxy, httpClientConfigurer, clientConfigurers, headersSupplier);
+				hostnameVerifier, proxy, webClientConfigurer, httpClientConfigurer, clientConfigurers, headersSupplier);
 	}
 
 	private static InetSocketAddress parse(String hostAndPort) {
 		return InetSocketAddressParser.parse(hostAndPort, ElasticsearchHost.DEFAULT_PORT);
 	}
-
 }

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

@@ -19,6 +19,7 @@
 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;
@@ -27,6 +28,7 @@
 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.
@@ -35,6 +37,7 @@
  * @author Christoph Strobl
  * @author Huw Ayling-Miller
  * @author Peter-Josef Meisch
+ * @author Taranjot Singh
  * @since 3.2
  */
 class DefaultClientConfiguration implements ClientConfiguration {
@@ -48,15 +51,16 @@ 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,
-			HttpClientConfigCallback httpClientConfigurer, List<ClientConfigurationCallback<?>> clientConfigurers,
-			Supplier<HttpHeaders> headersSupplier) {
+							   @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) {
 
 		this.hosts = List.copyOf(hosts);
 		this.headers = headers;
@@ -67,6 +71,7 @@ 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;
@@ -118,6 +123,11 @@ 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/main/java/org/springframework/data/elasticsearch/client/InetSocketAddressParser.java

@@ -24,6 +24,7 @@
  * Utility to parse endpoints in {@code host:port} format into {@link java.net.InetSocketAddress}.
  *
  * @author Mark Paluch
+ * @author Taranjot Singh
  * @since 3.2
  */
 public class InetSocketAddressParser {
@@ -42,7 +43,10 @@ public static InetSocketAddress parse(String hostPortString, int defaultPort) {
 		String host;
 		String portString = null;
 
-		if (hostPortString.startsWith("[")) {
+		// Check if the host is surrounded by square brackets
+		boolean isBracketedHost = hostPortString.startsWith("[");
+
+		if (isBracketedHost) {
 			String[] hostAndPort = getHostAndPortFromBracketedHost(hostPortString);
 			host = hostAndPort[0];
 			portString = hostAndPort[1];
@@ -58,19 +62,8 @@ public static InetSocketAddress parse(String hostPortString, int defaultPort) {
 			}
 		}
 
-		int port = defaultPort;
-		if (StringUtils.hasText(portString)) {
-			// Try to parse the whole port string as a number.
-			Assert.isTrue(!portString.startsWith("+"), String.format("Cannot parse port number: %s", hostPortString));
-			try {
-				port = Integer.parseInt(portString);
-			} catch (NumberFormatException e) {
-				throw new IllegalArgumentException(String.format("Cannot parse port number: %s", hostPortString));
-			}
-
-			Assert.isTrue(isValidPort(port), String.format("Port number out of range: %s", hostPortString));
-		}
-
+		int port = parsePort(portString, defaultPort);
+		Assert.isTrue(isValidPort(port), String.format("Port number out of range: %s", hostPortString));
 		return InetSocketAddress.createUnresolved(host, port);
 	}
 
@@ -114,4 +107,24 @@ private static String[] getHostAndPortFromBracketedHost(String hostPortString) {
 	private static boolean isValidPort(int port) {
 		return port >= 0 && port <= 65535;
 	}
+
+	/**
+	 * @param portString A string representing a port number.
+	 * @param defaultPort default port to apply if {@code hostPostString} does not contain a port.
+	 * @return {@literal true} for valid port numbers.
+	 */
+	private static int parsePort(String portString, int defaultPort) {
+		if (StringUtils.hasText(portString)) {
+			try {
+				return Integer.parseInt(portString);
+			} catch (NumberFormatException e) {
+				throw new IllegalArgumentException(String.format("Cannot parse port number: %s", portString));
+			}
+		} else {
+			return defaultPort;
+		}
+	}
+
 }
+
+

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchClients.java

@@ -51,6 +51,7 @@
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
+import org.springframework.context.annotation.Bean;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.data.elasticsearch.client.ClientLogger;
 import org.springframework.data.elasticsearch.support.HttpHeaders;
@@ -61,6 +62,7 @@
  * Utility class to create the different Elasticsearch clients
  *
  * @author Peter-Josef Meisch
+ * @author Taranjot Singh
  * @since 4.4
  */
 public final class ElasticsearchClients {
@@ -93,7 +95,7 @@ public static ReactiveElasticsearchClient createReactive(ClientConfiguration cli
 	 * @return the {@link ReactiveElasticsearchClient}
 	 */
 	public static ReactiveElasticsearchClient createReactive(ClientConfiguration clientConfiguration,
-			@Nullable TransportOptions transportOptions) {
+															 @Nullable TransportOptions transportOptions) {
 
 		Assert.notNull(clientConfiguration, "ClientConfiguration must not be null!");
 
@@ -118,7 +120,7 @@ public static ReactiveElasticsearchClient createReactive(RestClient restClient)
 	 * @return the {@link ReactiveElasticsearchClient}
 	 */
 	public static ReactiveElasticsearchClient createReactive(RestClient restClient,
-			@Nullable TransportOptions transportOptions) {
+															 @Nullable TransportOptions transportOptions) {
 		return new ReactiveElasticsearchClient(getElasticsearchTransport(restClient, REACTIVE_CLIENT, transportOptions));
 	}
 
@@ -140,7 +142,7 @@ public static ElasticsearchClient createImperative(ClientConfiguration clientCon
 	 * @return the {@link ElasticsearchClient}
 	 */
 	public static ElasticsearchClient createImperative(ClientConfiguration clientConfiguration,
-			TransportOptions transportOptions) {
+													   TransportOptions transportOptions) {
 		return createImperative(getRestClient(clientConfiguration), transportOptions);
 	}
 
@@ -162,7 +164,7 @@ public static ElasticsearchClient createImperative(RestClient restClient) {
 	 * @return the {@link ElasticsearchClient}
 	 */
 	public static ElasticsearchClient createImperative(RestClient restClient,
-			@Nullable TransportOptions transportOptions) {
+													   @Nullable TransportOptions transportOptions) {
 
 		Assert.notNull(restClient, "restClient must not be null");
 
@@ -246,14 +248,14 @@ private static RestClientBuilder getRestClientBuilder(ClientConfiguration client
 	}
 
 	private static ElasticsearchTransport getElasticsearchTransport(RestClient restClient, String clientType,
-			@Nullable TransportOptions transportOptions) {
+																	@Nullable TransportOptions transportOptions) {
 
 		TransportOptions.Builder transportOptionsBuilder = transportOptions != null ? transportOptions.toBuilder()
 				: new RestClientOptions(RequestOptions.DEFAULT).toBuilder();
 
 		ContentType jsonContentType = Version.VERSION == null ? ContentType.APPLICATION_JSON
 				: ContentType.create("application/vnd.elasticsearch+json",
-						new BasicNameValuePair("compatible-with", String.valueOf(Version.VERSION.major())));
+				new BasicNameValuePair("compatible-with", String.valueOf(Version.VERSION.major())));
 
 		Consumer<String> setHeaderIfNotPresent = header -> {
 			if (transportOptionsBuilder.build().headers().stream() //
@@ -403,4 +405,23 @@ static ElasticsearchRestClientConfigurationCallback from(
 			return restClientBuilderCallback::apply;
 		}
 	}
+
+	/**
+	 * Provides the {@link ElasticsearchClient} to be used.
+	 *
+	 * @param restClient the low level RestClient to use
+	 * @return ElasticsearchClient instance
+	 */
+	@Bean
+	public static ElasticsearchClient elasticsearchClient(RestClient restClient) {
+
+		Assert.notNull(restClient, "restClient must not be null");
+
+		return ElasticsearchClients.createImperative(restClient, transportOptions());
+	}
+
+	public static TransportOptions transportOptions() {
+		return new RestClientOptions(RequestOptions.DEFAULT);
+	}
+
 }

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchConfiguration.java

@@ -33,6 +33,7 @@
  * connection using the Elasticsearch Client.
  *
  * @author Peter-Josef Meisch
+ * @author Taranjot Singh
  * @since 4.4
  */
 public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurationSupport {
@@ -67,10 +68,7 @@ public RestClient elasticsearchRestClient(ClientConfiguration clientConfiguratio
 	 */
 	@Bean
 	public ElasticsearchClient elasticsearchClient(RestClient restClient) {
-
-		Assert.notNull(restClient, "restClient must not be null");
-
-		return ElasticsearchClients.createImperative(restClient, transportOptions());
+		return ElasticsearchClients.elasticsearchClient(restClient);
 	}
 
 	/**
@@ -81,7 +79,7 @@ public ElasticsearchClient elasticsearchClient(RestClient restClient) {
 	 */
 	@Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
 	public ElasticsearchOperations elasticsearchOperations(ElasticsearchConverter elasticsearchConverter,
-			ElasticsearchClient elasticsearchClient) {
+														   ElasticsearchClient elasticsearchClient) {
 
 		ElasticsearchTemplate template = new ElasticsearchTemplate(elasticsearchClient, elasticsearchConverter);
 		template.setRefreshPolicy(refreshPolicy());