HSEARCH-5464 More renames to address JQAssistant rules

Author: marko-bekhta

backend/elasticsearch-client/common/src/main/java/org/hibernate/search/backend/elasticsearch/client/common/logging/spi/ElasticsearchClientCommonLog.java

@@ -7,6 +7,7 @@
 
 import static org.jboss.logging.Logger.Level.TRACE;
 
+import org.hibernate.search.util.common.annotation.impl.SuppressJQAssistant;
 import org.hibernate.search.util.common.logging.impl.MessageConstants;
 
 import org.jboss.logging.annotations.LogMessage;
@@ -22,6 +23,10 @@
 		// Exceptions for legacy messages from Search 5 (engine module)
 		@ValidIdRange(min = 35, max = 35),
 })
+@SuppressJQAssistant(
+		reason = "Apache HTTP Client 5 uses a lot of classes/interfaces in the impl packages to create builders/instances etc. "
+				+
+				"So while it is bad to expose impl types ... in this case it's what Apache Client expects users to do?")
 public interface ElasticsearchClientCommonLog
 		extends ElasticsearchRequestLog, ElasticsearchClientLog {
 

backend/elasticsearch-client/common/src/main/java/org/hibernate/search/backend/elasticsearch/client/common/logging/spi/ElasticsearchClientConfigurationLog.java

@@ -12,6 +12,7 @@
 import java.util.List;
 
 import org.hibernate.search.util.common.SearchException;
+import org.hibernate.search.util.common.annotation.impl.SuppressJQAssistant;
 import org.hibernate.search.util.common.logging.CategorizedLogger;
 import org.hibernate.search.util.common.logging.impl.LoggerFactory;
 import org.hibernate.search.util.common.logging.impl.MessageConstants;
@@ -29,6 +30,10 @@
 				"""
 )
 @MessageLogger(projectCode = MessageConstants.PROJECT_CODE)
+@SuppressJQAssistant(
+		reason = "Apache HTTP Client 5 uses a lot of classes/interfaces in the impl packages to create builders/instances etc. "
+				+
+				"So while it is bad to expose impl types ... in this case it's what Apache Client expects users to do?")
 public interface ElasticsearchClientConfigurationLog {
 	String CATEGORY_NAME = "org.hibernate.search.configuration.elasticsearch.client";
 

backend/elasticsearch-client/common/src/main/java/org/hibernate/search/backend/elasticsearch/client/common/logging/spi/ElasticsearchClientLog.java

@@ -18,6 +18,7 @@
 import org.hibernate.search.util.common.AssertionFailure;
 import org.hibernate.search.util.common.SearchException;
 import org.hibernate.search.util.common.SearchTimeoutException;
+import org.hibernate.search.util.common.annotation.impl.SuppressJQAssistant;
 import org.hibernate.search.util.common.logging.CategorizedLogger;
 import org.hibernate.search.util.common.logging.impl.ClassFormatter;
 import org.hibernate.search.util.common.logging.impl.DurationInSecondsAndFractionsFormatter;
@@ -42,6 +43,10 @@
 				"""
 )
 @MessageLogger(projectCode = MessageConstants.PROJECT_CODE)
