Skip to content

Commit 1d0d3bf

Browse files
committed
HSEARCH-5464 Move (most of) the elasticsearch-client-rest back into the backend
and remove the client-common
1 parent b83183c commit 1d0d3bf

File tree

98 files changed

+338
-687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+338
-687
lines changed

backend/elasticsearch-aws/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<dependencies>
2727
<dependency>
2828
<groupId>org.hibernate.search</groupId>
29-
<artifactId>hibernate-search-backend-elasticsearch-client-common</artifactId>
29+
<artifactId>hibernate-search-backend-elasticsearch</artifactId>
3030
</dependency>
3131
<dependency>
3232
<groupId>software.amazon.awssdk</groupId>

backend/elasticsearch-client/common/pom.xml

Lines changed: 0 additions & 53 deletions
This file was deleted.

backend/elasticsearch-client/common/src/main/java/org/hibernate/search/backend/elasticsearch/client/common/cfg/ElasticsearchBackendClientCommonSettings.java

Lines changed: 0 additions & 103 deletions
This file was deleted.

backend/elasticsearch-client/common/src/main/java/org/hibernate/search/backend/elasticsearch/client/common/cfg/spi/ElasticsearchBackendClientSpiSettings.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

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

Lines changed: 0 additions & 57 deletions
This file was deleted.

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

Lines changed: 0 additions & 101 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</dependency>
3131
<dependency>
3232
<groupId>org.hibernate.search</groupId>
33-
<artifactId>hibernate-search-backend-elasticsearch-client-common</artifactId>
33+
<artifactId>hibernate-search-backend-elasticsearch</artifactId>
3434
</dependency>
3535
<dependency>
3636
<groupId>co.elastic.clients</groupId>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
package org.hibernate.search.backend.elasticsearch.client.java.cfg;
66

7-
import org.hibernate.search.backend.elasticsearch.client.common.cfg.ElasticsearchBackendClientCommonSettings;
7+
import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchBackendSettings;
88
import org.hibernate.search.backend.elasticsearch.client.java.ElasticsearchHttpClientConfigurer;
99

1010
/**
@@ -112,7 +112,7 @@ private ClientJavaElasticsearchBackendClientSettings() {
112112
* A {@link ElasticsearchHttpClientConfigurer} that defines custom HTTP client configuration.
113113
* <p>
114114
* It can be used for example to tune the SSL context to accept self-signed certificates.
115-
* It allows overriding other HTTP client settings, such as {@link ElasticsearchBackendClientCommonSettings#USERNAME} or {@link #MAX_CONNECTIONS_PER_ROUTE}.
115+
* It allows overriding other HTTP client settings, such as {@link ElasticsearchBackendSettings#USERNAME} or {@link #MAX_CONNECTIONS_PER_ROUTE}.
116116
* <p>
117117
* Expects a reference to a bean of type {@link ElasticsearchHttpClientConfigurer}.
118118
* <p>

0 commit comments

Comments
 (0)