removed redundant setter and fixed docs

elastic · Aug 28, 2018 · 7708d99 · 7708d99
1 parent 9758f39
commit 7708d99
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java
@@ -717,7 +717,7 @@ public void testUpdateByQuery() throws IOException {
         {
             // test1: create one doc in dest
             UpdateByQueryRequest updateByQueryRequest = new UpdateByQueryRequest();
-            updateByQueryRequest.setIndices(sourceIndex);
+            updateByQueryRequest.indices(sourceIndex);
             updateByQueryRequest.setQuery(new IdsQueryBuilder().addIds("1").types("type"));
             updateByQueryRequest.setRefresh(true);
             BulkByScrollResponse bulkResponse =
@@ -735,7 +735,7 @@ public void testUpdateByQuery() throws IOException {
         {
             // test2: update using script
             UpdateByQueryRequest updateByQueryRequest = new UpdateByQueryRequest();
-            updateByQueryRequest.setIndices(sourceIndex);
+            updateByQueryRequest.indices(sourceIndex);
             updateByQueryRequest.setScript(new Script("if (ctx._source.foo == 2) ctx._source.foo++;"));
             updateByQueryRequest.setRefresh(true);
             BulkByScrollResponse bulkResponse =

diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java
@@ -474,7 +474,7 @@ public void testReindex() throws IOException {
 
     public void testUpdateByQuery() throws IOException {
         UpdateByQueryRequest updateByQueryRequest = new UpdateByQueryRequest();
-        updateByQueryRequest.setIndices(randomIndicesNames(1, 5));
+        updateByQueryRequest.indices(randomIndicesNames(1, 5));
         Map<String, String> expectedParams = new HashMap<>();
         if (randomBoolean()) {
             updateByQueryRequest.setDocTypes(generateRandomStringArray(5, 5, false, false));

diff --git a/...-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java b/...-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java
@@ -924,8 +924,7 @@ public void testUpdateByQuery() throws Exception {
         }
         {
             // tag::update-by-query-request
-            UpdateByQueryRequest request = new UpdateByQueryRequest(); // <1>
-            request.setIndices("source1", "source2"); // <2>
+            UpdateByQueryRequest request = new UpdateByQueryRequest("source1", "source2"); // <1>
             // end::update-by-query-request
             // tag::update-by-query-request-conflicts
             request.setConflicts("proceed"); // <1>
@@ -993,7 +992,7 @@ public void testUpdateByQuery() throws Exception {
         }
         {
             UpdateByQueryRequest request = new UpdateByQueryRequest();
-            request.setIndices("source1");
+            request.indices("source1");
 
             // tag::update-by-query-execute-listener
             ActionListener<BulkByScrollResponse> listener = new ActionListener<BulkByScrollResponse>() {

diff --git a/docs/java-rest/high-level/document/update-by-query.asciidoc b/docs/java-rest/high-level/document/update-by-query.asciidoc
@@ -6,16 +6,15 @@
 
 A `UpdateByQueryRequest` can be used to update documents in an index.
 
-It requires an existing index and a target index which may or may not exist pre-request.
+It requires an existing index (or a set of indices) on which the update is to be performed.
 
 The simplest form of a `UpdateByQueryRequest` looks like follows:
 
 ["source","java",subs="attributes,callouts,macros"]
 --------------------------------------------------
 include-tagged::{doc-tests}/CRUDDocumentationIT.java[update-by-query-request]
 --------------------------------------------------
-<1> Creates the `UpdateByQueryRequest`
-<2> Adds a list of sources to update
+<1> Creates the `UpdateByQueryRequest` on a set of indices.
 
 By default version conflicts abort the `UpdateByQueryRequest` process but you can just count them by settings it to
 `proceed` in the request body

diff --git a/server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java
@@ -48,6 +48,10 @@ public UpdateByQueryRequest() {
         this(new SearchRequest());
     }
 
+    public UpdateByQueryRequest(String... indices) {
+        this(new SearchRequest(indices));
+    }
+
     UpdateByQueryRequest(SearchRequest search) {
         this(search, true);
     }
@@ -89,16 +93,6 @@ public UpdateByQueryRequest setDocTypes(String... types) {
         return this;
     }
 
-    /**
-     * Set the indices on which the update by query request is to be run
-     */
-    public UpdateByQueryRequest setIndices(String... indices) {
-        if (indices != null) {
-            getSearchRequest().indices(indices);
-        }
-        return this;
-    }
-
     /**
      * Set routing limiting the process to the shards that match that routing value
      */

diff --git a/server/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java b/server/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java
@@ -34,7 +34,7 @@ public void testUpdateByQueryRequestImplementsIndicesRequestReplaceable() {
         IndicesOptions indicesOptions = IndicesOptions.fromOptions(randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean());
 
         UpdateByQueryRequest request = new UpdateByQueryRequest();
-        request.setIndices(indices);
+        request.indices(indices);
         request.setIndicesOptions(indicesOptions);
         for (int i = 0; i < numIndices; i++) {
             assertEquals(indices[i], request.indices()[i]);
@@ -59,7 +59,7 @@ public void testUpdateByQueryRequestImplementsIndicesRequestReplaceable() {
 
     @Override
     protected UpdateByQueryRequest newRequest() {
-        return new UpdateByQueryRequest().setIndices(randomAlphaOfLength(5));
+        return new UpdateByQueryRequest(randomAlphaOfLength(5));
     }
 
     @Override