HSEARCH-5464 Remove dependency on ES version class in the client code

Author: marko-bekhta

backend/elasticsearch-aws/src/main/java/org/hibernate/search/backend/elasticsearch/aws/impl/ElasticsearchAwsHttpClientConfigurer.java

@@ -4,8 +4,6 @@
  */
 package org.hibernate.search.backend.elasticsearch.aws.impl;
 
-import org.hibernate.search.backend.elasticsearch.ElasticsearchDistributionName;
-import org.hibernate.search.backend.elasticsearch.ElasticsearchVersion;
 import org.hibernate.search.backend.elasticsearch.aws.cfg.ElasticsearchAwsBackendSettings;
 import org.hibernate.search.backend.elasticsearch.aws.cfg.ElasticsearchAwsCredentialsTypeNames;
 import org.hibernate.search.backend.elasticsearch.aws.logging.impl.AwsLog;
@@ -22,9 +20,11 @@
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
 
-public class ElasticsearchAwsHttpClientConfigurer implements ElasticsearchHttpClientConfigurer {
+import java.util.regex.Pattern;
 
-	private static final ConfigurationProperty<Boolean> SIGNING_ENABLED =
+public class ElasticsearchAwsHttpClientConfigurer implements ElasticsearchHttpClientConfigurer {
+    private static final Pattern DISTRIBUTION_NAME_PATTERN = Pattern.compile( "([^\\d]+)?(?:(?<=^)|(?=$)|(?<=.):(?=.))(.+)?" );
+    private static final ConfigurationProperty<Boolean> SIGNING_ENABLED =
 			ConfigurationProperty.forKey( ElasticsearchAwsBackendSettings.SIGNING_ENABLED )
 					.asBoolean()
 					.withDefault( ElasticsearchAwsBackendSettings.Defaults.SIGNING_ENABLED )
@@ -52,6 +52,11 @@ public class ElasticsearchAwsHttpClientConfigurer implements ElasticsearchHttpCl
 					.asString()
 					.build();
 
+    static final OptionalConfigurationProperty<String> DISTRIBUTION_NAME =
+			ConfigurationProperty.forKey( "version" )
+                    .asString()
+					.build();
+
 	@Override
 	public void configure(ElasticsearchHttpClientConfigurationContext context) {
 		ConfigurationPropertySource propertySource = context.configurationPropertySource();
@@ -63,17 +68,23 @@ public void configure(ElasticsearchHttpClientConfigurationContext context) {
 
 		Region region = REGION.getAndMapOrThrow( propertySource, Region::of, AwsLog.INSTANCE::missingPropertyForSigning );
 		String service;
-		switch ( context.configuredVersion().map( ElasticsearchVersion::distribution )
-				.orElse( ElasticsearchDistributionName.OPENSEARCH ) ) {
-			case AMAZON_OPENSEARCH_SERVERLESS:
-				service = "aoss";
-				break;
-			case ELASTIC:
-			case OPENSEARCH:
-			default:
-				service = "es";
-				break;
-		}
+
+        String distributionName = DISTRIBUTION_NAME.getAndTransform(propertySource, v ->
+                v.map(String::toLowerCase)
+                        .map(DISTRIBUTION_NAME_PATTERN::matcher)
+                        .map(matcher -> {
+                            if (matcher.matches()) {
+                                return matcher.group(1);
+                            }
+                            return null;
+                        }).orElse("opensearch"));
+
+        if ("amazon-opensearch-serverless".equals(distributionName)) {
+            service = "aoss";
+        } else {
+            service = "es";
+        }
+
 		AwsCredentialsProvider credentialsProvider = createCredentialsProvider( context.beanResolver(), propertySource );
 
 		AwsLog.INSTANCE.signingEnabled( region, service, credentialsProvider );

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/client/ElasticsearchHttpClientConfigurationContext.java

@@ -7,7 +7,9 @@
 import java.util.Optional;
 
 import org.hibernate.search.backend.elasticsearch.ElasticsearchVersion;
+import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchBackendSettings;
 import org.hibernate.search.engine.cfg.ConfigurationPropertySource;
+import org.hibernate.search.engine.cfg.spi.ConfigurationProperty;
 import org.hibernate.search.engine.environment.bean.BeanResolver;
 
 import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
@@ -39,7 +41,15 @@ public interface ElasticsearchHttpClientConfigurationContext {
 	/**
 	 * @return The version of Elasticsearch/OpenSearch configured on the backend.
 	 * May be empty if not configured explicitly (in which case it will only be known after the client is built).
+     *
+     * @deprecated Use the {@link #configurationPropertySource() property source} and inspect the corresponding properties
+     * (e.g. {@link ElasticsearchBackendSettings#VERSION}) instead.
 	 */
-	Optional<ElasticsearchVersion> configuredVersion();
+	@Deprecated(since = "8.2", forRemoval = true)
+	default Optional<ElasticsearchVersion> configuredVersion() {
+        return ConfigurationProperty.forKey(ElasticsearchBackendSettings.VERSION)
+                .as(ElasticsearchVersion.class, ElasticsearchVersion::of)
+                .build().get(configurationPropertySource());
+	}
 
 }

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/client/impl/ElasticsearchClientFactoryImpl.java

@@ -135,8 +135,7 @@ public class ElasticsearchClientFactoryImpl implements ElasticsearchClientFactor
 	public ElasticsearchClientImplementor create(BeanResolver beanResolver, ConfigurationPropertySource propertySource,
 			ThreadProvider threadProvider, String threadNamePrefix,
 			SimpleScheduledExecutor timeoutExecutorService,
-			GsonProvider gsonProvider,
-			Optional<ElasticsearchVersion> configuredVersion) {
+			GsonProvider gsonProvider) {
 		Optional<Integer> requestTimeoutMs = REQUEST_TIMEOUT.get( propertySource );
 		int connectionTimeoutMs = CONNECTION_TIMEOUT.get( propertySource );
 
@@ -153,7 +152,7 @@ public ElasticsearchClientImplementor create(BeanResolver beanResolver, Configur
 			ServerUris hosts = ServerUris.fromOptionalStrings( PROTOCOL.get( propertySource ),
 					HOSTS.get( propertySource ), URIS.get( propertySource ) );
 			restClientHolder = createClient( beanResolver, propertySource, threadProvider, threadNamePrefix,
-					configuredVersion, hosts, PATH_PREFIX.get( propertySource ) );
+					 hosts, PATH_PREFIX.get( propertySource ) );
 			sniffer = createSniffer( propertySource, restClientHolder.get(), hosts );
 		}
 
@@ -166,7 +165,6 @@ public ElasticsearchClientImplementor create(BeanResolver beanResolver, Configur
 
 	private BeanHolder<? extends RestClient> createClient(BeanResolver beanResolver, ConfigurationPropertySource propertySource,
 			ThreadProvider threadProvider, String threadNamePrefix,
-			Optional<ElasticsearchVersion> configuredVersion,
 			ServerUris hosts, String pathPrefix) {
 		RestClientBuilder builder = RestClient.builder( hosts.asHostsArray() );
 		if ( !pathPrefix.isEmpty() ) {
@@ -188,8 +186,7 @@ private BeanHolder<? extends RestClient> createClient(BeanResolver beanResolver,
 									b,
 									beanResolver, propertySource,
 									threadProvider, threadNamePrefix,
-									configuredVersion, hosts,
-									httpClientConfigurersHolder.get(), customConfig
+									hosts, httpClientConfigurersHolder.get(), customConfig
 							)
 					)
 					.build();
@@ -236,7 +233,6 @@ private Sniffer createSniffer(ConfigurationPropertySource propertySource,
 	private HttpAsyncClientBuilder customizeHttpClientConfig(HttpAsyncClientBuilder builder,
 			BeanResolver beanResolver, ConfigurationPropertySource propertySource,
 			ThreadProvider threadProvider, String threadNamePrefix,
-			Optional<ElasticsearchVersion> configuredVersion,
 			ServerUris hosts, Iterable<ElasticsearchHttpClientConfigurer> configurers,
 			Optional<? extends BeanHolder<? extends ElasticsearchHttpClientConfigurer>> customConfig) {
 		builder.setMaxConnTotal( MAX_TOTAL_CONNECTION.get( propertySource ) )
@@ -270,7 +266,7 @@ private HttpAsyncClientBuilder customizeHttpClientConfig(HttpAsyncClientBuilder
 		}
 
 		ElasticsearchHttpClientConfigurationContextImpl clientConfigurationContext =
-				new ElasticsearchHttpClientConfigurationContextImpl( beanResolver, propertySource, builder, configuredVersion );
+				new ElasticsearchHttpClientConfigurationContextImpl( beanResolver, propertySource, builder );
 
 		for ( ElasticsearchHttpClientConfigurer configurer : configurers ) {
 			configurer.configure( clientConfigurationContext );

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/client/impl/ElasticsearchHttpClientConfigurationContextImpl.java

@@ -18,17 +18,14 @@ final class ElasticsearchHttpClientConfigurationContextImpl
 	private final BeanResolver beanResolver;
 	private final ConfigurationPropertySource configurationPropertySource;
 	private final HttpAsyncClientBuilder clientBuilder;
-	private final Optional<ElasticsearchVersion> configuredVersion;
 
 	ElasticsearchHttpClientConfigurationContextImpl(
 			BeanResolver beanResolver,
 			ConfigurationPropertySource configurationPropertySource,
-			HttpAsyncClientBuilder clientBuilder,
-			Optional<ElasticsearchVersion> configuredVersion) {
+			HttpAsyncClientBuilder clientBuilder) {
 		this.beanResolver = beanResolver;
 		this.configurationPropertySource = configurationPropertySource;
 		this.clientBuilder = clientBuilder;
-		this.configuredVersion = configuredVersion;
 	}
 
 	@Override
@@ -46,9 +43,4 @@ public HttpAsyncClientBuilder clientBuilder() {
 		return clientBuilder;
 	}
 
-	@Override
-	public Optional<ElasticsearchVersion> configuredVersion() {
-		return configuredVersion;
-	}
-
 }