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/ClientJavaElasticsearchBackendClientSettings.java renamed to backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/cfg/ClientRest5ElasticsearchBackendClientSettings.java

@@ -17,9 +17,9 @@
  * @author Gunnar Morling
  */
 @Incubating
-public final class ClientJavaElasticsearchBackendClientSettings {
+public final class ClientRest5ElasticsearchBackendClientSettings {
 
-	private ClientJavaElasticsearchBackendClientSettings() {
+	private ClientRest5ElasticsearchBackendClientSettings() {
 	}
 
 	/**

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

@@ -16,8 +16,8 @@
 import org.hibernate.search.backend.elasticsearch.client.common.spi.ElasticsearchRequestInterceptor;
 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.ClientRest5ElasticsearchBackendClientSettings;
+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();
 
@@ -92,54 +92,54 @@ public class ClientJavaElasticsearchClientFactory implements ElasticsearchClient
 					.build();
 
 	private static final OptionalConfigurationProperty<Integer> REQUEST_TIMEOUT =
-			ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSettings.REQUEST_TIMEOUT )
+			ConfigurationProperty.forKey( ClientRest5ElasticsearchBackendClientSettings.REQUEST_TIMEOUT )
 					.asIntegerStrictlyPositive()
 					.build();
 
 	private static final ConfigurationProperty<Integer> READ_TIMEOUT =
-			ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSettings.READ_TIMEOUT )
+			ConfigurationProperty.forKey( ClientRest5ElasticsearchBackendClientSettings.READ_TIMEOUT )
 					.asIntegerPositiveOrZeroOrNegative()
-					.withDefault( ClientJavaElasticsearchBackendClientSettings.Defaults.READ_TIMEOUT )
+					.withDefault( ClientRest5ElasticsearchBackendClientSettings.Defaults.READ_TIMEOUT )
 					.build();
 
 	private static final ConfigurationProperty<Integer> CONNECTION_TIMEOUT =
-			ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSettings.CONNECTION_TIMEOUT )
+			ConfigurationProperty.forKey( ClientRest5ElasticsearchBackendClientSettings.CONNECTION_TIMEOUT )
 					.asIntegerPositiveOrZeroOrNegative()
-					.withDefault( ClientJavaElasticsearchBackendClientSettings.Defaults.CONNECTION_TIMEOUT )
+					.withDefault( ClientRest5ElasticsearchBackendClientSettings.Defaults.CONNECTION_TIMEOUT )
 					.build();
 
 	private static final ConfigurationProperty<Integer> MAX_TOTAL_CONNECTION =
-			ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSettings.MAX_CONNECTIONS )
+			ConfigurationProperty.forKey( ClientRest5ElasticsearchBackendClientSettings.MAX_CONNECTIONS )
 					.asIntegerStrictlyPositive()
-					.withDefault( ClientJavaElasticsearchBackendClientSettings.Defaults.MAX_CONNECTIONS )
+					.withDefault( ClientRest5ElasticsearchBackendClientSettings.Defaults.MAX_CONNECTIONS )
 					.build();
 
 	private static final ConfigurationProperty<Integer> MAX_TOTAL_CONNECTION_PER_ROUTE =
-			ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSettings.MAX_CONNECTIONS_PER_ROUTE )
+			ConfigurationProperty.forKey( ClientRest5ElasticsearchBackendClientSettings.MAX_CONNECTIONS_PER_ROUTE )
 					.asIntegerStrictlyPositive()
-					.withDefault( ClientJavaElasticsearchBackendClientSettings.Defaults.MAX_CONNECTIONS_PER_ROUTE )
+					.withDefault( ClientRest5ElasticsearchBackendClientSettings.Defaults.MAX_CONNECTIONS_PER_ROUTE )
 					.build();
 
 	private static final ConfigurationProperty<Boolean> DISCOVERY_ENABLED =
-			ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSettings.DISCOVERY_ENABLED )
+			ConfigurationProperty.forKey( ClientRest5ElasticsearchBackendClientSettings.DISCOVERY_ENABLED )
 					.asBoolean()
-					.withDefault( ClientJavaElasticsearchBackendClientSettings.Defaults.DISCOVERY_ENABLED )
+					.withDefault( ClientRest5ElasticsearchBackendClientSettings.Defaults.DISCOVERY_ENABLED )
 					.build();
 
 	private static final ConfigurationProperty<Integer> DISCOVERY_REFRESH_INTERVAL =
-			ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSettings.DISCOVERY_REFRESH_INTERVAL )
+			ConfigurationProperty.forKey( ClientRest5ElasticsearchBackendClientSettings.DISCOVERY_REFRESH_INTERVAL )
 					.asIntegerStrictlyPositive()
-					.withDefault( ClientJavaElasticsearchBackendClientSettings.Defaults.DISCOVERY_REFRESH_INTERVAL )
+					.withDefault( ClientRest5ElasticsearchBackendClientSettings.Defaults.DISCOVERY_REFRESH_INTERVAL )
 					.build();
 
 	private static final OptionalConfigurationProperty<
 			BeanReference<? extends ElasticsearchHttpClientConfigurer>> CLIENT_CONFIGURER =
-					ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSettings.CLIENT_CONFIGURER )
+					ConfigurationProperty.forKey( ClientRest5ElasticsearchBackendClientSettings.CLIENT_CONFIGURER )
 							.asBeanReference( ElasticsearchHttpClientConfigurer.class )
 							.build();
 
 	private static final OptionalConfigurationProperty<Long> MAX_KEEP_ALIVE =
-			ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSettings.MAX_KEEP_ALIVE )
+			ConfigurationProperty.forKey( ClientRest5ElasticsearchBackendClientSettings.MAX_KEEP_ALIVE )
 					.asLongStrictlyPositive()
 					.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 );
@@ -318,7 +318,7 @@ private HttpAsyncClientBuilder customizeHttpClientConfig(HttpAsyncClientBuilder
 			Optional<ElasticsearchRequestInterceptor> requestInterceptor =
 					interceptorProvider.provide( clientConfigurationContext );
 			if ( requestInterceptor.isPresent() ) {
-				builder.addRequestInterceptorLast( new ClientJavaHttpRequestInterceptor( requestInterceptor.get() ) );
+				builder.addRequestInterceptorLast( new ClientRest5HttpRequestInterceptor( requestInterceptor.get() ) );
 			}
 		}
 		if ( customConfig.isPresent() ) {

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/java/org/hibernate/search/backend/elasticsearch/client/rest5/impl/ClientJavaHttpRequestInterceptor.java renamed to backend/elasticsearch-client/elasticsearch-rest5-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/rest5/impl/ClientRest5HttpRequestInterceptor.java

@@ -26,19 +26,19 @@
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.net.URIBuilder;
 
-record ClientJavaHttpRequestInterceptor(ElasticsearchRequestInterceptor elasticsearchRequestInterceptor)
+record ClientRest5HttpRequestInterceptor(ElasticsearchRequestInterceptor elasticsearchRequestInterceptor)
 		implements HttpRequestInterceptor {
 
 	@Override
 	public void process(HttpRequest request, EntityDetails entity, HttpContext context) throws IOException {
 		elasticsearchRequestInterceptor.intercept(
-				new ClientJavaRequestContext( request, entity, context )
+				new ClientRest5RequestContext( request, entity, context )
 		);
 	}
 
-	private record ClientJavaRequestContext(HttpRequest request, EntityDetails entity, HttpClientContext clientContext)
+	private record ClientRest5RequestContext(HttpRequest request, EntityDetails entity, HttpClientContext clientContext)
 			implements ElasticsearchRequestInterceptorContext {
-		private ClientJavaRequestContext(HttpRequest request, EntityDetails entity, HttpContext context) {
+		private ClientRest5RequestContext(HttpRequest request, EntityDetails entity, HttpContext context) {
 			this( request, entity, HttpClientContext.cast( context ) );
 		}
 

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