From 96eabdd32dd5a6c423d7f48fb165e00312326404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Fri, 9 Apr 2021 13:15:04 +0200 Subject: [PATCH] align with es221 --- .../java/org/xbib/elx/api/package-info.java | 4 --- .../xbib/elx/common/DefaultBulkProcessor.java | 3 +- .../org/xbib/elx/common/package-info.java | 4 --- .../org/xbib/elx/common/test/AliasTest.java | 7 ++-- .../org/xbib/elx/common/test/SearchTest.java | 2 +- .../org/xbib/elx/common/test/SimpleTest.java | 10 +++--- .../xbib/elx/common/test/TestExtension.java | 33 ++++++++----------- .../xbib/elx/common/test/WildcardTest.java | 2 +- .../xbib/elx/common/test/package-info.java | 4 --- 9 files changed, 27 insertions(+), 42 deletions(-) delete mode 100644 elx-api/src/main/java/org/xbib/elx/api/package-info.java delete mode 100644 elx-common/src/main/java/org/xbib/elx/common/package-info.java delete mode 100644 elx-common/src/test/java/org/xbib/elx/common/test/package-info.java diff --git a/elx-api/src/main/java/org/xbib/elx/api/package-info.java b/elx-api/src/main/java/org/xbib/elx/api/package-info.java deleted file mode 100644 index 03fd0e3..0000000 --- a/elx-api/src/main/java/org/xbib/elx/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * The API of the extended Elasticsearch clients. - */ -package org.xbib.elx.api; diff --git a/elx-common/src/main/java/org/xbib/elx/common/DefaultBulkProcessor.java b/elx-common/src/main/java/org/xbib/elx/common/DefaultBulkProcessor.java index 88ce3dc..e7468cd 100644 --- a/elx-common/src/main/java/org/xbib/elx/common/DefaultBulkProcessor.java +++ b/elx-common/src/main/java/org/xbib/elx/common/DefaultBulkProcessor.java @@ -85,8 +85,7 @@ public class DefaultBulkProcessor implements BulkProcessor { return bulkListener; } - public static Builder builder(ElasticsearchClient client, - BulkListener bulkListener) { + public static Builder builder(ElasticsearchClient client, BulkListener bulkListener) { Objects.requireNonNull(client, "The client you specified while building a BulkProcessor is null"); Objects.requireNonNull(bulkListener, "A listener for the BulkProcessor is required but null"); return new Builder(client, bulkListener); diff --git a/elx-common/src/main/java/org/xbib/elx/common/package-info.java b/elx-common/src/main/java/org/xbib/elx/common/package-info.java deleted file mode 100644 index 4971f08..0000000 --- a/elx-common/src/main/java/org/xbib/elx/common/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Common classes for Elasticsearch client extensions. - */ -package org.xbib.elx.common; diff --git a/elx-common/src/test/java/org/xbib/elx/common/test/AliasTest.java b/elx-common/src/test/java/org/xbib/elx/common/test/AliasTest.java index 98afd47..1f2bc65 100644 --- a/elx-common/src/test/java/org/xbib/elx/common/test/AliasTest.java +++ b/elx-common/src/test/java/org/xbib/elx/common/test/AliasTest.java @@ -12,6 +12,8 @@ import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest; import org.elasticsearch.action.admin.indices.alias.get.GetAliasesResponse; import org.elasticsearch.action.admin.indices.create.CreateIndexAction; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; +import org.elasticsearch.action.admin.indices.refresh.RefreshAction; +import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.Strings; import org.junit.jupiter.api.Test; @@ -40,9 +42,10 @@ class AliasTest { @Test void testAlias() { - ElasticsearchClient client = helper.client("1"); + ElasticsearchClient client = helper.client(); CreateIndexRequest indexRequest = new CreateIndexRequest("test_index"); client.execute(CreateIndexAction.INSTANCE, indexRequest).actionGet(); + client.execute(RefreshAction.INSTANCE, new RefreshRequest()).actionGet(); IndicesAliasesRequest indicesAliasesRequest = new IndicesAliasesRequest(); String[] indices = new String[] { "test_index" }; String[] aliases = new String[] { "test_alias" }; @@ -64,7 +67,7 @@ class AliasTest { @Test void testMostRecentIndex() { - ElasticsearchClient client = helper.client("1"); + ElasticsearchClient client = helper.client(); String alias = "test"; CreateIndexRequest indexRequest = new CreateIndexRequest("test20160101"); client.execute(CreateIndexAction.INSTANCE, indexRequest).actionGet(); diff --git a/elx-common/src/test/java/org/xbib/elx/common/test/SearchTest.java b/elx-common/src/test/java/org/xbib/elx/common/test/SearchTest.java index 6bd4ba0..470f742 100644 --- a/elx-common/src/test/java/org/xbib/elx/common/test/SearchTest.java +++ b/elx-common/src/test/java/org/xbib/elx/common/test/SearchTest.java @@ -29,7 +29,7 @@ class SearchTest { @Test void testSearch() throws Exception { - ElasticsearchClient client = helper.client("1"); + ElasticsearchClient client = helper.client(); BulkRequestBuilder builder = new BulkRequestBuilder(client, BulkAction.INSTANCE); for (int i = 0; i < 1; i++) { IndexRequest indexRequest = new IndexRequest().index("pages") diff --git a/elx-common/src/test/java/org/xbib/elx/common/test/SimpleTest.java b/elx-common/src/test/java/org/xbib/elx/common/test/SimpleTest.java index 6bd38e5..9b23ad0 100644 --- a/elx-common/src/test/java/org/xbib/elx/common/test/SimpleTest.java +++ b/elx-common/src/test/java/org/xbib/elx/common/test/SimpleTest.java @@ -34,7 +34,7 @@ class SimpleTest { try { DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest().indices("test"); - helper.client("1").execute(DeleteIndexAction.INSTANCE, deleteIndexRequest).actionGet(); + helper.client().execute(DeleteIndexAction.INSTANCE, deleteIndexRequest).actionGet(); } catch (IndexNotFoundException e) { // ignore if index not found } @@ -45,22 +45,22 @@ class SimpleTest { .build(); CreateIndexRequest createIndexRequest = new CreateIndexRequest(); createIndexRequest.index("test").settings(indexSettings); - helper.client("1").execute(CreateIndexAction.INSTANCE, createIndexRequest).actionGet(); + helper.client().execute(CreateIndexAction.INSTANCE, createIndexRequest).actionGet(); IndexRequest indexRequest = new IndexRequest(); indexRequest.index("test").id("1") .source(XContentFactory.jsonBuilder().startObject().field("field", "1%2fPJJP3JV2C24iDfEu9XpHBaYxXh%2fdHTbmchB35SDznXO2g8Vz4D7GTIvY54iMiX_149c95f02a8").endObject()); - helper.client("1").execute(IndexAction.INSTANCE, indexRequest).actionGet(); + helper.client().execute(IndexAction.INSTANCE, indexRequest).actionGet(); RefreshRequest refreshRequest = new RefreshRequest(); refreshRequest.indices("test"); - helper.client("1").execute(RefreshAction.INSTANCE, refreshRequest).actionGet(); + helper.client().execute(RefreshAction.INSTANCE, refreshRequest).actionGet(); SearchSourceBuilder builder = new SearchSourceBuilder(); builder.query(QueryBuilders.matchQuery("field", "1%2fPJJP3JV2C24iDfEu9XpHBaYxXh%2fdHTbmchB35SDznXO2g8Vz4D7GTIvY54iMiX_149c95f02a8")); SearchRequest searchRequest = new SearchRequest(); searchRequest.indices("test"); searchRequest.source(builder); - String doc = helper.client("1").execute(SearchAction.INSTANCE, searchRequest).actionGet() + String doc = helper.client().execute(SearchAction.INSTANCE, searchRequest).actionGet() .getHits().getAt(0).getSourceAsString(); assertEquals(doc, "{\"field\":\"1%2fPJJP3JV2C24iDfEu9XpHBaYxXh%2fdHTbmchB35SDznXO2g8Vz4D7GTIvY54iMiX_149c95f02a8\"}"); diff --git a/elx-common/src/test/java/org/xbib/elx/common/test/TestExtension.java b/elx-common/src/test/java/org/xbib/elx/common/test/TestExtension.java index 2064a5a..7506da4 100644 --- a/elx-common/src/test/java/org/xbib/elx/common/test/TestExtension.java +++ b/elx-common/src/test/java/org/xbib/elx/common/test/TestExtension.java @@ -36,9 +36,7 @@ import java.nio.file.Paths; import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; @@ -82,14 +80,14 @@ public class TestExtension implements ParameterResolver, BeforeEachCallback, Aft Helper helper = extensionContext.getParent().get().getStore(ns) .getOrComputeIfAbsent(key + count.get(), key -> create(), Helper.class); logger.info("starting cluster with helper " + helper + " at " + helper.getHome()); - helper.startNode("1"); + helper.startNode(); NodesInfoRequest nodesInfoRequest = new NodesInfoRequest().addMetric(NodesInfoRequest.Metric.TRANSPORT.metricName()); - NodesInfoResponse response = helper.client("1").execute(NodesInfoAction.INSTANCE, nodesInfoRequest).actionGet(); + NodesInfoResponse response = helper.client().execute(NodesInfoAction.INSTANCE, nodesInfoRequest).actionGet(); TransportAddress address = response.getNodes().get(0).getNode().getAddress(); String host = address.address().getHostName(); int port = address.address().getPort(); try { - ClusterHealthResponse healthResponse = helper.client("1").execute(ClusterHealthAction.INSTANCE, + ClusterHealthResponse healthResponse = helper.client().execute(ClusterHealthAction.INSTANCE, new ClusterHealthRequest().waitForStatus(ClusterHealthStatus.GREEN) .timeout(TimeValue.timeValueSeconds(30))).actionGet(); if (healthResponse != null && healthResponse.isTimedOut()) { @@ -101,7 +99,7 @@ public class TestExtension implements ParameterResolver, BeforeEachCallback, Aft } ClusterStateRequest clusterStateRequest = new ClusterStateRequest().all(); ClusterStateResponse clusterStateResponse = - helper.client("1").execute(ClusterStateAction.INSTANCE, clusterStateRequest).actionGet(); + helper.client().execute(ClusterStateAction.INSTANCE, clusterStateRequest).actionGet(); logger.info("cluster name = {}", clusterStateResponse.getClusterName().value()); logger.info("host = {} port = {}", host, port); } @@ -118,10 +116,8 @@ public class TestExtension implements ParameterResolver, BeforeEachCallback, Aft private void closeNodes(Helper helper) throws IOException { logger.info("closing all nodes"); - for (Node node : helper.nodes.values()) { - if (node != null) { - node.close(); - } + if (helper.node != null) { + helper.node.close(); } logger.info("all nodes closed"); } @@ -158,7 +154,7 @@ public class TestExtension implements ParameterResolver, BeforeEachCallback, Aft String cluster; - Map nodes = new HashMap<>(); + Node node; void setHome(String home) { this.home = home; @@ -183,12 +179,12 @@ public class TestExtension implements ParameterResolver, BeforeEachCallback, Aft .build(); } - void startNode(String id) throws NodeValidationException { - buildNode(id).start(); + void startNode() throws NodeValidationException { + buildNode().start(); } - ElasticsearchClient client(String id) { - return nodes.get(id).client(); + ElasticsearchClient client() { + return node.client(); } String randomString(int len) { @@ -200,14 +196,13 @@ public class TestExtension implements ParameterResolver, BeforeEachCallback, Aft return new String(buf); } - private Node buildNode(String id) { + private Node buildNode() { Settings nodeSettings = Settings.builder() .put(getNodeSettings()) - .put("node.name", id) + .put("node.name", "1") .build(); List> plugins = Collections.singletonList(Netty4Plugin.class); - Node node = new MockNode(nodeSettings, plugins); - nodes.put(id, node); + this.node = new MockNode(nodeSettings, plugins); return node; } } diff --git a/elx-common/src/test/java/org/xbib/elx/common/test/WildcardTest.java b/elx-common/src/test/java/org/xbib/elx/common/test/WildcardTest.java index 69b1640..cdc5f93 100644 --- a/elx-common/src/test/java/org/xbib/elx/common/test/WildcardTest.java +++ b/elx-common/src/test/java/org/xbib/elx/common/test/WildcardTest.java @@ -26,7 +26,7 @@ class WildcardTest { @Test void testWildcard() throws Exception { - ElasticsearchClient client = helper.client("1"); + ElasticsearchClient client = helper.client(); index(client, "1", "010"); index(client, "2", "0*0"); // exact diff --git a/elx-common/src/test/java/org/xbib/elx/common/test/package-info.java b/elx-common/src/test/java/org/xbib/elx/common/test/package-info.java deleted file mode 100644 index 9d006c1..0000000 --- a/elx-common/src/test/java/org/xbib/elx/common/test/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * - */ -package org.xbib.elx.common.test;