HSEARCH-5482 Hide the REST JDK client in the impl package and allow passing a reference to the HttpClient instead

Author: marko-bekhta

backend/elasticsearch-client/jdk-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/jdk/cfg/spi/ClientJdkElasticsearchBackendClientSpiSettings.java

@@ -19,14 +19,16 @@ public final class ClientJdkElasticsearchBackendClientSpiSettings {
 	public static final String PREFIX = EngineSettings.PREFIX + "backend.";
 
 	/**
-	 * An external Elasticsearch client instance that Hibernate Search should use for all requests to Elasticsearch.
+	 * An external HTTP client instance that Hibernate Search should use for all requests to Elasticsearch.
 	 * <p>
-	 * If this is set, Hibernate Search will not attempt to create its own Elasticsearch,
-	 * and all other client-related configuration properties
-	 * (hosts/uris, authentication, discovery, timeouts, max connections, configurer, ...)
+	 * If this is set, Hibernate Search will not attempt to create its own {@link java.net.http.HttpClient},
+	 * and all client-related configuration properties (authentication, timeouts, configurer, ...)
 	 * will be ignored.
 	 * <p>
-	 * Expects a reference to a bean of type {@link RestJdkClient}.
+	 * Hibernate Search will still apply some configuration properties (e.g. hosts/uris)
+	 * that are not handled by the {@link java.net.http.HttpClient} itself.
+	 * <p>
+	 * Expects a reference to a bean of type {@link java.net.http.HttpClient}.
 	 * <p>
 	 * Defaults to nothing: if no client instance is provided, Hibernate Search will create its own.
 	 * <p>

backend/elasticsearch-client/jdk-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/jdk/impl/ClientJdkElasticsearchClient.java

@@ -30,7 +30,6 @@
 import org.hibernate.search.backend.elasticsearch.client.common.spi.ElasticsearchRequest;
 import org.hibernate.search.backend.elasticsearch.client.common.spi.ElasticsearchResponse;
 import org.hibernate.search.backend.elasticsearch.client.common.util.spi.ElasticsearchClientUtils;
-import org.hibernate.search.backend.elasticsearch.client.jdk.cfg.spi.RestJdkClient;
 import org.hibernate.search.backend.elasticsearch.logging.spi.ElasticsearchClientLog;
 import org.hibernate.search.backend.elasticsearch.logging.spi.ElasticsearchRequestLog;
 import org.hibernate.search.engine.common.execution.spi.SimpleScheduledExecutor;

backend/elasticsearch-client/jdk-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/jdk/impl/ClientJdkElasticsearchClientFactory.java

@@ -30,8 +30,6 @@
 import org.hibernate.search.backend.elasticsearch.client.jdk.ElasticsearchHttpClientConfigurer;
 import org.hibernate.search.backend.elasticsearch.client.jdk.cfg.ClientJdkElasticsearchBackendClientSettings;
 import org.hibernate.search.backend.elasticsearch.client.jdk.cfg.spi.ClientJdkElasticsearchBackendClientSpiSettings;
-import org.hibernate.search.backend.elasticsearch.client.jdk.cfg.spi.NodeProvider;
-import org.hibernate.search.backend.elasticsearch.client.jdk.cfg.spi.RestJdkClient;
 import org.hibernate.search.backend.elasticsearch.logging.spi.ConfigurationLog;
 import org.hibernate.search.engine.cfg.ConfigurationPropertySource;
 import org.hibernate.search.engine.cfg.spi.ConfigurationProperty;
@@ -46,9 +44,9 @@
 
 public class ClientJdkElasticsearchClientFactory implements ElasticsearchClientFactory {
 
-	private static final OptionalConfigurationProperty<BeanReference<? extends RestJdkClient>> CLIENT_INSTANCE =
+	private static final OptionalConfigurationProperty<BeanReference<? extends HttpClient>> CLIENT_INSTANCE =
 			ConfigurationProperty.forKey( ClientJdkElasticsearchBackendClientSpiSettings.CLIENT_INSTANCE )
-					.asBeanReference( RestJdkClient.class )
+					.asBeanReference( HttpClient.class )
 					.build();
 
 	private static final OptionalConfigurationProperty<List<String>> HOSTS =
@@ -106,18 +104,10 @@ public ElasticsearchClientImplementor create(BeanResolver beanResolver, Configur
 			GsonProvider gsonProvider) {
 		Optional<Integer> requestTimeoutMs = REQUEST_TIMEOUT.get( propertySource );
 
-		Optional<BeanHolder<? extends RestJdkClient>> providedRestClientHolder = CLIENT_INSTANCE.getAndMap(
-				propertySource, beanResolver::resolve );
-
-		BeanHolder<? extends RestJdkClient> restClientHolder;
-		if ( providedRestClientHolder.isPresent() ) {
-			restClientHolder = providedRestClientHolder.get();
-		}
-		else {
-			NodeProvider nodeProvider = NodeProvider.fromOptionalStrings( PROTOCOL.get( propertySource ),
-					HOSTS.get( propertySource ), URIS.get( propertySource ), PATH_PREFIX.get( propertySource ) );
-			restClientHolder = createClient( beanResolver, propertySource, threadProvider, threadNamePrefix, nodeProvider );
-		}
+		NodeProvider nodeProvider = NodeProvider.fromOptionalStrings( PROTOCOL.get( propertySource ),
+				HOSTS.get( propertySource ), URIS.get( propertySource ), PATH_PREFIX.get( propertySource ) );
+		BeanHolder<? extends RestJdkClient> restClientHolder =
+				createClient( beanResolver, propertySource, threadProvider, threadNamePrefix, nodeProvider );
 
 		return new ClientJdkElasticsearchClient(
 				restClientHolder, timeoutExecutorService, requestTimeoutMs,
@@ -149,6 +139,12 @@ private static List<HttpRequestInterceptor> createRequestInterceptors(BeanResolv
 	private BeanHolder<? extends RestJdkClient> createClient(BeanResolver beanResolver,
 			ConfigurationPropertySource propertySource,
 			ThreadProvider threadProvider, String threadNamePrefix, NodeProvider nodeProvider) {
+		Optional<BeanHolder<? extends HttpClient>> providedHttpClientHolder = CLIENT_INSTANCE.getAndMap(
+				propertySource, beanResolver::resolve );
+		if ( providedHttpClientHolder.isPresent() ) {
+			return BeanHolder.ofCloseable( new RestJdkClient( nodeProvider, providedHttpClientHolder.get().get() ) );
+		}
+
 		HttpClient.Builder builder = HttpClient.newBuilder()
 				// NOTE: ES does not work ok with HTTP 2 if we don't send the content length and that can happen so let's stick to 1.1 for now ?
 				//   (we end up with Caused by: java.io.IOException: Received RST_STREAM: Stream cancelled)

backend/elasticsearch-client/jdk-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/jdk/cfg/spi/NodeProvider.java renamed to backend/elasticsearch-client/jdk-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/jdk/impl/NodeProvider.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.search.backend.elasticsearch.client.jdk.cfg.spi;
+package org.hibernate.search.backend.elasticsearch.client.jdk.impl;
 
 import java.net.URI;
 import java.net.URISyntaxException;

backend/elasticsearch-client/jdk-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/jdk/cfg/spi/RestJdkClient.java renamed to backend/elasticsearch-client/jdk-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/jdk/impl/RestJdkClient.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.search.backend.elasticsearch.client.jdk.cfg.spi;
+package org.hibernate.search.backend.elasticsearch.client.jdk.impl;
 
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;