From a0a24b50da7d0412d573da4220427ce472000963 Mon Sep 17 00:00:00 2001 From: Hitesh Yadav Date: Mon, 2 Oct 2017 17:40:28 +0530 Subject: [PATCH 01/19] Fixing JsonNull exception in case of null maxscore. Max Score is null when sort criteria is custom in Elasticsearch. Issue: https://github.com/searchbox-io/Jest/issues/433 --- .../java/io/searchbox/core/SearchResult.java | 2 +- .../io/searchbox/core/SearchResultTest.java | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/jest-common/src/main/java/io/searchbox/core/SearchResult.java b/jest-common/src/main/java/io/searchbox/core/SearchResult.java index 5822cb62f..6fa21ab58 100644 --- a/jest-common/src/main/java/io/searchbox/core/SearchResult.java +++ b/jest-common/src/main/java/io/searchbox/core/SearchResult.java @@ -209,7 +209,7 @@ public Long getTotal() { public Float getMaxScore() { Float maxScore = null; JsonElement obj = getPath(PATH_TO_MAX_SCORE); - if (obj != null) maxScore = obj.getAsFloat(); + if (obj != null && !obj.isJsonNull()) maxScore = obj.getAsFloat(); return maxScore; } diff --git a/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java b/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java index 7acd8a1ee..2f0378d3b 100644 --- a/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java +++ b/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java @@ -58,6 +58,41 @@ public void testGetMaxScoreWhenMissing() { assertNull(maxScore); } + @Test + public void testGetMaxScoreNullMaxScore() { + String jsonWithMaxScore = "{\n" + + " \"_shards\":{\n" + + " \"total\" : 5,\n" + + " \"successful\" : 5,\n" + + " \"failed\" : 0\n" + + " },\n" + + " \"hits\":{\n" + + " \"max_score\" : null,\n" + + " \"total\" : 1,\n" + + " \"hits\" : [\n" + + " {\n" + + " \"_index\" : \"twitter\",\n" + + " \"_type\" : \"tweet\",\n" + + " \"_id\" : \"1\",\n" + + " \"_source\" : {\n" + + " \"user\" : \"kimchy\",\n" + + " \"postDate\" : \"2009-11-15T14:12:12\",\n" + + " \"message\" : \"trying out Elasticsearch\"\n" + + " }\n" + + " }\n" + + " ]\n" + + " }\n" + + "}"; + SearchResult searchResult = new SearchResult(new Gson()); + searchResult.setSucceeded(true); + searchResult.setJsonString(jsonWithMaxScore); + searchResult.setJsonObject(new JsonParser().parse(jsonWithMaxScore).getAsJsonObject()); + searchResult.setPathToResult("hits/hits/_source"); + + Float maxScore = searchResult.getMaxScore(); + assertNull(maxScore); + } + @Test public void testGetMaxScore() { String jsonWithMaxScore = "{\n" + From 8ae435f2670af98cb0abc4867c4f9c5b524f374e Mon Sep 17 00:00:00 2001 From: btrajkovski Date: Tue, 17 Oct 2017 23:57:53 +0200 Subject: [PATCH 02/19] Add toString in JestResult and use auto-closable - Add toString method on JestResult class - Use auto-closable in some classes to fix sonar issues --- .../src/main/java/io/searchbox/client/JestResult.java | 7 +++++++ .../indices/script/CreateIndexedScriptTest.java | 8 ++++---- .../java/io/searchbox/client/http/FailingProxy.java | 10 +++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/jest-common/src/main/java/io/searchbox/client/JestResult.java b/jest-common/src/main/java/io/searchbox/client/JestResult.java index 1061ef56c..0f7307f68 100644 --- a/jest-common/src/main/java/io/searchbox/client/JestResult.java +++ b/jest-common/src/main/java/io/searchbox/client/JestResult.java @@ -367,4 +367,11 @@ protected String[] getKeys() { return pathToResult == null ? null : pathToResult.split("/"); } + @Override + public String toString() { + return "Result: " + getJsonString() + + ", isSucceeded: " + isSucceeded() + + ", response code: " + getResponseCode() + + ", error message: " + getErrorMessage(); + } } diff --git a/jest-common/src/test/java/io/searchbox/indices/script/CreateIndexedScriptTest.java b/jest-common/src/test/java/io/searchbox/indices/script/CreateIndexedScriptTest.java index 38b5c4be1..75bba13a8 100644 --- a/jest-common/src/test/java/io/searchbox/indices/script/CreateIndexedScriptTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/script/CreateIndexedScriptTest.java @@ -78,10 +78,10 @@ public void fileSourceIsValidJsonString() throws Exception { private File createTempGroovySnippetFile() throws IOException { File file = File.createTempFile("test", ".groovy"); file.deleteOnExit(); - FileWriter writer = new FileWriter(file); - writer.write(groovysnippet); - writer.close(); - return file; + try (FileWriter writer = new FileWriter(file)) { + writer.write(groovysnippet); + return file; + } } private JsonObject parseAsGson(String data) { diff --git a/jest/src/test/java/io/searchbox/client/http/FailingProxy.java b/jest/src/test/java/io/searchbox/client/http/FailingProxy.java index a45808674..025f7ca5b 100644 --- a/jest/src/test/java/io/searchbox/client/http/FailingProxy.java +++ b/jest/src/test/java/io/searchbox/client/http/FailingProxy.java @@ -68,11 +68,11 @@ public void stop() { } private static int getUnusedPort() throws IOException { - final Socket deadSocket = new Socket(); - deadSocket.bind(null); - final int port = deadSocket.getLocalPort(); - deadSocket.close(); - return port; + try (Socket deadSocket = new Socket()) { + deadSocket.bind(null); + final int port = deadSocket.getLocalPort(); + return port; + } } private class FailingSourceAdapter extends HttpFiltersSourceAdapter { From e35b423df843fdc4e56cc3e8f66f22416cebd233 Mon Sep 17 00:00:00 2001 From: Hitesh Yadav Date: Mon, 23 Oct 2017 14:55:50 +0530 Subject: [PATCH 03/19] Update SearchResultTest.java --- .../src/test/java/io/searchbox/core/SearchResultTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java b/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java index 2f0378d3b..0cff9d6fb 100644 --- a/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java +++ b/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java @@ -60,7 +60,7 @@ public void testGetMaxScoreWhenMissing() { @Test public void testGetMaxScoreNullMaxScore() { - String jsonWithMaxScore = "{\n" + + String jsonWithNullMaxScore = "{\n" + " \"_shards\":{\n" + " \"total\" : 5,\n" + " \"successful\" : 5,\n" + @@ -85,8 +85,8 @@ public void testGetMaxScoreNullMaxScore() { "}"; SearchResult searchResult = new SearchResult(new Gson()); searchResult.setSucceeded(true); - searchResult.setJsonString(jsonWithMaxScore); - searchResult.setJsonObject(new JsonParser().parse(jsonWithMaxScore).getAsJsonObject()); + searchResult.setJsonString(jsonWithNullMaxScore); + searchResult.setJsonObject(new JsonParser().parse(jsonWithNullMaxScore).getAsJsonObject()); searchResult.setPathToResult("hits/hits/_source"); Float maxScore = searchResult.getMaxScore(); From 9288af58219931b9cca5516df601b4379f2d1612 Mon Sep 17 00:00:00 2001 From: Michael Siepmann Date: Tue, 24 Oct 2017 13:44:42 +0200 Subject: [PATCH 04/19] - Bugfix for Issue https://github.com/searchbox-io/Jest/issues/547 - Added method isNotBlank, which makes the code a little bit mor readable. --- .../java/io/searchbox/action/AbstractAction.java | 14 ++++++++++++-- .../action/AbstractDocumentTargetedAction.java | 2 +- .../src/main/java/io/searchbox/cluster/Health.java | 2 +- .../src/main/java/io/searchbox/core/Bulk.java | 6 +++--- .../main/java/io/searchbox/core/MultiSearch.java | 2 +- .../java/io/searchbox/indices/type/TypeExist.java | 7 ++++++- .../java/io/searchbox/strings/StringUtils.java | 4 ++++ .../io/searchbox/indices/type/TypeExistTest.java | 2 +- 8 files changed, 29 insertions(+), 10 deletions(-) diff --git a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java index 23bd04be1..c699b7dca 100644 --- a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java +++ b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java @@ -177,10 +177,16 @@ protected String buildURI() { StringBuilder sb = new StringBuilder(); try { - if (!StringUtils.isBlank(indexName)) { + if (StringUtils.isNotBlank(indexName)) { sb.append(URLEncoder.encode(indexName, CHARSET)); - if (!StringUtils.isBlank(typeName)) { + String commandExtension = getURLCommandExtension(); + + if (StringUtils.isNotBlank(commandExtension)) { + sb.append("/").append(URLEncoder.encode(commandExtension, CHARSET)); + } + + if (StringUtils.isNotBlank(typeName)) { sb.append("/").append(URLEncoder.encode(typeName, CHARSET)); } } @@ -193,6 +199,10 @@ protected String buildURI() { return sb.toString(); } + protected String getURLCommandExtension() { + return null; + } + protected String buildQueryString() throws UnsupportedEncodingException { StringBuilder queryString = new StringBuilder(); diff --git a/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java b/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java index 4b27952a7..9de05c55d 100644 --- a/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java +++ b/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java @@ -39,7 +39,7 @@ public String getId() { protected String buildURI() { StringBuilder sb = new StringBuilder(super.buildURI()); - if (!StringUtils.isBlank(id)) { + if (StringUtils.isNotBlank(id)) { try { sb.append("/").append(URLEncoder.encode(id, CHARSET)); } catch (UnsupportedEncodingException e) { diff --git a/jest-common/src/main/java/io/searchbox/cluster/Health.java b/jest-common/src/main/java/io/searchbox/cluster/Health.java index 8bf06739b..2e71667ca 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/Health.java +++ b/jest-common/src/main/java/io/searchbox/cluster/Health.java @@ -51,7 +51,7 @@ protected String buildURI() { StringBuilder sb = new StringBuilder("/_cluster/health/"); try { - if (!StringUtils.isBlank(indexName)) { + if (StringUtils.isNotBlank(indexName)) { sb.append(URLEncoder.encode(indexName, CHARSET)); } } catch (UnsupportedEncodingException e) { diff --git a/jest-common/src/main/java/io/searchbox/core/Bulk.java b/jest-common/src/main/java/io/searchbox/core/Bulk.java index 89a686651..4924fadd7 100644 --- a/jest-common/src/main/java/io/searchbox/core/Bulk.java +++ b/jest-common/src/main/java/io/searchbox/core/Bulk.java @@ -67,13 +67,13 @@ public String getData(Gson gson) { Map> opMap = new LinkedHashMap>(1); Map opDetails = new LinkedHashMap(3); - if (!StringUtils.isBlank(action.getId())) { + if (StringUtils.isNotBlank(action.getId())) { opDetails.put("_id", action.getId()); } - if (!StringUtils.isBlank(action.getIndex())) { + if (StringUtils.isNotBlank(action.getIndex())) { opDetails.put("_index", action.getIndex()); } - if (!StringUtils.isBlank(action.getType())) { + if (StringUtils.isNotBlank(action.getType())) { opDetails.put("_type", action.getType()); } diff --git a/jest-common/src/main/java/io/searchbox/core/MultiSearch.java b/jest-common/src/main/java/io/searchbox/core/MultiSearch.java index a3e14d5a0..2a5e305fa 100644 --- a/jest-common/src/main/java/io/searchbox/core/MultiSearch.java +++ b/jest-common/src/main/java/io/searchbox/core/MultiSearch.java @@ -50,7 +50,7 @@ public String getData(Gson gson) { StringBuilder sb = new StringBuilder(); for (Search search : searches) { sb.append("{\"index\" : \"").append(search.getIndex()); - if (!StringUtils.isBlank(search.getType())) { + if (StringUtils.isNotBlank(search.getType())) { sb.append("\", \"type\" : \"").append(search.getType()); } sb.append(getParameter(search, "ignore_unavailable")); diff --git a/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java b/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java index 3ac7ffd51..2840b5cdb 100644 --- a/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java +++ b/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java @@ -8,11 +8,16 @@ */ public class TypeExist extends GenericResultAbstractAction { - protected TypeExist(Builder builder) { + TypeExist(Builder builder) { super(builder); setURI(buildURI()); } + @Override + protected String getURLCommandExtension() { + return "_mapping"; + } + @Override public String getRestMethodName() { return "HEAD"; diff --git a/jest-common/src/main/java/io/searchbox/strings/StringUtils.java b/jest-common/src/main/java/io/searchbox/strings/StringUtils.java index 5e18bac01..5a2d06285 100644 --- a/jest-common/src/main/java/io/searchbox/strings/StringUtils.java +++ b/jest-common/src/main/java/io/searchbox/strings/StringUtils.java @@ -15,4 +15,8 @@ public static boolean isBlank(final CharSequence cs) { } return true; } + + public static boolean isNotBlank(final CharSequence cs) { + return !isBlank(cs); + } } diff --git a/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java b/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java index 1a1b8eaca..069799b44 100644 --- a/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java @@ -15,7 +15,7 @@ public void testBasicUriGeneration() { TypeExist typeExist = new TypeExist.Builder("happyprg").addType("seohoo").build(); assertEquals("HEAD", typeExist.getRestMethodName()); - assertEquals("happyprg/seohoo", typeExist.getURI()); + assertEquals("happyprg/_mapping/seohoo", typeExist.getURI()); } @Test From ce5bec4562bfa85dce4801fed6047fbb5ef4701f Mon Sep 17 00:00:00 2001 From: Michael Siepmann Date: Tue, 24 Oct 2017 13:50:54 +0200 Subject: [PATCH 05/19] TypeExists is now compatible for all versions. Sorry, i've no better idea how to solve the problem. :-) --- .../io/searchbox/indices/type/TypeExist.java | 16 +++++++++++++--- .../io/searchbox/indices/type/TypeExistTest.java | 8 ++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java b/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java index 2840b5cdb..bc8738090 100644 --- a/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java +++ b/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java @@ -8,14 +8,17 @@ */ public class TypeExist extends GenericResultAbstractAction { - TypeExist(Builder builder) { + private final boolean compatibleFor55; + + TypeExist(Builder builder, boolean compatibleFor55) { super(builder); + this.compatibleFor55 = compatibleFor55; setURI(buildURI()); } @Override protected String getURLCommandExtension() { - return "_mapping"; + return compatibleFor55 ? "_mapping" : super.getURLCommandExtension(); } @Override @@ -25,13 +28,20 @@ public String getRestMethodName() { public static class Builder extends AbstractMultiTypeActionBuilder { + private boolean compatibleFor55 = false; + public Builder(String index) { addIndex(index); } + public Builder makeCompatibleForVersion55() { + compatibleFor55 = true; + return this; + } + @Override public TypeExist build() { - return new TypeExist(this); + return new TypeExist(this, compatibleFor55); } } diff --git a/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java b/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java index 069799b44..5b326dc1c 100644 --- a/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java @@ -14,6 +14,14 @@ public class TypeExistTest { public void testBasicUriGeneration() { TypeExist typeExist = new TypeExist.Builder("happyprg").addType("seohoo").build(); + assertEquals("HEAD", typeExist.getRestMethodName()); + assertEquals("happyprg/seohoo", typeExist.getURI()); + } + + @Test + public void testBasicUriGeneration_compatibleForES55() { + TypeExist typeExist = new TypeExist.Builder("happyprg").addType("seohoo").makeCompatibleForVersion55().build(); + assertEquals("HEAD", typeExist.getRestMethodName()); assertEquals("happyprg/_mapping/seohoo", typeExist.getURI()); } From aee244c9b0149e32120b3d54fda2aa388b5be319 Mon Sep 17 00:00:00 2001 From: Michael Siepmann Date: Tue, 24 Oct 2017 13:54:38 +0200 Subject: [PATCH 06/19] New action for testing, if a document exists. --- .../io/searchbox/indices/DocumentExists.java | 35 +++++++++++++++++++ .../indices/DocumentExistsResult.java | 15 ++++++++ 2 files changed, 50 insertions(+) create mode 100644 jest-common/src/main/java/io/searchbox/indices/DocumentExists.java create mode 100644 jest-common/src/main/java/io/searchbox/indices/DocumentExistsResult.java diff --git a/jest-common/src/main/java/io/searchbox/indices/DocumentExists.java b/jest-common/src/main/java/io/searchbox/indices/DocumentExists.java new file mode 100644 index 000000000..a278c3eba --- /dev/null +++ b/jest-common/src/main/java/io/searchbox/indices/DocumentExists.java @@ -0,0 +1,35 @@ +package io.searchbox.indices; + +import com.google.gson.Gson; +import io.searchbox.action.AbstractDocumentTargetedAction; + +public class DocumentExists extends AbstractDocumentTargetedAction { + + DocumentExists(DocumentExists.Builder builder) { + super(builder); + setURI(buildURI()); + } + + @Override + public String getRestMethodName() { + return "HEAD"; + } + + @Override + public DocumentExistsResult createNewElasticSearchResult(String responseBody, int statusCode, String reasonPhrase, Gson gson) { + return createNewElasticSearchResult(new DocumentExistsResult(gson), responseBody, statusCode, reasonPhrase, gson); + } + + public static class Builder extends AbstractDocumentTargetedAction.Builder { + + public Builder(String index, String type, String id) { + this.index(index); + this.type(type); + this.id(id); + } + + public DocumentExists build() { + return new DocumentExists(this); + } + } +} \ No newline at end of file diff --git a/jest-common/src/main/java/io/searchbox/indices/DocumentExistsResult.java b/jest-common/src/main/java/io/searchbox/indices/DocumentExistsResult.java new file mode 100644 index 000000000..fb5f145e3 --- /dev/null +++ b/jest-common/src/main/java/io/searchbox/indices/DocumentExistsResult.java @@ -0,0 +1,15 @@ +package io.searchbox.indices; + +import com.google.gson.Gson; +import io.searchbox.client.JestResult; + +public class DocumentExistsResult extends JestResult { + + DocumentExistsResult(Gson gson) { + super(gson); + } + + public boolean documentExists() { + return isSucceeded(); + } +} From 8791336f76e27581dc02c7dfbb4aef8bc23c3953 Mon Sep 17 00:00:00 2001 From: Michael Siepmann Date: Wed, 25 Oct 2017 00:58:53 +0200 Subject: [PATCH 07/19] This is better: now you can set the version of ES in the clientconfiguration. --- .../io/searchbox/action/AbstractAction.java | 5 ++ .../AbstractDocumentTargetedAction.java | 1 + .../main/java/io/searchbox/action/Action.java | 3 + .../client/config/ElasticsearchVersion.java | 8 ++ .../io/searchbox/indices/type/TypeExist.java | 74 +++++++++---------- .../searchbox/indices/type/TypeExistTest.java | 5 +- .../searchbox/client/JestClientFactory.java | 2 + .../client/config/HttpClientConfig.java | 12 +++ .../searchbox/client/http/JestHttpClient.java | 8 ++ 9 files changed, 80 insertions(+), 38 deletions(-) create mode 100644 jest-common/src/main/java/io/searchbox/client/config/ElasticsearchVersion.java diff --git a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java index c699b7dca..b811779b9 100644 --- a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java +++ b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java @@ -11,6 +11,7 @@ import com.google.gson.JsonSyntaxException; import io.searchbox.annotations.JestId; import io.searchbox.client.JestResult; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.params.Parameters; import io.searchbox.strings.StringUtils; import org.slf4j.Logger; @@ -138,6 +139,10 @@ public Map getHeaders() { return headerMap; } + @Override + public void prepare(ElasticsearchVersion elasticsearchVersion) { + } + @Override public String getURI() { String finalUri = URI; diff --git a/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java b/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java index 9de05c55d..7fa7d6f7c 100644 --- a/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java +++ b/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java @@ -1,6 +1,7 @@ package io.searchbox.action; import io.searchbox.client.JestResult; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.strings.StringUtils; import java.io.UnsupportedEncodingException; diff --git a/jest-common/src/main/java/io/searchbox/action/Action.java b/jest-common/src/main/java/io/searchbox/action/Action.java index 4a905749b..37b81c7b5 100644 --- a/jest-common/src/main/java/io/searchbox/action/Action.java +++ b/jest-common/src/main/java/io/searchbox/action/Action.java @@ -2,6 +2,7 @@ import com.google.gson.Gson; import io.searchbox.client.JestResult; +import io.searchbox.client.config.ElasticsearchVersion; import java.util.Map; @@ -10,6 +11,8 @@ */ public interface Action { + void prepare(ElasticsearchVersion elasticsearchVersion); + String getURI(); String getRestMethodName(); diff --git a/jest-common/src/main/java/io/searchbox/client/config/ElasticsearchVersion.java b/jest-common/src/main/java/io/searchbox/client/config/ElasticsearchVersion.java new file mode 100644 index 000000000..c01eccdd3 --- /dev/null +++ b/jest-common/src/main/java/io/searchbox/client/config/ElasticsearchVersion.java @@ -0,0 +1,8 @@ +package io.searchbox.client.config; + +public enum ElasticsearchVersion { + + UNKNOWN, + V2, + V55 +} diff --git a/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java b/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java index bc8738090..b9b95c0e0 100644 --- a/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java +++ b/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java @@ -2,47 +2,47 @@ import io.searchbox.action.AbstractMultiTypeActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** - * @author happyprg(hongsgo@gmail.com) + * @author happyprg(hongsgo @ gmail.com) */ public class TypeExist extends GenericResultAbstractAction { - private final boolean compatibleFor55; - - TypeExist(Builder builder, boolean compatibleFor55) { - super(builder); - this.compatibleFor55 = compatibleFor55; - setURI(buildURI()); - } - - @Override - protected String getURLCommandExtension() { - return compatibleFor55 ? "_mapping" : super.getURLCommandExtension(); - } - - @Override - public String getRestMethodName() { - return "HEAD"; - } - - public static class Builder extends AbstractMultiTypeActionBuilder { - - private boolean compatibleFor55 = false; - - public Builder(String index) { - addIndex(index); - } - - public Builder makeCompatibleForVersion55() { - compatibleFor55 = true; - return this; - } - - @Override - public TypeExist build() { - return new TypeExist(this, compatibleFor55); - } - } + private ElasticsearchVersion elasticsearchVersion; + + TypeExist(Builder builder) { + super(builder); + setURI(buildURI()); + } + + @Override + public void prepare(ElasticsearchVersion elasticsearchVersion) { + super.prepare(elasticsearchVersion); + this.elasticsearchVersion = elasticsearchVersion; + setURI(buildURI()); + } + + @Override + protected String getURLCommandExtension() { + return elasticsearchVersion == ElasticsearchVersion.V55 ? "_mapping" : super.getURLCommandExtension(); + } + + @Override + public String getRestMethodName() { + return "HEAD"; + } + + public static class Builder extends AbstractMultiTypeActionBuilder { + + public Builder(String index) { + addIndex(index); + } + + @Override + public TypeExist build() { + return new TypeExist(this); + } + } } diff --git a/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java b/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java index 5b326dc1c..beef1ebf6 100644 --- a/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.type; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -20,7 +21,9 @@ public void testBasicUriGeneration() { @Test public void testBasicUriGeneration_compatibleForES55() { - TypeExist typeExist = new TypeExist.Builder("happyprg").addType("seohoo").makeCompatibleForVersion55().build(); + TypeExist typeExist = new TypeExist.Builder("happyprg").addType("seohoo").build(); + + typeExist.prepare(ElasticsearchVersion.V55); assertEquals("HEAD", typeExist.getRestMethodName()); assertEquals("happyprg/_mapping/seohoo", typeExist.getURI()); diff --git a/jest/src/main/java/io/searchbox/client/JestClientFactory.java b/jest/src/main/java/io/searchbox/client/JestClientFactory.java index c3abda10e..8e603fe41 100755 --- a/jest/src/main/java/io/searchbox/client/JestClientFactory.java +++ b/jest/src/main/java/io/searchbox/client/JestClientFactory.java @@ -103,6 +103,8 @@ public JestClient getObject() { client.setHttpClientContextTemplate(createPreemptiveAuthContext(preemptiveAuthTargetHosts)); } + client.setElasticsearchVersion(httpClientConfig.getElasticsearchVersion()); + return client; } diff --git a/jest/src/main/java/io/searchbox/client/config/HttpClientConfig.java b/jest/src/main/java/io/searchbox/client/config/HttpClientConfig.java index 5af1789cf..9e7a48cfe 100644 --- a/jest/src/main/java/io/searchbox/client/config/HttpClientConfig.java +++ b/jest/src/main/java/io/searchbox/client/config/HttpClientConfig.java @@ -43,6 +43,7 @@ public class HttpClientConfig extends ClientConfig { private final SchemeIOSessionStrategy httpIOSessionStrategy; private final SchemeIOSessionStrategy httpsIOSessionStrategy; private Set preemptiveAuthTargetHosts; + private final ElasticsearchVersion elasticsearchVersion; public HttpClientConfig(Builder builder) { super(builder); @@ -57,6 +58,7 @@ public HttpClientConfig(Builder builder) { this.httpIOSessionStrategy = builder.httpIOSessionStrategy; this.httpsIOSessionStrategy = builder.httpsIOSessionStrategy; this.preemptiveAuthTargetHosts = builder.preemptiveAuthTargetHosts; + this.elasticsearchVersion = builder.elasticsearchVersion; } public Map getMaxTotalConnectionPerRoute() { @@ -103,6 +105,10 @@ public Set getPreemptiveAuthTargetHosts() { return preemptiveAuthTargetHosts; } + public ElasticsearchVersion getElasticsearchVersion() { + return elasticsearchVersion; + } + public static class Builder extends ClientConfig.AbstractBuilder { private Integer maxTotalConnection; @@ -116,6 +122,7 @@ public static class Builder extends ClientConfig.AbstractBuilder preemptiveAuthTargetHosts = Collections.emptySet(); + private ElasticsearchVersion elasticsearchVersion = ElasticsearchVersion.UNKNOWN; public Builder(HttpClientConfig httpClientConfig) { super(httpClientConfig); @@ -279,6 +286,11 @@ public Builder proxy(HttpHost proxy, AuthenticationStrategy proxyAuthenticationS return this; } + public Builder elasticsearchVersion(ElasticsearchVersion elasticsearchVersion) { + this.elasticsearchVersion = elasticsearchVersion; + return this; + } + public HttpClientConfig build() { // Lazily initialize if necessary, as the call can be expensive when done eagerly. if (this.sslSocketFactory == null) { diff --git a/jest/src/main/java/io/searchbox/client/http/JestHttpClient.java b/jest/src/main/java/io/searchbox/client/http/JestHttpClient.java index 6f4c1b0a7..7cb1a6329 100755 --- a/jest/src/main/java/io/searchbox/client/http/JestHttpClient.java +++ b/jest/src/main/java/io/searchbox/client/http/JestHttpClient.java @@ -5,6 +5,7 @@ import io.searchbox.client.AbstractJestClient; import io.searchbox.client.JestResult; import io.searchbox.client.JestResultHandler; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.client.config.exception.CouldNotConnectException; import io.searchbox.client.http.apache.HttpDeleteWithEntity; import io.searchbox.client.http.apache.HttpGetWithEntity; @@ -50,6 +51,8 @@ public class JestHttpClient extends AbstractJestClient { private HttpClientContext httpClientContextTemplate; + private ElasticsearchVersion elasticsearchVersion = ElasticsearchVersion.UNKNOWN; + /** * @throws IOException in case of a problem or the connection was aborted during request, * or in case of a problem while reading the response stream @@ -112,6 +115,7 @@ public void close() throws IOException { } protected HttpUriRequest prepareRequest(final Action clientRequest, final RequestConfig requestConfig) { + clientRequest.prepare(elasticsearchVersion); String elasticSearchRestUrl = getRequestURL(getNextServer(), clientRequest.getURI()); HttpUriRequest request = constructHttpMethod(clientRequest.getRestMethodName(), elasticSearchRestUrl, clientRequest.getData(gson), requestConfig); @@ -243,6 +247,10 @@ public void setHttpClientContextTemplate(HttpClientContext httpClientContext) { this.httpClientContextTemplate = httpClientContext; } + public void setElasticsearchVersion(ElasticsearchVersion elasticsearchVersion) { + this.elasticsearchVersion = elasticsearchVersion; + } + protected class DefaultCallback implements FutureCallback { private final Action clientRequest; private final HttpRequest request; From 642a4c422108bd710a6569b2b2cbf08563f52b16 Mon Sep 17 00:00:00 2001 From: Michael Siepmann Date: Wed, 25 Oct 2017 21:37:54 +0200 Subject: [PATCH 08/19] Removed always doing the same thing. :-) --- .../io/searchbox/action/AbstractAction.java | 7 +---- .../io/searchbox/cluster/GetSettings.java | 1 - .../java/io/searchbox/cluster/Health.java | 1 - .../io/searchbox/cluster/NodesHotThreads.java | 1 - .../java/io/searchbox/cluster/NodesInfo.java | 1 - .../io/searchbox/cluster/NodesShutdown.java | 1 - .../java/io/searchbox/cluster/NodesStats.java | 1 - .../cluster/PendingClusterTasks.java | 1 - .../java/io/searchbox/cluster/Reroute.java | 1 - .../main/java/io/searchbox/cluster/State.java | 1 - .../main/java/io/searchbox/cluster/Stats.java | 1 - .../searchbox/cluster/TasksInformation.java | 1 - .../io/searchbox/cluster/UpdateSettings.java | 1 - .../src/main/java/io/searchbox/core/Bulk.java | 2 -- .../src/main/java/io/searchbox/core/Cat.java | 1 - .../java/io/searchbox/core/ClearScroll.java | 2 -- .../main/java/io/searchbox/core/Count.java | 2 -- .../main/java/io/searchbox/core/Delete.java | 1 - .../java/io/searchbox/core/DeleteByQuery.java | 1 - .../main/java/io/searchbox/core/Explain.java | 1 - .../src/main/java/io/searchbox/core/Get.java | 1 - .../main/java/io/searchbox/core/Index.java | 2 -- .../main/java/io/searchbox/core/MultiGet.java | 1 - .../java/io/searchbox/core/MultiSearch.java | 2 -- .../java/io/searchbox/core/Percolate.java | 1 - .../src/main/java/io/searchbox/core/Ping.java | 1 - .../main/java/io/searchbox/core/Search.java | 31 +++++++++---------- .../java/io/searchbox/core/SearchScroll.java | 1 - .../java/io/searchbox/core/SearchShards.java | 1 - .../main/java/io/searchbox/core/Suggest.java | 2 -- .../main/java/io/searchbox/core/Update.java | 2 -- .../java/io/searchbox/core/UpdateByQuery.java | 2 -- .../main/java/io/searchbox/core/Validate.java | 1 - .../java/io/searchbox/indices/Analyze.java | 1 - .../java/io/searchbox/indices/ClearCache.java | 1 - .../java/io/searchbox/indices/CloseIndex.java | 1 - .../io/searchbox/indices/CreateIndex.java | 1 - .../io/searchbox/indices/DeleteIndex.java | 1 - .../io/searchbox/indices/DocumentExists.java | 1 - .../main/java/io/searchbox/indices/Flush.java | 1 - .../java/io/searchbox/indices/ForceMerge.java | 1 - .../io/searchbox/indices/IndicesExists.java | 1 - .../java/io/searchbox/indices/OpenIndex.java | 1 - .../java/io/searchbox/indices/Optimize.java | 1 - .../java/io/searchbox/indices/Refresh.java | 1 - .../java/io/searchbox/indices/Rollover.java | 8 +++-- .../main/java/io/searchbox/indices/Stats.java | 2 -- .../indices/aliases/AliasExists.java | 1 - .../searchbox/indices/aliases/GetAliases.java | 1 - .../indices/aliases/ModifyAliases.java | 1 - .../indices/mapping/DeleteMapping.java | 1 - .../searchbox/indices/mapping/GetMapping.java | 1 - .../searchbox/indices/mapping/PutMapping.java | 1 - .../io/searchbox/indices/reindex/Reindex.java | 2 -- .../indices/script/CreateStoredScript.java | 1 - .../indices/script/DeleteStoredScript.java | 1 - .../indices/script/GetStoredScript.java | 1 - .../IndicesSettingsAbstractAction.java | 1 - .../indices/template/DeleteTemplate.java | 1 - .../indices/template/GetTemplate.java | 1 - .../indices/template/PutTemplate.java | 1 - .../indices/template/TemplateAction.java | 4 +-- .../io/searchbox/indices/type/TypeExist.java | 4 +-- .../snapshot/AbstractSnapshotAction.java | 1 - .../AbstractSnapshotRepositoryAction.java | 1 - .../searchbox/action/AbstractActionTest.java | 1 - 66 files changed, 22 insertions(+), 103 deletions(-) diff --git a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java index b811779b9..c9754fb0f 100644 --- a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java +++ b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java @@ -46,7 +46,6 @@ public abstract class AbstractAction implements Action private final ConcurrentMap headerMap = new ConcurrentHashMap(); private final Multimap parameterMap = LinkedHashMultimap.create(); private final Set cleanApiParameters = new LinkedHashSet(); - private String URI; public AbstractAction() { } @@ -145,7 +144,7 @@ public void prepare(ElasticsearchVersion elasticsearchVersion) { @Override public String getURI() { - String finalUri = URI; + String finalUri = buildURI(); if (!parameterMap.isEmpty() || !cleanApiParameters.isEmpty()) { try { finalUri += buildQueryString(); @@ -158,10 +157,6 @@ public String getURI() { return finalUri; } - protected void setURI(String URI) { - this.URI = URI; - } - @Override public String getData(Gson gson) { if (payload == null) { diff --git a/jest-common/src/main/java/io/searchbox/cluster/GetSettings.java b/jest-common/src/main/java/io/searchbox/cluster/GetSettings.java index c3d569ad9..3353bc301 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/GetSettings.java +++ b/jest-common/src/main/java/io/searchbox/cluster/GetSettings.java @@ -12,7 +12,6 @@ public class GetSettings extends GenericResultAbstractAction { protected GetSettings(Builder builder) { super(builder); - setURI(buildURI()); } protected String buildURI() { diff --git a/jest-common/src/main/java/io/searchbox/cluster/Health.java b/jest-common/src/main/java/io/searchbox/cluster/Health.java index 2e71667ca..f332692f8 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/Health.java +++ b/jest-common/src/main/java/io/searchbox/cluster/Health.java @@ -43,7 +43,6 @@ public String getKey() { protected Health(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/NodesHotThreads.java b/jest-common/src/main/java/io/searchbox/cluster/NodesHotThreads.java index f6c894650..fa37a349c 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/NodesHotThreads.java +++ b/jest-common/src/main/java/io/searchbox/cluster/NodesHotThreads.java @@ -15,7 +15,6 @@ public class NodesHotThreads extends GenericResultAbstractAction { protected NodesHotThreads(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/NodesInfo.java b/jest-common/src/main/java/io/searchbox/cluster/NodesInfo.java index dfa96e0f0..4d31da126 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/NodesInfo.java +++ b/jest-common/src/main/java/io/searchbox/cluster/NodesInfo.java @@ -11,7 +11,6 @@ public class NodesInfo extends GenericResultAbstractAction { protected NodesInfo(Builder builder) { super(builder); - setURI(buildURI()); } protected String buildURI() { diff --git a/jest-common/src/main/java/io/searchbox/cluster/NodesShutdown.java b/jest-common/src/main/java/io/searchbox/cluster/NodesShutdown.java index 61f253c11..a847a838b 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/NodesShutdown.java +++ b/jest-common/src/main/java/io/searchbox/cluster/NodesShutdown.java @@ -11,7 +11,6 @@ public class NodesShutdown extends GenericResultAbstractAction { protected NodesShutdown(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/NodesStats.java b/jest-common/src/main/java/io/searchbox/cluster/NodesStats.java index f4b4fbcd7..b77564d32 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/NodesStats.java +++ b/jest-common/src/main/java/io/searchbox/cluster/NodesStats.java @@ -11,7 +11,6 @@ public class NodesStats extends GenericResultAbstractAction { protected NodesStats(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/PendingClusterTasks.java b/jest-common/src/main/java/io/searchbox/cluster/PendingClusterTasks.java index b801272cb..b171f6f37 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/PendingClusterTasks.java +++ b/jest-common/src/main/java/io/searchbox/cluster/PendingClusterTasks.java @@ -6,7 +6,6 @@ public class PendingClusterTasks extends GenericResultAbstractAction { protected PendingClusterTasks(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/Reroute.java b/jest-common/src/main/java/io/searchbox/cluster/Reroute.java index 7416afb6c..35fa9dce4 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/Reroute.java +++ b/jest-common/src/main/java/io/searchbox/cluster/Reroute.java @@ -14,7 +14,6 @@ public class Reroute extends GenericResultAbstractAction { protected Reroute(Builder builder) { super(builder); - setURI(buildURI()); List actions = new LinkedList<>(); for (RerouteCommand rerouteCommand : builder.commandList) { diff --git a/jest-common/src/main/java/io/searchbox/cluster/State.java b/jest-common/src/main/java/io/searchbox/cluster/State.java index 2af30e49d..edfeaba65 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/State.java +++ b/jest-common/src/main/java/io/searchbox/cluster/State.java @@ -11,7 +11,6 @@ public class State extends GenericResultAbstractAction { protected State(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/Stats.java b/jest-common/src/main/java/io/searchbox/cluster/Stats.java index 84ab0153e..07413a7c9 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/Stats.java +++ b/jest-common/src/main/java/io/searchbox/cluster/Stats.java @@ -6,7 +6,6 @@ public class Stats extends GenericResultAbstractAction { protected Stats(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/TasksInformation.java b/jest-common/src/main/java/io/searchbox/cluster/TasksInformation.java index 0cfab1fe6..2e57a3922 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/TasksInformation.java +++ b/jest-common/src/main/java/io/searchbox/cluster/TasksInformation.java @@ -12,7 +12,6 @@ public class TasksInformation extends GenericResultAbstractAction { protected TasksInformation(Builder builder) { super(builder); task = builder.task; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/UpdateSettings.java b/jest-common/src/main/java/io/searchbox/cluster/UpdateSettings.java index 16661ee1e..230c38213 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/UpdateSettings.java +++ b/jest-common/src/main/java/io/searchbox/cluster/UpdateSettings.java @@ -18,7 +18,6 @@ public class UpdateSettings extends GenericResultAbstractAction { protected UpdateSettings(Builder builder) { super(builder); - setURI(buildURI()); this.payload = builder.source; } diff --git a/jest-common/src/main/java/io/searchbox/core/Bulk.java b/jest-common/src/main/java/io/searchbox/core/Bulk.java index 4924fadd7..29873b71e 100644 --- a/jest-common/src/main/java/io/searchbox/core/Bulk.java +++ b/jest-common/src/main/java/io/searchbox/core/Bulk.java @@ -36,8 +36,6 @@ protected Bulk(Builder builder) { indexName = builder.defaultIndex; typeName = builder.defaultType; bulkableActions = builder.actions; - - setURI(buildURI()); } private Object getJson(Gson gson, Object source) { diff --git a/jest-common/src/main/java/io/searchbox/core/Cat.java b/jest-common/src/main/java/io/searchbox/core/Cat.java index cd8b74f33..935433716 100644 --- a/jest-common/src/main/java/io/searchbox/core/Cat.java +++ b/jest-common/src/main/java/io/searchbox/core/Cat.java @@ -21,7 +21,6 @@ public class Cat extends AbstractAction { protected & CatBuilder> Cat(T builder) { super(builder); this.operationPath = builder.operationPath(); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/ClearScroll.java b/jest-common/src/main/java/io/searchbox/core/ClearScroll.java index 1baaef1b4..bdd664c8b 100644 --- a/jest-common/src/main/java/io/searchbox/core/ClearScroll.java +++ b/jest-common/src/main/java/io/searchbox/core/ClearScroll.java @@ -21,8 +21,6 @@ public ClearScroll(Builder builder) { uri = "/_search/scroll"; this.payload = ImmutableMap.of("scroll_id", builder.getScrollIds()); } - - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Count.java b/jest-common/src/main/java/io/searchbox/core/Count.java index 904fe4361..fd1bf1d5e 100644 --- a/jest-common/src/main/java/io/searchbox/core/Count.java +++ b/jest-common/src/main/java/io/searchbox/core/Count.java @@ -12,9 +12,7 @@ public class Count extends AbstractAction { protected Count(Builder builder) { super(builder); - this.payload = builder.query; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Delete.java b/jest-common/src/main/java/io/searchbox/core/Delete.java index 41c645c1c..0a4c157dd 100644 --- a/jest-common/src/main/java/io/searchbox/core/Delete.java +++ b/jest-common/src/main/java/io/searchbox/core/Delete.java @@ -11,7 +11,6 @@ public class Delete extends SingleResultAbstractDocumentTargetedAction implement protected Delete(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/DeleteByQuery.java b/jest-common/src/main/java/io/searchbox/core/DeleteByQuery.java index 7ed2e226b..25cfa670b 100644 --- a/jest-common/src/main/java/io/searchbox/core/DeleteByQuery.java +++ b/jest-common/src/main/java/io/searchbox/core/DeleteByQuery.java @@ -17,7 +17,6 @@ protected DeleteByQuery(Builder builder) { super(builder); this.payload = builder.query; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Explain.java b/jest-common/src/main/java/io/searchbox/core/Explain.java index bbe7104c3..304f4a0a0 100644 --- a/jest-common/src/main/java/io/searchbox/core/Explain.java +++ b/jest-common/src/main/java/io/searchbox/core/Explain.java @@ -10,7 +10,6 @@ public class Explain extends SingleResultAbstractDocumentTargetedAction { protected Explain(Builder builder) { super(builder); - setURI(buildURI()); this.payload = builder.query; } diff --git a/jest-common/src/main/java/io/searchbox/core/Get.java b/jest-common/src/main/java/io/searchbox/core/Get.java index ecb9684fa..fa8b9fc86 100644 --- a/jest-common/src/main/java/io/searchbox/core/Get.java +++ b/jest-common/src/main/java/io/searchbox/core/Get.java @@ -11,7 +11,6 @@ public class Get extends SingleResultAbstractDocumentTargetedAction { protected Get(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Index.java b/jest-common/src/main/java/io/searchbox/core/Index.java index 7163c3eeb..7c2c37a3b 100644 --- a/jest-common/src/main/java/io/searchbox/core/Index.java +++ b/jest-common/src/main/java/io/searchbox/core/Index.java @@ -14,9 +14,7 @@ public class Index extends SingleResultAbstractDocumentTargetedAction implements protected Index(Builder builder) { super(builder); - this.payload = builder.source; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/MultiGet.java b/jest-common/src/main/java/io/searchbox/core/MultiGet.java index 4bdd72554..94d486ad6 100644 --- a/jest-common/src/main/java/io/searchbox/core/MultiGet.java +++ b/jest-common/src/main/java/io/searchbox/core/MultiGet.java @@ -19,7 +19,6 @@ public class MultiGet extends GenericResultAbstractAction { protected MultiGet(AbstractAction.Builder builder) { super(builder); - setURI(buildURI()); } protected MultiGet(Builder.ByDoc builder) { diff --git a/jest-common/src/main/java/io/searchbox/core/MultiSearch.java b/jest-common/src/main/java/io/searchbox/core/MultiSearch.java index 2a5e305fa..53efa2e38 100644 --- a/jest-common/src/main/java/io/searchbox/core/MultiSearch.java +++ b/jest-common/src/main/java/io/searchbox/core/MultiSearch.java @@ -22,9 +22,7 @@ public class MultiSearch extends AbstractAction { protected MultiSearch(Builder builder) { super(builder); - this.searches = builder.searchList; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Percolate.java b/jest-common/src/main/java/io/searchbox/core/Percolate.java index 403c6fdde..73b69dbb2 100644 --- a/jest-common/src/main/java/io/searchbox/core/Percolate.java +++ b/jest-common/src/main/java/io/searchbox/core/Percolate.java @@ -16,7 +16,6 @@ protected Percolate(Builder builder) { this.indexName = builder.index; this.typeName = builder.type; this.payload = builder.query; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Ping.java b/jest-common/src/main/java/io/searchbox/core/Ping.java index 69fe77459..ba8bf75e5 100644 --- a/jest-common/src/main/java/io/searchbox/core/Ping.java +++ b/jest-common/src/main/java/io/searchbox/core/Ping.java @@ -5,7 +5,6 @@ public class Ping extends GenericResultAbstractAction { protected Ping(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Search.java b/jest-common/src/main/java/io/searchbox/core/Search.java index 4287f67ed..9aad22a66 100644 --- a/jest-common/src/main/java/io/searchbox/core/Search.java +++ b/jest-common/src/main/java/io/searchbox/core/Search.java @@ -26,29 +26,26 @@ public class Search extends AbstractAction { private String query; - private List sortList = new LinkedList(); - protected List includePatternList = new ArrayList(); - protected List excludePatternList = new ArrayList(); + private List sortList; + protected List includePatternList; + protected List excludePatternList; + private final String templateSuffix; protected Search(Builder builder) { - super(builder); + this(builder, ""); + } + + protected Search(TemplateBuilder templatedBuilder) { + this(templatedBuilder, "/template"); + } + private Search(Builder builder, String templateSuffix) { + super(builder); this.query = builder.query; this.sortList = builder.sortList; this.includePatternList = builder.includePatternList; this.excludePatternList = builder.excludePatternList; - setURI(buildURI()); - } - - protected Search(TemplateBuilder templatedBuilder) { - super(templatedBuilder); - - //reuse query as it's just the request body of the POST - this.query = templatedBuilder.query; - this.sortList = templatedBuilder.sortList; - this.includePatternList = templatedBuilder.includePatternList; - this.excludePatternList = templatedBuilder.excludePatternList; - setURI(buildURI() + "/template"); + this.templateSuffix = templateSuffix; } @Override @@ -66,7 +63,7 @@ public String getType() { @Override protected String buildURI() { - return super.buildURI() + "/_search"; + return super.buildURI() + "/_search" + templateSuffix; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/SearchScroll.java b/jest-common/src/main/java/io/searchbox/core/SearchScroll.java index ec3358211..cc3e78d3b 100644 --- a/jest-common/src/main/java/io/searchbox/core/SearchScroll.java +++ b/jest-common/src/main/java/io/searchbox/core/SearchScroll.java @@ -30,7 +30,6 @@ protected SearchScroll(Builder builder) { } else { this.restMethodName = "GET"; } - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/SearchShards.java b/jest-common/src/main/java/io/searchbox/core/SearchShards.java index 7799714c2..4780e4461 100644 --- a/jest-common/src/main/java/io/searchbox/core/SearchShards.java +++ b/jest-common/src/main/java/io/searchbox/core/SearchShards.java @@ -13,7 +13,6 @@ public class SearchShards extends GenericResultAbstractAction { protected SearchShards(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Suggest.java b/jest-common/src/main/java/io/searchbox/core/Suggest.java index 5bfbe86cc..ea30e6ad5 100644 --- a/jest-common/src/main/java/io/searchbox/core/Suggest.java +++ b/jest-common/src/main/java/io/searchbox/core/Suggest.java @@ -8,9 +8,7 @@ public class Suggest extends AbstractAction { protected Suggest(final Builder builder) { super(builder); - this.payload = builder.getQuery(); - this.setURI(this.buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Update.java b/jest-common/src/main/java/io/searchbox/core/Update.java index 0826be012..435c94bc3 100644 --- a/jest-common/src/main/java/io/searchbox/core/Update.java +++ b/jest-common/src/main/java/io/searchbox/core/Update.java @@ -12,9 +12,7 @@ public class Update extends SingleResultAbstractDocumentTargetedAction implement protected Update(Builder builder) { super(builder); - this.payload = builder.payload; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/UpdateByQuery.java b/jest-common/src/main/java/io/searchbox/core/UpdateByQuery.java index f067dbebd..40482bcfc 100644 --- a/jest-common/src/main/java/io/searchbox/core/UpdateByQuery.java +++ b/jest-common/src/main/java/io/searchbox/core/UpdateByQuery.java @@ -12,9 +12,7 @@ public class UpdateByQuery extends AbstractAction { protected UpdateByQuery(Builder builder) { super(builder); - this.payload = builder.payload; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Validate.java b/jest-common/src/main/java/io/searchbox/core/Validate.java index 7d6182da7..6e2974104 100644 --- a/jest-common/src/main/java/io/searchbox/core/Validate.java +++ b/jest-common/src/main/java/io/searchbox/core/Validate.java @@ -14,7 +14,6 @@ protected Validate(Builder builder) { this.indexName = builder.index; this.typeName = builder.type; this.payload = builder.query; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/Analyze.java b/jest-common/src/main/java/io/searchbox/indices/Analyze.java index c98923757..d2ddde7eb 100644 --- a/jest-common/src/main/java/io/searchbox/indices/Analyze.java +++ b/jest-common/src/main/java/io/searchbox/indices/Analyze.java @@ -21,7 +21,6 @@ protected Analyze(Builder builder) { this.indexName = builder.index; this.payload = "{\"text\": " + new Gson().toJson(builder.textToAnalyze) + "}"; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/ClearCache.java b/jest-common/src/main/java/io/searchbox/indices/ClearCache.java index 34f5f886b..cd955905b 100644 --- a/jest-common/src/main/java/io/searchbox/indices/ClearCache.java +++ b/jest-common/src/main/java/io/searchbox/indices/ClearCache.java @@ -11,7 +11,6 @@ public class ClearCache extends GenericResultAbstractAction { protected ClearCache(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/CloseIndex.java b/jest-common/src/main/java/io/searchbox/indices/CloseIndex.java index 062207090..7729200e3 100644 --- a/jest-common/src/main/java/io/searchbox/indices/CloseIndex.java +++ b/jest-common/src/main/java/io/searchbox/indices/CloseIndex.java @@ -11,7 +11,6 @@ protected CloseIndex(Builder builder) { super(builder); this.indexName = builder.index; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/CreateIndex.java b/jest-common/src/main/java/io/searchbox/indices/CreateIndex.java index 2ac8ba112..88490f732 100644 --- a/jest-common/src/main/java/io/searchbox/indices/CreateIndex.java +++ b/jest-common/src/main/java/io/searchbox/indices/CreateIndex.java @@ -19,7 +19,6 @@ protected CreateIndex(Builder builder) { } else { this.payload = new Object(); } - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/DeleteIndex.java b/jest-common/src/main/java/io/searchbox/indices/DeleteIndex.java index a44dc2b16..f5af5a38f 100644 --- a/jest-common/src/main/java/io/searchbox/indices/DeleteIndex.java +++ b/jest-common/src/main/java/io/searchbox/indices/DeleteIndex.java @@ -12,7 +12,6 @@ protected DeleteIndex(Builder builder) { super(builder); indexName = builder.index; typeName = builder.type; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/DocumentExists.java b/jest-common/src/main/java/io/searchbox/indices/DocumentExists.java index a278c3eba..d13233cb6 100644 --- a/jest-common/src/main/java/io/searchbox/indices/DocumentExists.java +++ b/jest-common/src/main/java/io/searchbox/indices/DocumentExists.java @@ -7,7 +7,6 @@ public class DocumentExists extends AbstractDocumentTargetedAction { private String index; diff --git a/jest-common/src/main/java/io/searchbox/indices/Stats.java b/jest-common/src/main/java/io/searchbox/indices/Stats.java index 24a206729..35404d104 100644 --- a/jest-common/src/main/java/io/searchbox/indices/Stats.java +++ b/jest-common/src/main/java/io/searchbox/indices/Stats.java @@ -13,8 +13,6 @@ public class Stats extends GenericResultAbstractAction { protected Stats(Builder builder) { super(builder); indexName = builder.getJoinedIndices(); - - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/aliases/AliasExists.java b/jest-common/src/main/java/io/searchbox/indices/aliases/AliasExists.java index 36b8c4237..06a0b5686 100644 --- a/jest-common/src/main/java/io/searchbox/indices/aliases/AliasExists.java +++ b/jest-common/src/main/java/io/searchbox/indices/aliases/AliasExists.java @@ -9,7 +9,6 @@ public class AliasExists extends GenericResultAbstractAction { protected AliasExists(Builder builder, String alias) { super(builder); this.alias = alias; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java b/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java index 29b2cf8fb..eef8fcb7c 100644 --- a/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java +++ b/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java @@ -10,7 +10,6 @@ public class GetAliases extends GenericResultAbstractAction { protected GetAliases(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/aliases/ModifyAliases.java b/jest-common/src/main/java/io/searchbox/indices/aliases/ModifyAliases.java index 0fb230952..b7b5ab076 100644 --- a/jest-common/src/main/java/io/searchbox/indices/aliases/ModifyAliases.java +++ b/jest-common/src/main/java/io/searchbox/indices/aliases/ModifyAliases.java @@ -21,7 +21,6 @@ protected ModifyAliases(Builder builder) { actions.addAll(aliasMapping.getData()); } this.payload = ImmutableMap.of("actions", actions); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/mapping/DeleteMapping.java b/jest-common/src/main/java/io/searchbox/indices/mapping/DeleteMapping.java index baad25a35..15d42da5b 100644 --- a/jest-common/src/main/java/io/searchbox/indices/mapping/DeleteMapping.java +++ b/jest-common/src/main/java/io/searchbox/indices/mapping/DeleteMapping.java @@ -14,7 +14,6 @@ protected DeleteMapping(Builder builder) { this.indexName = builder.index; this.typeName = builder.type; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/mapping/GetMapping.java b/jest-common/src/main/java/io/searchbox/indices/mapping/GetMapping.java index 59db4f9db..976c7c35a 100644 --- a/jest-common/src/main/java/io/searchbox/indices/mapping/GetMapping.java +++ b/jest-common/src/main/java/io/searchbox/indices/mapping/GetMapping.java @@ -11,7 +11,6 @@ public class GetMapping extends GenericResultAbstractAction { protected GetMapping(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/mapping/PutMapping.java b/jest-common/src/main/java/io/searchbox/indices/mapping/PutMapping.java index c4e757900..04b0c07e8 100644 --- a/jest-common/src/main/java/io/searchbox/indices/mapping/PutMapping.java +++ b/jest-common/src/main/java/io/searchbox/indices/mapping/PutMapping.java @@ -14,7 +14,6 @@ protected PutMapping(Builder builder) { this.indexName = builder.index; this.typeName = builder.type; this.payload = builder.source; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/reindex/Reindex.java b/jest-common/src/main/java/io/searchbox/indices/reindex/Reindex.java index 69bc7c3d8..680537856 100644 --- a/jest-common/src/main/java/io/searchbox/indices/reindex/Reindex.java +++ b/jest-common/src/main/java/io/searchbox/indices/reindex/Reindex.java @@ -28,8 +28,6 @@ public class Reindex extends GenericResultAbstractAction { payload.put("script", builder.script); } this.payload = ImmutableMap.copyOf(payload); - - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/script/CreateStoredScript.java b/jest-common/src/main/java/io/searchbox/indices/script/CreateStoredScript.java index e294b6d29..6bf42fa3b 100644 --- a/jest-common/src/main/java/io/searchbox/indices/script/CreateStoredScript.java +++ b/jest-common/src/main/java/io/searchbox/indices/script/CreateStoredScript.java @@ -13,7 +13,6 @@ public class CreateStoredScript extends AbstractStoredScript { protected CreateStoredScript(Builder builder) { super(builder); this.payload = builder.payload; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/script/DeleteStoredScript.java b/jest-common/src/main/java/io/searchbox/indices/script/DeleteStoredScript.java index 2d02eabde..6e08b9228 100644 --- a/jest-common/src/main/java/io/searchbox/indices/script/DeleteStoredScript.java +++ b/jest-common/src/main/java/io/searchbox/indices/script/DeleteStoredScript.java @@ -4,7 +4,6 @@ public class DeleteStoredScript extends AbstractStoredScript { protected DeleteStoredScript(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/script/GetStoredScript.java b/jest-common/src/main/java/io/searchbox/indices/script/GetStoredScript.java index 20cf4b942..9e8062778 100644 --- a/jest-common/src/main/java/io/searchbox/indices/script/GetStoredScript.java +++ b/jest-common/src/main/java/io/searchbox/indices/script/GetStoredScript.java @@ -6,7 +6,6 @@ public class GetStoredScript extends AbstractStoredScript { protected GetStoredScript(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/settings/IndicesSettingsAbstractAction.java b/jest-common/src/main/java/io/searchbox/indices/settings/IndicesSettingsAbstractAction.java index d9a024ed5..93a44ebbc 100644 --- a/jest-common/src/main/java/io/searchbox/indices/settings/IndicesSettingsAbstractAction.java +++ b/jest-common/src/main/java/io/searchbox/indices/settings/IndicesSettingsAbstractAction.java @@ -9,7 +9,6 @@ public abstract class IndicesSettingsAbstractAction extends GenericResultAbstrac protected IndicesSettingsAbstractAction(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/template/DeleteTemplate.java b/jest-common/src/main/java/io/searchbox/indices/template/DeleteTemplate.java index 6dd7ec17a..e7b76fcda 100644 --- a/jest-common/src/main/java/io/searchbox/indices/template/DeleteTemplate.java +++ b/jest-common/src/main/java/io/searchbox/indices/template/DeleteTemplate.java @@ -8,7 +8,6 @@ public class DeleteTemplate extends TemplateAction { protected DeleteTemplate(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/template/GetTemplate.java b/jest-common/src/main/java/io/searchbox/indices/template/GetTemplate.java index 86ac1ce40..5b2a5ee86 100644 --- a/jest-common/src/main/java/io/searchbox/indices/template/GetTemplate.java +++ b/jest-common/src/main/java/io/searchbox/indices/template/GetTemplate.java @@ -8,7 +8,6 @@ public class GetTemplate extends TemplateAction { protected GetTemplate(Builder builder) { super(builder); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/template/PutTemplate.java b/jest-common/src/main/java/io/searchbox/indices/template/PutTemplate.java index c5b02186d..117822629 100644 --- a/jest-common/src/main/java/io/searchbox/indices/template/PutTemplate.java +++ b/jest-common/src/main/java/io/searchbox/indices/template/PutTemplate.java @@ -10,7 +10,6 @@ protected PutTemplate(Builder builder) { super(builder); this.payload = builder.source; - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/template/TemplateAction.java b/jest-common/src/main/java/io/searchbox/indices/template/TemplateAction.java index 16c7501cc..b6c87fe60 100644 --- a/jest-common/src/main/java/io/searchbox/indices/template/TemplateAction.java +++ b/jest-common/src/main/java/io/searchbox/indices/template/TemplateAction.java @@ -16,9 +16,7 @@ protected TemplateAction(Builder builder) { @Override protected String buildURI() { - StringBuilder sb = new StringBuilder("_template/"); - sb.append(templateName); - return sb.toString(); + return "_template/" + templateName; } protected abstract static class Builder extends GenericResultAbstractAction.Builder { diff --git a/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java b/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java index b9b95c0e0..3aae261ed 100644 --- a/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java +++ b/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java @@ -13,14 +13,12 @@ public class TypeExist extends GenericResultAbstractAction { TypeExist(Builder builder) { super(builder); - setURI(buildURI()); } @Override public void prepare(ElasticsearchVersion elasticsearchVersion) { - super.prepare(elasticsearchVersion); this.elasticsearchVersion = elasticsearchVersion; - setURI(buildURI()); + super.prepare(elasticsearchVersion); } @Override diff --git a/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotAction.java b/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotAction.java index eaa43cdfc..45661e118 100644 --- a/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotAction.java +++ b/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotAction.java @@ -20,7 +20,6 @@ protected AbstractSnapshotAction(SnapshotBuilder builder) { this.repository = builder.repository; this.snapshots = builder.getSnapshots(); - setURI(buildURI()); } @Override diff --git a/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotRepositoryAction.java b/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotRepositoryAction.java index 6d8e67d39..26d9d9a26 100644 --- a/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotRepositoryAction.java +++ b/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotRepositoryAction.java @@ -13,7 +13,6 @@ protected AbstractSnapshotRepositoryAction(RepositoryBuilder builder) { super(builder); this.repositories = builder.getRepositories(); - setURI(buildURI()); } @Override diff --git a/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java b/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java index 38ed36da9..54582679d 100644 --- a/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java +++ b/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java @@ -133,7 +133,6 @@ public void getIdFromSourceWithAnnotationWithNullId() { static class DummyAction extends GenericResultAbstractAction { public DummyAction(Builder builder) { super(builder); - setURI(buildURI()); } @Override From 00584c2b1e60586a8cbc10dd3c61f611cc9cec97 Mon Sep 17 00:00:00 2001 From: Michael Siepmann Date: Wed, 25 Oct 2017 21:48:05 +0200 Subject: [PATCH 09/19] Code simplified --- .../java/io/searchbox/action/AbstractAction.java | 8 +++++--- .../java/io/searchbox/indices/type/TypeExist.java | 12 ++---------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java index c9754fb0f..eeb4bc8f1 100644 --- a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java +++ b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java @@ -46,6 +46,7 @@ public abstract class AbstractAction implements Action private final ConcurrentMap headerMap = new ConcurrentHashMap(); private final Multimap parameterMap = LinkedHashMultimap.create(); private final Set cleanApiParameters = new LinkedHashSet(); + private ElasticsearchVersion elasticsearchVersion = ElasticsearchVersion.UNKNOWN; public AbstractAction() { } @@ -139,7 +140,8 @@ public Map getHeaders() { } @Override - public void prepare(ElasticsearchVersion elasticsearchVersion) { + public final void prepare(ElasticsearchVersion elasticsearchVersion) { + this.elasticsearchVersion = elasticsearchVersion; } @Override @@ -180,7 +182,7 @@ protected String buildURI() { if (StringUtils.isNotBlank(indexName)) { sb.append(URLEncoder.encode(indexName, CHARSET)); - String commandExtension = getURLCommandExtension(); + String commandExtension = getURLCommandExtension(elasticsearchVersion); if (StringUtils.isNotBlank(commandExtension)) { sb.append("/").append(URLEncoder.encode(commandExtension, CHARSET)); @@ -199,7 +201,7 @@ protected String buildURI() { return sb.toString(); } - protected String getURLCommandExtension() { + protected String getURLCommandExtension(ElasticsearchVersion elasticsearchVersion) { return null; } diff --git a/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java b/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java index 3aae261ed..20e0bcb27 100644 --- a/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java +++ b/jest-common/src/main/java/io/searchbox/indices/type/TypeExist.java @@ -9,21 +9,13 @@ */ public class TypeExist extends GenericResultAbstractAction { - private ElasticsearchVersion elasticsearchVersion; - TypeExist(Builder builder) { super(builder); } @Override - public void prepare(ElasticsearchVersion elasticsearchVersion) { - this.elasticsearchVersion = elasticsearchVersion; - super.prepare(elasticsearchVersion); - } - - @Override - protected String getURLCommandExtension() { - return elasticsearchVersion == ElasticsearchVersion.V55 ? "_mapping" : super.getURLCommandExtension(); + protected String getURLCommandExtension(ElasticsearchVersion elasticsearchVersion) { + return elasticsearchVersion == ElasticsearchVersion.V55 ? "_mapping" : super.getURLCommandExtension(elasticsearchVersion); } @Override From a938498817e4a528240987409d32afee1fedd180 Mon Sep 17 00:00:00 2001 From: Michael Siepmann Date: Wed, 25 Oct 2017 22:06:34 +0200 Subject: [PATCH 10/19] My goal was to get rid of the prepare-method. This was solved. --- .../io/searchbox/action/AbstractAction.java | 12 ++--- .../AbstractDocumentTargetedAction.java | 4 +- .../main/java/io/searchbox/action/Action.java | 6 +-- .../io/searchbox/cluster/GetSettings.java | 5 +- .../java/io/searchbox/cluster/Health.java | 3 +- .../io/searchbox/cluster/NodesHotThreads.java | 5 +- .../java/io/searchbox/cluster/NodesInfo.java | 5 +- .../io/searchbox/cluster/NodesShutdown.java | 5 +- .../java/io/searchbox/cluster/NodesStats.java | 5 +- .../cluster/PendingClusterTasks.java | 5 +- .../java/io/searchbox/cluster/Reroute.java | 5 +- .../main/java/io/searchbox/cluster/State.java | 5 +- .../main/java/io/searchbox/cluster/Stats.java | 5 +- .../searchbox/cluster/TasksInformation.java | 5 +- .../io/searchbox/cluster/UpdateSettings.java | 5 +- .../src/main/java/io/searchbox/core/Bulk.java | 5 +- .../src/main/java/io/searchbox/core/Cat.java | 5 +- .../java/io/searchbox/core/ClearScroll.java | 5 +- .../main/java/io/searchbox/core/Count.java | 5 +- .../java/io/searchbox/core/DeleteByQuery.java | 5 +- .../main/java/io/searchbox/core/Explain.java | 5 +- .../main/java/io/searchbox/core/MultiGet.java | 5 +- .../java/io/searchbox/core/MultiSearch.java | 5 +- .../java/io/searchbox/core/Percolate.java | 5 +- .../src/main/java/io/searchbox/core/Ping.java | 5 +- .../main/java/io/searchbox/core/Search.java | 5 +- .../java/io/searchbox/core/SearchScroll.java | 5 +- .../java/io/searchbox/core/SearchShards.java | 5 +- .../main/java/io/searchbox/core/Suggest.java | 5 +- .../main/java/io/searchbox/core/Update.java | 5 +- .../java/io/searchbox/core/UpdateByQuery.java | 6 ++- .../main/java/io/searchbox/core/Validate.java | 5 +- .../java/io/searchbox/indices/Analyze.java | 5 +- .../java/io/searchbox/indices/ClearCache.java | 5 +- .../java/io/searchbox/indices/CloseIndex.java | 5 +- .../main/java/io/searchbox/indices/Flush.java | 5 +- .../java/io/searchbox/indices/ForceMerge.java | 5 +- .../java/io/searchbox/indices/OpenIndex.java | 5 +- .../java/io/searchbox/indices/Optimize.java | 5 +- .../java/io/searchbox/indices/Refresh.java | 5 +- .../java/io/searchbox/indices/Rollover.java | 4 +- .../main/java/io/searchbox/indices/Stats.java | 5 +- .../indices/aliases/AliasExists.java | 5 +- .../searchbox/indices/aliases/GetAliases.java | 5 +- .../indices/aliases/ModifyAliases.java | 5 +- .../indices/mapping/DeleteMapping.java | 5 +- .../searchbox/indices/mapping/GetMapping.java | 5 +- .../searchbox/indices/mapping/PutMapping.java | 5 +- .../io/searchbox/indices/reindex/Reindex.java | 5 +- .../indices/script/AbstractStoredScript.java | 5 +- .../IndicesSettingsAbstractAction.java | 5 +- .../indices/template/TemplateAction.java | 3 +- .../snapshot/AbstractSnapshotAction.java | 5 +- .../AbstractSnapshotRepositoryAction.java | 5 +- .../searchbox/snapshot/RestoreSnapshot.java | 6 ++- .../io/searchbox/snapshot/SnapshotStatus.java | 6 ++- .../searchbox/action/AbstractActionTest.java | 6 ++- .../cluster/NodesHotThreadsTest.java | 7 ++- .../searchbox/cluster/NodesShutdownTest.java | 9 ++-- .../io/searchbox/cluster/NodesStatsTest.java | 5 +- .../cluster/PendingClusterTasksTest.java | 3 +- .../java/io/searchbox/cluster/StateTest.java | 4 +- .../java/io/searchbox/cluster/StatsTest.java | 5 +- .../cluster/TasksInformationTest.java | 4 +- .../io/searchbox/core/SearchScrollTest.java | 11 ++-- .../java/io/searchbox/core/SearchTest.java | 52 +++++++++---------- .../java/io/searchbox/core/SuggestTest.java | 14 ++--- .../java/io/searchbox/indices/StatsTest.java | 5 +- .../script/CreateIndexedScriptTest.java | 17 +++--- .../script/DeleteIndexedScriptTest.java | 15 +++--- .../indices/script/GetIndexedScriptTest.java | 15 +++--- .../searchbox/indices/type/TypeExistTest.java | 4 +- .../searchbox/client/http/JestHttpClient.java | 3 +- 73 files changed, 256 insertions(+), 208 deletions(-) diff --git a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java index eeb4bc8f1..cca3a9adc 100644 --- a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java +++ b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java @@ -46,7 +46,6 @@ public abstract class AbstractAction implements Action private final ConcurrentMap headerMap = new ConcurrentHashMap(); private final Multimap parameterMap = LinkedHashMultimap.create(); private final Set cleanApiParameters = new LinkedHashSet(); - private ElasticsearchVersion elasticsearchVersion = ElasticsearchVersion.UNKNOWN; public AbstractAction() { } @@ -139,14 +138,13 @@ public Map getHeaders() { return headerMap; } - @Override - public final void prepare(ElasticsearchVersion elasticsearchVersion) { - this.elasticsearchVersion = elasticsearchVersion; + public String getURI() { + return getURI(ElasticsearchVersion.UNKNOWN); } @Override - public String getURI() { - String finalUri = buildURI(); + public String getURI(ElasticsearchVersion elasticsearchVersion) { + String finalUri = buildURI(elasticsearchVersion); if (!parameterMap.isEmpty() || !cleanApiParameters.isEmpty()) { try { finalUri += buildQueryString(); @@ -175,7 +173,7 @@ public String getPathToResult() { return null; } - protected String buildURI() { + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { StringBuilder sb = new StringBuilder(); try { diff --git a/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java b/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java index 7fa7d6f7c..d74dc5e91 100644 --- a/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java +++ b/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java @@ -37,8 +37,8 @@ public String getId() { } @Override - protected String buildURI() { - StringBuilder sb = new StringBuilder(super.buildURI()); + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + StringBuilder sb = new StringBuilder(super.buildURI(elasticsearchVersion)); if (StringUtils.isNotBlank(id)) { try { diff --git a/jest-common/src/main/java/io/searchbox/action/Action.java b/jest-common/src/main/java/io/searchbox/action/Action.java index 37b81c7b5..f96191174 100644 --- a/jest-common/src/main/java/io/searchbox/action/Action.java +++ b/jest-common/src/main/java/io/searchbox/action/Action.java @@ -11,12 +11,10 @@ */ public interface Action { - void prepare(ElasticsearchVersion elasticsearchVersion); - - String getURI(); - String getRestMethodName(); + String getURI(ElasticsearchVersion elasticsearchVersion); + String getData(Gson gson); String getPathToResult(); diff --git a/jest-common/src/main/java/io/searchbox/cluster/GetSettings.java b/jest-common/src/main/java/io/searchbox/cluster/GetSettings.java index 3353bc301..5fde193a7 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/GetSettings.java +++ b/jest-common/src/main/java/io/searchbox/cluster/GetSettings.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractAction; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * Retrieve cluster wide settings. @@ -14,8 +15,8 @@ protected GetSettings(Builder builder) { super(builder); } - protected String buildURI() { - return super.buildURI() + "/_cluster/settings"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_cluster/settings"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/Health.java b/jest-common/src/main/java/io/searchbox/cluster/Health.java index f332692f8..94d744a0b 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/Health.java +++ b/jest-common/src/main/java/io/searchbox/cluster/Health.java @@ -3,6 +3,7 @@ import com.google.common.base.Preconditions; import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.strings.StringUtils; import java.io.UnsupportedEncodingException; @@ -46,7 +47,7 @@ protected Health(Builder builder) { } @Override - protected String buildURI() { + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { StringBuilder sb = new StringBuilder("/_cluster/health/"); try { diff --git a/jest-common/src/main/java/io/searchbox/cluster/NodesHotThreads.java b/jest-common/src/main/java/io/searchbox/cluster/NodesHotThreads.java index fa37a349c..a6c9546c7 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/NodesHotThreads.java +++ b/jest-common/src/main/java/io/searchbox/cluster/NodesHotThreads.java @@ -3,6 +3,7 @@ import com.google.gson.JsonObject; import io.searchbox.action.AbstractMultiINodeActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * Allows to get the current hot threads on each node in the cluster. @@ -18,8 +19,8 @@ protected NodesHotThreads(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_nodes/" + + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_nodes/" + nodes + "/hot_threads"; } diff --git a/jest-common/src/main/java/io/searchbox/cluster/NodesInfo.java b/jest-common/src/main/java/io/searchbox/cluster/NodesInfo.java index 4d31da126..f4e16f84f 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/NodesInfo.java +++ b/jest-common/src/main/java/io/searchbox/cluster/NodesInfo.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiINodeActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -13,8 +14,8 @@ protected NodesInfo(Builder builder) { super(builder); } - protected String buildURI() { - return super.buildURI() + "/_nodes/" + nodes; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_nodes/" + nodes; } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/NodesShutdown.java b/jest-common/src/main/java/io/searchbox/cluster/NodesShutdown.java index a847a838b..3b3fe2f21 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/NodesShutdown.java +++ b/jest-common/src/main/java/io/searchbox/cluster/NodesShutdown.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiINodeActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -14,8 +15,8 @@ protected NodesShutdown(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_nodes/" + + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_nodes/" + nodes + "/_shutdown"; } diff --git a/jest-common/src/main/java/io/searchbox/cluster/NodesStats.java b/jest-common/src/main/java/io/searchbox/cluster/NodesStats.java index b77564d32..81c0a1b46 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/NodesStats.java +++ b/jest-common/src/main/java/io/searchbox/cluster/NodesStats.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiINodeActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -14,8 +15,8 @@ protected NodesStats(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_nodes/" + + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_nodes/" + nodes + "/stats"; } diff --git a/jest-common/src/main/java/io/searchbox/cluster/PendingClusterTasks.java b/jest-common/src/main/java/io/searchbox/cluster/PendingClusterTasks.java index b171f6f37..62c8d1046 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/PendingClusterTasks.java +++ b/jest-common/src/main/java/io/searchbox/cluster/PendingClusterTasks.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractAction; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; public class PendingClusterTasks extends GenericResultAbstractAction { protected PendingClusterTasks(Builder builder) { @@ -9,8 +10,8 @@ protected PendingClusterTasks(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_cluster/pending_tasks"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_cluster/pending_tasks"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/Reroute.java b/jest-common/src/main/java/io/searchbox/cluster/Reroute.java index 35fa9dce4..73a189a8f 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/Reroute.java +++ b/jest-common/src/main/java/io/searchbox/cluster/Reroute.java @@ -3,6 +3,7 @@ import com.google.common.collect.ImmutableMap; import io.searchbox.action.AbstractAction; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.cluster.reroute.RerouteCommand; import java.util.Collection; @@ -25,8 +26,8 @@ protected Reroute(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_cluster/reroute"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_cluster/reroute"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/State.java b/jest-common/src/main/java/io/searchbox/cluster/State.java index edfeaba65..c55f2d7d6 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/State.java +++ b/jest-common/src/main/java/io/searchbox/cluster/State.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractAction; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -14,8 +15,8 @@ protected State(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_cluster/state"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_cluster/state"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/Stats.java b/jest-common/src/main/java/io/searchbox/cluster/Stats.java index 07413a7c9..1de8b0a5c 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/Stats.java +++ b/jest-common/src/main/java/io/searchbox/cluster/Stats.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiINodeActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; public class Stats extends GenericResultAbstractAction { protected Stats(Builder builder) { @@ -9,8 +10,8 @@ protected Stats(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_cluster/stats/nodes/" + nodes; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_cluster/stats/nodes/" + nodes; } @Override diff --git a/jest-common/src/main/java/io/searchbox/cluster/TasksInformation.java b/jest-common/src/main/java/io/searchbox/cluster/TasksInformation.java index 2e57a3922..1c0c06b7e 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/TasksInformation.java +++ b/jest-common/src/main/java/io/searchbox/cluster/TasksInformation.java @@ -1,6 +1,7 @@ package io.searchbox.cluster; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * Currently only supports retrieving information for a particular task @@ -15,8 +16,8 @@ protected TasksInformation(Builder builder) { } @Override - protected String buildURI() { - String uri = super.buildURI() + "_tasks"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + String uri = super.buildURI(elasticsearchVersion) + "_tasks"; if (task != null) { uri += "/" + task; } diff --git a/jest-common/src/main/java/io/searchbox/cluster/UpdateSettings.java b/jest-common/src/main/java/io/searchbox/cluster/UpdateSettings.java index 230c38213..7a5712ff3 100644 --- a/jest-common/src/main/java/io/searchbox/cluster/UpdateSettings.java +++ b/jest-common/src/main/java/io/searchbox/cluster/UpdateSettings.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractAction; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * Allows to update cluster wide specific settings. Settings updated can either be persistent (applied cross restarts) @@ -21,8 +22,8 @@ protected UpdateSettings(Builder builder) { this.payload = builder.source; } - protected String buildURI() { - return super.buildURI() + "/_cluster/settings"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_cluster/settings"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Bulk.java b/jest-common/src/main/java/io/searchbox/core/Bulk.java index 29873b71e..72b7542fb 100644 --- a/jest-common/src/main/java/io/searchbox/core/Bulk.java +++ b/jest-common/src/main/java/io/searchbox/core/Bulk.java @@ -6,6 +6,7 @@ import io.searchbox.action.AbstractAction; import io.searchbox.action.BulkableAction; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.params.Parameters; import io.searchbox.strings.StringUtils; import org.slf4j.Logger; @@ -113,8 +114,8 @@ public String getPathToResult() { } @Override - protected String buildURI() { - return super.buildURI() + "/_bulk"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_bulk"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Cat.java b/jest-common/src/main/java/io/searchbox/core/Cat.java index 935433716..471bf8655 100644 --- a/jest-common/src/main/java/io/searchbox/core/Cat.java +++ b/jest-common/src/main/java/io/searchbox/core/Cat.java @@ -10,6 +10,7 @@ import io.searchbox.action.AbstractAction; import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.AbstractMultiTypeActionBuilder; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Bartosz Polnik @@ -24,8 +25,8 @@ public class Cat extends AbstractAction { } @Override - protected String buildURI() { - String uriSuffix = super.buildURI(); + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + String uriSuffix = super.buildURI(elasticsearchVersion); return "_cat/" + this.operationPath + (uriSuffix.isEmpty() ? "" : "/") + uriSuffix; } diff --git a/jest-common/src/main/java/io/searchbox/core/ClearScroll.java b/jest-common/src/main/java/io/searchbox/core/ClearScroll.java index bdd664c8b..e3acc8a98 100644 --- a/jest-common/src/main/java/io/searchbox/core/ClearScroll.java +++ b/jest-common/src/main/java/io/searchbox/core/ClearScroll.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableMap; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import java.util.Collection; import java.util.LinkedHashSet; @@ -29,8 +30,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + uri; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + uri; } public static class Builder extends GenericResultAbstractAction.Builder { diff --git a/jest-common/src/main/java/io/searchbox/core/Count.java b/jest-common/src/main/java/io/searchbox/core/Count.java index fd1bf1d5e..96d3ffdcd 100644 --- a/jest-common/src/main/java/io/searchbox/core/Count.java +++ b/jest-common/src/main/java/io/searchbox/core/Count.java @@ -3,6 +3,7 @@ import com.google.gson.Gson; import io.searchbox.action.AbstractAction; import io.searchbox.action.AbstractMultiTypeActionBuilder; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -16,8 +17,8 @@ protected Count(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_count"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_count"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/DeleteByQuery.java b/jest-common/src/main/java/io/searchbox/core/DeleteByQuery.java index 25cfa670b..72002f7a8 100644 --- a/jest-common/src/main/java/io/searchbox/core/DeleteByQuery.java +++ b/jest-common/src/main/java/io/searchbox/core/DeleteByQuery.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiTypeActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * Delete By Query API is removed in Elasticsearch version 2.0. @@ -20,8 +21,8 @@ protected DeleteByQuery(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_delete_by_query"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_delete_by_query"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Explain.java b/jest-common/src/main/java/io/searchbox/core/Explain.java index 304f4a0a0..2cfcc3924 100644 --- a/jest-common/src/main/java/io/searchbox/core/Explain.java +++ b/jest-common/src/main/java/io/searchbox/core/Explain.java @@ -1,6 +1,7 @@ package io.searchbox.core; import io.searchbox.action.SingleResultAbstractDocumentTargetedAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -19,8 +20,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + "/_explain"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_explain"; } public static class Builder extends SingleResultAbstractDocumentTargetedAction.Builder { diff --git a/jest-common/src/main/java/io/searchbox/core/MultiGet.java b/jest-common/src/main/java/io/searchbox/core/MultiGet.java index 94d486ad6..94dc716e0 100644 --- a/jest-common/src/main/java/io/searchbox/core/MultiGet.java +++ b/jest-common/src/main/java/io/searchbox/core/MultiGet.java @@ -6,6 +6,7 @@ import io.searchbox.action.AbstractAction; import io.searchbox.action.AbstractMultiTypeActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import java.util.Collection; import java.util.LinkedList; @@ -41,8 +42,8 @@ public Object apply(Doc doc) { } @Override - protected String buildURI() { - return super.buildURI() + "/_mget"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_mget"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/MultiSearch.java b/jest-common/src/main/java/io/searchbox/core/MultiSearch.java index 53efa2e38..f955534e5 100644 --- a/jest-common/src/main/java/io/searchbox/core/MultiSearch.java +++ b/jest-common/src/main/java/io/searchbox/core/MultiSearch.java @@ -4,6 +4,7 @@ import com.google.gson.Gson; import io.searchbox.action.AbstractAction; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.strings.StringUtils; import java.util.Collection; @@ -77,8 +78,8 @@ private String getParameter(Search search, String parameter) { } @Override - protected String buildURI() { - return super.buildURI() + "/_msearch"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_msearch"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Percolate.java b/jest-common/src/main/java/io/searchbox/core/Percolate.java index 73b69dbb2..e1fbd9dae 100644 --- a/jest-common/src/main/java/io/searchbox/core/Percolate.java +++ b/jest-common/src/main/java/io/searchbox/core/Percolate.java @@ -1,6 +1,7 @@ package io.searchbox.core; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * Use this action to query on registered percolaters. @@ -24,8 +25,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + "/_percolate"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_percolate"; } public static class Builder extends GenericResultAbstractAction.Builder { diff --git a/jest-common/src/main/java/io/searchbox/core/Ping.java b/jest-common/src/main/java/io/searchbox/core/Ping.java index ba8bf75e5..0bd8d2eaa 100644 --- a/jest-common/src/main/java/io/searchbox/core/Ping.java +++ b/jest-common/src/main/java/io/searchbox/core/Ping.java @@ -1,6 +1,7 @@ package io.searchbox.core; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; public class Ping extends GenericResultAbstractAction { protected Ping(Builder builder) { @@ -8,8 +9,8 @@ protected Ping(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI(); + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion); } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Search.java b/jest-common/src/main/java/io/searchbox/core/Search.java index 9aad22a66..70811a28a 100644 --- a/jest-common/src/main/java/io/searchbox/core/Search.java +++ b/jest-common/src/main/java/io/searchbox/core/Search.java @@ -15,6 +15,7 @@ import io.searchbox.action.AbstractAction; import io.searchbox.action.AbstractMultiTypeActionBuilder; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.core.search.sort.Sort; import io.searchbox.params.Parameters; import io.searchbox.params.SearchType; @@ -62,8 +63,8 @@ public String getType() { } @Override - protected String buildURI() { - return super.buildURI() + "/_search" + templateSuffix; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_search" + templateSuffix; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/SearchScroll.java b/jest-common/src/main/java/io/searchbox/core/SearchScroll.java index cc3e78d3b..bff5a91da 100644 --- a/jest-common/src/main/java/io/searchbox/core/SearchScroll.java +++ b/jest-common/src/main/java/io/searchbox/core/SearchScroll.java @@ -5,6 +5,7 @@ import com.google.gson.JsonObject; import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.params.Parameters; /** @@ -33,8 +34,8 @@ protected SearchScroll(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_search/scroll"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_search/scroll"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/SearchShards.java b/jest-common/src/main/java/io/searchbox/core/SearchShards.java index 4780e4461..b12a6ceb3 100644 --- a/jest-common/src/main/java/io/searchbox/core/SearchShards.java +++ b/jest-common/src/main/java/io/searchbox/core/SearchShards.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiTypeActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * The search shards api returns the indices and shards that a search request would be executed against. @@ -16,8 +17,8 @@ protected SearchShards(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_search_shards"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_search_shards"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Suggest.java b/jest-common/src/main/java/io/searchbox/core/Suggest.java index ea30e6ad5..cb668ea1c 100644 --- a/jest-common/src/main/java/io/searchbox/core/Suggest.java +++ b/jest-common/src/main/java/io/searchbox/core/Suggest.java @@ -3,6 +3,7 @@ import com.google.gson.Gson; import io.searchbox.action.AbstractAction; import io.searchbox.action.AbstractMultiTypeActionBuilder; +import io.searchbox.client.config.ElasticsearchVersion; public class Suggest extends AbstractAction { @@ -30,8 +31,8 @@ public String getType() { } @Override - protected String buildURI() { - return super.buildURI() + "/_suggest"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_suggest"; } public static class Builder extends AbstractMultiTypeActionBuilder { diff --git a/jest-common/src/main/java/io/searchbox/core/Update.java b/jest-common/src/main/java/io/searchbox/core/Update.java index 435c94bc3..5bcdb1c80 100644 --- a/jest-common/src/main/java/io/searchbox/core/Update.java +++ b/jest-common/src/main/java/io/searchbox/core/Update.java @@ -2,6 +2,7 @@ import io.searchbox.action.BulkableAction; import io.searchbox.action.SingleResultAbstractDocumentTargetedAction; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.params.Parameters; /** @@ -21,8 +22,8 @@ public String getBulkMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + "/_update"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_update"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/UpdateByQuery.java b/jest-common/src/main/java/io/searchbox/core/UpdateByQuery.java index 40482bcfc..032146c59 100644 --- a/jest-common/src/main/java/io/searchbox/core/UpdateByQuery.java +++ b/jest-common/src/main/java/io/searchbox/core/UpdateByQuery.java @@ -3,6 +3,8 @@ import com.google.gson.Gson; import io.searchbox.action.AbstractAction; import io.searchbox.action.AbstractMultiTypeActionBuilder; +import io.searchbox.client.config.ElasticsearchVersion; + import java.util.Objects; /** @@ -16,8 +18,8 @@ protected UpdateByQuery(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_update_by_query"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_update_by_query"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/core/Validate.java b/jest-common/src/main/java/io/searchbox/core/Validate.java index 6e2974104..e9b5e18c1 100644 --- a/jest-common/src/main/java/io/searchbox/core/Validate.java +++ b/jest-common/src/main/java/io/searchbox/core/Validate.java @@ -1,6 +1,7 @@ package io.searchbox.core; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -17,8 +18,8 @@ protected Validate(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_validate/query"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_validate/query"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/Analyze.java b/jest-common/src/main/java/io/searchbox/indices/Analyze.java index d2ddde7eb..be6a44d1b 100644 --- a/jest-common/src/main/java/io/searchbox/indices/Analyze.java +++ b/jest-common/src/main/java/io/searchbox/indices/Analyze.java @@ -3,6 +3,7 @@ import com.google.gson.Gson; import io.searchbox.action.AbstractAction; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import java.util.ArrayList; import java.util.Collection; @@ -24,8 +25,8 @@ protected Analyze(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_analyze"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_analyze"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/ClearCache.java b/jest-common/src/main/java/io/searchbox/indices/ClearCache.java index cd955905b..0d77186ca 100644 --- a/jest-common/src/main/java/io/searchbox/indices/ClearCache.java +++ b/jest-common/src/main/java/io/searchbox/indices/ClearCache.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -14,8 +15,8 @@ protected ClearCache(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_cache/clear"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_cache/clear"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/CloseIndex.java b/jest-common/src/main/java/io/searchbox/indices/CloseIndex.java index 7729200e3..cb69f95ac 100644 --- a/jest-common/src/main/java/io/searchbox/indices/CloseIndex.java +++ b/jest-common/src/main/java/io/searchbox/indices/CloseIndex.java @@ -1,6 +1,7 @@ package io.searchbox.indices; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author cihat keser @@ -14,8 +15,8 @@ protected CloseIndex(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_close"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_close"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/Flush.java b/jest-common/src/main/java/io/searchbox/indices/Flush.java index fd8839836..1d6bf774a 100644 --- a/jest-common/src/main/java/io/searchbox/indices/Flush.java +++ b/jest-common/src/main/java/io/searchbox/indices/Flush.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -14,8 +15,8 @@ protected Flush(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_flush"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_flush"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/ForceMerge.java b/jest-common/src/main/java/io/searchbox/indices/ForceMerge.java index bbe6840fb..9d248db7a 100644 --- a/jest-common/src/main/java/io/searchbox/indices/ForceMerge.java +++ b/jest-common/src/main/java/io/searchbox/indices/ForceMerge.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * Force-merge API: https://www.elastic.co/guide/en/elasticsearch/reference/2.4/indices-forcemerge.html @@ -24,8 +25,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + "/_forcemerge"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_forcemerge"; } public static class Builder extends AbstractMultiIndexActionBuilder { diff --git a/jest-common/src/main/java/io/searchbox/indices/OpenIndex.java b/jest-common/src/main/java/io/searchbox/indices/OpenIndex.java index ba5d09b05..4da06f42b 100644 --- a/jest-common/src/main/java/io/searchbox/indices/OpenIndex.java +++ b/jest-common/src/main/java/io/searchbox/indices/OpenIndex.java @@ -1,6 +1,7 @@ package io.searchbox.indices; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author cihat keser @@ -13,8 +14,8 @@ protected OpenIndex(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_open"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_open"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/Optimize.java b/jest-common/src/main/java/io/searchbox/indices/Optimize.java index 54ea29dcb..4fdbb04fa 100644 --- a/jest-common/src/main/java/io/searchbox/indices/Optimize.java +++ b/jest-common/src/main/java/io/searchbox/indices/Optimize.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * Optimize API: https://www.elastic.co/guide/en/elasticsearch/reference/2.4/indices-optimize.html @@ -23,8 +24,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + "/_optimize"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_optimize"; } public static class Builder extends AbstractMultiIndexActionBuilder { diff --git a/jest-common/src/main/java/io/searchbox/indices/Refresh.java b/jest-common/src/main/java/io/searchbox/indices/Refresh.java index 0e516bb36..e3f3fc187 100644 --- a/jest-common/src/main/java/io/searchbox/indices/Refresh.java +++ b/jest-common/src/main/java/io/searchbox/indices/Refresh.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -19,8 +20,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + "/_refresh"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_refresh"; } public static class Builder extends AbstractMultiIndexActionBuilder { diff --git a/jest-common/src/main/java/io/searchbox/indices/Rollover.java b/jest-common/src/main/java/io/searchbox/indices/Rollover.java index b66587c06..d16b14b33 100644 --- a/jest-common/src/main/java/io/searchbox/indices/Rollover.java +++ b/jest-common/src/main/java/io/searchbox/indices/Rollover.java @@ -33,8 +33,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + "/_rollover" + (isDryRun ? "?dry_run" : ""); + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_rollover" + (isDryRun ? "?dry_run" : ""); } public static class Builder extends AbstractAction.Builder { diff --git a/jest-common/src/main/java/io/searchbox/indices/Stats.java b/jest-common/src/main/java/io/searchbox/indices/Stats.java index 35404d104..45d8c4043 100644 --- a/jest-common/src/main/java/io/searchbox/indices/Stats.java +++ b/jest-common/src/main/java/io/searchbox/indices/Stats.java @@ -3,6 +3,7 @@ import com.google.common.base.Joiner; import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -21,8 +22,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + "/_stats"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_stats"; } public static class Builder extends AbstractMultiIndexActionBuilder { diff --git a/jest-common/src/main/java/io/searchbox/indices/aliases/AliasExists.java b/jest-common/src/main/java/io/searchbox/indices/aliases/AliasExists.java index 06a0b5686..5fd5c045a 100644 --- a/jest-common/src/main/java/io/searchbox/indices/aliases/AliasExists.java +++ b/jest-common/src/main/java/io/searchbox/indices/aliases/AliasExists.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; public class AliasExists extends GenericResultAbstractAction { private String alias; @@ -17,8 +18,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + "/_alias/" + alias; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_alias/" + alias; } public static class Builder extends AbstractMultiIndexActionBuilder { diff --git a/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java b/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java index eef8fcb7c..ad430dd10 100644 --- a/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java +++ b/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author cihat keser @@ -18,8 +19,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + "/_aliases"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_aliases"; } public static class Builder extends AbstractMultiIndexActionBuilder { diff --git a/jest-common/src/main/java/io/searchbox/indices/aliases/ModifyAliases.java b/jest-common/src/main/java/io/searchbox/indices/aliases/ModifyAliases.java index b7b5ab076..b581bf425 100644 --- a/jest-common/src/main/java/io/searchbox/indices/aliases/ModifyAliases.java +++ b/jest-common/src/main/java/io/searchbox/indices/aliases/ModifyAliases.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableMap; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import java.util.Collection; import java.util.LinkedList; @@ -24,8 +25,8 @@ protected ModifyAliases(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_aliases"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_aliases"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/mapping/DeleteMapping.java b/jest-common/src/main/java/io/searchbox/indices/mapping/DeleteMapping.java index 15d42da5b..37769d959 100644 --- a/jest-common/src/main/java/io/searchbox/indices/mapping/DeleteMapping.java +++ b/jest-common/src/main/java/io/searchbox/indices/mapping/DeleteMapping.java @@ -2,6 +2,7 @@ import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author Dogukan Sonmez @@ -17,8 +18,8 @@ protected DeleteMapping(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_mapping"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_mapping"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/mapping/GetMapping.java b/jest-common/src/main/java/io/searchbox/indices/mapping/GetMapping.java index 976c7c35a..5130e344c 100644 --- a/jest-common/src/main/java/io/searchbox/indices/mapping/GetMapping.java +++ b/jest-common/src/main/java/io/searchbox/indices/mapping/GetMapping.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractMultiTypeActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author ferhat @@ -19,8 +20,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - return super.buildURI() + "/_mapping"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_mapping"; } public static class Builder extends AbstractMultiTypeActionBuilder { diff --git a/jest-common/src/main/java/io/searchbox/indices/mapping/PutMapping.java b/jest-common/src/main/java/io/searchbox/indices/mapping/PutMapping.java index 04b0c07e8..ff96c107c 100644 --- a/jest-common/src/main/java/io/searchbox/indices/mapping/PutMapping.java +++ b/jest-common/src/main/java/io/searchbox/indices/mapping/PutMapping.java @@ -1,6 +1,7 @@ package io.searchbox.indices.mapping; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author ferhat @@ -17,8 +18,8 @@ protected PutMapping(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_mapping"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_mapping"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/reindex/Reindex.java b/jest-common/src/main/java/io/searchbox/indices/reindex/Reindex.java index 680537856..90989207c 100644 --- a/jest-common/src/main/java/io/searchbox/indices/reindex/Reindex.java +++ b/jest-common/src/main/java/io/searchbox/indices/reindex/Reindex.java @@ -6,6 +6,7 @@ import java.util.Map; import com.google.common.collect.ImmutableMap; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author fabien baligand @@ -31,8 +32,8 @@ public class Reindex extends GenericResultAbstractAction { } @Override - protected String buildURI() { - return super.buildURI() + "/_reindex"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_reindex"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/indices/script/AbstractStoredScript.java b/jest-common/src/main/java/io/searchbox/indices/script/AbstractStoredScript.java index e30221aa4..2abebb9cb 100644 --- a/jest-common/src/main/java/io/searchbox/indices/script/AbstractStoredScript.java +++ b/jest-common/src/main/java/io/searchbox/indices/script/AbstractStoredScript.java @@ -2,6 +2,7 @@ import io.searchbox.action.AbstractAction; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import java.io.UnsupportedEncodingException; @@ -21,8 +22,8 @@ protected AbstractStoredScript(Builder builder) { this.scriptLanguage = builder.scriptLanguage; } - protected String buildURI() { - String finalUri = super.buildURI() + "/_scripts/" + scriptLanguage.pathParameterName + "/"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + String finalUri = super.buildURI(elasticsearchVersion) + "/_scripts/" + scriptLanguage.pathParameterName + "/"; try { finalUri += encode(scriptName, CHARSET); } catch (UnsupportedEncodingException e) { diff --git a/jest-common/src/main/java/io/searchbox/indices/settings/IndicesSettingsAbstractAction.java b/jest-common/src/main/java/io/searchbox/indices/settings/IndicesSettingsAbstractAction.java index 93a44ebbc..c01e7bf86 100644 --- a/jest-common/src/main/java/io/searchbox/indices/settings/IndicesSettingsAbstractAction.java +++ b/jest-common/src/main/java/io/searchbox/indices/settings/IndicesSettingsAbstractAction.java @@ -1,6 +1,7 @@ package io.searchbox.indices.settings; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author cihat keser @@ -12,8 +13,8 @@ protected IndicesSettingsAbstractAction(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_settings"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_settings"; } } diff --git a/jest-common/src/main/java/io/searchbox/indices/template/TemplateAction.java b/jest-common/src/main/java/io/searchbox/indices/template/TemplateAction.java index b6c87fe60..3070c8799 100644 --- a/jest-common/src/main/java/io/searchbox/indices/template/TemplateAction.java +++ b/jest-common/src/main/java/io/searchbox/indices/template/TemplateAction.java @@ -1,6 +1,7 @@ package io.searchbox.indices.template; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author cihat keser @@ -15,7 +16,7 @@ protected TemplateAction(Builder builder) { } @Override - protected String buildURI() { + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { return "_template/" + templateName; } diff --git a/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotAction.java b/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotAction.java index 45661e118..06525fa8b 100644 --- a/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotAction.java +++ b/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotAction.java @@ -2,6 +2,7 @@ import com.google.common.base.Joiner; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import java.util.Collection; import java.util.LinkedHashSet; @@ -23,8 +24,8 @@ protected AbstractSnapshotAction(SnapshotBuilder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_snapshot/" + repository + "/" + snapshots; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_snapshot/" + repository + "/" + snapshots; } public abstract static class SnapshotBuilder extends Builder { diff --git a/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotRepositoryAction.java b/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotRepositoryAction.java index 26d9d9a26..d75b31c3f 100644 --- a/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotRepositoryAction.java +++ b/jest-common/src/main/java/io/searchbox/snapshot/AbstractSnapshotRepositoryAction.java @@ -1,6 +1,7 @@ package io.searchbox.snapshot; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; /** * @author ckeser @@ -16,8 +17,8 @@ protected AbstractSnapshotRepositoryAction(RepositoryBuilder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_snapshot/" + repositories; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_snapshot/" + repositories; } public abstract static class RepositoryBuilder extends Builder { diff --git a/jest-common/src/main/java/io/searchbox/snapshot/RestoreSnapshot.java b/jest-common/src/main/java/io/searchbox/snapshot/RestoreSnapshot.java index a4e82e842..a31729199 100644 --- a/jest-common/src/main/java/io/searchbox/snapshot/RestoreSnapshot.java +++ b/jest-common/src/main/java/io/searchbox/snapshot/RestoreSnapshot.java @@ -1,5 +1,7 @@ package io.searchbox.snapshot; +import io.searchbox.client.config.ElasticsearchVersion; + /** * @author happyprg(hongsgo@gmail.com) */ @@ -11,8 +13,8 @@ protected RestoreSnapshot(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_restore"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_restore"; } @Override diff --git a/jest-common/src/main/java/io/searchbox/snapshot/SnapshotStatus.java b/jest-common/src/main/java/io/searchbox/snapshot/SnapshotStatus.java index 1b9163c88..523377ea5 100644 --- a/jest-common/src/main/java/io/searchbox/snapshot/SnapshotStatus.java +++ b/jest-common/src/main/java/io/searchbox/snapshot/SnapshotStatus.java @@ -1,5 +1,7 @@ package io.searchbox.snapshot; +import io.searchbox.client.config.ElasticsearchVersion; + /** * @author happyprg(hongsgo@gmail.com) */ @@ -10,8 +12,8 @@ protected SnapshotStatus(Builder builder) { } @Override - protected String buildURI() { - return super.buildURI() + "/_status"; + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + return super.buildURI(elasticsearchVersion) + "/_status"; } @Override diff --git a/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java b/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java index 54582679d..941854895 100644 --- a/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java +++ b/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java @@ -5,6 +5,7 @@ import com.google.gson.JsonSyntaxException; import io.searchbox.annotations.JestId; import io.searchbox.client.JestResult; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.core.Delete; import io.searchbox.core.Get; import io.searchbox.core.Index; @@ -22,13 +23,14 @@ public class AbstractActionTest { @Test public void buildRestUrlWithValidParameters() { String expected = "twitter/tweet/1"; - String actual = new Delete.Builder("1").index("twitter").type("tweet").build().buildURI(); + final Delete build = new Delete.Builder("1").index("twitter").type("tweet").build(); + String actual = build.buildURI(ElasticsearchVersion.UNKNOWN); assertEquals(expected, actual); } @Test public void buildUrlWithRequestParameterWithMultipleValues() { - Action dummyAction = new DummyAction.Builder() + DummyAction dummyAction = new DummyAction.Builder() .setParameter("x", "y") .setParameter("x", "z") .setParameter("x", "q") diff --git a/jest-common/src/test/java/io/searchbox/cluster/NodesHotThreadsTest.java b/jest-common/src/test/java/io/searchbox/cluster/NodesHotThreadsTest.java index ad14623db..dfacf92c5 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/NodesHotThreadsTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/NodesHotThreadsTest.java @@ -12,20 +12,19 @@ public class NodesHotThreadsTest { @Test public void testUriGenerationWithAllNodes() { - Action action = new NodesHotThreads.Builder().build(); + NodesHotThreads action = new NodesHotThreads.Builder().build(); assertEquals("/_nodes/_all/hot_threads", action.getURI()); } @Test public void testUriGenerationWithSingleNode() { - Action action = new NodesHotThreads.Builder().addNode("Pony").build(); + NodesHotThreads action = new NodesHotThreads.Builder().addNode("Pony").build(); assertEquals("/_nodes/Pony/hot_threads", action.getURI()); } @Test public void testUriGenerationWithSingleNodeAndParameter() { - Action action = new NodesHotThreads.Builder().addNode("Pony").interval("100ms").build(); + NodesHotThreads action = new NodesHotThreads.Builder().addNode("Pony").interval("100ms").build(); assertEquals("/_nodes/Pony/hot_threads?interval=100ms", action.getURI()); } - } diff --git a/jest-common/src/test/java/io/searchbox/cluster/NodesShutdownTest.java b/jest-common/src/test/java/io/searchbox/cluster/NodesShutdownTest.java index 168c83b77..9728228ea 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/NodesShutdownTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/NodesShutdownTest.java @@ -12,26 +12,25 @@ public class NodesShutdownTest { @Test public void testBuildURI() throws Exception { - Action action = new NodesShutdown.Builder().build(); + NodesShutdown action = new NodesShutdown.Builder().build(); assertEquals("/_nodes/_all/_shutdown", action.getURI()); } @Test public void testBuildURIWithDelay() throws Exception { - Action action = new NodesShutdown.Builder().delay("5s").build(); + NodesShutdown action = new NodesShutdown.Builder().delay("5s").build(); assertEquals("/_nodes/_all/_shutdown?delay=5s", action.getURI()); } @Test public void testBuildURIWithNodes() throws Exception { - Action action = new NodesShutdown.Builder().addNode("_local").build(); + NodesShutdown action = new NodesShutdown.Builder().addNode("_local").build(); assertEquals("/_nodes/_local/_shutdown", action.getURI()); } @Test public void testBuildURIWithNodeAttributeWildcard() throws Exception { - Action action = new NodesShutdown.Builder().addNode("ra*:2*").build(); + NodesShutdown action = new NodesShutdown.Builder().addNode("ra*:2*").build(); assertEquals("/_nodes/ra*:2*/_shutdown", action.getURI()); } - } diff --git a/jest-common/src/test/java/io/searchbox/cluster/NodesStatsTest.java b/jest-common/src/test/java/io/searchbox/cluster/NodesStatsTest.java index 078c78f8a..d321be164 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/NodesStatsTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/NodesStatsTest.java @@ -1,6 +1,5 @@ package io.searchbox.cluster; -import io.searchbox.action.Action; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,14 +11,14 @@ public class NodesStatsTest { @Test public void testUriGeneration() throws Exception { - Action action = new NodesStats.Builder() + NodesStats action = new NodesStats.Builder() .build(); assertEquals("/_nodes/_all/stats", action.getURI()); } @Test public void testUriGenerationWithSingleNode() throws Exception { - Action action = new NodesStats.Builder() + NodesStats action = new NodesStats.Builder() .addNode("james") .withOs() .withJvm() diff --git a/jest-common/src/test/java/io/searchbox/cluster/PendingClusterTasksTest.java b/jest-common/src/test/java/io/searchbox/cluster/PendingClusterTasksTest.java index 8f6308083..26bd528be 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/PendingClusterTasksTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/PendingClusterTasksTest.java @@ -1,6 +1,5 @@ package io.searchbox.cluster; -import io.searchbox.action.Action; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -8,7 +7,7 @@ public class PendingClusterTasksTest { @Test public void testUriGeneration() { - Action action = new PendingClusterTasks.Builder().build(); + PendingClusterTasks action = new PendingClusterTasks.Builder().build(); assertEquals("/_cluster/pending_tasks", action.getURI()); } } diff --git a/jest-common/src/test/java/io/searchbox/cluster/StateTest.java b/jest-common/src/test/java/io/searchbox/cluster/StateTest.java index e08359717..cdf21e5ea 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/StateTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/StateTest.java @@ -12,13 +12,13 @@ public class StateTest { @Test public void testUriGeneration() { - Action action = new State.Builder().build(); + State action = new State.Builder().build(); assertEquals("/_cluster/state", action.getURI()); } @Test public void testUriGenerationWithOptionalFields() { - Action action = new State.Builder() + State action = new State.Builder() .withBlocks() .withMetadata() .build(); diff --git a/jest-common/src/test/java/io/searchbox/cluster/StatsTest.java b/jest-common/src/test/java/io/searchbox/cluster/StatsTest.java index de90a7a54..80708df0d 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/StatsTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/StatsTest.java @@ -1,6 +1,5 @@ package io.searchbox.cluster; -import io.searchbox.action.Action; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -8,13 +7,13 @@ public class StatsTest { @Test public void testUriGeneration() { - Action action = new Stats.Builder().build(); + Stats action = new Stats.Builder().build(); assertEquals("/_cluster/stats/nodes/_all", action.getURI()); } @Test public void testUriGenerationWithSpecificNodes() { - Action action = new Stats.Builder() + Stats action = new Stats.Builder() .addNode("test1") .addNode("test2") .build(); diff --git a/jest-common/src/test/java/io/searchbox/cluster/TasksInformationTest.java b/jest-common/src/test/java/io/searchbox/cluster/TasksInformationTest.java index 238cc263c..98f02c955 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/TasksInformationTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/TasksInformationTest.java @@ -9,13 +9,13 @@ public class TasksInformationTest { @Test public void testUriGeneration() { - Action action = new TasksInformation.Builder().build(); + TasksInformation action = new TasksInformation.Builder().build(); assertEquals("_tasks", action.getURI()); } @Test public void testUriGenerationSpecificTask() { - Action action = new TasksInformation.Builder().task("node_id:task_id").build(); + TasksInformation action = new TasksInformation.Builder().task("node_id:task_id").build(); assertEquals("_tasks/node_id:task_id", action.getURI()); } } \ No newline at end of file diff --git a/jest-common/src/test/java/io/searchbox/core/SearchScrollTest.java b/jest-common/src/test/java/io/searchbox/core/SearchScrollTest.java index 1b8c581de..49cade50a 100644 --- a/jest-common/src/test/java/io/searchbox/core/SearchScrollTest.java +++ b/jest-common/src/test/java/io/searchbox/core/SearchScrollTest.java @@ -3,17 +3,20 @@ import com.google.common.base.Strings; import com.google.gson.Gson; import com.google.gson.JsonObject; -import io.searchbox.action.Action; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class SearchScrollTest { @Test public void methodIsGetIfScrollIdIsShort() { String scrollId = Strings.padStart("scrollId", SearchScroll.MAX_SCROLL_ID_LENGTH, 'x'); - Action searchScroll = new SearchScroll.Builder(scrollId, "1m").build(); + SearchScroll searchScroll = new SearchScroll.Builder(scrollId, "1m").build(); String uri = searchScroll.getURI(); assertEquals("GET", searchScroll.getRestMethodName()); @@ -29,7 +32,7 @@ public void methodIsPostIfScrollIdIsLong() { JsonObject expectedResults = new JsonObject(); expectedResults.addProperty("scroll_id", scrollId); - Action searchScroll = new SearchScroll.Builder(scrollId, "1m").build(); + SearchScroll searchScroll = new SearchScroll.Builder(scrollId, "1m").build(); String uri = searchScroll.getURI(); assertEquals("POST", searchScroll.getRestMethodName()); diff --git a/jest-common/src/test/java/io/searchbox/core/SearchTest.java b/jest-common/src/test/java/io/searchbox/core/SearchTest.java index 948406876..83997c941 100644 --- a/jest-common/src/test/java/io/searchbox/core/SearchTest.java +++ b/jest-common/src/test/java/io/searchbox/core/SearchTest.java @@ -1,29 +1,27 @@ package io.searchbox.core; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; -import java.util.List; - -import io.searchbox.action.AbstractAction; -import io.searchbox.params.Parameters; -import org.json.JSONException; -import org.junit.Test; -import org.skyscreamer.jsonassert.JSONAssert; - import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; - +import io.searchbox.action.AbstractAction; import io.searchbox.action.Action; import io.searchbox.core.search.sort.Sort; import io.searchbox.core.search.sort.Sort.Sorting; +import io.searchbox.params.Parameters; +import org.json.JSONException; +import org.junit.Test; +import org.skyscreamer.jsonassert.JSONAssert; + +import java.util.Arrays; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @author Dogukan Sonmez @@ -38,43 +36,43 @@ public class SearchTest { @Test public void getURIWithoutIndexAndType() { - Action search = new Search.Builder("").build(); + Search search = new Search.Builder("").build(); assertEquals("_all/_search", search.getURI()); } @Test public void getURIWithOnlyOneIndex() { - Action search = new Search.Builder("").addIndex("twitter").build(); + Search search = new Search.Builder("").addIndex("twitter").build(); assertEquals("twitter/_search", search.getURI()); } @Test public void getURIWithOneIndexAndOneType() { - Action search = new Search.Builder("").addIndex("twitter").addType("tweet").build(); + Search search = new Search.Builder("").addIndex("twitter").addType("tweet").build(); assertEquals("twitter/tweet/_search", search.getURI()); } @Test public void getURIWithOnlyOneType() { - Action search = new Search.Builder("").addType("tweet").build(); + Search search = new Search.Builder("").addType("tweet").build(); assertEquals("_all/tweet/_search", search.getURI()); } @Test public void getURIWithOnlyMultipleIndex() { - Action search = new Search.Builder("").addIndex("twitter").addIndex("searchbox").build(); + Search search = new Search.Builder("").addIndex("twitter").addIndex("searchbox").build(); assertEquals("twitter%2Csearchbox/_search", search.getURI()); } @Test public void getURIWithOnlyMultipleType() { - Action search = new Search.Builder("").addType("tweet").addType("jest").build(); + Search search = new Search.Builder("").addType("tweet").addType("jest").build(); assertEquals("_all/tweet%2Cjest/_search", search.getURI()); } @Test public void getURIWithMultipleIndexAndTypes() { - Action search = new Search.Builder("") + Search search = new Search.Builder("") .addIndex("twitter") .addIndex("searchbox") .addType("tweet") @@ -85,19 +83,19 @@ public void getURIWithMultipleIndexAndTypes() { @Test public void getURIForTemplateWithoutIndexAndType() { - Action search = new Search.TemplateBuilder("").build(); + Search search = new Search.TemplateBuilder("").build(); assertEquals("_all/_search/template", search.getURI()); } @Test public void getURIForTemplateWithIndexAndType() { - Action search = new Search.TemplateBuilder("").addIndex("twitter").addType("tweet").build(); + Search search = new Search.TemplateBuilder("").addIndex("twitter").addType("tweet").build(); assertEquals("twitter/tweet/_search/template", search.getURI()); } @Test public void getURIWithVersion() { - Action search = new Search.VersionBuilder("").addIndex("twitter").addType("tweet").build(); + Search search = new Search.VersionBuilder("").addIndex("twitter").addType("tweet").build(); assertTrue("Version Parameter missing", search.getURI().contains("version=true")); } @@ -241,7 +239,7 @@ public void sortTest() { .build(); srch = (AbstractAction) search; assertTrue(srch.getParameter(Parameters.TRACK_SCORES).size() == 1); - assertTrue((Boolean)srch.getParameter(Parameters.TRACK_SCORES).iterator().next()); + assertTrue((Boolean) srch.getParameter(Parameters.TRACK_SCORES).iterator().next()); } @Test diff --git a/jest-common/src/test/java/io/searchbox/core/SuggestTest.java b/jest-common/src/test/java/io/searchbox/core/SuggestTest.java index 786e41edf..de15b36d3 100644 --- a/jest-common/src/test/java/io/searchbox/core/SuggestTest.java +++ b/jest-common/src/test/java/io/searchbox/core/SuggestTest.java @@ -10,43 +10,43 @@ public class SuggestTest { @Test public void getURIWithoutIndexAndType() { - Action suggest = new Suggest.Builder("").build(); + Suggest suggest = new Suggest.Builder("").build(); assertEquals("_all/_suggest", suggest.getURI()); } @Test public void getURIWithOnlyOneIndex() { - Action suggest = new Suggest.Builder("").addIndex("twitter").build(); + Suggest suggest = new Suggest.Builder("").addIndex("twitter").build(); assertEquals("twitter/_suggest", suggest.getURI()); } @Test public void getURIWithOneIndexAndOneType() { - Action suggest = new Suggest.Builder("").addIndex("twitter").addType("tweet").build(); + Suggest suggest = new Suggest.Builder("").addIndex("twitter").addType("tweet").build(); assertEquals("twitter/tweet/_suggest", suggest.getURI()); } @Test public void getURIWithOnlyOneType() { - Action suggest = new Suggest.Builder("").addType("tweet").build(); + Suggest suggest = new Suggest.Builder("").addType("tweet").build(); assertEquals("_all/tweet/_suggest", suggest.getURI()); } @Test public void getURIWithOnlyMultipleIndex() { - Action suggest = new Suggest.Builder("").addIndex("twitter").addIndex("suggestbox").build(); + Suggest suggest = new Suggest.Builder("").addIndex("twitter").addIndex("suggestbox").build(); assertEquals("twitter%2Csuggestbox/_suggest", suggest.getURI()); } @Test public void getURIWithOnlyMultipleType() { - Action suggest = new Suggest.Builder("").addType("tweet").addType("jest").build(); + Suggest suggest = new Suggest.Builder("").addType("tweet").addType("jest").build(); assertEquals("_all/tweet%2Cjest/_suggest", suggest.getURI()); } @Test public void getURIWithMultipleIndexAndTypes() { - Action suggest = new Suggest.Builder("") + Suggest suggest = new Suggest.Builder("") .addIndex("twitter") .addIndex("suggestbox") .addType("tweet") diff --git a/jest-common/src/test/java/io/searchbox/indices/StatsTest.java b/jest-common/src/test/java/io/searchbox/indices/StatsTest.java index 277444499..054744043 100644 --- a/jest-common/src/test/java/io/searchbox/indices/StatsTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/StatsTest.java @@ -1,6 +1,5 @@ package io.searchbox.indices; -import io.searchbox.action.Action; import org.junit.Test; import java.net.URLDecoder; @@ -36,7 +35,7 @@ public void equalsReturnsFalseForDifferentIndex() { @Test public void testUriGenerationWithStatsFields() throws Exception { - Action action = new Stats.Builder() + Stats action = new Stats.Builder() .flush(true) .indexing(true) .search(true, "group1", "group2") @@ -46,7 +45,7 @@ public void testUriGenerationWithStatsFields() throws Exception { @Test public void testUriGenerationWhenRemovingStatsFields() throws Exception { - Action action = new Stats.Builder() + Stats action = new Stats.Builder() .flush(true) .indexing(true) .indexing(false) diff --git a/jest-common/src/test/java/io/searchbox/indices/script/CreateIndexedScriptTest.java b/jest-common/src/test/java/io/searchbox/indices/script/CreateIndexedScriptTest.java index 38b5c4be1..a7487f494 100644 --- a/jest-common/src/test/java/io/searchbox/indices/script/CreateIndexedScriptTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/script/CreateIndexedScriptTest.java @@ -3,6 +3,7 @@ import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Before; import org.junit.Test; @@ -23,7 +24,7 @@ public class CreateIndexedScriptTest { private String groovysnippet; @Before - public void setUp() throws Exception { + public void setUp() { builder = new CreateStoredScript.Builder(A_NAME).setLanguage(JAVASCRIPT); script = builder.build(); groovysnippet = "def test_a=123\n" + @@ -31,11 +32,11 @@ public void setUp() throws Exception { } @Test - public void defaultScriptingLanguageIsGroovy() throws Exception { + public void defaultScriptingLanguageIsGroovy() { CreateStoredScript script = new CreateStoredScript.Builder(A_NAME).build(); assertEquals(GROOVY, script.getScriptLanguage()); - assertThat(script.buildURI(), containsString(GROOVY.pathParameterName)); + assertThat(script.buildURI(ElasticsearchVersion.UNKNOWN), containsString(GROOVY.pathParameterName)); } @Test @@ -44,17 +45,17 @@ public void methodIsPost() { } @Test - public void scriptingLanguageIsSetIntoPath() throws Exception { - assertThat(script.buildURI(), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/")); + public void scriptingLanguageIsSetIntoPath() { + assertThat(script.buildURI(ElasticsearchVersion.UNKNOWN), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/")); } @Test - public void nameOfTheScriptIsSetIntoPath() throws Exception { - assertThat(script.buildURI(), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/" + A_NAME)); + public void nameOfTheScriptIsSetIntoPath() { + assertThat(script.buildURI(ElasticsearchVersion.UNKNOWN), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/" + A_NAME)); } @Test - public void scriptSourceIsValidJsonString() throws Exception { + public void scriptSourceIsValidJsonString() { builder.setSource(groovysnippet); script = builder.build(); diff --git a/jest-common/src/test/java/io/searchbox/indices/script/DeleteIndexedScriptTest.java b/jest-common/src/test/java/io/searchbox/indices/script/DeleteIndexedScriptTest.java index 071d329ea..8ca2cd160 100644 --- a/jest-common/src/test/java/io/searchbox/indices/script/DeleteIndexedScriptTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/script/DeleteIndexedScriptTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.script; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Before; import org.junit.Test; @@ -15,17 +16,17 @@ public class DeleteIndexedScriptTest { private DeleteStoredScript script; @Before - public void setUp() throws Exception { + public void setUp() { DeleteStoredScript.Builder builder = new DeleteStoredScript.Builder(A_NAME).setLanguage(JAVASCRIPT); script = builder.build(); } @Test - public void defaultScriptingLanguageIsGroovy() throws Exception { + public void defaultScriptingLanguageIsGroovy() { DeleteStoredScript script = new DeleteStoredScript.Builder(A_NAME).build(); assertEquals(GROOVY, script.getScriptLanguage()); - assertThat(script.buildURI(), containsString(GROOVY.pathParameterName)); + assertThat(script.buildURI(ElasticsearchVersion.UNKNOWN), containsString(GROOVY.pathParameterName)); } @Test @@ -34,13 +35,13 @@ public void methodIsDelete() { } @Test - public void scriptingLanguageIsSetIntoPath() throws Exception { - assertThat(script.buildURI(), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/")); + public void scriptingLanguageIsSetIntoPath() { + assertThat(script.buildURI(ElasticsearchVersion.UNKNOWN), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/")); } @Test - public void nameOfTheScriptIsSetIntoPath() throws Exception { - assertThat(script.buildURI(), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/" + A_NAME)); + public void nameOfTheScriptIsSetIntoPath() { + assertThat(script.buildURI(ElasticsearchVersion.UNKNOWN), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/" + A_NAME)); } } \ No newline at end of file diff --git a/jest-common/src/test/java/io/searchbox/indices/script/GetIndexedScriptTest.java b/jest-common/src/test/java/io/searchbox/indices/script/GetIndexedScriptTest.java index bd0795ffc..7252f7e17 100644 --- a/jest-common/src/test/java/io/searchbox/indices/script/GetIndexedScriptTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/script/GetIndexedScriptTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.script; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Before; import org.junit.Test; @@ -18,17 +19,17 @@ public class GetIndexedScriptTest { private GetStoredScript script; @Before - public void setUp() throws Exception { + public void setUp() { GetStoredScript.Builder builder = new GetStoredScript.Builder(A_NAME).setLanguage(JAVASCRIPT); script = builder.build(); } @Test - public void defaultScriptingLanguageIsGroovy() throws Exception { + public void defaultScriptingLanguageIsGroovy() { GetStoredScript script = new GetStoredScript.Builder(A_NAME).build(); assertEquals(GROOVY, script.getScriptLanguage()); - assertThat(script.buildURI(), containsString(GROOVY.pathParameterName)); + assertThat(script.buildURI(ElasticsearchVersion.UNKNOWN), containsString(GROOVY.pathParameterName)); } @Test @@ -37,13 +38,13 @@ public void methodIsGet() { } @Test - public void scriptingLanguageIsSetIntoPath() throws Exception { - assertThat(script.buildURI(), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/")); + public void scriptingLanguageIsSetIntoPath() { + assertThat(script.buildURI(ElasticsearchVersion.UNKNOWN), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/")); } @Test - public void nameOfTheScriptIsSetIntoPath() throws Exception { - assertThat(script.buildURI(), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/" + A_NAME)); + public void nameOfTheScriptIsSetIntoPath() { + assertThat(script.buildURI(ElasticsearchVersion.UNKNOWN), containsString("/_scripts/" + JAVASCRIPT.pathParameterName + "/" + A_NAME)); } } \ No newline at end of file diff --git a/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java b/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java index beef1ebf6..5a482ecbd 100644 --- a/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java @@ -23,10 +23,8 @@ public void testBasicUriGeneration() { public void testBasicUriGeneration_compatibleForES55() { TypeExist typeExist = new TypeExist.Builder("happyprg").addType("seohoo").build(); - typeExist.prepare(ElasticsearchVersion.V55); - assertEquals("HEAD", typeExist.getRestMethodName()); - assertEquals("happyprg/_mapping/seohoo", typeExist.getURI()); + assertEquals("happyprg/_mapping/seohoo", typeExist.getURI(ElasticsearchVersion.V55)); } @Test diff --git a/jest/src/main/java/io/searchbox/client/http/JestHttpClient.java b/jest/src/main/java/io/searchbox/client/http/JestHttpClient.java index 7cb1a6329..76c3d6ac0 100755 --- a/jest/src/main/java/io/searchbox/client/http/JestHttpClient.java +++ b/jest/src/main/java/io/searchbox/client/http/JestHttpClient.java @@ -115,8 +115,7 @@ public void close() throws IOException { } protected HttpUriRequest prepareRequest(final Action clientRequest, final RequestConfig requestConfig) { - clientRequest.prepare(elasticsearchVersion); - String elasticSearchRestUrl = getRequestURL(getNextServer(), clientRequest.getURI()); + String elasticSearchRestUrl = getRequestURL(getNextServer(), clientRequest.getURI(elasticsearchVersion)); HttpUriRequest request = constructHttpMethod(clientRequest.getRestMethodName(), elasticSearchRestUrl, clientRequest.getData(gson), requestConfig); log.debug("Request method={} url={}", clientRequest.getRestMethodName(), elasticSearchRestUrl); From 11fa9416557170c605a612fdb0f951a43f1b415c Mon Sep 17 00:00:00 2001 From: Michael Siepmann Date: Wed, 25 Oct 2017 22:16:55 +0200 Subject: [PATCH 11/19] Forgot this implementation of the interface. --- .../src/main/java/com/searchly/jestdroid/JestDroidClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jest-droid/src/main/java/com/searchly/jestdroid/JestDroidClient.java b/jest-droid/src/main/java/com/searchly/jestdroid/JestDroidClient.java index edc5f3033..22ec0b65b 100644 --- a/jest-droid/src/main/java/com/searchly/jestdroid/JestDroidClient.java +++ b/jest-droid/src/main/java/com/searchly/jestdroid/JestDroidClient.java @@ -8,6 +8,7 @@ import io.searchbox.client.JestClient; import io.searchbox.client.JestResult; import io.searchbox.client.JestResultHandler; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.client.config.exception.CouldNotConnectException; import org.apache.http.HttpEntityEnclosingRequest; import org.apache.http.HttpResponse; @@ -46,7 +47,7 @@ public T execute(Action clientRequest) throws IOExcept } public T execute(Action clientRequest, RequestConfig requestConfig) throws IOException { - String elasticSearchRestUrl = getRequestURL(getNextServer(), clientRequest.getURI()); + String elasticSearchRestUrl = getRequestURL(getNextServer(), clientRequest.getURI(ElasticsearchVersion.UNKNOWN)); HttpUriRequest request = constructHttpMethod(clientRequest.getRestMethodName(), elasticSearchRestUrl, clientRequest.getData(gson), requestConfig); // add headers added to action From 4b3c83e9e50c4be54a791e0273230202c2c67a40 Mon Sep 17 00:00:00 2001 From: Michael Siepmann Date: Wed, 25 Oct 2017 22:34:09 +0200 Subject: [PATCH 12/19] getURI without parameters was only used in test-classes. Inlined it. --- .../io/searchbox/action/AbstractAction.java | 10 +++------ .../searchbox/action/AbstractActionTest.java | 18 ++++++---------- .../cluster/NodesHotThreadsTest.java | 8 +++---- .../io/searchbox/cluster/NodesInfoTest.java | 15 ++++++------- .../searchbox/cluster/NodesShutdownTest.java | 10 ++++----- .../io/searchbox/cluster/NodesStatsTest.java | 5 +++-- .../cluster/PendingClusterTasksTest.java | 3 ++- .../io/searchbox/cluster/RerouteTest.java | 3 ++- .../java/io/searchbox/cluster/StateTest.java | 6 +++--- .../java/io/searchbox/cluster/StatsTest.java | 5 +++-- .../cluster/TasksInformationTest.java | 6 +++--- .../test/java/io/searchbox/core/BulkTest.java | 7 ++++--- .../searchbox/core/CatAliasesBuilderTest.java | 7 ++++--- .../searchbox/core/CatIndicesBuilderTest.java | 9 ++++---- .../searchbox/core/CatNodesBuilderTest.java | 5 +++-- .../core/CatSegmentsBuilderTest.java | 11 +++++----- .../searchbox/core/CatShardsBuilderTest.java | 7 ++++--- .../java/io/searchbox/core/CountTest.java | 11 +++++----- .../io/searchbox/core/DeleteByQueryTest.java | 14 ++++++------- .../java/io/searchbox/core/DeleteTest.java | 5 +++-- .../java/io/searchbox/core/ExplainTest.java | 3 ++- .../test/java/io/searchbox/core/GetTest.java | 3 ++- .../java/io/searchbox/core/IndexTest.java | 7 ++++--- .../java/io/searchbox/core/MultiGetTest.java | 5 +++-- .../io/searchbox/core/MultiSearchTest.java | 9 ++++---- .../java/io/searchbox/core/PercolateTest.java | 3 ++- .../test/java/io/searchbox/core/PingTest.java | 3 ++- .../io/searchbox/core/SearchScrollTest.java | 5 +++-- .../java/io/searchbox/core/SearchTest.java | 21 ++++++++++--------- .../java/io/searchbox/core/SuggestTest.java | 15 ++++++------- .../io/searchbox/core/UpdateByQueryTest.java | 14 ++++++------- .../java/io/searchbox/core/UpdateTest.java | 3 ++- .../java/io/searchbox/core/ValidateTest.java | 7 ++++--- .../io/searchbox/indices/AnalyzeTest.java | 11 +++++----- .../io/searchbox/indices/ClearCacheTest.java | 7 ++++--- .../io/searchbox/indices/CloseIndexTest.java | 3 ++- .../io/searchbox/indices/CreateIndexTest.java | 3 ++- .../io/searchbox/indices/DeleteIndexTest.java | 5 +++-- .../java/io/searchbox/indices/FlushTest.java | 7 ++++--- .../io/searchbox/indices/ForceMergeTest.java | 3 ++- .../searchbox/indices/IndicesExistsTest.java | 3 ++- .../io/searchbox/indices/OpenIndexTest.java | 3 ++- .../io/searchbox/indices/OptimizeTest.java | 3 ++- .../io/searchbox/indices/RefreshTest.java | 3 ++- .../io/searchbox/indices/RolloverTest.java | 7 ++++--- .../java/io/searchbox/indices/StatsTest.java | 9 ++++---- .../indices/aliases/AliasExistsTest.java | 9 ++++---- .../indices/aliases/GetAliasesTest.java | 3 ++- .../indices/aliases/ModifyAliasesTest.java | 3 ++- .../indices/mapping/DeleteMappingTest.java | 3 ++- .../indices/mapping/GetMappingTest.java | 3 ++- .../indices/mapping/PutMappingTest.java | 3 ++- .../indices/reindex/ReindexTest.java | 5 +++-- .../indices/settings/GetSettingsTest.java | 19 +++++++++-------- .../indices/settings/UpdateSettingsTest.java | 3 ++- .../indices/template/DeleteTemplateTest.java | 3 ++- .../indices/template/GetTemplateTest.java | 3 ++- .../indices/template/PutTemplateTest.java | 3 ++- .../searchbox/indices/type/TypeExistTest.java | 2 +- .../CreateSnapshotRepositoryTest.java | 5 +++-- .../snapshot/CreateSnapshotTest.java | 5 +++-- .../DeleteSnapshotRepositoryTest.java | 3 ++- .../snapshot/DeleteSnapshotTest.java | 3 ++- .../snapshot/GetSnapshotRepositoryTest.java | 7 ++++--- .../searchbox/snapshot/GetSnapshotTest.java | 5 +++-- .../snapshot/RestoreSnapshotTest.java | 3 ++- .../snapshot/SnapshotStatusTest.java | 5 +++-- 67 files changed, 238 insertions(+), 190 deletions(-) diff --git a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java index cca3a9adc..682024666 100644 --- a/jest-common/src/main/java/io/searchbox/action/AbstractAction.java +++ b/jest-common/src/main/java/io/searchbox/action/AbstractAction.java @@ -138,10 +138,6 @@ public Map getHeaders() { return headerMap; } - public String getURI() { - return getURI(ElasticsearchVersion.UNKNOWN); - } - @Override public String getURI(ElasticsearchVersion elasticsearchVersion) { String finalUri = buildURI(elasticsearchVersion); @@ -227,14 +223,14 @@ protected String buildQueryString() throws UnsupportedEncodingException { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("uri", getURI()) + .add("uri", getURI(ElasticsearchVersion.UNKNOWN)) .add("method", getRestMethodName()) .toString(); } @Override public int hashCode() { - return Objects.hash(getURI(), getRestMethodName(), getHeaders(), payload); + return Objects.hash(getURI(ElasticsearchVersion.UNKNOWN), getRestMethodName(), getHeaders(), payload); } @Override @@ -250,7 +246,7 @@ public boolean equals(Object obj) { } AbstractAction rhs = (AbstractAction) obj; - return Objects.equals(getURI(), rhs.getURI()) + return Objects.equals(getURI(ElasticsearchVersion.UNKNOWN), rhs.getURI(ElasticsearchVersion.UNKNOWN)) && Objects.equals(getRestMethodName(), rhs.getRestMethodName()) && Objects.equals(getHeaders(), rhs.getHeaders()) && Objects.equals(payload, rhs.payload); diff --git a/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java b/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java index 941854895..35495b5c1 100644 --- a/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java +++ b/jest-common/src/test/java/io/searchbox/action/AbstractActionTest.java @@ -36,7 +36,7 @@ public void buildUrlWithRequestParameterWithMultipleValues() { .setParameter("x", "q") .setParameter("w", "p") .build(); - assertEquals("?x=y&x=z&x=q&w=p", dummyAction.getURI()); + assertEquals("?x=y&x=z&x=q&w=p", dummyAction.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -97,25 +97,21 @@ public void requestDataMultipleClientRequest() { assertEquals("\"updateData\"", update.getData(null).toString()); assertEquals("POST", update.getRestMethodName()); - assertEquals("indexName/indexType/1/_update", update.getURI()); + assertEquals("indexName/indexType/1/_update", update.getURI(ElasticsearchVersion.UNKNOWN)); assertEquals("\"indexDocumentData\"", indexDocument.getData(null).toString()); assertEquals("PUT", indexDocument.getRestMethodName()); - assertEquals("index/type/id", indexDocument.getURI()); + assertEquals("index/type/id", indexDocument.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getIdFromNullSource() { - String expected = null; - String actual = AbstractAction.getIdFromSource(null); - assertEquals(expected, actual); + assertNull(AbstractAction.getIdFromSource(null)); } @Test public void getIdFromSourceWithoutAnnotation() { - String expected = null; - String actual = AbstractAction.getIdFromSource("JEST"); - assertEquals(expected, actual); + assertNull(AbstractAction.getIdFromSource("JEST")); } @Test @@ -127,9 +123,7 @@ public void getIdFromSourceWithAnnotation() { @Test public void getIdFromSourceWithAnnotationWithNullId() { - String expected = null; - String actual = AbstractAction.getIdFromSource(new Source("data", null)); - assertEquals(expected, actual); + assertNull(AbstractAction.getIdFromSource(new Source("data", null))); } static class DummyAction extends GenericResultAbstractAction { diff --git a/jest-common/src/test/java/io/searchbox/cluster/NodesHotThreadsTest.java b/jest-common/src/test/java/io/searchbox/cluster/NodesHotThreadsTest.java index dfacf92c5..17fe6dfdc 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/NodesHotThreadsTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/NodesHotThreadsTest.java @@ -1,6 +1,6 @@ package io.searchbox.cluster; -import io.searchbox.action.Action; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -13,18 +13,18 @@ public class NodesHotThreadsTest { @Test public void testUriGenerationWithAllNodes() { NodesHotThreads action = new NodesHotThreads.Builder().build(); - assertEquals("/_nodes/_all/hot_threads", action.getURI()); + assertEquals("/_nodes/_all/hot_threads", action.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testUriGenerationWithSingleNode() { NodesHotThreads action = new NodesHotThreads.Builder().addNode("Pony").build(); - assertEquals("/_nodes/Pony/hot_threads", action.getURI()); + assertEquals("/_nodes/Pony/hot_threads", action.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testUriGenerationWithSingleNodeAndParameter() { NodesHotThreads action = new NodesHotThreads.Builder().addNode("Pony").interval("100ms").build(); - assertEquals("/_nodes/Pony/hot_threads?interval=100ms", action.getURI()); + assertEquals("/_nodes/Pony/hot_threads?interval=100ms", action.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/cluster/NodesInfoTest.java b/jest-common/src/test/java/io/searchbox/cluster/NodesInfoTest.java index 4035fa142..7f767e9d4 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/NodesInfoTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/NodesInfoTest.java @@ -1,5 +1,6 @@ package io.searchbox.cluster; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,37 +13,37 @@ public class NodesInfoTest { @Test public void getURIWithoutNodeAndInfo() { NodesInfo nodesInfo = new NodesInfo.Builder().build(); - assertEquals("/_nodes/_all", nodesInfo.getURI()); + assertEquals("/_nodes/_all", nodesInfo.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyOneNode() { NodesInfo nodesInfo = new NodesInfo.Builder().addNode("twitter").build(); - assertEquals("/_nodes/twitter", nodesInfo.getURI()); + assertEquals("/_nodes/twitter", nodesInfo.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOneNodeAndOneInfo() { NodesInfo nodesInfo = new NodesInfo.Builder().addNode("twitter").withOs().build(); - assertEquals("/_nodes/twitter/os", nodesInfo.getURI()); + assertEquals("/_nodes/twitter/os", nodesInfo.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyOneType() { NodesInfo nodesInfo = new NodesInfo.Builder().withOs().build(); - assertEquals("/_nodes/_all/os", nodesInfo.getURI()); + assertEquals("/_nodes/_all/os", nodesInfo.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyMultipleNode() { NodesInfo nodesInfo = new NodesInfo.Builder().addNode("twitter").addNode("searchbox").build(); - assertEquals("/_nodes/twitter,searchbox", nodesInfo.getURI()); + assertEquals("/_nodes/twitter,searchbox", nodesInfo.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyMultipleType() { NodesInfo nodesInfo = new NodesInfo.Builder().withOs().withProcess().build(); - assertEquals("/_nodes/_all/os,process", nodesInfo.getURI()); + assertEquals("/_nodes/_all/os,process", nodesInfo.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -54,7 +55,7 @@ public void getURIWithMultipleNodeAndTypes() { .withProcess() .withSettings() .build(); - assertEquals("/_nodes/twitter,jest/os,process,settings", nodesInfo.getURI()); + assertEquals("/_nodes/twitter,jest/os,process,settings", nodesInfo.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/cluster/NodesShutdownTest.java b/jest-common/src/test/java/io/searchbox/cluster/NodesShutdownTest.java index 9728228ea..d8496ea1e 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/NodesShutdownTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/NodesShutdownTest.java @@ -1,6 +1,6 @@ package io.searchbox.cluster; -import io.searchbox.action.Action; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -13,24 +13,24 @@ public class NodesShutdownTest { @Test public void testBuildURI() throws Exception { NodesShutdown action = new NodesShutdown.Builder().build(); - assertEquals("/_nodes/_all/_shutdown", action.getURI()); + assertEquals("/_nodes/_all/_shutdown", action.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testBuildURIWithDelay() throws Exception { NodesShutdown action = new NodesShutdown.Builder().delay("5s").build(); - assertEquals("/_nodes/_all/_shutdown?delay=5s", action.getURI()); + assertEquals("/_nodes/_all/_shutdown?delay=5s", action.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testBuildURIWithNodes() throws Exception { NodesShutdown action = new NodesShutdown.Builder().addNode("_local").build(); - assertEquals("/_nodes/_local/_shutdown", action.getURI()); + assertEquals("/_nodes/_local/_shutdown", action.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testBuildURIWithNodeAttributeWildcard() throws Exception { NodesShutdown action = new NodesShutdown.Builder().addNode("ra*:2*").build(); - assertEquals("/_nodes/ra*:2*/_shutdown", action.getURI()); + assertEquals("/_nodes/ra*:2*/_shutdown", action.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/cluster/NodesStatsTest.java b/jest-common/src/test/java/io/searchbox/cluster/NodesStatsTest.java index d321be164..a555b7420 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/NodesStatsTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/NodesStatsTest.java @@ -1,5 +1,6 @@ package io.searchbox.cluster; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -13,7 +14,7 @@ public class NodesStatsTest { public void testUriGeneration() throws Exception { NodesStats action = new NodesStats.Builder() .build(); - assertEquals("/_nodes/_all/stats", action.getURI()); + assertEquals("/_nodes/_all/stats", action.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -23,7 +24,7 @@ public void testUriGenerationWithSingleNode() throws Exception { .withOs() .withJvm() .build(); - assertEquals("/_nodes/james/stats/os,jvm", action.getURI()); + assertEquals("/_nodes/james/stats/os,jvm", action.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/cluster/PendingClusterTasksTest.java b/jest-common/src/test/java/io/searchbox/cluster/PendingClusterTasksTest.java index 26bd528be..44a7fcbfd 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/PendingClusterTasksTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/PendingClusterTasksTest.java @@ -1,5 +1,6 @@ package io.searchbox.cluster; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -8,6 +9,6 @@ public class PendingClusterTasksTest { @Test public void testUriGeneration() { PendingClusterTasks action = new PendingClusterTasks.Builder().build(); - assertEquals("/_cluster/pending_tasks", action.getURI()); + assertEquals("/_cluster/pending_tasks", action.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/cluster/RerouteTest.java b/jest-common/src/test/java/io/searchbox/cluster/RerouteTest.java index 316bde3be..8fc4a9db8 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/RerouteTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/RerouteTest.java @@ -1,6 +1,7 @@ package io.searchbox.cluster; import com.google.gson.Gson; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.cluster.reroute.RerouteAllocateReplica; import io.searchbox.cluster.reroute.RerouteCancel; import io.searchbox.cluster.reroute.RerouteMove; @@ -24,7 +25,7 @@ public void reroute() throws JSONException { moveCommands.add(new RerouteAllocateReplica("index3", 1, "node3")); Reroute reroute = new Reroute.Builder(moveCommands).build(); - assertEquals("/_cluster/reroute", reroute.getURI()); + assertEquals("/_cluster/reroute", reroute.getURI(ElasticsearchVersion.UNKNOWN)); assertEquals("POST", reroute.getRestMethodName()); String expectedData = "{ \"commands\": [" + diff --git a/jest-common/src/test/java/io/searchbox/cluster/StateTest.java b/jest-common/src/test/java/io/searchbox/cluster/StateTest.java index cdf21e5ea..78e6a295a 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/StateTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/StateTest.java @@ -1,6 +1,6 @@ package io.searchbox.cluster; -import io.searchbox.action.Action; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -13,7 +13,7 @@ public class StateTest { @Test public void testUriGeneration() { State action = new State.Builder().build(); - assertEquals("/_cluster/state", action.getURI()); + assertEquals("/_cluster/state", action.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -22,7 +22,7 @@ public void testUriGenerationWithOptionalFields() { .withBlocks() .withMetadata() .build(); - assertEquals("/_cluster/state/blocks,metadata", action.getURI()); + assertEquals("/_cluster/state/blocks,metadata", action.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/cluster/StatsTest.java b/jest-common/src/test/java/io/searchbox/cluster/StatsTest.java index 80708df0d..a2e23ef3e 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/StatsTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/StatsTest.java @@ -1,5 +1,6 @@ package io.searchbox.cluster; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -8,7 +9,7 @@ public class StatsTest { @Test public void testUriGeneration() { Stats action = new Stats.Builder().build(); - assertEquals("/_cluster/stats/nodes/_all", action.getURI()); + assertEquals("/_cluster/stats/nodes/_all", action.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -17,6 +18,6 @@ public void testUriGenerationWithSpecificNodes() { .addNode("test1") .addNode("test2") .build(); - assertEquals("/_cluster/stats/nodes/test1,test2", action.getURI()); + assertEquals("/_cluster/stats/nodes/test1,test2", action.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/cluster/TasksInformationTest.java b/jest-common/src/test/java/io/searchbox/cluster/TasksInformationTest.java index 98f02c955..3a01b39e1 100644 --- a/jest-common/src/test/java/io/searchbox/cluster/TasksInformationTest.java +++ b/jest-common/src/test/java/io/searchbox/cluster/TasksInformationTest.java @@ -1,6 +1,6 @@ package io.searchbox.cluster; -import io.searchbox.action.Action; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.*; @@ -10,12 +10,12 @@ public class TasksInformationTest { @Test public void testUriGeneration() { TasksInformation action = new TasksInformation.Builder().build(); - assertEquals("_tasks", action.getURI()); + assertEquals("_tasks", action.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testUriGenerationSpecificTask() { TasksInformation action = new TasksInformation.Builder().task("node_id:task_id").build(); - assertEquals("_tasks/node_id:task_id", action.getURI()); + assertEquals("_tasks/node_id:task_id", action.getURI(ElasticsearchVersion.UNKNOWN)); } } \ No newline at end of file diff --git a/jest-common/src/test/java/io/searchbox/core/BulkTest.java b/jest-common/src/test/java/io/searchbox/core/BulkTest.java index 0b3776aa9..c4a8f98a5 100644 --- a/jest-common/src/test/java/io/searchbox/core/BulkTest.java +++ b/jest-common/src/test/java/io/searchbox/core/BulkTest.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import io.searchbox.client.config.ElasticsearchVersion; import org.json.JSONException; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -102,14 +103,14 @@ public void bulkOperationWithMultipleIndexAndDelete() throws JSONException { @Test public void testUris() { Bulk bulkWitIndex = new Bulk.Builder().defaultIndex("twitter").build(); - assertEquals("twitter/_bulk", bulkWitIndex.getURI()); + assertEquals("twitter/_bulk", bulkWitIndex.getURI(ElasticsearchVersion.UNKNOWN)); Bulk bulkWitIndexAndType = new Bulk.Builder().defaultIndex("twitter").defaultType("tweet").build(); - assertEquals("twitter/tweet/_bulk", bulkWitIndexAndType.getURI()); + assertEquals("twitter/tweet/_bulk", bulkWitIndexAndType.getURI(ElasticsearchVersion.UNKNOWN)); } private void executeAsserts(Bulk bulk) { assertEquals("POST", bulk.getRestMethodName()); - assertEquals("/_bulk", bulk.getURI()); + assertEquals("/_bulk", bulk.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/core/CatAliasesBuilderTest.java b/jest-common/src/test/java/io/searchbox/core/CatAliasesBuilderTest.java index f16715cc1..c0319fd86 100644 --- a/jest-common/src/test/java/io/searchbox/core/CatAliasesBuilderTest.java +++ b/jest-common/src/test/java/io/searchbox/core/CatAliasesBuilderTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -18,18 +19,18 @@ public void shouldSetApplicationJsonHeader() { @Test public void shouldGenerateValidUriWhenIndexNotGiven() { Cat cat = new Cat.AliasesBuilder().build(); - assertEquals("_cat/aliases/_all", cat.getURI()); + assertEquals("_cat/aliases/_all", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenIndexGiven() { Cat cat = new Cat.AliasesBuilder().addIndex("testIndex").build(); - assertEquals("_cat/aliases/testIndex", cat.getURI()); + assertEquals("_cat/aliases/testIndex", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenParameterGiven() { Cat cat = new Cat.AliasesBuilder().setParameter("v", "true").build(); - assertEquals("_cat/aliases/_all?v=true", cat.getURI()); + assertEquals("_cat/aliases/_all?v=true", cat.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/core/CatIndicesBuilderTest.java b/jest-common/src/test/java/io/searchbox/core/CatIndicesBuilderTest.java index ebbf6ebfd..c0e60f062 100644 --- a/jest-common/src/test/java/io/searchbox/core/CatIndicesBuilderTest.java +++ b/jest-common/src/test/java/io/searchbox/core/CatIndicesBuilderTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -18,24 +19,24 @@ public void shouldSetApplicationJsonHeader() { @Test public void shouldGenerateValidUriWhenIndexNotGiven() { Cat cat = new Cat.IndicesBuilder().build(); - assertEquals("_cat/indices/_all", cat.getURI()); + assertEquals("_cat/indices/_all", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenIndexGiven() { Cat cat = new Cat.IndicesBuilder().addIndex("testIndex").build(); - assertEquals("_cat/indices/testIndex", cat.getURI()); + assertEquals("_cat/indices/testIndex", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenIndexAndTypeGiven() { Cat cat = new Cat.IndicesBuilder().addIndex("testIndex").addType("testType").build(); - assertEquals("_cat/indices/testIndex/testType", cat.getURI()); + assertEquals("_cat/indices/testIndex/testType", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenParameterGiven() { Cat cat = new Cat.IndicesBuilder().setParameter("v", "true").build(); - assertEquals("_cat/indices/_all?v=true", cat.getURI()); + assertEquals("_cat/indices/_all?v=true", cat.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/core/CatNodesBuilderTest.java b/jest-common/src/test/java/io/searchbox/core/CatNodesBuilderTest.java index d91b2ae40..f26fe37d8 100644 --- a/jest-common/src/test/java/io/searchbox/core/CatNodesBuilderTest.java +++ b/jest-common/src/test/java/io/searchbox/core/CatNodesBuilderTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -15,12 +16,12 @@ public void shouldSetApplicationJsonHeader() { @Test public void shouldGenerateValidUriWhenIndexNotGiven() { Cat cat = new Cat.NodesBuilder().build(); - assertEquals("_cat/nodes", cat.getURI()); + assertEquals("_cat/nodes", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenParameterGiven() { Cat cat = new Cat.NodesBuilder().setParameter("v", "true").build(); - assertEquals("_cat/nodes?v=true", cat.getURI()); + assertEquals("_cat/nodes?v=true", cat.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/core/CatSegmentsBuilderTest.java b/jest-common/src/test/java/io/searchbox/core/CatSegmentsBuilderTest.java index cf5fb4f17..f01681da3 100644 --- a/jest-common/src/test/java/io/searchbox/core/CatSegmentsBuilderTest.java +++ b/jest-common/src/test/java/io/searchbox/core/CatSegmentsBuilderTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -19,31 +20,31 @@ public void shouldSetApplicationJsonHeader() { @Test public void shouldGenerateValidUriWhenIndexNotGiven() { Cat cat = new Cat.SegmentsBuilder().build(); - assertEquals("_cat/segments", cat.getURI()); + assertEquals("_cat/segments", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenSingleIndexGiven() { Cat cat = new Cat.SegmentsBuilder().addIndex("testIndex").build(); - assertEquals("_cat/segments/testIndex", cat.getURI()); + assertEquals("_cat/segments/testIndex", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenIndicesGiven() { Cat cat = new Cat.SegmentsBuilder().addIndex("testIndex1").addIndex("testIndex2").build(); - assertEquals("_cat/segments/testIndex1%2CtestIndex2", cat.getURI()); + assertEquals("_cat/segments/testIndex1%2CtestIndex2", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenParameterGiven() { Cat cat = new Cat.SegmentsBuilder().setParameter("v", "true").build(); - assertEquals("_cat/segments?v=true", cat.getURI()); + assertEquals("_cat/segments?v=true", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenHeadersParameterGiven() { Cat cat = new Cat.SegmentsBuilder().setParameter("h", "index,shard,prirep,segment,docs.count").build(); - assertEquals("_cat/segments?h=index%2Cshard%2Cprirep%2Csegment%2Cdocs.count", cat.getURI()); + assertEquals("_cat/segments?h=index%2Cshard%2Cprirep%2Csegment%2Cdocs.count", cat.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/core/CatShardsBuilderTest.java b/jest-common/src/test/java/io/searchbox/core/CatShardsBuilderTest.java index 7b54f44c6..6f3254556 100644 --- a/jest-common/src/test/java/io/searchbox/core/CatShardsBuilderTest.java +++ b/jest-common/src/test/java/io/searchbox/core/CatShardsBuilderTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -15,18 +16,18 @@ public void shouldSetApplicationJsonHeader() { @Test public void shouldGenerateValidUriWhenIndexNotGiven() { Cat cat = new Cat.ShardsBuilder().build(); - assertEquals("_cat/shards", cat.getURI()); + assertEquals("_cat/shards", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenIndexGiven() { Cat cat = new Cat.ShardsBuilder().addIndex("testIndex").build(); - assertEquals("_cat/shards/testIndex", cat.getURI()); + assertEquals("_cat/shards/testIndex", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenParameterGiven() { Cat cat = new Cat.ShardsBuilder().setParameter("v", "true").build(); - assertEquals("_cat/shards?v=true", cat.getURI()); + assertEquals("_cat/shards?v=true", cat.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/core/CountTest.java b/jest-common/src/test/java/io/searchbox/core/CountTest.java index 6b2c1e968..7a0b57305 100644 --- a/jest-common/src/test/java/io/searchbox/core/CountTest.java +++ b/jest-common/src/test/java/io/searchbox/core/CountTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -14,25 +15,25 @@ public class CountTest { @Test public void getURIWithoutIndexAndType() { Count count = new Count.Builder().build(); - assertEquals("_all/_count", count.getURI()); + assertEquals("_all/_count", count.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyOneIndex() { Count count = new Count.Builder().addIndex("twitter").build(); - assertEquals("twitter/_count", count.getURI()); + assertEquals("twitter/_count", count.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOneIndexAndOneType() { Count count = new Count.Builder().addIndex("twitter").addType("tweet").build(); - assertEquals("twitter/tweet/_count", count.getURI()); + assertEquals("twitter/tweet/_count", count.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyMultipleIndex() { Count count = new Count.Builder().addIndex("twitter").addIndex("searchbox").build(); - assertEquals("twitter%2Csearchbox/_count", count.getURI()); + assertEquals("twitter%2Csearchbox/_count", count.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -81,7 +82,7 @@ public void getURIWithMultipleIndexAndTypes() { .addType("tweet") .addType("jest") .build(); - assertEquals("twitter%2Csearchbox/tweet%2Cjest/_count", count.getURI()); + assertEquals("twitter%2Csearchbox/tweet%2Cjest/_count", count.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/core/DeleteByQueryTest.java b/jest-common/src/test/java/io/searchbox/core/DeleteByQueryTest.java index e0e2627ea..c44e0d192 100644 --- a/jest-common/src/test/java/io/searchbox/core/DeleteByQueryTest.java +++ b/jest-common/src/test/java/io/searchbox/core/DeleteByQueryTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,28 +13,28 @@ public class DeleteByQueryTest { @Test public void getURIWithoutIndexAndType() { - assertEquals("_all/_delete_by_query", new DeleteByQuery.Builder(null).build().getURI()); + assertEquals("_all/_delete_by_query", new DeleteByQuery.Builder(null).build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyOneIndex() { - assertEquals("twitter/_delete_by_query", new DeleteByQuery.Builder(null).addIndex("twitter").build().getURI()); + assertEquals("twitter/_delete_by_query", new DeleteByQuery.Builder(null).addIndex("twitter").build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyMultipleType() { - assertEquals("_all/tweet%2Cjest/_delete_by_query", new DeleteByQuery.Builder(null).addType("tweet").addType("jest").build().getURI()); + assertEquals("_all/tweet%2Cjest/_delete_by_query", new DeleteByQuery.Builder(null).addType("tweet").addType("jest").build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOneIndexAndOneType() { - assertEquals("twitter/tweet/_delete_by_query", new DeleteByQuery.Builder(null).addIndex("twitter").addType("tweet").build().getURI()); + assertEquals("twitter/tweet/_delete_by_query", new DeleteByQuery.Builder(null).addIndex("twitter").addType("tweet").build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyMultipleIndex() { assertEquals("twitter%2Csearchbox/_delete_by_query", - new DeleteByQuery.Builder(null).addIndex("twitter").addIndex("searchbox").build().getURI()); + new DeleteByQuery.Builder(null).addIndex("twitter").addIndex("searchbox").build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -43,8 +44,7 @@ public void getURIWithMultipleIndexAndTypes() { .addIndex("searchbox") .addType("tweet") .addType("jest") - .build() - .getURI()); + .build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/core/DeleteTest.java b/jest-common/src/test/java/io/searchbox/core/DeleteTest.java index 1923e0ba0..18c6412ea 100644 --- a/jest-common/src/test/java/io/searchbox/core/DeleteTest.java +++ b/jest-common/src/test/java/io/searchbox/core/DeleteTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.params.Parameters; import org.junit.Test; @@ -46,7 +47,7 @@ public void deleteDocument() { .type("tweet") .build(); assertEquals("DELETE", delete.getRestMethodName()); - assertEquals("twitter/tweet/1", delete.getURI()); + assertEquals("twitter/tweet/1", delete.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -57,6 +58,6 @@ public void deleteDocumentWithVersion() { .setParameter(Parameters.VERSION, 1) .build(); assertEquals("DELETE", delete.getRestMethodName()); - assertEquals("twitter/tweet/1?version=1", delete.getURI()); + assertEquals("twitter/tweet/1?version=1", delete.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/core/ExplainTest.java b/jest-common/src/test/java/io/searchbox/core/ExplainTest.java index cae3d0a72..bd7540e9e 100644 --- a/jest-common/src/test/java/io/searchbox/core/ExplainTest.java +++ b/jest-common/src/test/java/io/searchbox/core/ExplainTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -14,7 +15,7 @@ public class ExplainTest { public void explain() { Explain explain = new Explain.Builder("twitter", "tweet", "1", "query").build(); assertEquals("POST", explain.getRestMethodName()); - assertEquals("twitter/tweet/1/_explain", explain.getURI()); + assertEquals("twitter/tweet/1/_explain", explain.getURI(ElasticsearchVersion.UNKNOWN)); assertEquals("query", explain.getData(null)); } diff --git a/jest-common/src/test/java/io/searchbox/core/GetTest.java b/jest-common/src/test/java/io/searchbox/core/GetTest.java index e7da94ce4..446fb583d 100644 --- a/jest-common/src/test/java/io/searchbox/core/GetTest.java +++ b/jest-common/src/test/java/io/searchbox/core/GetTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -15,6 +16,6 @@ public class GetTest { public void getDocument() { Get get = new Get.Builder("twitter", "1").type("tweet").build(); assertEquals("GET", get.getRestMethodName()); - assertEquals("twitter/tweet/1", get.getURI()); + assertEquals("twitter/tweet/1", get.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/core/IndexTest.java b/jest-common/src/test/java/io/searchbox/core/IndexTest.java index 6766fdeb5..a8cb1ab62 100644 --- a/jest-common/src/test/java/io/searchbox/core/IndexTest.java +++ b/jest-common/src/test/java/io/searchbox/core/IndexTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.params.Parameters; import org.junit.Test; @@ -17,7 +18,7 @@ public class IndexTest { public void indexDocument() { Index index = new Index.Builder(new Object()).index("twitter").type("tweet").id("1").build(); assertEquals("PUT", index.getRestMethodName()); - assertEquals("twitter/tweet/1", index.getURI()); + assertEquals("twitter/tweet/1", index.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -29,14 +30,14 @@ public void indexDocumentWithVersionParameter() { .setParameter(Parameters.VERSION, 3) .build(); assertEquals("PUT", index.getRestMethodName()); - assertEquals("twitter/tweet/1?version=3", index.getURI()); + assertEquals("twitter/tweet/1?version=3", index.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void indexDocumentWithoutId() { Index index = new Index.Builder(new Object()).index("twitter").type("tweet").build(); assertEquals("POST", index.getRestMethodName()); - assertEquals("twitter/tweet", index.getURI()); + assertEquals("twitter/tweet", index.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/core/MultiGetTest.java b/jest-common/src/test/java/io/searchbox/core/MultiGetTest.java index 30705a55f..516640301 100644 --- a/jest-common/src/test/java/io/searchbox/core/MultiGetTest.java +++ b/jest-common/src/test/java/io/searchbox/core/MultiGetTest.java @@ -5,6 +5,7 @@ import java.util.Arrays; +import io.searchbox.client.config.ElasticsearchVersion; import org.json.JSONException; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -25,7 +26,7 @@ public void getMultipleDocs() throws JSONException { MultiGet get = new MultiGet.Builder.ByDoc(Arrays.asList(doc1, doc2, doc3)).build(); assertEquals("POST", get.getRestMethodName()); - assertEquals("/_mget", get.getURI()); + assertEquals("/_mget", get.getURI(ElasticsearchVersion.UNKNOWN)); JSONAssert.assertEquals("{\"docs\":[" + "{\"_index\":\"twitter\",\"_type\":\"tweet\",\"_id\":\"1\"}," + "{\"_index\":\"twitter\",\"_type\":\"tweet\",\"_id\":\"2\"}," + @@ -54,7 +55,7 @@ public void getDocumentWithMultipleIds() throws JSONException { MultiGet get = new MultiGet.Builder.ById("twitter", "tweet").addId(Arrays.asList("1", "2", "3")).build(); assertEquals("POST", get.getRestMethodName()); - assertEquals("twitter/tweet/_mget", get.getURI()); + assertEquals("twitter/tweet/_mget", get.getURI(ElasticsearchVersion.UNKNOWN)); JSONAssert.assertEquals("{\"ids\":[\"1\",\"2\",\"3\"]}", get.getData(new Gson()), false); } diff --git a/jest-common/src/test/java/io/searchbox/core/MultiSearchTest.java b/jest-common/src/test/java/io/searchbox/core/MultiSearchTest.java index 74035cd0e..878158d46 100644 --- a/jest-common/src/test/java/io/searchbox/core/MultiSearchTest.java +++ b/jest-common/src/test/java/io/searchbox/core/MultiSearchTest.java @@ -2,6 +2,7 @@ import com.google.gson.Gson; import com.google.gson.JsonParser; +import io.searchbox.client.config.ElasticsearchVersion; import org.json.JSONException; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -22,7 +23,7 @@ public void multiSearchHasCorrectContentType() throws JSONException { MultiSearch multiSearch = new MultiSearch.Builder(search).build(); assertEquals("POST", multiSearch.getRestMethodName()); - assertEquals("/_msearch", multiSearch.getURI()); + assertEquals("/_msearch", multiSearch.getURI(ElasticsearchVersion.UNKNOWN)); assertEquals("application/x-ndjson", multiSearch.getHeader("Content-Type")); } @@ -35,7 +36,7 @@ public void singleMultiSearchWithoutIndex() throws JSONException { MultiSearch multiSearch = new MultiSearch.Builder(search).build(); assertEquals("POST", multiSearch.getRestMethodName()); - assertEquals("/_msearch", multiSearch.getURI()); + assertEquals("/_msearch", multiSearch.getURI(ElasticsearchVersion.UNKNOWN)); JSONAssert.assertEquals(expectedData, multiSearch.getData(null).toString(), false); } @@ -50,7 +51,7 @@ public void singleMultiSearchWitIndex() throws JSONException { MultiSearch multiSearch = new MultiSearch.Builder(search).build(); assertEquals("POST", multiSearch.getRestMethodName()); - assertEquals("/_msearch", multiSearch.getURI()); + assertEquals("/_msearch", multiSearch.getURI(ElasticsearchVersion.UNKNOWN)); JSONAssert.assertEquals(expectedData, multiSearch.getData(null).toString(), false); } @@ -68,7 +69,7 @@ public void multiSearchWitIndex() throws JSONException { MultiSearch multiSearch = new MultiSearch.Builder(search).addSearch(search2).build(); assertEquals("POST", multiSearch.getRestMethodName()); - assertEquals("/_msearch", multiSearch.getURI()); + assertEquals("/_msearch", multiSearch.getURI(ElasticsearchVersion.UNKNOWN)); JSONAssert.assertEquals(expectedData, multiSearch.getData(null).toString(), false); } diff --git a/jest-common/src/test/java/io/searchbox/core/PercolateTest.java b/jest-common/src/test/java/io/searchbox/core/PercolateTest.java index ff005c588..416eb01c4 100644 --- a/jest-common/src/test/java/io/searchbox/core/PercolateTest.java +++ b/jest-common/src/test/java/io/searchbox/core/PercolateTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -16,7 +17,7 @@ public class PercolateTest { public void percolateDocument() { Percolate percolate = new Percolate.Builder("twitter", "percolateQuery", "{query}").build(); assertEquals("POST", percolate.getRestMethodName()); - assertEquals("twitter/percolateQuery/_percolate", percolate.getURI()); + assertEquals("twitter/percolateQuery/_percolate", percolate.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/core/PingTest.java b/jest-common/src/test/java/io/searchbox/core/PingTest.java index cafdee5c9..9630fd066 100644 --- a/jest-common/src/test/java/io/searchbox/core/PingTest.java +++ b/jest-common/src/test/java/io/searchbox/core/PingTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,6 +13,6 @@ public void testBasicUriGeneration() { assertEquals("GET", ping.getRestMethodName()); assertNull(ping.getData(null)); - assertEquals("", ping.getURI()); + assertEquals("", ping.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/core/SearchScrollTest.java b/jest-common/src/test/java/io/searchbox/core/SearchScrollTest.java index 49cade50a..5e43e1b92 100644 --- a/jest-common/src/test/java/io/searchbox/core/SearchScrollTest.java +++ b/jest-common/src/test/java/io/searchbox/core/SearchScrollTest.java @@ -3,6 +3,7 @@ import com.google.common.base.Strings; import com.google.gson.Gson; import com.google.gson.JsonObject; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -17,7 +18,7 @@ public class SearchScrollTest { public void methodIsGetIfScrollIdIsShort() { String scrollId = Strings.padStart("scrollId", SearchScroll.MAX_SCROLL_ID_LENGTH, 'x'); SearchScroll searchScroll = new SearchScroll.Builder(scrollId, "1m").build(); - String uri = searchScroll.getURI(); + String uri = searchScroll.getURI(ElasticsearchVersion.UNKNOWN); assertEquals("GET", searchScroll.getRestMethodName()); assertNull(searchScroll.getData(new Gson())); @@ -33,7 +34,7 @@ public void methodIsPostIfScrollIdIsLong() { expectedResults.addProperty("scroll_id", scrollId); SearchScroll searchScroll = new SearchScroll.Builder(scrollId, "1m").build(); - String uri = searchScroll.getURI(); + String uri = searchScroll.getURI(ElasticsearchVersion.UNKNOWN); assertEquals("POST", searchScroll.getRestMethodName()); assertEquals(expectedResults.toString(), searchScroll.getData(new Gson())); diff --git a/jest-common/src/test/java/io/searchbox/core/SearchTest.java b/jest-common/src/test/java/io/searchbox/core/SearchTest.java index 83997c941..22b869eec 100644 --- a/jest-common/src/test/java/io/searchbox/core/SearchTest.java +++ b/jest-common/src/test/java/io/searchbox/core/SearchTest.java @@ -7,6 +7,7 @@ import com.google.gson.JsonParser; import io.searchbox.action.AbstractAction; import io.searchbox.action.Action; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.core.search.sort.Sort; import io.searchbox.core.search.sort.Sort.Sorting; import io.searchbox.params.Parameters; @@ -37,37 +38,37 @@ public class SearchTest { @Test public void getURIWithoutIndexAndType() { Search search = new Search.Builder("").build(); - assertEquals("_all/_search", search.getURI()); + assertEquals("_all/_search", search.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyOneIndex() { Search search = new Search.Builder("").addIndex("twitter").build(); - assertEquals("twitter/_search", search.getURI()); + assertEquals("twitter/_search", search.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOneIndexAndOneType() { Search search = new Search.Builder("").addIndex("twitter").addType("tweet").build(); - assertEquals("twitter/tweet/_search", search.getURI()); + assertEquals("twitter/tweet/_search", search.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyOneType() { Search search = new Search.Builder("").addType("tweet").build(); - assertEquals("_all/tweet/_search", search.getURI()); + assertEquals("_all/tweet/_search", search.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyMultipleIndex() { Search search = new Search.Builder("").addIndex("twitter").addIndex("searchbox").build(); - assertEquals("twitter%2Csearchbox/_search", search.getURI()); + assertEquals("twitter%2Csearchbox/_search", search.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyMultipleType() { Search search = new Search.Builder("").addType("tweet").addType("jest").build(); - assertEquals("_all/tweet%2Cjest/_search", search.getURI()); + assertEquals("_all/tweet%2Cjest/_search", search.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -78,25 +79,25 @@ public void getURIWithMultipleIndexAndTypes() { .addType("tweet") .addType("jest") .build(); - assertEquals("twitter%2Csearchbox/tweet%2Cjest/_search", search.getURI()); + assertEquals("twitter%2Csearchbox/tweet%2Cjest/_search", search.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIForTemplateWithoutIndexAndType() { Search search = new Search.TemplateBuilder("").build(); - assertEquals("_all/_search/template", search.getURI()); + assertEquals("_all/_search/template", search.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIForTemplateWithIndexAndType() { Search search = new Search.TemplateBuilder("").addIndex("twitter").addType("tweet").build(); - assertEquals("twitter/tweet/_search/template", search.getURI()); + assertEquals("twitter/tweet/_search/template", search.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithVersion() { Search search = new Search.VersionBuilder("").addIndex("twitter").addType("tweet").build(); - assertTrue("Version Parameter missing", search.getURI().contains("version=true")); + assertTrue("Version Parameter missing", search.getURI(ElasticsearchVersion.UNKNOWN).contains("version=true")); } @Test diff --git a/jest-common/src/test/java/io/searchbox/core/SuggestTest.java b/jest-common/src/test/java/io/searchbox/core/SuggestTest.java index de15b36d3..f2b45a90c 100644 --- a/jest-common/src/test/java/io/searchbox/core/SuggestTest.java +++ b/jest-common/src/test/java/io/searchbox/core/SuggestTest.java @@ -1,6 +1,7 @@ package io.searchbox.core; import io.searchbox.action.Action; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -11,37 +12,37 @@ public class SuggestTest { @Test public void getURIWithoutIndexAndType() { Suggest suggest = new Suggest.Builder("").build(); - assertEquals("_all/_suggest", suggest.getURI()); + assertEquals("_all/_suggest", suggest.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyOneIndex() { Suggest suggest = new Suggest.Builder("").addIndex("twitter").build(); - assertEquals("twitter/_suggest", suggest.getURI()); + assertEquals("twitter/_suggest", suggest.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOneIndexAndOneType() { Suggest suggest = new Suggest.Builder("").addIndex("twitter").addType("tweet").build(); - assertEquals("twitter/tweet/_suggest", suggest.getURI()); + assertEquals("twitter/tweet/_suggest", suggest.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyOneType() { Suggest suggest = new Suggest.Builder("").addType("tweet").build(); - assertEquals("_all/tweet/_suggest", suggest.getURI()); + assertEquals("_all/tweet/_suggest", suggest.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyMultipleIndex() { Suggest suggest = new Suggest.Builder("").addIndex("twitter").addIndex("suggestbox").build(); - assertEquals("twitter%2Csuggestbox/_suggest", suggest.getURI()); + assertEquals("twitter%2Csuggestbox/_suggest", suggest.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyMultipleType() { Suggest suggest = new Suggest.Builder("").addType("tweet").addType("jest").build(); - assertEquals("_all/tweet%2Cjest/_suggest", suggest.getURI()); + assertEquals("_all/tweet%2Cjest/_suggest", suggest.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -52,7 +53,7 @@ public void getURIWithMultipleIndexAndTypes() { .addType("tweet") .addType("jest") .build(); - assertEquals("twitter%2Csuggestbox/tweet%2Cjest/_suggest", suggest.getURI()); + assertEquals("twitter%2Csuggestbox/tweet%2Cjest/_suggest", suggest.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/core/UpdateByQueryTest.java b/jest-common/src/test/java/io/searchbox/core/UpdateByQueryTest.java index 37ad5eba2..44f048ada 100644 --- a/jest-common/src/test/java/io/searchbox/core/UpdateByQueryTest.java +++ b/jest-common/src/test/java/io/searchbox/core/UpdateByQueryTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,28 +13,28 @@ public class UpdateByQueryTest { @Test public void getURIWithoutIndexAndType() { - assertEquals("_all/_update_by_query", new UpdateByQuery.Builder(null).build().getURI()); + assertEquals("_all/_update_by_query", new UpdateByQuery.Builder(null).build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyOneIndex() { - assertEquals("twitter/_update_by_query", new UpdateByQuery.Builder(null).addIndex("twitter").build().getURI()); + assertEquals("twitter/_update_by_query", new UpdateByQuery.Builder(null).addIndex("twitter").build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyMultipleType() { - assertEquals("_all/tweet%2Cjest/_update_by_query", new UpdateByQuery.Builder(null).addType("tweet").addType("jest").build().getURI()); + assertEquals("_all/tweet%2Cjest/_update_by_query", new UpdateByQuery.Builder(null).addType("tweet").addType("jest").build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOneIndexAndOneType() { - assertEquals("twitter/tweet/_update_by_query", new UpdateByQuery.Builder(null).addIndex("twitter").addType("tweet").build().getURI()); + assertEquals("twitter/tweet/_update_by_query", new UpdateByQuery.Builder(null).addIndex("twitter").addType("tweet").build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void getURIWithOnlyMultipleIndex() { assertEquals("twitter%2Csearchbox/_update_by_query", - new UpdateByQuery.Builder(null).addIndex("twitter").addIndex("searchbox").build().getURI()); + new UpdateByQuery.Builder(null).addIndex("twitter").addIndex("searchbox").build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -43,8 +44,7 @@ public void getURIWithMultipleIndexAndTypes() { .addIndex("searchbox") .addType("tweet") .addType("jest") - .build() - .getURI()); + .build().getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/core/UpdateTest.java b/jest-common/src/test/java/io/searchbox/core/UpdateTest.java index 9baa25794..05247c03b 100644 --- a/jest-common/src/test/java/io/searchbox/core/UpdateTest.java +++ b/jest-common/src/test/java/io/searchbox/core/UpdateTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -14,7 +15,7 @@ public class UpdateTest { public void updateDocumentWithoutDoc(){ Update update = new Update.Builder(new Object()).index("twitter").type("tweet").id("1").build(); assertEquals("POST", update.getRestMethodName()); - assertEquals("twitter/tweet/1/_update", update.getURI()); + assertEquals("twitter/tweet/1/_update", update.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/core/ValidateTest.java b/jest-common/src/test/java/io/searchbox/core/ValidateTest.java index b5f1c9855..6d9849a4c 100644 --- a/jest-common/src/test/java/io/searchbox/core/ValidateTest.java +++ b/jest-common/src/test/java/io/searchbox/core/ValidateTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -18,7 +19,7 @@ public void validateQuery() { assertEquals("POST", validate.getRestMethodName()); assertEquals("{query:query}", validate.getData(null)); - assertEquals("/_validate/query", validate.getURI()); + assertEquals("/_validate/query", validate.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -27,7 +28,7 @@ public void validateQueryWithIndex() { assertEquals("POST", validate.getRestMethodName()); assertEquals("{query:query}", validate.getData(null)); - assertEquals("twitter/_validate/query", validate.getURI()); + assertEquals("twitter/_validate/query", validate.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -36,7 +37,7 @@ public void validateQueryWithIndexAndType() { assertEquals("POST", validate.getRestMethodName()); assertEquals("{query:query}", validate.getData(null)); - assertEquals("twitter/tweet/_validate/query", validate.getURI()); + assertEquals("twitter/tweet/_validate/query", validate.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/AnalyzeTest.java b/jest-common/src/test/java/io/searchbox/indices/AnalyzeTest.java index 8f2ef4073..e62db4887 100644 --- a/jest-common/src/test/java/io/searchbox/indices/AnalyzeTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/AnalyzeTest.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableList; import com.google.gson.Gson; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -17,7 +18,7 @@ public void testBasicUrlGeneration() { Analyze analyze = new Analyze.Builder() .analyzer("standard") .build(); - assertEquals("/_analyze?analyzer=standard", analyze.getURI()); + assertEquals("/_analyze?analyzer=standard", analyze.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -26,7 +27,7 @@ public void testUrlGenerationWithCustomTransientAnalyzer() { .tokenizer("keyword") .filter("lowercase") .build(); - assertEquals("/_analyze?tokenizer=keyword&filter=lowercase", analyze.getURI()); + assertEquals("/_analyze?tokenizer=keyword&filter=lowercase", analyze.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -34,7 +35,7 @@ public void testUrlGenerationWithIndex() { Analyze analyze = new Analyze.Builder() .index("test") .build(); - assertEquals("test/_analyze", analyze.getURI()); + assertEquals("test/_analyze", analyze.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -43,7 +44,7 @@ public void testUrlGenerationWithIndexAndAnalyzer() { .index("test") .analyzer("whitespace") .build(); - assertEquals("test/_analyze?analyzer=whitespace", analyze.getURI()); + assertEquals("test/_analyze?analyzer=whitespace", analyze.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -52,7 +53,7 @@ public void testUrlGenerationWithIndexAndFieldMapping() { .index("test") .field("obj1.field1") .build(); - assertEquals("test/_analyze?field=obj1.field1", analyze.getURI()); + assertEquals("test/_analyze?field=obj1.field1", analyze.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/ClearCacheTest.java b/jest-common/src/test/java/io/searchbox/indices/ClearCacheTest.java index 8488380d6..277ac5a63 100644 --- a/jest-common/src/test/java/io/searchbox/indices/ClearCacheTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/ClearCacheTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -13,19 +14,19 @@ public class ClearCacheTest { @Test public void testBasicUrlGeneration() { ClearCache clearCache = new ClearCache.Builder().build(); - assertEquals("_all/_cache/clear", clearCache.getURI()); + assertEquals("_all/_cache/clear", clearCache.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testBasicUrlGenerationWithParameters() { ClearCache clearCache = new ClearCache.Builder().bloom(true).fieldData(false).build(); - assertEquals("_all/_cache/clear?bloom=true&field_data=false", clearCache.getURI()); + assertEquals("_all/_cache/clear?bloom=true&field_data=false", clearCache.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testMultiIndexUrlGenerationWithParameters() { ClearCache clearCache = new ClearCache.Builder().addIndex("tom").addIndex("jerry").bloom(true).build(); - assertEquals("tom%2Cjerry/_cache/clear?bloom=true", clearCache.getURI()); + assertEquals("tom%2Cjerry/_cache/clear?bloom=true", clearCache.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/CloseIndexTest.java b/jest-common/src/test/java/io/searchbox/indices/CloseIndexTest.java index 58681c116..d75b6c3d2 100644 --- a/jest-common/src/test/java/io/searchbox/indices/CloseIndexTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/CloseIndexTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -15,7 +16,7 @@ public void testBasicUrlGeneration() { CloseIndex closeIndex = new CloseIndex.Builder("twitter").build(); assertEquals("POST", closeIndex.getRestMethodName()); - assertEquals("twitter/_close", closeIndex.getURI()); + assertEquals("twitter/_close", closeIndex.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/CreateIndexTest.java b/jest-common/src/test/java/io/searchbox/indices/CreateIndexTest.java index 05ec90ac2..6401161b6 100644 --- a/jest-common/src/test/java/io/searchbox/indices/CreateIndexTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/CreateIndexTest.java @@ -1,6 +1,7 @@ package io.searchbox.indices; import com.google.gson.Gson; +import io.searchbox.client.config.ElasticsearchVersion; import org.elasticsearch.common.settings.Settings; import org.junit.Test; @@ -16,7 +17,7 @@ public class CreateIndexTest { public void createIndexWithoutSettings() { CreateIndex createIndex = new CreateIndex.Builder("tweet").build(); - assertEquals("tweet", createIndex.getURI()); + assertEquals("tweet", createIndex.getURI(ElasticsearchVersion.UNKNOWN)); assertEquals("PUT", createIndex.getRestMethodName()); String settings = new Gson().toJson(createIndex.getData(new Gson())); assertEquals("\"{}\"", settings); diff --git a/jest-common/src/test/java/io/searchbox/indices/DeleteIndexTest.java b/jest-common/src/test/java/io/searchbox/indices/DeleteIndexTest.java index c84e2174d..ce1210979 100644 --- a/jest-common/src/test/java/io/searchbox/indices/DeleteIndexTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/DeleteIndexTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -15,7 +16,7 @@ public void testBasicUriGenerationWithJustIndex() { DeleteIndex delete = new DeleteIndex.Builder("twitter").build(); assertEquals("DELETE", delete.getRestMethodName()); - assertEquals("twitter", delete.getURI()); + assertEquals("twitter", delete.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -23,7 +24,7 @@ public void testBasicUriGenerationWithIndexAndType() { DeleteIndex delete = new DeleteIndex.Builder("twitter").type("tweet").build(); assertEquals("DELETE", delete.getRestMethodName()); - assertEquals("twitter/tweet", delete.getURI()); + assertEquals("twitter/tweet", delete.getURI(ElasticsearchVersion.UNKNOWN)); } diff --git a/jest-common/src/test/java/io/searchbox/indices/FlushTest.java b/jest-common/src/test/java/io/searchbox/indices/FlushTest.java index c19f8d7c9..ec7673259 100644 --- a/jest-common/src/test/java/io/searchbox/indices/FlushTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/FlushTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testBasicUriGeneration() { Flush flush = new Flush.Builder().addIndex("twitter").addIndex("myspace").build(); assertEquals("POST", flush.getRestMethodName()); - assertEquals("twitter%2Cmyspace/_flush", flush.getURI()); + assertEquals("twitter%2Cmyspace/_flush", flush.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -20,7 +21,7 @@ public void testBasicUriGenerationWithForce() { Flush flush = new Flush.Builder().addIndex("twitter").force().build(); assertEquals("POST", flush.getRestMethodName()); - assertEquals("twitter/_flush?force=true", flush.getURI()); + assertEquals("twitter/_flush?force=true", flush.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -28,7 +29,7 @@ public void testBasicUriGenerationWithWaitIfOngoing() { Flush flush = new Flush.Builder().addIndex("twitter").waitIfOngoing().build(); assertEquals("POST", flush.getRestMethodName()); - assertEquals("twitter/_flush?wait_if_ongoing=true", flush.getURI()); + assertEquals("twitter/_flush?wait_if_ongoing=true", flush.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/ForceMergeTest.java b/jest-common/src/test/java/io/searchbox/indices/ForceMergeTest.java index 0ffa182f1..aefdfb84a 100644 --- a/jest-common/src/test/java/io/searchbox/indices/ForceMergeTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/ForceMergeTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testBasicUriGeneration() { ForceMerge forceMerge = new ForceMerge.Builder().addIndex("twitter").build(); assertEquals("POST", forceMerge.getRestMethodName()); - assertEquals("twitter/_forcemerge", forceMerge.getURI()); + assertEquals("twitter/_forcemerge", forceMerge.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/IndicesExistsTest.java b/jest-common/src/test/java/io/searchbox/indices/IndicesExistsTest.java index 0fc355053..4b19cdf11 100644 --- a/jest-common/src/test/java/io/searchbox/indices/IndicesExistsTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/IndicesExistsTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -14,7 +15,7 @@ public class IndicesExistsTest { public void testBasicUriGeneration() { IndicesExists indicesExists = new IndicesExists.Builder("twitter").build(); assertEquals("HEAD", indicesExists.getRestMethodName()); - assertEquals("twitter", indicesExists.getURI()); + assertEquals("twitter", indicesExists.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/OpenIndexTest.java b/jest-common/src/test/java/io/searchbox/indices/OpenIndexTest.java index d70e120b7..88804984b 100644 --- a/jest-common/src/test/java/io/searchbox/indices/OpenIndexTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/OpenIndexTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testBasicUriGeneration() { OpenIndex openIndex = new OpenIndex.Builder("twitter").build(); assertEquals("POST", openIndex.getRestMethodName()); - assertEquals("twitter/_open", openIndex.getURI()); + assertEquals("twitter/_open", openIndex.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/OptimizeTest.java b/jest-common/src/test/java/io/searchbox/indices/OptimizeTest.java index 9ae76d530..79df58e5e 100644 --- a/jest-common/src/test/java/io/searchbox/indices/OptimizeTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/OptimizeTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testBasicUriGeneration() { Optimize optimize = new Optimize.Builder().addIndex("twitter").build(); assertEquals("POST", optimize.getRestMethodName()); - assertEquals("twitter/_optimize", optimize.getURI()); + assertEquals("twitter/_optimize", optimize.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/RefreshTest.java b/jest-common/src/test/java/io/searchbox/indices/RefreshTest.java index 098740c59..bfab01d96 100644 --- a/jest-common/src/test/java/io/searchbox/indices/RefreshTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/RefreshTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testBasicUriGeneration() { Refresh refresh = new Refresh.Builder().addIndex("twitter").addIndex("myspace").build(); assertEquals("POST", refresh.getRestMethodName()); - assertEquals("twitter%2Cmyspace/_refresh", refresh.getURI()); + assertEquals("twitter%2Cmyspace/_refresh", refresh.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/RolloverTest.java b/jest-common/src/test/java/io/searchbox/indices/RolloverTest.java index c1f4be73b..5068814c6 100644 --- a/jest-common/src/test/java/io/searchbox/indices/RolloverTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/RolloverTest.java @@ -1,6 +1,7 @@ package io.searchbox.indices; import com.google.gson.Gson; +import io.searchbox.client.config.ElasticsearchVersion; import org.elasticsearch.common.collect.MapBuilder; import org.junit.Test; @@ -24,7 +25,7 @@ public class RolloverTest { public void testBasicUriGeneration() { Rollover rollover = new Rollover.Builder("twitter").conditions(rolloverConditions).build(); assertEquals("POST", rollover.getRestMethodName()); - assertEquals("twitter/_rollover", rollover.getURI()); + assertEquals("twitter/_rollover", rollover.getURI(ElasticsearchVersion.UNKNOWN)); assertEquals("{\"conditions\":{\"max_age\":\"1d\",\"max_docs\":\"10000\"}}", rollover.getData(new Gson())); } @@ -32,7 +33,7 @@ public void testBasicUriGeneration() { public void testBasicUriWithSettingsGeneration() { Rollover rollover = new Rollover.Builder("twitter").conditions(rolloverConditions).settings(rolloverSettings).build(); assertEquals("POST", rollover.getRestMethodName()); - assertEquals("twitter/_rollover", rollover.getURI()); + assertEquals("twitter/_rollover", rollover.getURI(ElasticsearchVersion.UNKNOWN)); assertEquals("{\"settings\":{\"index.number_of_shards\":\"2\"},\"conditions\":{\"max_age\":\"1d\",\"max_docs\":\"10000\"}}", rollover.getData(new Gson())); } @@ -40,7 +41,7 @@ public void testBasicUriWithSettingsGeneration() { public void testDryRunUriGeneration() { Rollover rollover = new Rollover.Builder("twitter").conditions(rolloverConditions).setDryRun(true).build(); assertEquals("POST", rollover.getRestMethodName()); - assertEquals("twitter/_rollover?dry_run", rollover.getURI()); + assertEquals("twitter/_rollover?dry_run", rollover.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/StatsTest.java b/jest-common/src/test/java/io/searchbox/indices/StatsTest.java index 054744043..46d70f8da 100644 --- a/jest-common/src/test/java/io/searchbox/indices/StatsTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/StatsTest.java @@ -1,5 +1,7 @@ package io.searchbox.indices; +import io.searchbox.action.AbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import java.net.URLDecoder; @@ -14,7 +16,7 @@ public void testBasicUriGeneration() { Stats stats = new Stats.Builder().addIndex("twitter").build(); assertEquals("GET", stats.getRestMethodName()); - assertEquals("twitter/_stats", stats.getURI()); + assertEquals("twitter/_stats", stats.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -40,7 +42,7 @@ public void testUriGenerationWithStatsFields() throws Exception { .indexing(true) .search(true, "group1", "group2") .build(); - assertEquals("_all/_stats/flush,indexing,search?groups=group1,group2", URLDecoder.decode(action.getURI())); + assertEquals("_all/_stats/flush,indexing,search?groups=group1,group2", URLDecoder.decode(action.getURI(ElasticsearchVersion.UNKNOWN), AbstractAction.CHARSET)); } @Test @@ -50,7 +52,6 @@ public void testUriGenerationWhenRemovingStatsFields() throws Exception { .indexing(true) .indexing(false) .build(); - assertEquals("_all/_stats/flush", URLDecoder.decode(action.getURI())); + assertEquals("_all/_stats/flush", URLDecoder.decode(action.getURI(ElasticsearchVersion.UNKNOWN), AbstractAction.CHARSET)); } - } \ No newline at end of file diff --git a/jest-common/src/test/java/io/searchbox/indices/aliases/AliasExistsTest.java b/jest-common/src/test/java/io/searchbox/indices/aliases/AliasExistsTest.java index 4ac76aa5e..aa75ae22b 100644 --- a/jest-common/src/test/java/io/searchbox/indices/aliases/AliasExistsTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/aliases/AliasExistsTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.aliases; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -10,7 +11,7 @@ public void testBasicUriGeneration() { AliasExists aliasExists = new AliasExists.Builder().build(); assertEquals("HEAD", aliasExists.getRestMethodName()); - assertEquals("_all/_alias/*", aliasExists.getURI()); + assertEquals("_all/_alias/*", aliasExists.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -18,7 +19,7 @@ public void testBasicUriGenerationWithIndex() { AliasExists aliasExists = new AliasExists.Builder().addIndex("indexName").build(); assertEquals("HEAD", aliasExists.getRestMethodName()); - assertEquals("indexName/_alias/*", aliasExists.getURI()); + assertEquals("indexName/_alias/*", aliasExists.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -26,7 +27,7 @@ public void testBasicUriGenerationWithAlias() { AliasExists aliasExists = new AliasExists.Builder().alias("aliasName").build(); assertEquals("HEAD", aliasExists.getRestMethodName()); - assertEquals("_all/_alias/aliasName", aliasExists.getURI()); + assertEquals("_all/_alias/aliasName", aliasExists.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -34,6 +35,6 @@ public void testBasicUriGenerationWithAliasAndIndex() { AliasExists aliasExists = new AliasExists.Builder().addIndex("indexName").alias("aliasName").build(); assertEquals("HEAD", aliasExists.getRestMethodName()); - assertEquals("indexName/_alias/aliasName", aliasExists.getURI()); + assertEquals("indexName/_alias/aliasName", aliasExists.getURI(ElasticsearchVersion.UNKNOWN)); } } \ No newline at end of file diff --git a/jest-common/src/test/java/io/searchbox/indices/aliases/GetAliasesTest.java b/jest-common/src/test/java/io/searchbox/indices/aliases/GetAliasesTest.java index 733a5b853..30afd77c8 100644 --- a/jest-common/src/test/java/io/searchbox/indices/aliases/GetAliasesTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/aliases/GetAliasesTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.aliases; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testBasicUriGeneration() { GetAliases getAliases = new GetAliases.Builder().addIndex("twitter").build(); assertEquals("GET", getAliases.getRestMethodName()); - assertEquals("twitter/_aliases", getAliases.getURI()); + assertEquals("twitter/_aliases", getAliases.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/aliases/ModifyAliasesTest.java b/jest-common/src/test/java/io/searchbox/indices/aliases/ModifyAliasesTest.java index 37b98c214..1880502ea 100644 --- a/jest-common/src/test/java/io/searchbox/indices/aliases/ModifyAliasesTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/aliases/ModifyAliasesTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.aliases; +import io.searchbox.client.config.ElasticsearchVersion; import org.elasticsearch.common.collect.MapBuilder; import org.junit.Test; @@ -26,7 +27,7 @@ public void testBasicUriGeneration() { ModifyAliases modifyAliases = new ModifyAliases.Builder(addMapping).build(); assertEquals("POST", modifyAliases.getRestMethodName()); - assertEquals("/_aliases", modifyAliases.getURI()); + assertEquals("/_aliases", modifyAliases.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/mapping/DeleteMappingTest.java b/jest-common/src/test/java/io/searchbox/indices/mapping/DeleteMappingTest.java index a82b458c6..1c0f15c38 100644 --- a/jest-common/src/test/java/io/searchbox/indices/mapping/DeleteMappingTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/mapping/DeleteMappingTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.mapping; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testBasicUriGeneration() { DeleteMapping deleteMapping = new DeleteMapping.Builder("twitter","tweet").build(); assertEquals("DELETE", deleteMapping.getRestMethodName()); - assertEquals("twitter/tweet/_mapping", deleteMapping.getURI()); + assertEquals("twitter/tweet/_mapping", deleteMapping.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/mapping/GetMappingTest.java b/jest-common/src/test/java/io/searchbox/indices/mapping/GetMappingTest.java index 369e61cd0..d004508e4 100644 --- a/jest-common/src/test/java/io/searchbox/indices/mapping/GetMappingTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/mapping/GetMappingTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.mapping; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testBasicUriGeneration() { GetMapping getMapping = new GetMapping.Builder().addIndex("twitter").build(); assertEquals("GET", getMapping.getRestMethodName()); - assertEquals("twitter/_mapping", getMapping.getURI()); + assertEquals("twitter/_mapping", getMapping.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/mapping/PutMappingTest.java b/jest-common/src/test/java/io/searchbox/indices/mapping/PutMappingTest.java index 2edb3fcec..ac2a9406f 100644 --- a/jest-common/src/test/java/io/searchbox/indices/mapping/PutMappingTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/mapping/PutMappingTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.mapping; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testBasicUriGeneration() { PutMapping putMapping = new PutMapping.Builder("twitter", "tweet", "source").build(); assertEquals("PUT", putMapping.getRestMethodName()); - assertEquals("twitter/tweet/_mapping", putMapping.getURI()); + assertEquals("twitter/tweet/_mapping", putMapping.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/reindex/ReindexTest.java b/jest-common/src/test/java/io/searchbox/indices/reindex/ReindexTest.java index d9665d6f0..a44b6df04 100644 --- a/jest-common/src/test/java/io/searchbox/indices/reindex/ReindexTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/reindex/ReindexTest.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableMap; import com.google.gson.GsonBuilder; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -18,7 +19,7 @@ public void testBasicUriGeneration() { Reindex reindex = new Reindex.Builder(source,dest).build(); assertEquals("POST", reindex.getRestMethodName()); - assertEquals("/_reindex", reindex.getURI()); + assertEquals("/_reindex", reindex.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -31,7 +32,7 @@ public void testQueryStringGeneration() throws Exception { .requestsPerSecond(5d) .build(); - String generatedURI = reindex.getURI(); + String generatedURI = reindex.getURI(ElasticsearchVersion.UNKNOWN); String expectedURI = "/_reindex?wait_for_completion=true&wait_for_active_shards=1&timeout=5000&requests_per_second=5.0"; assertEquals(expectedURI, generatedURI); diff --git a/jest-common/src/test/java/io/searchbox/indices/settings/GetSettingsTest.java b/jest-common/src/test/java/io/searchbox/indices/settings/GetSettingsTest.java index 1f17733c9..b01516159 100644 --- a/jest-common/src/test/java/io/searchbox/indices/settings/GetSettingsTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/settings/GetSettingsTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.settings; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testDefaultUriGeneration() { String expectedUri = "_all/_settings"; GetSettings getSettings = new GetSettings.Builder().build(); - assertEquals(expectedUri, getSettings.getURI()); + assertEquals(expectedUri, getSettings.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -20,7 +21,7 @@ public void testDefaultUriGenerationWithPrefix() { String expectedUri = "_all/_settings?prefix=index.routing.allocation."; GetSettings getSettings = new GetSettings.Builder().prefixQuery("index.routing.allocation.").build(); - assertEquals(expectedUri, getSettings.getURI()); + assertEquals(expectedUri, getSettings.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -28,7 +29,7 @@ public void testDefaultUriGenerationWithEmptyPrefix() { String expectedUri = "_all/_settings?prefix="; GetSettings getSettings = new GetSettings.Builder().prefixQuery("").build(); - assertEquals(expectedUri, getSettings.getURI()); + assertEquals(expectedUri, getSettings.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -36,7 +37,7 @@ public void testSingleIndexUriGeneration() { String expectedUri = "books/_settings"; GetSettings getSettings = new GetSettings.Builder().addIndex("books").build(); - assertEquals(expectedUri, getSettings.getURI()); + assertEquals(expectedUri, getSettings.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -44,7 +45,7 @@ public void testSingleIndexUriGenerationWithPrefix() { String expectedUri = "books/_settings?prefix=index.routing.allocation."; GetSettings getSettings = new GetSettings.Builder().addIndex("books").prefixQuery("index.routing.allocation.").build(); - assertEquals(expectedUri, getSettings.getURI()); + assertEquals(expectedUri, getSettings.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -52,7 +53,7 @@ public void testMultipleIndicesUriGeneration() { String expectedUri = "books%2Carticles/_settings"; GetSettings getSettings = new GetSettings.Builder().addIndex("books").addIndex("articles").build(); - assertEquals(expectedUri, getSettings.getURI()); + assertEquals(expectedUri, getSettings.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -61,7 +62,7 @@ public void testMultipleIndicesUriGenerationWithPrefix() { GetSettings getSettings = new GetSettings.Builder() .addIndex("books").addIndex("articles").prefixQuery("index.routing.allocation.").build(); - assertEquals(expectedUri, getSettings.getURI()); + assertEquals(expectedUri, getSettings.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -69,7 +70,7 @@ public void testWildcardUriGeneration() { String expectedUri = "2013-*/_settings"; GetSettings getSettings = new GetSettings.Builder().addIndex("2013-*").build(); - assertEquals(expectedUri, getSettings.getURI()); + assertEquals(expectedUri, getSettings.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -77,7 +78,7 @@ public void testWildcardUriGenerationWithPrefix() { String expectedUri = "2013-*/_settings?prefix=index.routing.allocation."; GetSettings getSettings = new GetSettings.Builder().addIndex("2013-*").prefixQuery("index.routing.allocation.").build(); - assertEquals(expectedUri, getSettings.getURI()); + assertEquals(expectedUri, getSettings.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/settings/UpdateSettingsTest.java b/jest-common/src/test/java/io/searchbox/indices/settings/UpdateSettingsTest.java index 1e0ea6620..433d41fef 100644 --- a/jest-common/src/test/java/io/searchbox/indices/settings/UpdateSettingsTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/settings/UpdateSettingsTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.settings; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testDefaultBehaviour() { String expectedUri = "_all/_settings"; UpdateSettings updateSettings = new UpdateSettings.Builder("").build(); - assertEquals(expectedUri, updateSettings.getURI()); + assertEquals(expectedUri, updateSettings.getURI(ElasticsearchVersion.UNKNOWN)); assertEquals("", updateSettings.getData(null)); assertEquals("PUT", updateSettings.getRestMethodName()); } diff --git a/jest-common/src/test/java/io/searchbox/indices/template/DeleteTemplateTest.java b/jest-common/src/test/java/io/searchbox/indices/template/DeleteTemplateTest.java index c72e56396..c47228bdb 100644 --- a/jest-common/src/test/java/io/searchbox/indices/template/DeleteTemplateTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/template/DeleteTemplateTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.template; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testBasicUriGeneration() { DeleteTemplate deleteTemplate = new DeleteTemplate.Builder("personal_tweet").build(); assertEquals("DELETE", deleteTemplate.getRestMethodName()); - assertEquals("_template/personal_tweet", deleteTemplate.getURI()); + assertEquals("_template/personal_tweet", deleteTemplate.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/template/GetTemplateTest.java b/jest-common/src/test/java/io/searchbox/indices/template/GetTemplateTest.java index 9c75f40c9..4acf8be16 100644 --- a/jest-common/src/test/java/io/searchbox/indices/template/GetTemplateTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/template/GetTemplateTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.template; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void testBasicUriGeneration() { GetTemplate getTemplate = new GetTemplate.Builder("personal_tweet").build(); assertEquals("GET", getTemplate.getRestMethodName()); - assertEquals("_template/personal_tweet", getTemplate.getURI()); + assertEquals("_template/personal_tweet", getTemplate.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/template/PutTemplateTest.java b/jest-common/src/test/java/io/searchbox/indices/template/PutTemplateTest.java index f69fde700..557e662aa 100644 --- a/jest-common/src/test/java/io/searchbox/indices/template/PutTemplateTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/template/PutTemplateTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.template; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,7 @@ public void tesstBsicUriGeneration() { PutTemplate putTemplate = new PutTemplate.Builder("sponsored_tweet", new Object()).build(); assertEquals("PUT", putTemplate.getRestMethodName()); - assertEquals("_template/sponsored_tweet", putTemplate.getURI()); + assertEquals("_template/sponsored_tweet", putTemplate.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java b/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java index 5a482ecbd..8e8bb7073 100644 --- a/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/type/TypeExistTest.java @@ -16,7 +16,7 @@ public void testBasicUriGeneration() { TypeExist typeExist = new TypeExist.Builder("happyprg").addType("seohoo").build(); assertEquals("HEAD", typeExist.getRestMethodName()); - assertEquals("happyprg/seohoo", typeExist.getURI()); + assertEquals("happyprg/seohoo", typeExist.getURI(ElasticsearchVersion.UNKNOWN)); } @Test diff --git a/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotRepositoryTest.java b/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotRepositoryTest.java index 91dc1fb02..c0771ab26 100644 --- a/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotRepositoryTest.java +++ b/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotRepositoryTest.java @@ -1,6 +1,7 @@ package io.searchbox.snapshot; import com.google.gson.Gson; +import io.searchbox.client.config.ElasticsearchVersion; import org.elasticsearch.common.settings.Settings; import org.junit.Test; @@ -27,7 +28,7 @@ public void testBasicUriGeneration() { CreateSnapshotRepository createSnapshotRepository = new CreateSnapshotRepository.Builder(repository).settings(registerRepositorySettings.build().getAsMap()).build(); assertEquals("PUT", createSnapshotRepository.getRestMethodName()); - assertEquals("/_snapshot/" + repository, createSnapshotRepository.getURI()); + assertEquals("/_snapshot/" + repository, createSnapshotRepository.getURI(ElasticsearchVersion.UNKNOWN)); String settings = new Gson().toJson(createSnapshotRepository.getData(new Gson())); assertEquals("\"{\\\"settings.chunk_size\\\":\\\"10m\\\",\\\"settings.compress\\\":\\\"true\\\",\\\"settings.location\\\":\\\"/mount/backups/my_backup\\\",\\\"settings.max_restore_bytes_per_sec\\\":\\\"40mb\\\",\\\"settings.max_snapshot_bytes_per_sec\\\":\\\"40mb\\\",\\\"settings.readonly\\\":\\\"false\\\",\\\"type\\\":\\\"fs\\\"}\"", settings); } @@ -35,6 +36,6 @@ public void testBasicUriGeneration() { @Test public void testVerifyParam() { CreateSnapshotRepository createSnapshotRepository = new CreateSnapshotRepository.Builder(repository).verify(false).build(); - assertEquals("/_snapshot/seohoo?verify=false", createSnapshotRepository.getURI()); + assertEquals("/_snapshot/seohoo?verify=false", createSnapshotRepository.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotTest.java b/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotTest.java index 78650a326..37dab6553 100644 --- a/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotTest.java +++ b/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotTest.java @@ -1,6 +1,7 @@ package io.searchbox.snapshot; import com.google.gson.Gson; +import io.searchbox.client.config.ElasticsearchVersion; import org.elasticsearch.common.settings.Settings; import org.junit.Test; @@ -18,7 +19,7 @@ public class CreateSnapshotTest { public void testSnapshot() { CreateSnapshot createSnapshot = new CreateSnapshot.Builder(repository, snapshot).waitForCompletion(true).build(); assertEquals("PUT", createSnapshot.getRestMethodName()); - assertEquals("/_snapshot/leeseohoo/leeseola?wait_for_completion=true", createSnapshot.getURI()); + assertEquals("/_snapshot/leeseohoo/leeseola?wait_for_completion=true", createSnapshot.getURI(ElasticsearchVersion.UNKNOWN)); } @Test @@ -35,7 +36,7 @@ public void testSnapshotWithSettings() { .build(); assertEquals("PUT", createSnapshot.getRestMethodName()); - assertEquals("/_snapshot/leeseohoo/leeseola?wait_for_completion=true", createSnapshot.getURI()); + assertEquals("/_snapshot/leeseohoo/leeseola?wait_for_completion=true", createSnapshot.getURI(ElasticsearchVersion.UNKNOWN)); String settings = new Gson().toJson(createSnapshot.getData(new Gson())); assertEquals("\"{\\\"ignore_unavailable\\\":\\\"true\\\",\\\"include_global_state\\\":\\\"false\\\",\\\"indices\\\":\\\"index_1,index_2\\\"}\"", settings); } diff --git a/jest-common/src/test/java/io/searchbox/snapshot/DeleteSnapshotRepositoryTest.java b/jest-common/src/test/java/io/searchbox/snapshot/DeleteSnapshotRepositoryTest.java index 41de1da6e..5dbd456a7 100644 --- a/jest-common/src/test/java/io/searchbox/snapshot/DeleteSnapshotRepositoryTest.java +++ b/jest-common/src/test/java/io/searchbox/snapshot/DeleteSnapshotRepositoryTest.java @@ -1,5 +1,6 @@ package io.searchbox.snapshot; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -14,6 +15,6 @@ public void testRepository() { DeleteSnapshotRepository deleteSnapshotRepository = new DeleteSnapshotRepository.Builder(repository).build(); assertEquals("DELETE", deleteSnapshotRepository.getRestMethodName()); - assertEquals("/_snapshot/leeseohoo", deleteSnapshotRepository.getURI()); + assertEquals("/_snapshot/leeseohoo", deleteSnapshotRepository.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/snapshot/DeleteSnapshotTest.java b/jest-common/src/test/java/io/searchbox/snapshot/DeleteSnapshotTest.java index 12ea111a3..b98dc32c5 100644 --- a/jest-common/src/test/java/io/searchbox/snapshot/DeleteSnapshotTest.java +++ b/jest-common/src/test/java/io/searchbox/snapshot/DeleteSnapshotTest.java @@ -1,5 +1,6 @@ package io.searchbox.snapshot; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -16,6 +17,6 @@ public class DeleteSnapshotTest { public void testSnapshot() { DeleteSnapshot deleteSnapshot = new DeleteSnapshot.Builder(repository, snapshot).build(); assertEquals("DELETE", deleteSnapshot.getRestMethodName()); - assertEquals("/_snapshot/leeseohoo/leeseola", deleteSnapshot.getURI()); + assertEquals("/_snapshot/leeseohoo/leeseola", deleteSnapshot.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/snapshot/GetSnapshotRepositoryTest.java b/jest-common/src/test/java/io/searchbox/snapshot/GetSnapshotRepositoryTest.java index 86b3893b8..97e932fff 100644 --- a/jest-common/src/test/java/io/searchbox/snapshot/GetSnapshotRepositoryTest.java +++ b/jest-common/src/test/java/io/searchbox/snapshot/GetSnapshotRepositoryTest.java @@ -1,5 +1,6 @@ package io.searchbox.snapshot; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import java.util.Arrays; @@ -18,19 +19,19 @@ public class GetSnapshotRepositoryTest { public void testRepositorySingleName() { GetSnapshotRepository getSnapshotRepository = new GetSnapshotRepository.Builder(repository).build(); assertEquals("GET", getSnapshotRepository.getRestMethodName()); - assertEquals("/_snapshot/leeseohoo", getSnapshotRepository.getURI()); + assertEquals("/_snapshot/leeseohoo", getSnapshotRepository.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testRepositoryMultipleNames() { GetSnapshotRepository getSnapshotRepository = new GetSnapshotRepository.Builder(repository) .addRepository(Arrays.asList(repository, repository2)).build(); - assertEquals("/_snapshot/leeseohoo,kangsungjeon", getSnapshotRepository.getURI()); + assertEquals("/_snapshot/leeseohoo,kangsungjeon", getSnapshotRepository.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testRepositoryAll() { GetSnapshotRepository getSnapshotRepository = new GetSnapshotRepository.Builder().build(); - assertEquals("/_snapshot/_all", getSnapshotRepository.getURI()); + assertEquals("/_snapshot/_all", getSnapshotRepository.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/snapshot/GetSnapshotTest.java b/jest-common/src/test/java/io/searchbox/snapshot/GetSnapshotTest.java index f2d4a0042..be05674ee 100644 --- a/jest-common/src/test/java/io/searchbox/snapshot/GetSnapshotTest.java +++ b/jest-common/src/test/java/io/searchbox/snapshot/GetSnapshotTest.java @@ -1,5 +1,6 @@ package io.searchbox.snapshot; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import java.util.Arrays; @@ -18,13 +19,13 @@ public class GetSnapshotTest { @Test public void testSnapshotMultipleNames() { GetSnapshot getSnapshotRepository = new GetSnapshot.Builder(repository).addSnapshot(Arrays.asList(snapshot, snapshot2)).build(); - assertEquals("/_snapshot/kangsungjeon/leeseohoo,kangsungjeon", getSnapshotRepository.getURI()); + assertEquals("/_snapshot/kangsungjeon/leeseohoo,kangsungjeon", getSnapshotRepository.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testSnapshotAll() { GetSnapshot getSnapshotRepository = new GetSnapshot.Builder(repository).build(); - assertEquals("/_snapshot/kangsungjeon/_all", getSnapshotRepository.getURI()); + assertEquals("/_snapshot/kangsungjeon/_all", getSnapshotRepository.getURI(ElasticsearchVersion.UNKNOWN)); } } diff --git a/jest-common/src/test/java/io/searchbox/snapshot/RestoreSnapshotTest.java b/jest-common/src/test/java/io/searchbox/snapshot/RestoreSnapshotTest.java index 642eb7b53..59c8790dd 100644 --- a/jest-common/src/test/java/io/searchbox/snapshot/RestoreSnapshotTest.java +++ b/jest-common/src/test/java/io/searchbox/snapshot/RestoreSnapshotTest.java @@ -1,6 +1,7 @@ package io.searchbox.snapshot; import com.google.gson.Gson; +import io.searchbox.client.config.ElasticsearchVersion; import org.elasticsearch.common.settings.Settings; import org.junit.Test; @@ -26,7 +27,7 @@ public void testSnapshot() { RestoreSnapshot restoreSnapshot = new RestoreSnapshot.Builder(repository, snapshot) .settings(registerRepositorySettings.build().getAsMap()).build(); assertEquals("POST", restoreSnapshot.getRestMethodName()); - assertEquals("/_snapshot/leeseohoo/leeseola/_restore", restoreSnapshot.getURI()); + assertEquals("/_snapshot/leeseohoo/leeseola/_restore", restoreSnapshot.getURI(ElasticsearchVersion.UNKNOWN)); String settings = new Gson().toJson(restoreSnapshot.getData(new Gson())); assertEquals("\"{\\\"ignore_unavailable\\\":\\\"true\\\",\\\"include_global_state\\\":\\\"false\\\",\\\"indices\\\":\\\"index_1,index_2\\\",\\\"rename_pattern\\\":\\\"index_(.+)\\\",\\\"rename_replacement\\\":\\\"restored_index_$1\\\"}\"", settings); } diff --git a/jest-common/src/test/java/io/searchbox/snapshot/SnapshotStatusTest.java b/jest-common/src/test/java/io/searchbox/snapshot/SnapshotStatusTest.java index e5cdf23bb..41ad4bdc7 100644 --- a/jest-common/src/test/java/io/searchbox/snapshot/SnapshotStatusTest.java +++ b/jest-common/src/test/java/io/searchbox/snapshot/SnapshotStatusTest.java @@ -1,5 +1,6 @@ package io.searchbox.snapshot; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import java.util.Arrays; @@ -19,12 +20,12 @@ public class SnapshotStatusTest { public void testSnapshotSingleName() { SnapshotStatus snapshotStatus = new SnapshotStatus.Builder(repository).addSnapshot(snapshot).build(); assertEquals("GET", snapshotStatus.getRestMethodName()); - assertEquals("/_snapshot/leeseohoo/leeseola/_status", snapshotStatus.getURI()); + assertEquals("/_snapshot/leeseohoo/leeseola/_status", snapshotStatus.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void testSnapshotMultipleNames() { SnapshotStatus snapshotStatus = new SnapshotStatus.Builder(repository).addSnapshot(Arrays.asList(snapshot, snapshot2)).build(); - assertEquals("/_snapshot/leeseohoo/leeseola,kangsungjeon/_status", snapshotStatus.getURI()); + assertEquals("/_snapshot/leeseohoo/leeseola,kangsungjeon/_status", snapshotStatus.getURI(ElasticsearchVersion.UNKNOWN)); } } From 9797ea66698d790ef46c874b0dfedce7fb182c71 Mon Sep 17 00:00:00 2001 From: mvrueden Date: Thu, 16 Nov 2017 22:37:18 +0100 Subject: [PATCH 13/19] Reference latest jest version 5.3.3 instead of 2.0.0 --- jest/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jest/README.md b/jest/README.md index 517f0bd2f..9a89e5787 100644 --- a/jest/README.md +++ b/jest/README.md @@ -39,7 +39,7 @@ Add Jest as a dependency to your project. io.searchbox jest - 2.0.0 + 5.3.3 ``` From 71ecf5b5200242ee159699daf19310ab564469e0 Mon Sep 17 00:00:00 2001 From: Roi Rav-Hon Date: Tue, 21 Nov 2017 14:50:18 +0200 Subject: [PATCH 14/19] Change version --- jest-common/pom.xml | 2 +- jest-droid/pom.xml | 2 +- jest/pom.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jest-common/pom.xml b/jest-common/pom.xml index f50099005..5dcd629f2 100644 --- a/jest-common/pom.xml +++ b/jest-common/pom.xml @@ -45,7 +45,7 @@ io.searchbox jest-parent - 5.3.4-Logzio-1 + 5.3.4-SNAPSHOT diff --git a/jest-droid/pom.xml b/jest-droid/pom.xml index 94107da45..1bd01dbce 100644 --- a/jest-droid/pom.xml +++ b/jest-droid/pom.xml @@ -45,7 +45,7 @@ io.searchbox jest-parent - 5.3.4-Logzio-1 + 5.3.4-SNAPSHOT diff --git a/jest/pom.xml b/jest/pom.xml index 8bf7350f9..430dbe7a8 100644 --- a/jest/pom.xml +++ b/jest/pom.xml @@ -45,7 +45,7 @@ io.searchbox jest-parent - 5.3.4-Logzio-1 + 5.3.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 603b61dd4..89246ab37 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.searchbox jest-parent pom - 5.3.4-Logzio-1 + 5.3.4-SNAPSHOT Jest Parent POM Parent POM for Jest - ElasticSearch Java rest client https://github.com/searchbox-io/Jest @@ -250,7 +250,7 @@ io.searchbox jest-common - 5.3.4-Logzio-1 + 5.3.4-SNAPSHOT From 343c1c8a43ab94a863ecc228d8dfb4a821b44e74 Mon Sep 17 00:00:00 2001 From: Roi Rav-Hon Date: Tue, 21 Nov 2017 15:26:19 +0200 Subject: [PATCH 15/19] Space change to trigger new build --- jest-common/src/main/java/io/searchbox/core/Cat.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jest-common/src/main/java/io/searchbox/core/Cat.java b/jest-common/src/main/java/io/searchbox/core/Cat.java index 045eb8c37..4253b0e13 100644 --- a/jest-common/src/main/java/io/searchbox/core/Cat.java +++ b/jest-common/src/main/java/io/searchbox/core/Cat.java @@ -199,11 +199,11 @@ public String operationPath() { @Override public String getJoinedNodes() { - return nodes.isEmpty() ? null : Joiner.on(',').join(nodes); + return nodes.isEmpty() ? null : Joiner.on(',').join(nodes); } } protected interface CatBuilder { String operationPath(); } -} \ No newline at end of file +} From 2aea1ad4620efa059bc5558270219106508ee2fb Mon Sep 17 00:00:00 2001 From: John Lister Date: Tue, 2 Jan 2018 21:14:34 +0000 Subject: [PATCH 16/19] Added option to fetch aliases by alias name --- .../searchbox/indices/aliases/GetAliases.java | 33 ++++++++++++++++++- .../indices/aliases/GetAliasesTest.java | 19 ++++++++++- .../aliases/GetAliasesIntegrationTest.java | 5 ++- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java b/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java index 29b2cf8fb..965ef960c 100644 --- a/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java +++ b/jest-common/src/main/java/io/searchbox/indices/aliases/GetAliases.java @@ -1,15 +1,21 @@ package io.searchbox.indices.aliases; +import com.google.common.base.Joiner; import io.searchbox.action.AbstractMultiIndexActionBuilder; import io.searchbox.action.GenericResultAbstractAction; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.Set; /** * @author cihat keser */ public class GetAliases extends GenericResultAbstractAction { + protected String aliasName; protected GetAliases(Builder builder) { super(builder); + aliasName = builder.getJoinedAliases(); setURI(buildURI()); } @@ -20,11 +26,36 @@ public String getRestMethodName() { @Override protected String buildURI() { - return super.buildURI() + "/_aliases"; + if (aliasName == null){ + return super.buildURI() + "/_alias"; + } else { + return super.buildURI() + "/_alias/" + aliasName; + } } public static class Builder extends AbstractMultiIndexActionBuilder { + protected Set aliasNames = new LinkedHashSet(); + + public String getJoinedAliases() { + if (aliasNames.size() > 0) { + return Joiner.on(',').join(aliasNames); + } else { + return null; + } + } + + public Builder addAlias(String aliasName) { + this.aliasNames.add(aliasName); + return this; + } + + public Builder addAliases(Collection aliasNames) { + this.aliasNames.addAll(aliasNames); + return this; + } + + @Override public GetAliases build() { return new GetAliases(this); diff --git a/jest-common/src/test/java/io/searchbox/indices/aliases/GetAliasesTest.java b/jest-common/src/test/java/io/searchbox/indices/aliases/GetAliasesTest.java index 733a5b853..39fece2a0 100644 --- a/jest-common/src/test/java/io/searchbox/indices/aliases/GetAliasesTest.java +++ b/jest-common/src/test/java/io/searchbox/indices/aliases/GetAliasesTest.java @@ -1,5 +1,6 @@ package io.searchbox.indices.aliases; +import java.util.Arrays; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -12,7 +13,23 @@ public void testBasicUriGeneration() { GetAliases getAliases = new GetAliases.Builder().addIndex("twitter").build(); assertEquals("GET", getAliases.getRestMethodName()); - assertEquals("twitter/_aliases", getAliases.getURI()); + assertEquals("twitter/_alias", getAliases.getURI()); + } + + @Test + public void testBasicUriGenerationWithAliases() { + GetAliases getAliases = new GetAliases.Builder().addIndex("twitter").addAlias("alias").build(); + + assertEquals("GET", getAliases.getRestMethodName()); + assertEquals("twitter/_alias/alias", getAliases.getURI()); + } + + @Test + public void testBasicUriGenerationWithMultipleAliases() { + GetAliases getAliases = new GetAliases.Builder().addIndex("twitter").addAliases(Arrays.asList(new String[]{"alias1", "alias2"})).build(); + + assertEquals("GET", getAliases.getRestMethodName()); + assertEquals("twitter/_alias/alias1,alias2", getAliases.getURI()); } @Test diff --git a/jest/src/test/java/io/searchbox/indices/aliases/GetAliasesIntegrationTest.java b/jest/src/test/java/io/searchbox/indices/aliases/GetAliasesIntegrationTest.java index 9c6cc3d45..88cf2d407 100644 --- a/jest/src/test/java/io/searchbox/indices/aliases/GetAliasesIntegrationTest.java +++ b/jest/src/test/java/io/searchbox/indices/aliases/GetAliasesIntegrationTest.java @@ -2,15 +2,14 @@ import io.searchbox.client.JestResult; import io.searchbox.common.AbstractIntegrationTest; +import java.io.IOException; +import java.util.concurrent.TimeUnit; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse; import org.elasticsearch.test.ESIntegTestCase; import org.junit.Before; import org.junit.Test; -import java.io.IOException; -import java.util.concurrent.TimeUnit; - /** * @author cihat keser */ From 1117b0daa74d5a11761bd263ad2020db7bfc4dff Mon Sep 17 00:00:00 2001 From: Michael Siepmann Date: Sat, 3 Feb 2018 17:53:56 +0100 Subject: [PATCH 17/19] Fixed Tests. --- .../io/searchbox/core/CatAllocationBuilderTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jest-common/src/test/java/io/searchbox/core/CatAllocationBuilderTest.java b/jest-common/src/test/java/io/searchbox/core/CatAllocationBuilderTest.java index 6a0121451..cfadb944a 100644 --- a/jest-common/src/test/java/io/searchbox/core/CatAllocationBuilderTest.java +++ b/jest-common/src/test/java/io/searchbox/core/CatAllocationBuilderTest.java @@ -1,5 +1,6 @@ package io.searchbox.core; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -15,30 +16,30 @@ public void shouldSetApplicationJsonHeader() { @Test public void shouldGenerateValidUriWhenIndexNotGiven() { Cat cat = new Cat.AllocationBuilder().build(); - assertEquals("_cat/allocation", cat.getURI()); + assertEquals("_cat/allocation", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenSingleNodeGiven() { Cat cat = new Cat.AllocationBuilder().addNode("testNode").build(); - assertEquals("_cat/allocation/testNode", cat.getURI()); + assertEquals("_cat/allocation/testNode", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenNodesGiven() { Cat cat = new Cat.AllocationBuilder().addNode("testNode1").addNode("testNode2").build(); - assertEquals("_cat/allocation/testNode1%2CtestNode2", cat.getURI()); + assertEquals("_cat/allocation/testNode1%2CtestNode2", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenParameterGiven() { Cat cat = new Cat.AllocationBuilder().setParameter("v", "true").build(); - assertEquals("_cat/allocation?v=true", cat.getURI()); + assertEquals("_cat/allocation?v=true", cat.getURI(ElasticsearchVersion.UNKNOWN)); } @Test public void shouldGenerateValidUriWhenHeadersParameterGiven() { Cat cat = new Cat.AllocationBuilder().setParameter("h", "shards,disk.indices,disk.used").build(); - assertEquals("_cat/allocation?h=shards%2Cdisk.indices%2Cdisk.used", cat.getURI()); + assertEquals("_cat/allocation?h=shards%2Cdisk.indices%2Cdisk.used", cat.getURI(ElasticsearchVersion.UNKNOWN)); } } From 8c3611982fed7bf8a8307957f36165afbcb09aa8 Mon Sep 17 00:00:00 2001 From: Niraj Patel Date: Mon, 5 Feb 2018 13:47:55 -0600 Subject: [PATCH 18/19] Adding matched_queries to search hits --- .../java/io/searchbox/core/SearchResult.java | 32 +++++----- .../io/searchbox/core/SearchResultTest.java | 58 +++++++++++++++++++ 2 files changed, 77 insertions(+), 13 deletions(-) diff --git a/jest-common/src/main/java/io/searchbox/core/SearchResult.java b/jest-common/src/main/java/io/searchbox/core/SearchResult.java index 6fa21ab58..ff8bc8a8c 100644 --- a/jest-common/src/main/java/io/searchbox/core/SearchResult.java +++ b/jest-common/src/main/java/io/searchbox/core/SearchResult.java @@ -132,6 +132,14 @@ protected Hit extractHit(Class sourceType, Class explanationT Map> highlight = extractHighlight(hitObject.getAsJsonObject(HIGHLIGHT_KEY)); List sort = extractSort(hitObject.getAsJsonArray(SORT_KEY)); + List matchedQueries = new ArrayList<>(); + if (hitObject.has("matched_queries") && !hitObject.get("matched_queries").isJsonNull()) { + JsonArray rawMatchedQueries = hitObject.get("matched_queries").getAsJsonArray(); + rawMatchedQueries.forEach(matchedQuery -> { + matchedQueries.add(matchedQuery.getAsString()); + }); + } + if (addEsMetadataFields) { JsonObject clonedSource = null; for (MetaField metaField : META_FIELDS) { @@ -160,7 +168,8 @@ protected Hit extractHit(Class sourceType, Class explanationT id, score, parent, - routing + routing, + matchedQueries ); } } @@ -255,10 +264,7 @@ public class Hit { public final Double score; public final String parent; public final String routing; - - public Hit(Class sourceType, JsonElement source) { - this(sourceType, source, null, null); - } + public final List matchedQueries; public Hit(Class sourceType, JsonElement source, Class explanationType, JsonElement explanation) { this(sourceType, source, explanationType, explanation, null, null); @@ -266,11 +272,12 @@ public Hit(Class sourceType, JsonElement source, Class explanationType, Js public Hit(Class sourceType, JsonElement source, Class explanationType, JsonElement explanation, Map> highlight, List sort) { - this(sourceType, source, explanationType, explanation, highlight, sort, null, null, null, null); + this(sourceType, source, explanationType, explanation, highlight, sort, null, null, null, null, null, null, null); } public Hit(Class sourceType, JsonElement source, Class explanationType, JsonElement explanation, - Map> highlight, List sort, String index, String type, String id, Double score, String parent, String routing) { + Map> highlight, List sort, String index, String type, String id, + Double score, String parent, String routing, List matchedQueries) { if (source == null) { this.source = null; } else { @@ -288,14 +295,14 @@ public Hit(Class sourceType, JsonElement source, Class explanationType, Js this.type = type; this.id = id; this.score = score; - this.parent = parent; this.routing = routing; + this.matchedQueries = matchedQueries; } public Hit(Class sourceType, JsonElement source, Class explanationType, JsonElement explanation, Map> highlight, List sort, String index, String type, String id, Double score) { - this(sourceType, source, explanationType, explanation, highlight, sort, index, type, id, score, null, null); + this(sourceType, source, explanationType, explanation, highlight, sort, index, type, id, score, null, null, null); } public Hit(T source) { @@ -307,22 +314,21 @@ public Hit(T source, K explanation) { } public Hit(T source, K explanation, Map> highlight, List sort) { - this(source, explanation, highlight, sort, null, null, null, null); + this(source, explanation, highlight, sort, null, null, null, null, null); } - public Hit(T source, K explanation, Map> highlight, List sort, String index, String type, String id, Double score) { + public Hit(T source, K explanation, Map> highlight, List sort, String index, String type, String id, Double score, List matchedQueries) { this.source = source; this.explanation = explanation; this.highlight = highlight; this.sort = sort; - this.index = index; this.type = type; this.id = id; this.score = score; - this.parent = null; this.routing = null; + this.matchedQueries = matchedQueries; } @Override diff --git a/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java b/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java index 0cff9d6fb..5c5527a9a 100644 --- a/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java +++ b/jest-common/src/test/java/io/searchbox/core/SearchResultTest.java @@ -6,6 +6,7 @@ import io.searchbox.annotations.JestVersion; import org.junit.Test; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -229,6 +230,7 @@ public void testGetFirstHit() { assertNotNull(hit.sort); assertNotNull(hit.id); assertNull(hit.score); + assertEquals(Collections.emptyList(), hit.matchedQueries); hit = searchResult.getFirstHit(Object.class, Object.class); assertNotNull(hit); @@ -237,6 +239,7 @@ public void testGetFirstHit() { assertNotNull(hit.sort); assertNotNull(hit.id); assertNull(hit.score); + assertEquals(Collections.emptyList(), hit.matchedQueries); } @Test @@ -417,6 +420,61 @@ public void testParentChild() { assertEquals("Incorrect version", someVersion, hit.source.getVersion()); } + @Test + public void testGetMatchedQueries() { + String jsonWithScore = "{\n" + + " \"_shards\":{\n" + + " \"total\" : 5,\n" + + " \"successful\" : 5,\n" + + " \"failed\" : 0\n" + + " },\n" + + " \"hits\":{\n" + + " \"total\" : 1,\n" + + " \"hits\" : [\n" + + " {\n" + + " \"_index\" : \"twitter\",\n" + + " \"_type\" : \"tweet\",\n" + + " \"_score\" : \"1.02332\",\n" + + " \"_id\" : \"1\",\n" + + " \"_source\" : {\n" + + " \"user\" : \"kimchy\",\n" + + " \"postDate\" : \"2009-11-15T14:12:12\",\n" + + " \"message\" : \"trying out Elasticsearch\"\n" + + " },\n" + + " \"sort\" : [\n" + + " 1234.5678\n" + + " ], \n" + + " \"matched_queries\" : [\"some-query\"] \n" + + " }\n" + + " ]\n" + + " }\n" + + "}"; + + SearchResult searchResult = new SearchResult(new Gson()); + searchResult.setSucceeded(true); + searchResult.setJsonString(jsonWithScore); + searchResult.setJsonObject(new JsonParser().parse(jsonWithScore).getAsJsonObject()); + searchResult.setPathToResult("hits/hits/_source"); + + SearchResult.Hit hit = searchResult.getFirstHit(Object.class); + assertNotNull(hit); + assertNotNull(hit.source); + assertNull(hit.explanation); + assertNotNull(hit.sort); + assertNotNull(hit.id); + assertNotNull(hit.score); + assertEquals("Incorrect Matched Query", Collections.singletonList("some-query"), hit.matchedQueries); + + hit = searchResult.getFirstHit(Object.class, Object.class); + assertNotNull(hit); + assertNotNull(hit.source); + assertNull(hit.explanation); + assertNotNull(hit.sort); + assertNotNull(hit.id); + assertNotNull(hit.score); + assertEquals("Incorrect Matched Query", Collections.singletonList("some-query"), hit.matchedQueries); + } + class TestObject { @JestId private String id; From ed2b2635fe6b494e6ce167e9000a02a402e29651 Mon Sep 17 00:00:00 2001 From: ofir76 Date: Wed, 11 Apr 2018 18:31:55 +0300 Subject: [PATCH 19/19] add cat recovery --- .../src/main/java/io/searchbox/core/Cat.java | 27 ++++++++++++++ .../core/CatRecoveryBuilderTest.java | 35 +++++++++++++++++++ .../io/searchbox/core/CatIntegrationTest.java | 26 ++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 jest-common/src/test/java/io/searchbox/core/CatRecoveryBuilderTest.java diff --git a/jest-common/src/main/java/io/searchbox/core/Cat.java b/jest-common/src/main/java/io/searchbox/core/Cat.java index 185139dcb..46861eb2e 100644 --- a/jest-common/src/main/java/io/searchbox/core/Cat.java +++ b/jest-common/src/main/java/io/searchbox/core/Cat.java @@ -109,6 +109,33 @@ public String operationPath() { } } + public static class RecoveryBuilder extends AbstractMultiIndexActionBuilder implements CatBuilder { + private static final String operationPath = "recovery"; + public RecoveryBuilder() { + setHeader("accept", "application/json"); + setHeader("content-type", "application/json"); + } + + @Override + public Cat build() { + return new Cat(this); + } + + @Override + public String operationPath() { + return operationPath; + } + + @Override + public String getJoinedIndices() { + if (indexNames.size() > 0) { + return Joiner.on(',').join(indexNames); + } else { + return null; + } + } + } + public static class ShardsBuilder extends AbstractMultiIndexActionBuilder implements CatBuilder { private static final String operationPath = "shards"; public ShardsBuilder() { diff --git a/jest-common/src/test/java/io/searchbox/core/CatRecoveryBuilderTest.java b/jest-common/src/test/java/io/searchbox/core/CatRecoveryBuilderTest.java new file mode 100644 index 000000000..96ef4607e --- /dev/null +++ b/jest-common/src/test/java/io/searchbox/core/CatRecoveryBuilderTest.java @@ -0,0 +1,35 @@ +package io.searchbox.core; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +/** + * @author Bartosz Polnik + */ +public class CatRecoveryBuilderTest { + @Test + public void shouldSetApplicationJsonHeader() { + Cat cat = new Cat.RecoveryBuilder().build(); + assertEquals("application/json", cat.getHeader("accept")); + assertEquals("application/json", cat.getHeader("content-type")); + } + + @Test + public void shouldGenerateValidUriWhenIndexNotGiven() { + Cat cat = new Cat.RecoveryBuilder().build(); + assertEquals("_cat/recovery/_all", cat.getURI()); + } + + @Test + public void shouldGenerateValidUriWhenIndexGiven() { + Cat cat = new Cat.RecoveryBuilder().addIndex("testIndex").build(); + assertEquals("_cat/recovery/testIndex", cat.getURI()); + } + + @Test + public void shouldGenerateValidUriWhenParameterGiven() { + Cat cat = new Cat.RecoveryBuilder().setParameter("v", "true").build(); + assertEquals("_cat/recovery/_all?v=true", cat.getURI()); + } +} diff --git a/jest/src/test/java/io/searchbox/core/CatIntegrationTest.java b/jest/src/test/java/io/searchbox/core/CatIntegrationTest.java index f66379d17..a46207a10 100644 --- a/jest/src/test/java/io/searchbox/core/CatIntegrationTest.java +++ b/jest/src/test/java/io/searchbox/core/CatIntegrationTest.java @@ -1,9 +1,11 @@ package io.searchbox.core; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import java.util.stream.IntStream; import com.google.gson.JsonElement; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesAction; @@ -74,6 +76,30 @@ public void shouldDisplayAliasForSingleResult() throws IOException, JSONExceptio JSONAssert.assertEquals("[{\"alias\":\"catintegrationalias\",\"index\":\"catintegrationindex\"}]", result.getSourceAsString(), false); } + @Test + public void shouldDisplayRecoveryForSingleResult() throws IOException, JSONException { + createIndex(INDEX); + ensureSearchable(INDEX); + + CatResult result = client.execute(new Cat.RecoveryBuilder().addIndex(INDEX).setParameter("h", "index,stage").build()); + + ArrayList expectedsPlainText = new ArrayList<>(); + ArrayList recovertResponsePerShared = new ArrayList<>(); + + String expectedLine = "{\"index\":\"catintegrationindex\",\"stage\":\"done\"}"; + expectedsPlainText.add(new String[]{"index", "stage"}); + + IntStream.range(0, getNumShards(INDEX).totalNumShards).forEach(value -> { + expectedsPlainText.add(new String[]{INDEX, "done"}); + recovertResponsePerShared.add(expectedLine); + }); + assertArrayEquals(expectedsPlainText.toArray(), result.getPlainText()); + + String expectedSourceAsString = "[" + String.join(",", recovertResponsePerShared) + "]"; + + JSONAssert.assertEquals(expectedSourceAsString, result.getSourceAsString(), false); + } + @Test public void shouldChangeOrderOfColumnsByspecifyingParameters() throws IOException, JSONException { createIndex(INDEX);