Skip to content

Commit 98bbb78

Browse files
marko-bekhtamarko-bekhta
committed
HSEARCH-5464 Address some of the review comments
1 parent 1d0d3bf commit 98bbb78

File tree

45 files changed

+96
-96
lines changed

Some content is hidden

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

45 files changed

+96
-96
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,13 @@
77

88
import org.hibernate.search.engine.cfg.ConfigurationPropertySource;
99
import org.hibernate.search.engine.environment.bean.BeanResolver;
10-
import org.hibernate.search.util.common.annotation.impl.SuppressJQAssistant;
1110

1211
import org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder;
1312

1413

1514
/**
1615
* The context passed to {@link ElasticsearchHttpClientConfigurer}.
1716
*/
18-
@SuppressJQAssistant(
19-
reason = "Apache HTTP Client 5 uses a lot of classes/interfaces in the impl packages to create builders/instances etc. "
20-
+ "So while it is bad to expose impl types ... in this case it's what Apache Client expects users to do?")
2117
public interface ElasticsearchHttpClientConfigurationContext {
2218

2319
/**

‎backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/impl/ClientJavaElasticsearchClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.hibernate.search.backend.elasticsearch.client.common.spi.ElasticsearchRequest;
2424
import org.hibernate.search.backend.elasticsearch.client.common.spi.ElasticsearchResponse;
2525
import org.hibernate.search.backend.elasticsearch.client.common.util.spi.ElasticsearchClientUtils;
26-
import org.hibernate.search.backend.elasticsearch.logging.impl.ElasticsearchClientLog;
27-
import org.hibernate.search.backend.elasticsearch.logging.impl.ElasticsearchRequestLog;
26+
import org.hibernate.search.backend.elasticsearch.logging.spi.ElasticsearchClientLog;
27+
import org.hibernate.search.backend.elasticsearch.logging.spi.ElasticsearchRequestLog;
2828
import org.hibernate.search.engine.common.execution.spi.SimpleScheduledExecutor;
2929
import org.hibernate.search.engine.common.timing.Deadline;
3030
import org.hibernate.search.engine.environment.bean.BeanHolder;

‎backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/impl/ClientJavaElasticsearchClientFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.hibernate.search.backend.elasticsearch.client.java.ElasticsearchHttpClientConfigurer;
1919
import org.hibernate.search.backend.elasticsearch.client.java.cfg.ClientJavaElasticsearchBackendClientSettings;
2020
import org.hibernate.search.backend.elasticsearch.client.java.cfg.spi.ClientJavaElasticsearchBackendClientSpiSettings;
21-
import org.hibernate.search.backend.elasticsearch.logging.impl.ConfigurationLog;
21+
import org.hibernate.search.backend.elasticsearch.logging.spi.ConfigurationLog;
2222
import org.hibernate.search.engine.cfg.ConfigurationPropertySource;
2323
import org.hibernate.search.engine.cfg.spi.ConfigurationProperty;
2424
import org.hibernate.search.engine.cfg.spi.OptionalConfigurationProperty;

‎backend/elasticsearch-client/elasticsearch-java-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/java/impl/ServerUris.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.Optional;
1111

1212
import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchBackendSettings;
13-
import org.hibernate.search.backend.elasticsearch.logging.impl.ConfigurationLog;
13+
import org.hibernate.search.backend.elasticsearch.logging.spi.ConfigurationLog;
1414

1515
import org.apache.hc.core5.http.HttpHost;
1616

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,12 @@
77

88
import org.hibernate.search.engine.cfg.ConfigurationPropertySource;
99
import org.hibernate.search.engine.environment.bean.BeanResolver;
10-
import org.hibernate.search.util.common.annotation.impl.SuppressJQAssistant;
1110

1211
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
1312

1413
/**
1514
* The context passed to {@link ElasticsearchHttpClientConfigurer}.
1615
*/
17-
@SuppressJQAssistant(
18-
reason = "Apache HTTP Client 5 uses a lot of classes/interfaces in the impl packages to create builders/instances etc. "
19-
+ "So while it is bad to expose impl types ... in this case it's what Apache Client expects users to do?")
2016
public interface ElasticsearchHttpClientConfigurationContext {
2117

2218
/**

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,13 @@
77

88
import org.hibernate.search.engine.cfg.ConfigurationPropertySource;
99
import org.hibernate.search.engine.environment.bean.BeanResolver;
10-
import org.hibernate.search.util.common.annotation.impl.SuppressJQAssistant;
1110

1211
import org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder;
1312

1413

1514
/**
1615
* The context passed to {@link ElasticsearchHttpClientConfigurer}.
1716
*/
18-
@SuppressJQAssistant(
19-
reason = "Apache HTTP Client 5 uses a lot of classes/interfaces in the impl packages to create builders/instances etc. "
20-
+ "So while it is bad to expose impl types ... in this case it's what Apache Client expects users to do?")
2117
public interface ElasticsearchHttpClientConfigurationContext {
2218

2319
/**

‎backend/elasticsearch-client/opensearch-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/opensearch/impl/ClientOpenSearchElasticsearchClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.hibernate.search.backend.elasticsearch.client.common.spi.ElasticsearchRequest;
2323
import org.hibernate.search.backend.elasticsearch.client.common.spi.ElasticsearchResponse;
2424
import org.hibernate.search.backend.elasticsearch.client.common.util.spi.ElasticsearchClientUtils;
25-
import org.hibernate.search.backend.elasticsearch.logging.impl.ElasticsearchClientLog;
26-
import org.hibernate.search.backend.elasticsearch.logging.impl.ElasticsearchRequestLog;
25+
import org.hibernate.search.backend.elasticsearch.logging.spi.ElasticsearchClientLog;
26+
import org.hibernate.search.backend.elasticsearch.logging.spi.ElasticsearchRequestLog;
2727
import org.hibernate.search.engine.common.execution.spi.SimpleScheduledExecutor;
2828
import org.hibernate.search.engine.common.timing.Deadline;
2929
import org.hibernate.search.engine.environment.bean.BeanHolder;

‎backend/elasticsearch-client/opensearch-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/opensearch/impl/ClientOpenSearchElasticsearchClientFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.hibernate.search.backend.elasticsearch.client.opensearch.ElasticsearchHttpClientConfigurer;
1919
import org.hibernate.search.backend.elasticsearch.client.opensearch.cfg.ClientOpenSearchElasticsearchBackendClientSettings;
2020
import org.hibernate.search.backend.elasticsearch.client.opensearch.cfg.spi.ClientOpenSearchElasticsearchBackendClientSpiSettings;
21-
import org.hibernate.search.backend.elasticsearch.logging.impl.ConfigurationLog;
21+
import org.hibernate.search.backend.elasticsearch.logging.spi.ConfigurationLog;
2222
import org.hibernate.search.engine.cfg.ConfigurationPropertySource;
2323
import org.hibernate.search.engine.cfg.spi.ConfigurationProperty;
2424
import org.hibernate.search.engine.cfg.spi.OptionalConfigurationProperty;

‎backend/elasticsearch-client/opensearch-rest-client/src/main/java/org/hibernate/search/backend/elasticsearch/client/opensearch/impl/ServerUris.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.Optional;
1111

1212
import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchBackendSettings;
13-
import org.hibernate.search.backend.elasticsearch.logging.impl.ConfigurationLog;
13+
import org.hibernate.search.backend.elasticsearch.logging.spi.ConfigurationLog;
1414

1515
import org.apache.hc.core5.http.HttpHost;
1616

@@ -94,7 +94,7 @@ private static ServerUris fromStrings(String protocol, List<String> hostAndPortS
9494
}
9595

9696
private static HttpHost createHttpHost(String scheme, String hostAndPort) {
97-
if ( hostAndPort.indexOf( "://" ) >= 0 ) {
97+
if ( hostAndPort.contains( "://" ) ) {
9898
throw ConfigurationLog.INSTANCE.invalidHostAndPort( hostAndPort, null );
9999
}
100100
String host;

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchDistributionName.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.List;
99
import java.util.stream.Collectors;
1010

11-
import org.hibernate.search.backend.elasticsearch.logging.impl.ConfigurationLog;
11+
import org.hibernate.search.backend.elasticsearch.logging.spi.ConfigurationLog;
1212
import org.hibernate.search.engine.cfg.spi.ParseUtils;
1313
import org.hibernate.search.util.common.annotation.Incubating;
1414

0 commit comments

Comments
 (0)