You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/05/16 08:48:33 UTC
[james-project] 18/23: JAMES-2719 Migrate and fix
ClientProviderImplConnectionTest class with ES6 syntax
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b79ce0bcc3ebcb7eacf0bfa7e61aac3c7b7f9cae
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Wed May 15 15:52:04 2019 +0700
JAMES-2719 Migrate and fix ClientProviderImplConnectionTest class with ES6 syntax
---
.../es/v6/ClientProviderImplConnectionTest.java | 43 +++++++++++++---------
1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/backends-common/elasticsearch-v6/src/test/java/org/apache/james/backends/es/v6/ClientProviderImplConnectionTest.java b/backends-common/elasticsearch-v6/src/test/java/org/apache/james/backends/es/v6/ClientProviderImplConnectionTest.java
index a30d96e..0a36d6a 100644
--- a/backends-common/elasticsearch-v6/src/test/java/org/apache/james/backends/es/v6/ClientProviderImplConnectionTest.java
+++ b/backends-common/elasticsearch-v6/src/test/java/org/apache/james/backends/es/v6/ClientProviderImplConnectionTest.java
@@ -23,41 +23,45 @@ import java.util.Optional;
import java.util.concurrent.TimeUnit;
import org.apache.james.util.docker.DockerGenericContainer;
+import org.apache.james.util.docker.Images;
import org.awaitility.Awaitility;
-import org.elasticsearch.client.Client;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.index.query.QueryBuilders;
-import org.junit.Ignore;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Ignore("JAMES-1952")
public class ClientProviderImplConnectionTest {
private static final Logger LOGGER = LoggerFactory.getLogger(ClientProviderImplConnectionTest.class);
- private static final String DOCKER_ES_IMAGE = "elasticsearch:2.2.1";
- private static final int ES_APPLICATIVE_PORT = 9300;
+ private static final int ES_APPLICATIVE_PORT = 9200;
- @Rule
- public DockerGenericContainer es1 = new DockerGenericContainer(DOCKER_ES_IMAGE)
+ @ClassRule
+ public static DockerGenericContainer es1 = new DockerGenericContainer(Images.ELASTICSEARCH_6)
+ .withEnv("discovery.type", "single-node")
.withAffinityToContainer()
.withExposedPorts(ES_APPLICATIVE_PORT);
@Rule
- public DockerGenericContainer es2 = new DockerGenericContainer(DOCKER_ES_IMAGE)
+ public DockerGenericContainer es2 = new DockerGenericContainer(Images.ELASTICSEARCH_6)
+ .withEnv("discovery.type", "single-node")
.withAffinityToContainer()
.withExposedPorts(ES_APPLICATIVE_PORT);
@Test
- public void connectingASingleServerShouldWork() throws Exception {
+ public void connectingASingleServerShouldWork() {
Awaitility.await()
.atMost(1, TimeUnit.MINUTES)
.pollInterval(5, TimeUnit.SECONDS)
- .until(() -> isConnected(ClientProviderImpl.forHost(es1.getContainerIp(), 9300, Optional.empty())));
+ .until(() -> isConnected(ClientProviderImpl.forHost(es1.getContainerIp(), ES_APPLICATIVE_PORT, Optional.empty())));
}
@Test
- public void connectingAClusterShouldWork() throws Exception {
+ public void connectingAClusterShouldWork() {
Awaitility.await()
.atMost(1, TimeUnit.MINUTES)
.pollInterval(5, TimeUnit.SECONDS)
@@ -69,7 +73,9 @@ public class ClientProviderImplConnectionTest {
}
@Test
- public void connectingAClusterWithAFailedNodeShouldWork() throws Exception {
+ public void connectingAClusterWithAFailedNodeShouldWork() {
+ String es1Ip = es1.getContainerIp();
+ String es2Ip = es2.getContainerIp();
es2.stop();
Awaitility.await()
@@ -77,16 +83,17 @@ public class ClientProviderImplConnectionTest {
.pollInterval(5, TimeUnit.SECONDS)
.until(() -> isConnected(
ClientProviderImpl.fromHostsString(
- es1.getContainerIp() + ":" + ES_APPLICATIVE_PORT + ","
- + es2.getContainerIp() + ":" + ES_APPLICATIVE_PORT,
+ es1Ip + ":" + ES_APPLICATIVE_PORT + ","
+ + es2Ip + ":" + ES_APPLICATIVE_PORT,
Optional.empty())));
}
private boolean isConnected(ClientProvider clientProvider) {
- try (Client client = clientProvider.get()) {
- client.prepareSearch()
- .setQuery(QueryBuilders.existsQuery("any"))
- .get();
+ try (RestHighLevelClient client = clientProvider.get()) {
+ client.search(
+ new SearchRequest()
+ .source(new SearchSourceBuilder().query(QueryBuilders.existsQuery("any"))),
+ RequestOptions.DEFAULT);
return true;
} catch (Exception e) {
LOGGER.info("Caught exception while trying to connect", e);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org