Skip to content

[UPDATE] Upgrading opensearch java client to v3 #2764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[UPDATE] Upgrading opensearch java client to v3 #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions backends-common/opensearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,16 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
<version>5.3.4</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
Expand All @@ -87,12 +97,12 @@
<dependency>
<groupId>org.opensearch.client</groupId>
<artifactId>opensearch-java</artifactId>
<version>2.25.0</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.opensearch.client</groupId>
<artifactId>opensearch-rest-client</artifactId>
<version>2.19.2</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
74 changes: 46 additions & 28 deletions ...-common/opensearch/src/main/java/org/apache/james/backends/opensearch/ClientProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,21 @@

import org.apache.commons.lang3.NotImplementedException;
import org.apache.commons.lang3.time.DurationFormatUtils;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.conn.ssl.DefaultHostnameVerifier;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.ssl.TrustStrategy;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.CredentialsStore;
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder;
import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder;
import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.nio.ssl.TlsStrategy;
import org.apache.hc.core5.ssl.SSLContextBuilder;
import org.apache.hc.core5.ssl.TrustStrategy;
import org.apache.hc.core5.util.Timeout;
import org.apache.james.util.concurrent.NamedThreadFactory;
import org.opensearch.client.RestClient;
import org.opensearch.client.json.jackson.JacksonJsonpMapper;
Expand All @@ -60,7 +65,7 @@
public class ClientProvider implements Provider<ReactorOpenSearchClient> {

private static class HttpAsyncClientConfigurer {

private static final AuthScope ANY = new AuthScope(null, null, -1, null, null);
private static final TrustStrategy TRUST_ALL = (x509Certificates, authType) -> true;
private static final HostnameVerifier ACCEPT_ANY_HOSTNAME = (hostname, sslSession) -> true;

Expand All @@ -75,9 +80,6 @@ private HttpAsyncClientBuilder configure(HttpAsyncClientBuilder builder) {
configureHostScheme(builder);
configureTimeout(builder);

configuration.getMaxConnections().ifPresent(builder::setMaxConnTotal);
configuration.getMaxConnectionsPerHost().ifPresent(builder::setMaxConnPerRoute);

builder.setThreadFactory(NamedThreadFactory.withName("OpenSearch-driver"));

return builder;
Expand All @@ -99,19 +101,35 @@ private void configureHostScheme(HttpAsyncClientBuilder builder) {
}

private void configureSSLOptions(HttpAsyncClientBuilder builder) {
try {
builder
.setSSLContext(sslContext())
.setSSLHostnameVerifier(hostnameVerifier());
} catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException | CertificateException | IOException e) {
throw new RuntimeException("Cannot set SSL options to the builder", e);
}
builder.setConnectionManager(connectionManager());
}

private void configureTimeout(HttpAsyncClientBuilder builder) {
builder.setDefaultRequestConfig(requestConfig());
}

private PoolingAsyncClientConnectionManager connectionManager() {
PoolingAsyncClientConnectionManagerBuilder builder = PoolingAsyncClientConnectionManagerBuilder
.create()
.setTlsStrategy(tlsStrategy());

configuration.getMaxConnections().ifPresent(builder::setMaxConnTotal);
configuration.getMaxConnectionsPerHost().ifPresent(builder::setMaxConnPerRoute);

return builder.build();
}

private TlsStrategy tlsStrategy() {
try {
return ClientTlsStrategyBuilder.create()
.setSslContext(sslContext())
.setHostnameVerifier(hostnameVerifier())
.buildAsync();
} catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException | CertificateException | IOException e) {
throw new RuntimeException("Cannot set SSL options to the builder", e);
}
}

private SSLContext sslContext() throws KeyStoreException, NoSuchAlgorithmException, KeyManagementException,
CertificateException, IOException {

Expand Down Expand Up @@ -152,9 +170,9 @@ private HostnameVerifier hostnameVerifier() {

private RequestConfig requestConfig() {
return RequestConfig.custom()
.setConnectTimeout(Math.toIntExact(configuration.getRequestTimeout().toMillis()))
.setConnectionRequestTimeout(Math.toIntExact(configuration.getRequestTimeout().toMillis()))
.setSocketTimeout(Math.toIntExact(configuration.getRequestTimeout().toMillis()))
.setConnectTimeout(Timeout.of(configuration.getRequestTimeout()))
.setConnectionRequestTimeout(Timeout.of(configuration.getRequestTimeout()))
.setResponseTimeout(Timeout.of(configuration.getRequestTimeout()))
.build();
}

Expand All @@ -172,9 +190,9 @@ private SSLContextBuilder applyTrustStore(SSLContextBuilder sslContextBuilder) t
private void configureAuthentication(HttpAsyncClientBuilder builder) {
configuration.getCredential()
.ifPresent(credential -> {
CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY,
new UsernamePasswordCredentials(credential.getUsername(), String.valueOf(credential.getPassword())));
CredentialsStore credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(ANY,
new UsernamePasswordCredentials(credential.getUsername(), credential.getPassword()));
builder.setDefaultCredentialsProvider(credentialsProvider);
});
}
Expand Down Expand Up @@ -225,7 +243,7 @@ private OpenSearchAsyncClient connectToCluster() {

private HttpHost[] hostsToHttpHosts() {
return configuration.getHosts().stream()
.map(host -> new HttpHost(host.getHostName(), host.getPort(), configuration.getHostScheme().name()))
.map(host -> new HttpHost(configuration.getHostScheme().name(), host.getHostName(), host.getPort()))
.toArray(HttpHost[]::new);
}

Expand Down
4 changes: 2 additions & 2 deletions ...n/opensearch/src/main/java/org/apache/james/backends/opensearch/IndexCreationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@ private boolean indexExists(ReactorOpenSearchClient client, IndexName indexName)

private IndexSettings generateSetting() {
return new IndexSettings.Builder()
.numberOfShards(Integer.toString(nbShards))
.numberOfReplicas(Integer.toString(nbReplica))
.numberOfShards(nbShards)
.numberOfReplicas(nbReplica)
.analysis(new IndexSettingsAnalysis.Builder()
.normalizer(CASE_INSENSITIVE, new Normalizer.Builder()
.custom(generateNormalizer())
Expand Down
4 changes: 2 additions & 2 deletions ...nsearch/src/test/java/org/apache/james/backends/opensearch/OpenSearchHealthCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ private static HealthResponse fakeHealthResponse(HealthStatus status) {
.clusterName("fake-cluster")
.activePrimaryShards(0)
.activeShards(0)
.activeShardsPercentAsNumber("0")
.activeShardsPercentAsNumber(0)
.delayedUnassignedShards(0)
.initializingShards(0)
.numberOfDataNodes(0)
.numberOfInFlightFetch(0)
.numberOfNodes(0)
.numberOfPendingTasks(0)
.relocatingShards(0)
.taskMaxWaitingInQueueMillis(String.valueOf(System.currentTimeMillis()))
.taskMaxWaitingInQueueMillis(System.currentTimeMillis())
.timedOut(false)
.unassignedShards(0)
.status(status)
Expand Down
2 changes: 1 addition & 1 deletion server/testing/src/main/java/org/apache/james/util/docker/Images.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public interface Images {
String RABBITMQ = "rabbitmq:4.1.1-management";
String ELASTICSEARCH_2 = "elasticsearch:2.4.6";
String ELASTICSEARCH_6 = "docker.elastic.co/elasticsearch/elasticsearch:6.3.2";
String OPENSEARCH = "opensearchproject/opensearch:2.19.2";
String OPENSEARCH = "opensearchproject/opensearch:3.1.0";
String TIKA = "apache/tika:3.2.0.0";
String MOCK_SMTP_SERVER = "linagora/mock-smtp-server:0.7";
String OPEN_LDAP = "osixia/openldap:1.5.0";
Expand Down