+@SuppressJQAssistant(
+		reason = "Apache HTTP Client 5 uses a lot of classes/interfaces in the impl packages to create builders/instances etc. "
+				+
+				"So while it is bad to expose impl types ... in this case it's what Apache Client expects users to do?")
 public interface ElasticsearchClientLog {
 	String CATEGORY_NAME = "org.hibernate.search.elasticsearch.client";
 

backend/elasticsearch-client/common/src/main/java/org/hibernate/search/backend/elasticsearch/client/common/logging/spi/ElasticsearchRequestLog.java

@@ -7,6 +7,7 @@
 import java.lang.invoke.MethodHandles;
 import java.util.Map;
 
+import org.hibernate.search.util.common.annotation.impl.SuppressJQAssistant;
 import org.hibernate.search.util.common.logging.CategorizedLogger;
 import org.hibernate.search.util.common.logging.impl.LoggerFactory;
 import org.hibernate.search.util.common.logging.impl.MessageConstants;
@@ -25,6 +26,10 @@
 				"""
 )
 @MessageLogger(projectCode = MessageConstants.PROJECT_CODE)
+@SuppressJQAssistant(
+		reason = "Apache HTTP Client 5 uses a lot of classes/interfaces in the impl packages to create builders/instances etc. "
+				+
+				"So while it is bad to expose impl types ... in this case it's what Apache Client expects users to do?")
 public interface ElasticsearchRequestLog extends BasicLogger {
 	/**
 	 * This is the category of the Logger used to print out executed Elasticsearch requests,

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

@@ -7,13 +7,17 @@
 
 import org.hibernate.search.engine.cfg.ConfigurationPropertySource;
 import org.hibernate.search.engine.environment.bean.BeanResolver;
+import org.hibernate.search.util.common.annotation.impl.SuppressJQAssistant;
 
 import org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder;
 
 
 /**
  * The context passed to {@link ElasticsearchHttpClientConfigurer}.
  */
+@SuppressJQAssistant(
+		reason = "Apache HTTP Client 5 uses a lot of classes/interfaces in the impl packages to create builders/instances etc. "
+				+ "So while it is bad to expose impl types ... in this case it's what Apache Client expects users to do?")
 public interface ElasticsearchHttpClientConfigurationContext {
 
 	/**

backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/cfg/ElasticsearchBackendClientSettings.java renamed to backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/cfg/ClientJavaElasticsearchBackendClientSettings.java

@@ -15,9 +15,9 @@
  *
  * @author Gunnar Morling
  */
-public final class ElasticsearchBackendClientSettings {
+public final class ClientJavaElasticsearchBackendClientSettings {
 
-	private ElasticsearchBackendClientSettings() {
+	private ClientJavaElasticsearchBackendClientSettings() {
 	}
 
 	/**

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

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

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

@@ -47,7 +47,7 @@
 import org.apache.hc.core5.http.impl.EnglishReasonPhraseCatalog;
 import org.apache.hc.core5.util.Timeout;
 
-public class ElasticsearchClientImpl implements ElasticsearchClientImplementor {
+public class ClientJavaElasticsearchClient implements ElasticsearchClientImplementor {
 
 	private final BeanHolder<? extends Rest5Client> restClientHolder;
 
@@ -56,20 +56,18 @@ public class ElasticsearchClientImpl implements ElasticsearchClientImplementor {
 	private final SimpleScheduledExecutor timeoutExecutorService;
 
 	private final Optional<Integer> requestTimeoutMs;
-	private final int connectionTimeoutMs;
 
 	private final Gson gson;
 	private final JsonLogHelper jsonLogHelper;
 
-	ElasticsearchClientImpl(BeanHolder<? extends Rest5Client> restClientHolder, Sniffer sniffer,
+	ClientJavaElasticsearchClient(BeanHolder<? extends Rest5Client> restClientHolder, Sniffer sniffer,
 			SimpleScheduledExecutor timeoutExecutorService,
-			Optional<Integer> requestTimeoutMs, int connectionTimeoutMs,
+			Optional<Integer> requestTimeoutMs,
 			Gson gson, JsonLogHelper jsonLogHelper) {
 		this.restClientHolder = restClientHolder;
 		this.sniffer = sniffer;
 		this.timeoutExecutorService = timeoutExecutorService;
 		this.requestTimeoutMs = requestTimeoutMs;
-		this.connectionTimeoutMs = connectionTimeoutMs;
 		this.gson = gson;
 		this.jsonLogHelper = jsonLogHelper;
 	}

backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/impl/ElasticsearchClientBeanConfigurer.java renamed to backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/impl/ClientJavaElasticsearchClientBeanConfigurer.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 ElasticsearchClientBeanConfigurer implements BeanConfigurer {
+public class ClientJavaElasticsearchClientBeanConfigurer implements BeanConfigurer {
 	@Override
 	public void configure(BeanConfigurationContext context) {
 		context.define(
 				ElasticsearchClientFactory.class, "elasticsearch-java",
-				beanResolver -> BeanHolder.of( new ElasticsearchClientFactoryImpl() )
+				beanResolver -> BeanHolder.of( new ClientJavaElasticsearchClientFactory() )
 		);
 	}
 }

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

@@ -15,8 +15,8 @@
 import org.hibernate.search.backend.elasticsearch.client.common.spi.ElasticsearchClientFactory;
 import org.hibernate.search.backend.elasticsearch.client.common.spi.ElasticsearchClientImplementor;
 import org.hibernate.search.backend.elasticsearch.client.java.ElasticsearchHttpClientConfigurer;
-import org.hibernate.search.backend.elasticsearch.client.java.cfg.ElasticsearchBackendClientSettings;
-import org.hibernate.search.backend.elasticsearch.client.java.cfg.spi.ElasticsearchBackendClientSpiSettings;
+import org.hibernate.search.backend.elasticsearch.client.java.cfg.ClientJavaElasticsearchBackendClientSettings;
+import org.hibernate.search.backend.elasticsearch.client.java.cfg.spi.ClientJavaElasticsearchBackendClientSpiSettings;
 import org.hibernate.search.engine.cfg.ConfigurationPropertySource;
 import org.hibernate.search.engine.cfg.spi.ConfigurationProperty;
 import org.hibernate.search.engine.cfg.spi.OptionalConfigurationProperty;
@@ -51,10 +51,10 @@
 /**
  * @author Gunnar Morling
  */
-public class ElasticsearchClientFactoryImpl implements ElasticsearchClientFactory {
+public class ClientJavaElasticsearchClientFactory implements ElasticsearchClientFactory {
 
 	private static final OptionalConfigurationProperty<BeanReference<? extends Rest5Client>> CLIENT_INSTANCE =
-			ConfigurationProperty.forKey( ElasticsearchBackendClientSpiSettings.CLIENT_INSTANCE )
+			ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSpiSettings.CLIENT_INSTANCE )
 					.asBeanReference( Rest5Client.class )
 					.build();
 
@@ -132,7 +132,7 @@ public class ElasticsearchClientFactoryImpl implements ElasticsearchClientFactor
 
 	private static final OptionalConfigurationProperty<
 			BeanReference<? extends ElasticsearchHttpClientConfigurer>> CLIENT_CONFIGURER =
-					ConfigurationProperty.forKey( ElasticsearchBackendClientSettings.CLIENT_CONFIGURER )
+					ConfigurationProperty.forKey( ClientJavaElasticsearchBackendClientSettings.CLIENT_CONFIGURER )
 							.asBeanReference( ElasticsearchHttpClientConfigurer.class )
 							.build();
 
@@ -147,7 +147,6 @@ public ElasticsearchClientImplementor create(BeanResolver beanResolver, Configur
 			SimpleScheduledExecutor timeoutExecutorService,
 			GsonProvider gsonProvider) {
 		Optional<Integer> requestTimeoutMs = REQUEST_TIMEOUT.get( propertySource );
-		int connectionTimeoutMs = CONNECTION_TIMEOUT.get( propertySource );
 
 		Optional<BeanHolder<? extends Rest5Client>> providedRestClientHolder = CLIENT_INSTANCE.getAndMap(
 				propertySource, beanResolver::resolve );
@@ -166,9 +165,9 @@ public ElasticsearchClientImplementor create(BeanResolver beanResolver, Configur
 			sniffer = createSniffer( propertySource, restClientHolder.get(), hosts );
 		}
 
-		return new ElasticsearchClientImpl(
+		return new ClientJavaElasticsearchClient(
 				restClientHolder, sniffer, timeoutExecutorService,
-				requestTimeoutMs, connectionTimeoutMs,
+				requestTimeoutMs,
 				gsonProvider.getGson(), gsonProvider.getLogHelper()
 		);
 	}
@@ -301,8 +300,8 @@ private HttpAsyncClientBuilder customizeHttpClientConfig(HttpAsyncClientBuilder
 			builder.setKeepAliveStrategy( new CustomConnectionKeepAliveStrategy( maxKeepAlive.get() ) );
 		}
 
-		ElasticsearchHttpClientConfigurationContextImpl clientConfigurationContext =
-				new ElasticsearchHttpClientConfigurationContextImpl( beanResolver, propertySource, builder );
+		ClientJavaElasticsearchHttpClientConfigurationContext clientConfigurationContext =
+				new ClientJavaElasticsearchHttpClientConfigurationContext( beanResolver, propertySource, builder );
 
 		for ( ElasticsearchHttpClientConfigurer configurer : configurers ) {
 			configurer.configure( clientConfigurationContext );