Merge branch 'master' into es_2.0

searchbox-io · Nov 1, 2015 · df9c6f1 · df9c6f1
2 parents ffbaef3 + c7a1deb
commit df9c6f1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 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
@@ -41,7 +41,6 @@ public abstract class AbstractAction<T extends JestResult> implements Action<T>
     private final Multimap<String, Object> parameterMap = LinkedHashMultimap.create();
     private final Set<String> cleanApiParameters = new LinkedHashSet<String>();
     private String URI;
-    private String pathToResult;
 
     public AbstractAction() {
     }
@@ -160,11 +159,7 @@ public String getData(Gson gson) {
 
     @Override
     public String getPathToResult() {
-        return pathToResult;
-    }
-
-    protected void setPathToResult(String pathToResult) {
-        this.pathToResult = pathToResult;
+        return null;
     }
 
     protected String buildURI() {

diff --git 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);
-        setPathToResult("nodes");
         setURI(buildURI());
     }
 
@@ -24,6 +23,11 @@ public String getRestMethodName() {
         return "GET";
     }
 
+    @Override
+    public String getPathToResult() {
+        return "nodes";
+    }
+
     public static class Builder extends AbstractMultiINodeActionBuilder<NodesInfo, Builder> {
 
         public Builder withSettings() {

diff --git 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);
-        setPathToResult("nodes");
         setURI(buildURI());
     }
 
@@ -27,6 +26,11 @@ public String getRestMethodName() {
         return "POST";
     }
 
+    @Override
+    public String getPathToResult() {
+        return "nodes";
+    }
+
     public static class Builder extends AbstractMultiINodeActionBuilder<NodesShutdown, Builder> {
 
         /**

diff --git 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);
-        setPathToResult("nodes");
         setURI(buildURI());
     }
 
@@ -27,6 +26,11 @@ public String getRestMethodName() {
         return "GET";
     }
 
+    @Override
+    public String getPathToResult() {
+        return "nodes";
+    }
+
     public static class Builder extends AbstractMultiINodeActionBuilder<NodesStats, Builder> {
 
         public Builder withSettings() {

diff --git a/jest-common/src/main/java/io/searchbox/core/MultiGet.java b/jest-common/src/main/java/io/searchbox/core/MultiGet.java
@@ -22,7 +22,6 @@ public class MultiGet extends GenericResultAbstractAction {
     protected MultiGet(AbstractAction.Builder builder) {
         super(builder);
         setURI(buildURI());
-        setPathToResult("docs/_source");
     }
 
     protected MultiGet(Builder.ByDoc builder) {
@@ -54,6 +53,11 @@ public String getRestMethodName() {
         return "GET";
     }
 
+    @Override
+    public String getPathToResult() {
+        return "docs/_source";
+    }
+
     @Override
     public int hashCode() {
         return new HashCodeBuilder()