HSEARCH-5464 Rename the clients

Author: marko-bekhta

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

@@ -6,7 +6,7 @@
 
 import org.hibernate.search.backend.elasticsearch.aws.cfg.ElasticsearchAwsCredentialsTypeNames;
 import org.hibernate.search.backend.elasticsearch.aws.spi.ElasticsearchAwsCredentialsProvider;
-import org.hibernate.search.backend.elasticsearch.client.elasticsearch.lowlevel.ElasticsearchHttpClientConfigurer;
+import org.hibernate.search.backend.elasticsearch.client.rest.ElasticsearchHttpClientConfigurer;
 import org.hibernate.search.engine.environment.bean.BeanHolder;
 import org.hibernate.search.engine.environment.bean.spi.BeanConfigurationContext;
 import org.hibernate.search.engine.environment.bean.spi.BeanConfigurer;

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

@@ -11,8 +11,8 @@
 import org.hibernate.search.backend.elasticsearch.aws.cfg.ElasticsearchAwsCredentialsTypeNames;
 import org.hibernate.search.backend.elasticsearch.aws.logging.impl.AwsLog;
 import org.hibernate.search.backend.elasticsearch.aws.spi.ElasticsearchAwsCredentialsProvider;
-import org.hibernate.search.backend.elasticsearch.client.elasticsearch.lowlevel.ElasticsearchHttpClientConfigurationContext;
-import org.hibernate.search.backend.elasticsearch.client.elasticsearch.lowlevel.ElasticsearchHttpClientConfigurer;
+import org.hibernate.search.backend.elasticsearch.client.rest.ElasticsearchHttpClientConfigurationContext;
+import org.hibernate.search.backend.elasticsearch.client.rest.ElasticsearchHttpClientConfigurer;
 import org.hibernate.search.engine.cfg.ConfigurationPropertySource;
 import org.hibernate.search.engine.cfg.spi.ConfigurationProperty;
 import org.hibernate.search.engine.cfg.spi.OptionalConfigurationProperty;

backend/elasticsearch-client/elasticsearch-java-client/pom.xml

@@ -12,15 +12,15 @@
         <version>8.2.0-SNAPSHOT</version>
         <relativePath>../../../build/parents/public</relativePath>
     </parent>
-    <artifactId>hibernate-search-backend-elasticsearch-client-elasticsearch-java</artifactId>
+    <artifactId>hibernate-search-backend-elasticsearch-client-java</artifactId>
 
     <name>Hibernate Search Backend - Elasticsearch client based on the low-level Elasticsearch java client</name>
     <description>Hibernate Search Elasticsearch client based on the low-level Elasticsearch java client</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.elasticsearch.restclient</java.module.name>
+        <java.module.name>org.hibernate.search.backend.elasticsearch.client.java</java.module.name>
     </properties>
 
     <dependencies>

backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/elasticsearch/restclient/package-info.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.elasticsearch.restclient;
+package org.hibernate.search.backend.elasticsearch.client.java;
 
 
 import org.hibernate.search.engine.cfg.ConfigurationPropertySource;

backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/elasticsearch/restclient/ElasticsearchHttpClientConfigurationContext.java renamed to backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/ElasticsearchHttpClientConfigurationContext.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.elasticsearch.lowlevel;
+package org.hibernate.search.backend.elasticsearch.client.java;
 
 /**
  * An extension point allowing fine tuning of the Apache HTTP Client used by the Elasticsearch integration.

backend/elasticsearch-client/elasticsearch-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/elasticsearch/lowlevel/ElasticsearchHttpClientConfigurer.java renamed to backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/ElasticsearchHttpClientConfigurer.java

@@ -2,10 +2,10 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.search.backend.elasticsearch.client.elasticsearch.lowlevel.cfg;
+package org.hibernate.search.backend.elasticsearch.client.java.cfg;
 
 import org.hibernate.search.backend.elasticsearch.client.common.cfg.ElasticsearchBackendClientCommonSettings;
-import org.hibernate.search.backend.elasticsearch.client.elasticsearch.lowlevel.ElasticsearchHttpClientConfigurer;
+import org.hibernate.search.backend.elasticsearch.client.java.ElasticsearchHttpClientConfigurer;
 
 /**
  * Specific configuration properties for the Elasticsearch backend's rest client based on the Elasticsearch's low-level rest client.

backend/elasticsearch-client/elasticsearch-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/elasticsearch/lowlevel/cfg/ElasticsearchBackendClientSettings.java renamed to backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/cfg/ElasticsearchBackendClientSettings.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.elasticsearch.restclient.cfg.spi;
+package org.hibernate.search.backend.elasticsearch.client.java.cfg.spi;
 
 import org.hibernate.search.engine.cfg.EngineSettings;
 
@@ -24,7 +24,7 @@ public final class ElasticsearchBackendClientSpiSettings {
 	 * (hosts/uris, authentication, discovery, timeouts, max connections, configurer, ...)
 	 * will be ignored.
 	 * <p>
-	 * Expects a reference to a bean of type {@link org.elasticsearch.client.RestClient}.
+	 * Expects a reference to a bean of type {@link co.elastic.clients.transport.rest5_client.low_level.Rest5Client}.
 	 * <p>
 	 * Defaults to nothing: if no client instance is provided, Hibernate Search will create its own.
 	 * <p>

backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/elasticsearch/restclient/cfg/spi/ElasticsearchBackendClientSpiSettings.java renamed to backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/cfg/spi/ElasticsearchBackendClientSpiSettings.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.elasticsearch.restclient.impl;
+package org.hibernate.search.backend.elasticsearch.client.java.impl;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/elasticsearch/restclient/impl/ByteBufferDataStreamChannel.java renamed to backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/impl/ByteBufferDataStreamChannel.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.elasticsearch.lowlevel.impl;
+package org.hibernate.search.backend.elasticsearch.client.java.impl;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;