Merge pull request searchbox-io#7 from logzio/add-cat-recovery

Add cat recovery
xialinbing · Apr 11, 2018 · e3af9b9 · e3af9b9
2 parents dfbb61b + 42d2ba6
commit e3af9b9
Show file tree

Hide file tree

Showing 159 changed files with 927 additions and 548 deletions.
diff --git a/jest-common/pom.xml b/jest-common/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>io.searchbox</groupId>
         <artifactId>jest-parent</artifactId>
-        <version>5.3.4-Logzio-2</version>
+        <version>5.3.4-Logzio-3</version>
     </parent>
 
     <dependencies>

diff --git 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;
@@ -45,7 +46,6 @@ public abstract class AbstractAction<T extends JestResult> implements Action<T>
     private final ConcurrentMap<String, Object> headerMap = new ConcurrentHashMap<String, Object>();
     private final Multimap<String, Object> parameterMap = LinkedHashMultimap.create();
     private final Set<String> cleanApiParameters = new LinkedHashSet<String>();
-    private String URI;
 
     public AbstractAction() {
     }
@@ -139,8 +139,8 @@ public Map<String, Object> getHeaders() {
     }
 
     @Override
-    public String getURI() {
-        String finalUri = URI;
+    public String getURI(ElasticsearchVersion elasticsearchVersion) {
+        String finalUri = buildURI(elasticsearchVersion);
         if (!parameterMap.isEmpty() || !cleanApiParameters.isEmpty()) {
             try {
                 finalUri += buildQueryString();
@@ -153,10 +153,6 @@ public String getURI() {
         return finalUri;
     }
 
-    protected void setURI(String URI) {
-        this.URI = URI;
-    }
-
     @Override
     public String getData(Gson gson) {
         if (payload == null) {
@@ -173,14 +169,20 @@ public String getPathToResult() {
         return null;
     }
 
-    protected String buildURI() {
+    protected String buildURI(ElasticsearchVersion elasticsearchVersion) {
         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(elasticsearchVersion);
+
+                if (StringUtils.isNotBlank(commandExtension)) {
+                    sb.append("/").append(URLEncoder.encode(commandExtension, CHARSET));
+                }
+
+                if (StringUtils.isNotBlank(typeName)) {
                     sb.append("/").append(URLEncoder.encode(typeName, CHARSET));
                 }
             }
@@ -193,6 +195,10 @@ protected String buildURI() {
         return sb.toString();
     }
 
+    protected String getURLCommandExtension(ElasticsearchVersion elasticsearchVersion) {
+        return null;
+    }
+
     protected String buildQueryString() throws UnsupportedEncodingException {
         StringBuilder queryString = new StringBuilder();
 
@@ -217,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
@@ -240,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/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;
@@ -36,10 +37,10 @@ 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.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/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,10 +11,10 @@
  */
 public interface Action<T extends JestResult> {
 
-    String getURI();
-
     String getRestMethodName();
 
+    String getURI(ElasticsearchVersion elasticsearchVersion);
+
     String getData(Gson gson);
 
     String getPathToResult();

diff --git 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/main/java/io/searchbox/client/config/ElasticsearchVersion.java 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/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.
@@ -12,11 +13,10 @@ public class GetSettings extends GenericResultAbstractAction {
 
     protected GetSettings(Builder builder) {
         super(builder);
-        setURI(buildURI());
     }
 
-    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
@@ -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;
@@ -43,15 +44,14 @@ public String getKey() {
 
     protected Health(Builder builder) {
         super(builder);
-        setURI(buildURI());
     }
 
     @Override
-    protected String buildURI() {
+    protected String buildURI(ElasticsearchVersion elasticsearchVersion) {
         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/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.
@@ -15,12 +16,11 @@ public class NodesHotThreads extends GenericResultAbstractAction {
 
     protected NodesHotThreads(Builder builder) {
         super(builder);
-        setURI(buildURI());
     }
 
     @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
@@ -2,6 +2,7 @@
 
 import io.searchbox.action.AbstractMultiINodeActionBuilder;
 import io.searchbox.action.GenericResultAbstractAction;
+import io.searchbox.client.config.ElasticsearchVersion;
 
 /**
  * @author Dogukan Sonmez
@@ -11,11 +12,10 @@ public class NodesInfo extends GenericResultAbstractAction {
 
     protected NodesInfo(Builder builder) {
         super(builder);
-        setURI(buildURI());
     }
 
-    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
@@ -2,6 +2,7 @@
 
 import io.searchbox.action.AbstractMultiINodeActionBuilder;
 import io.searchbox.action.GenericResultAbstractAction;
+import io.searchbox.client.config.ElasticsearchVersion;
 
 /**
  * @author Dogukan Sonmez
@@ -11,12 +12,11 @@ public class NodesShutdown extends GenericResultAbstractAction {
 
     protected NodesShutdown(Builder builder) {
         super(builder);
-        setURI(buildURI());
     }
 
     @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
@@ -2,6 +2,7 @@
 
 import io.searchbox.action.AbstractMultiINodeActionBuilder;
 import io.searchbox.action.GenericResultAbstractAction;
+import io.searchbox.client.config.ElasticsearchVersion;
 
 /**
  * @author Dogukan Sonmez
@@ -11,12 +12,11 @@ public class NodesStats extends GenericResultAbstractAction {
 
     protected NodesStats(Builder builder) {
         super(builder);
-        setURI(buildURI());
     }
 
     @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
@@ -2,16 +2,16 @@
 
 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) {
         super(builder);
-        setURI(buildURI());
     }
 
     @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
@@ -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;
@@ -14,7 +15,6 @@ public class Reroute extends GenericResultAbstractAction {
 
     protected Reroute(Builder builder) {
         super(builder);
-        setURI(buildURI());
 
         List<Map> actions = new LinkedList<>();
         for (RerouteCommand rerouteCommand : builder.commandList) {
@@ -26,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
@@ -2,6 +2,7 @@
 
 import io.searchbox.action.AbstractAction;
 import io.searchbox.action.GenericResultAbstractAction;
+import io.searchbox.client.config.ElasticsearchVersion;
 
 /**
  * @author Dogukan Sonmez
@@ -11,12 +12,11 @@ public class State extends GenericResultAbstractAction {
 
     protected State(Builder builder) {
         super(builder);
-        setURI(buildURI());
     }
 
     @Override
-    protected String buildURI() {
-        return super.buildURI() + "/_cluster/state";
+    protected String buildURI(ElasticsearchVersion elasticsearchVersion) {
+        return super.buildURI(elasticsearchVersion) + "/_cluster/state";
     }
 
     @Override