HSEARCH-5464 Finish with renaming and JQAssistant

Author: marko-bekhta

backend/elasticsearch-client/elasticsearch-rest4-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest4/cfg/ClientRestElasticsearchBackendClientSettings.java renamed to backend/elasticsearch-client/elasticsearch-rest4-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest4/cfg/ClientRest4ElasticsearchBackendClientSettings.java

@@ -14,9 +14,9 @@
  *
  * @author Gunnar Morling
  */
-public final class ClientRestElasticsearchBackendClientSettings {
+public final class ClientRest4ElasticsearchBackendClientSettings {
 
-	private ClientRestElasticsearchBackendClientSettings() {
+	private ClientRest4ElasticsearchBackendClientSettings() {
 	}
 
 	/**

backend/elasticsearch-client/elasticsearch-rest4-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest4/cfg/spi/ClientRestElasticsearchBackendClientSpiSettings.java renamed to backend/elasticsearch-client/elasticsearch-rest4-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest4/cfg/spi/ClientRest4ElasticsearchBackendClientSpiSettings.java

@@ -9,7 +9,7 @@
 /**
  * Configuration properties for the Elasticsearch backend that are considered SPI (and not API).
  */
-public final class ClientRestElasticsearchBackendClientSpiSettings {
+public final class ClientRest4ElasticsearchBackendClientSpiSettings {
 
 	/**
 	 * The prefix expected for the key of every Hibernate Search configuration property.
@@ -35,7 +35,7 @@ public final class ClientRestElasticsearchBackendClientSpiSettings {
 	 */
 	public static final String CLIENT_INSTANCE = "client.instance";
 
-	private ClientRestElasticsearchBackendClientSpiSettings() {
+	private ClientRest4ElasticsearchBackendClientSpiSettings() {
 	}
 
 	/**

backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/cfg/spi/ClientJavaElasticsearchBackendClientSpiSettings.java renamed to backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/cfg/spi/ClientRest5ElasticsearchBackendClientSpiSettings.java

@@ -11,7 +11,7 @@
  * Configuration properties for the Elasticsearch backend that are considered SPI (and not API).
  */
 @Incubating
-public final class ClientJavaElasticsearchBackendClientSpiSettings {
+public final class ClientRest5ElasticsearchBackendClientSpiSettings {
 
 	/**
 	 * The prefix expected for the key of every Hibernate Search configuration property.
@@ -37,7 +37,7 @@ public final class ClientJavaElasticsearchBackendClientSpiSettings {
 	 */
 	public static final String CLIENT_INSTANCE = "client.instance";
 
-	private ClientJavaElasticsearchBackendClientSpiSettings() {
+	private ClientRest5ElasticsearchBackendClientSpiSettings() {
 	}
 
 	/**

backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/impl/ClientJavaElasticsearchClient.java renamed to backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/impl/ClientRest5ElasticsearchClient.java

@@ -47,7 +47,7 @@
 import org.apache.hc.core5.http.impl.EnglishReasonPhraseCatalog;
 import org.apache.hc.core5.util.Timeout;
 
-public class ClientJavaElasticsearchClient implements ElasticsearchClientImplementor {
+public class ClientRest5ElasticsearchClient implements ElasticsearchClientImplementor {
 
 	private final BeanHolder<? extends Rest5Client> restClientHolder;
 
@@ -60,7 +60,7 @@ public class ClientJavaElasticsearchClient implements ElasticsearchClientImpleme
 	private final Gson gson;
 	private final JsonLogHelper jsonLogHelper;
 
-	ClientJavaElasticsearchClient(BeanHolder<? extends Rest5Client> restClientHolder, Sniffer sniffer,
+	ClientRest5ElasticsearchClient(BeanHolder<? extends Rest5Client> restClientHolder, Sniffer sniffer,
 			SimpleScheduledExecutor timeoutExecutorService,
 			Optional<Integer> requestTimeoutMs,
 			Gson gson, JsonLogHelper jsonLogHelper) {

backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/impl/ClientJavaElasticsearchClientBeanConfigurer.java renamed to backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/impl/ClientRest5ElasticsearchClientBeanConfigurer.java

@@ -9,12 +9,12 @@
 import org.hibernate.search.engine.environment.bean.spi.BeanConfigurationContext;
 import org.hibernate.search.engine.environment.bean.spi.BeanConfigurer;
 
-public class ClientJavaElasticsearchClientBeanConfigurer implements BeanConfigurer {
+public class ClientRest5ElasticsearchClientBeanConfigurer implements BeanConfigurer {
 	@Override
 	public void configure(BeanConfigurationContext context) {
 		context.define(
-				ElasticsearchClientFactory.class, "elasticsearch-java",
-				beanResolver -> BeanHolder.of( new ClientJavaElasticsearchClientFactory() )
+				ElasticsearchClientFactory.class, "elasticsearch-rest5",
+				beanResolver -> BeanHolder.of( new ClientRest5ElasticsearchClientFactory() )
 		);
 	}
 }

backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/impl/ClientJavaElasticsearchClientFactory.java renamed to backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/impl/ClientRest5ElasticsearchClientFactory.java

@@ -17,7 +17,7 @@
 import org.hibernate.search.backend.elasticsearch.client.common.spi.ElasticsearchRequestInterceptorProvider;
 import org.hibernate.search.backend.elasticsearch.client.rest5.ElasticsearchHttpClientConfigurer;
 import org.hibernate.search.backend.elasticsearch.client.rest5.cfg.ClientJavaElasticsearchBackendClientSettings;
-import org.hibernate.search.backend.elasticsearch.client.rest5.cfg.spi.ClientJavaElasticsearchBackendClientSpiSettings;
+import org.hibernate.search.backend.elasticsearch.client.rest5.cfg.spi.ClientRest5ElasticsearchBackendClientSpiSettings;
 import org.hibernate.search.backend.elasticsearch.logging.spi.ConfigurationLog;
 import org.hibernate.search.engine.cfg.ConfigurationPropertySource;
 import org.hibernate.search.engine.cfg.spi.ConfigurationProperty;
@@ -53,10 +53,10 @@
 /**
  * @author Gunnar Morling
  */
-public class ClientJavaElasticsearchClientFactory implements ElasticsearchClientFactory {
+public class ClientRest5ElasticsearchClientFactory implements ElasticsearchClientFactory {
 
 	private static final OptionalConfigurationProperty<BeanReference<? extends Rest5Client>> CLIENT_INSTANCE =
-			ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSpiSettings.CLIENT_INSTANCE )
+			ConfigurationProperty.forKey( ClientRest5ElasticsearchBackendClientSpiSettings.CLIENT_INSTANCE )
 					.asBeanReference( Rest5Client.class )
 					.build();
 
@@ -167,7 +167,7 @@ public ElasticsearchClientImplementor create(BeanResolver beanResolver, Configur
 			sniffer = createSniffer( propertySource, restClientHolder.get(), hosts );
 		}
 
-		return new ClientJavaElasticsearchClient(
+		return new ClientRest5ElasticsearchClient(
 				restClientHolder, sniffer, timeoutExecutorService,
 				requestTimeoutMs,
 				gsonProvider.getGson(), gsonProvider.getLogHelper()
@@ -308,8 +308,8 @@ private HttpAsyncClientBuilder customizeHttpClientConfig(HttpAsyncClientBuilder
 			builder.setKeepAliveStrategy( new CustomConnectionKeepAliveStrategy( maxKeepAlive.get() ) );
 		}
 
-		ClientJavaElasticsearchHttpClientConfigurationContext clientConfigurationContext =
-				new ClientJavaElasticsearchHttpClientConfigurationContext( beanResolver, propertySource, builder );
+		ClientRest5ElasticsearchHttpClientConfigurationContext clientConfigurationContext =
+				new ClientRest5ElasticsearchHttpClientConfigurationContext( beanResolver, propertySource, builder );
 
 		for ( ElasticsearchHttpClientConfigurer configurer : configurers ) {
 			configurer.configure( clientConfigurationContext );

backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/impl/ClientJavaElasticsearchHttpClientConfigurationContext.java renamed to backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/impl/ClientRest5ElasticsearchHttpClientConfigurationContext.java

@@ -11,13 +11,13 @@
 
 import org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder;
 
-final class ClientJavaElasticsearchHttpClientConfigurationContext
+final class ClientRest5ElasticsearchHttpClientConfigurationContext
 		implements ElasticsearchHttpClientConfigurationContext, ElasticsearchRequestInterceptorProviderContext {
 	private final BeanResolver beanResolver;
 	private final ConfigurationPropertySource configurationPropertySource;
 	private final HttpAsyncClientBuilder clientBuilder;
 
-	ClientJavaElasticsearchHttpClientConfigurationContext(
+	ClientRest5ElasticsearchHttpClientConfigurationContext(
 			BeanResolver beanResolver,
 			ConfigurationPropertySource configurationPropertySource,
 			HttpAsyncClientBuilder clientBuilder) {

backend/elasticsearch-client/elasticsearch-rest5-client/src/main/resources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer

@@ -1 +1 @@
-org.hibernate.search.backend.elasticsearch.client.rest5.impl.ClientJavaElasticsearchClientBeanConfigurer
+org.hibernate.search.backend.elasticsearch.client.rest5.impl.ClientRest5ElasticsearchClientBeanConfigurer

backend/elasticsearch-client/opensearch-rest-client/pom.xml

@@ -15,12 +15,12 @@
     <artifactId>hibernate-search-backend-elasticsearch-client-opensearch-rest</artifactId>
 
     <name>Hibernate Search Backend - Elasticsearch client based on the low-level OpenSearch client</name>
-    <description>Hibernate Search Elasticsearch client based on the low-level OpenSearch client</description>
+    <description>Hibernate Search Elasticsearch client based on the low-level OpenSearch client (Apache HTTP Client 5 based one)</description>
 
     <properties>
         <!-- This is a publicly distributed module that should be published: -->
         <deploy.skip>false</deploy.skip>
-        <java.module.name>org.hibernate.search.backend.elasticsearch.client.opensearch</java.module.name>
+        <java.module.name>org.hibernate.search.backend.elasticsearch.client.opensearch.rest</java.module.name>
     </properties>
 
     <dependencies>

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/cfg/ElasticsearchBackendSettings.java

@@ -8,6 +8,7 @@
 import java.util.List;
 
 import org.hibernate.search.backend.elasticsearch.ElasticsearchVersion;
+import org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRest4ElasticsearchBackendClientSettings;
 import org.hibernate.search.backend.elasticsearch.index.layout.IndexLayoutStrategy;
 import org.hibernate.search.backend.elasticsearch.index.layout.impl.SimpleIndexLayoutStrategy;
 import org.hibernate.search.backend.elasticsearch.mapping.TypeNameMappingStrategyName;
@@ -139,7 +140,7 @@ private ElasticsearchBackendSettings() {
 	 * <p>
 	 * Defaults to no request timeout.
 	 *
-	 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings#REQUEST_TIMEOUT} instead.
+	 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings#REQUEST_TIMEOUT} instead.
 	 * The setting itself is not deprecated, it just moved to the client-specific configuration.
 	 */
 	@Deprecated(since = "8.2", forRemoval = true)
@@ -153,7 +154,7 @@ private ElasticsearchBackendSettings() {
 	 * <p>
 	 * Defaults to {@link Defaults#READ_TIMEOUT}.
 	 *
-	 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings#READ_TIMEOUT} instead.
+	 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings#READ_TIMEOUT} instead.
 	 * The setting itself is not deprecated, it just moved to the client-specific configuration.
 	 */
 	@Deprecated(since = "8.2", forRemoval = true)
@@ -167,7 +168,7 @@ private ElasticsearchBackendSettings() {
 	 * <p>
 	 * Defaults to {@link Defaults#CONNECTION_TIMEOUT}.
 	 *
-	 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings#CONNECTION_TIMEOUT} instead.
+	 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings#CONNECTION_TIMEOUT} instead.
 	 * The setting itself is not deprecated, it just moved to the client-specific configuration.
 	 */
 	@Deprecated(since = "8.2", forRemoval = true)
@@ -182,7 +183,7 @@ private ElasticsearchBackendSettings() {
 	 * <p>
 	 * Defaults to {@link Defaults#MAX_CONNECTIONS}.
 	 *
-	 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings#MAX_CONNECTIONS} instead.
+	 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings#MAX_CONNECTIONS} instead.
 	 * The setting itself is not deprecated, it just moved to the client-specific configuration.
 	 */
 	@Deprecated(since = "8.2", forRemoval = true)
@@ -196,7 +197,7 @@ private ElasticsearchBackendSettings() {
 	 * <p>
 	 * Defaults to {@link Defaults#MAX_CONNECTIONS_PER_ROUTE}.
 	 *
-	 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings#MAX_CONNECTIONS_PER_ROUTE} instead.
+	 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings#MAX_CONNECTIONS_PER_ROUTE} instead.
 	 * The setting itself is not deprecated, it just moved to the client-specific configuration.
 	 */
 	@Deprecated(since = "8.2", forRemoval = true)
@@ -210,7 +211,7 @@ private ElasticsearchBackendSettings() {
 	 * <p>
 	 * Defaults to {@link Defaults#DISCOVERY_ENABLED}.
 	 *
-	 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings#DISCOVERY_ENABLED} instead.
+	 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings#DISCOVERY_ENABLED} instead.
 	 * The setting itself is not deprecated, it just moved to the client-specific configuration.
 	 */
 	@Deprecated(since = "8.2", forRemoval = true)
@@ -224,7 +225,7 @@ private ElasticsearchBackendSettings() {
 	 * <p>
 	 * Defaults to {@link Defaults#DISCOVERY_REFRESH_INTERVAL}.
 	 *
-	 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings#DISCOVERY_REFRESH_INTERVAL} instead.
+	 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings#DISCOVERY_REFRESH_INTERVAL} instead.
 	 * The setting itself is not deprecated, it just moved to the client-specific configuration.
 	 */
 	@Deprecated(since = "8.2", forRemoval = true)
@@ -330,7 +331,7 @@ private ElasticsearchBackendSettings() {
 	 * If this property is not set, only the {@code Keep-Alive} header is considered,
 	 * and if it's absent, idle connections will be kept forever.
 	 *
-	 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings#MAX_KEEP_ALIVE} instead.
+	 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings#MAX_KEEP_ALIVE} instead.
 	 * The setting itself is not deprecated, it just moved to the client-specific configuration.
 	 */
 	@Deprecated(since = "8.2", forRemoval = true)
@@ -365,37 +366,37 @@ private Defaults() {
 		public static final String PROTOCOL = "http";
 		public static final String PATH_PREFIX = "";
 		/**
-		 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings.Defaults#READ_TIMEOUT} instead.
+		 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings.Defaults#READ_TIMEOUT} instead.
 		 * The default value itself is not deprecated, just the constant defining it moved to a different, client-specific class.
 		 */
 		@Deprecated(since = "8.2", forRemoval = true)
 		public static final int READ_TIMEOUT = 30000;
 		/**
-		 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings.Defaults#CONNECTION_TIMEOUT} instead.
+		 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings.Defaults#CONNECTION_TIMEOUT} instead.
 		 * The default value itself is not deprecated, just the constant defining it moved to a different, client-specific class.
 		 */
 		@Deprecated(since = "8.2", forRemoval = true)
 		public static final int CONNECTION_TIMEOUT = 1000;
 		/**
-		 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings.Defaults#MAX_CONNECTIONS} instead.
+		 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings.Defaults#MAX_CONNECTIONS} instead.
 		 * The default value itself is not deprecated, just the constant defining it moved to a different, client-specific class.
 		 */
 		@Deprecated(since = "8.2", forRemoval = true)
 		public static final int MAX_CONNECTIONS = 40;
 		/**
-		 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings.Defaults#MAX_CONNECTIONS_PER_ROUTE} instead.
+		 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings.Defaults#MAX_CONNECTIONS_PER_ROUTE} instead.
 		 * The default value itself is not deprecated, just the constant defining it moved to a different, client-specific class.
 		 */
 		@Deprecated(since = "8.2", forRemoval = true)
 		public static final int MAX_CONNECTIONS_PER_ROUTE = 20;
 		/**
-		 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings.Defaults#DISCOVERY_ENABLED} instead.
+		 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings.Defaults#DISCOVERY_ENABLED} instead.
 		 * The default value itself is not deprecated, just the constant defining it moved to a different, client-specific class.
 		 */
 		@Deprecated(since = "8.2", forRemoval = true)
 		public static final boolean DISCOVERY_ENABLED = false;
 		/**
-		 * @deprecated Use {@link org.hibernate.search.backend.elasticsearch.client.rest4.cfg.ClientRestElasticsearchBackendClientSettings.Defaults#DISCOVERY_REFRESH_INTERVAL} instead.
+		 * @deprecated Use {@link ClientRest4ElasticsearchBackendClientSettings.Defaults#DISCOVERY_REFRESH_INTERVAL} instead.
 		 * The default value itself is not deprecated, just the constant defining it moved to a different, client-specific class.
 		 */
 		@Deprecated(since = "8.2", forRemoval = true)