Improve client ssl configuration.

 Closes spring-projects#2778

Author: sothawo

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

@@ -233,6 +233,15 @@ interface MaybeSecureClientConfigurationBuilder extends TerminalClientConfigurat
 		 */
 		TerminalClientConfigurationBuilder usingSsl();
 
+		/**
+		 * Connects using https if flag is true.
+		 *
+		 * @param flag whether to use https in the connection
+		 * @return the {@link TerminalClientConfigurationBuilder}
+		 * @since 5.3
+		 */
+		TerminalClientConfigurationBuilder usingSsl(boolean flag);
+
 		/**
 		 * Connect via {@literal https} using the given {@link SSLContext}.<br />
 		 * <strong>NOTE</strong> You need to leave out the protocol in

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

@@ -25,7 +25,6 @@
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 
-import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationBuilderWithRequiredEndpoint;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.TerminalClientConfigurationBuilder;
@@ -106,6 +105,13 @@ public TerminalClientConfigurationBuilder usingSsl() {
 		return this;
 	}
 
+	@Override
+	public TerminalClientConfigurationBuilder usingSsl(boolean flag) {
+
+		this.useSsl = flag;
+		return this;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder#usingSsl(javax.net.ssl.SSLContext)

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

@@ -58,7 +58,7 @@ public void shouldCreateCustomizedConfiguration() {
 
 		ClientConfiguration clientConfiguration = ClientConfiguration.builder() //
 				.connectedTo("foo", "bar") //
-				.usingSsl() //
+				.usingSsl(true) //
 				.withDefaultHeaders(headers) //
 				.withConnectTimeout(Duration.ofDays(1)).withSocketTimeout(Duration.ofDays(2)) //
 				.withPathPrefix("myPathPrefix") //

src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ElasticsearchTemplateConfiguration.java

@@ -51,10 +51,8 @@ public ClientConfiguration clientConfiguration() {
 			configurationBuilder = configurationBuilder.withProxy(proxy);
 		}
 
-		if (clusterConnectionInfo.isUseSsl()) {
-			configurationBuilder = ((ClientConfiguration.MaybeSecureClientConfigurationBuilder) configurationBuilder)
-					.usingSsl();
-		}
+		configurationBuilder = ((ClientConfiguration.MaybeSecureClientConfigurationBuilder) configurationBuilder)
+				.usingSsl(clusterConnectionInfo.isUseSsl());
 
 		String user = System.getenv("DATAES_ELASTICSEARCH_USER");
 		String password = System.getenv("DATAES_ELASTICSEARCH_PASSWORD");

src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ReactiveElasticsearchTemplateConfiguration.java

@@ -50,10 +50,9 @@ public ClientConfiguration clientConfiguration() {
 		if (proxy != null) {
 			configurationBuilder = configurationBuilder.withProxy(proxy);
 		}
-		if (clusterConnectionInfo.isUseSsl()) {
-			configurationBuilder = ((ClientConfiguration.MaybeSecureClientConfigurationBuilder) configurationBuilder)
-					.usingSsl();
-		}
+
+		configurationBuilder = ((ClientConfiguration.MaybeSecureClientConfigurationBuilder) configurationBuilder)
+				.usingSsl(clusterConnectionInfo.isUseSsl());
 
 		String user = System.getenv("DATAES_ELASTICSEARCH_USER");
 		String password = System.getenv("DATAES_ELASTICSEARCH_PASSWORD");