Reindex: rename source to searchRequest

This makes the code easier to read for those familiar with the
Elasticsearch code base.

Author: nik9000

modules/reindex/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java

@@ -46,7 +46,7 @@ public abstract class AbstractBulkByScrollRequest<Self extends AbstractBulkByScr
     /**
      * The search to be executed.
      */
-    private SearchRequest source;
+    private SearchRequest searchRequest;
 
     /**
      * Maximum number of processed documents. Defaults to -1 meaning process all
@@ -89,7 +89,7 @@ public AbstractBulkByScrollRequest() {
     }
 
     public AbstractBulkByScrollRequest(SearchRequest source) {
-        this.source = source;
+        this.searchRequest = source;
 
         // Set the defaults which differ from SearchRequest's defaults.
         source.scroll(DEFAULT_SCROLL_TIMEOUT);
@@ -106,8 +106,8 @@ public AbstractBulkByScrollRequest(SearchRequest source) {
 
     @Override
     public ActionRequestValidationException validate() {
-        ActionRequestValidationException e = source.validate();
-        if (source.source().from() != -1) {
+        ActionRequestValidationException e = searchRequest.validate();
+        if (searchRequest.source().from() != -1) {
             e = addValidationError("from is not supported in this context", e);
         }
         if (maxRetries < 0) {
@@ -173,8 +173,8 @@ public void setConflicts(String conflicts) {
     /**
      * The search request that matches the documents to process.
      */
-    public SearchRequest getSource() {
-        return source;
+    public SearchRequest getSearchRequest() {
+        return searchRequest;
     }
 
     /**
@@ -260,8 +260,8 @@ public Task createTask(long id, String type, String action) {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        source = new SearchRequest();
-        source.readFrom(in);
+        searchRequest = new SearchRequest();
+        searchRequest.readFrom(in);
         abortOnVersionConflict = in.readBoolean();
         size = in.readVInt();
         refresh = in.readBoolean();
@@ -274,7 +274,7 @@ public void readFrom(StreamInput in) throws IOException {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        source.writeTo(out);
+        searchRequest.writeTo(out);
         out.writeBoolean(abortOnVersionConflict);
         out.writeVInt(size);
         out.writeBoolean(refresh);
@@ -289,13 +289,13 @@ public void writeTo(StreamOutput out) throws IOException {
      * to make toString.
      */
     protected void searchToString(StringBuilder b) {
-        if (source.indices() != null && source.indices().length != 0) {
-            b.append(Arrays.toString(source.indices()));
+        if (searchRequest.indices() != null && searchRequest.indices().length != 0) {
+            b.append(Arrays.toString(searchRequest.indices()));
         } else {
             b.append("[all indices]");
         }
-        if (source.types() != null && source.types().length != 0) {
-            b.append(Arrays.toString(source.types()));
+        if (searchRequest.types() != null && searchRequest.types().length != 0) {
+            b.append(Arrays.toString(searchRequest.types()));
         }
     }
 }

modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java

@@ -53,7 +53,7 @@ protected ReindexRequest self() {
     @Override
     public ActionRequestValidationException validate() {
         ActionRequestValidationException e = super.validate();
-        if (getSource().indices() == null || getSource().indices().length == 0) {
+        if (getSearchRequest().indices() == null || getSearchRequest().indices().length == 0) {
             e = addValidationError("use _all if you really want to copy from all existing indexes", e);
         }
         /*

modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java

@@ -91,7 +91,7 @@ public class RestReindexAction extends AbstractBaseReindexRestHandler<ReindexReq
         destParser.declareString((i, ttl) -> i.ttl(parseTimeValue(ttl, TimeValue.timeValueMillis(-1), "ttl").millis()),
                 new ParseField("ttl"));
 
-        PARSER.declareField((p, v, c) -> sourceParser.parse(p, v.getSource(), c), new ParseField("source"), ValueType.OBJECT);
+        PARSER.declareField((p, v, c) -> sourceParser.parse(p, v.getSearchRequest(), c), new ParseField("source"), ValueType.OBJECT);
         PARSER.declareField((p, v, c) -> destParser.parse(p, v.getDestination(), null), new ParseField("dest"), ValueType.OBJECT);
         PARSER.declareInt(ReindexRequest::setSize, new ParseField("size"));
         PARSER.declareField((p, v, c) -> v.setScript(Script.parse(p, c.queryParseContext.parseFieldMatcher())), new ParseField("script"),

modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestUpdateByQueryAction.java

@@ -64,8 +64,8 @@ protected void handleRequest(RestRequest request, RestChannel channel, Client cl
          * defaults. Then the parse can override them.
          */
         UpdateByQueryRequest internalRequest = new UpdateByQueryRequest(new SearchRequest());
-        int scrollSize = internalRequest.getSource().source().size();
-        internalRequest.getSource().source().size(SIZE_ALL_MATCHES);
+        int scrollSize = internalRequest.getSearchRequest().source().size();
+        internalRequest.getSearchRequest().source().size(SIZE_ALL_MATCHES);
         /*
          * We can't send parseSearchRequest REST content that it doesn't support
          * so we will have to remove the content that is valid in addition to
@@ -95,7 +95,7 @@ protected void handleRequest(RestRequest request, RestChannel channel, Client cl
                 bodyContent = builder.bytes();
             }
         }
-        RestSearchAction.parseSearchRequest(internalRequest.getSource(), indicesQueriesRegistry, request,
+        RestSearchAction.parseSearchRequest(internalRequest.getSearchRequest(), indicesQueriesRegistry, request,
                 parseFieldMatcher, aggParsers, bodyContent);
 
         String conflicts = request.param("conflicts");
@@ -104,8 +104,8 @@ protected void handleRequest(RestRequest request, RestChannel channel, Client cl
         }
         parseCommon(internalRequest, request);
 
-        internalRequest.setSize(internalRequest.getSource().source().size());
-        internalRequest.getSource().source().size(request.paramAsInt("scroll_size", scrollSize));
+        internalRequest.setSize(internalRequest.getSearchRequest().source().size());
+        internalRequest.getSearchRequest().source().size(request.paramAsInt("scroll_size", scrollSize));
 
         execute(request, internalRequest, channel);
     }

modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportReindexAction.java

@@ -71,7 +71,7 @@ public TransportReindexAction(Settings settings, ThreadPool threadPool, ActionFi
 
     @Override
     protected void doExecute(Task task, ReindexRequest request, ActionListener<ReindexResponse> listener) {
-        validateAgainstAliases(request.getSource(), request.getDestination(), indexNameExpressionResolver, autoCreateIndex,
+        validateAgainstAliases(request.getSearchRequest(), request.getDestination(), indexNameExpressionResolver, autoCreateIndex,
                 clusterService.state());
         new AsyncIndexBySearchAction((BulkByScrollTask) task, logger, scriptService, client, threadPool, request, listener).start();
     }
@@ -117,7 +117,7 @@ static String validateAgainstAliases(SearchRequest source, IndexRequest destinat
     static class AsyncIndexBySearchAction extends AbstractAsyncBulkIndexByScrollAction<ReindexRequest, ReindexResponse> {
         public AsyncIndexBySearchAction(BulkByScrollTask task, ESLogger logger, ScriptService scriptService, Client client,
                 ThreadPool threadPool, ReindexRequest request, ActionListener<ReindexResponse> listener) {
-            super(task, logger, scriptService, client, threadPool, request, request.getSource(), listener);
+            super(task, logger, scriptService, client, threadPool, request, request.getSearchRequest(), listener);
         }
 
         @Override

modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportUpdateByQueryAction.java

@@ -78,7 +78,7 @@ protected void doExecute(UpdateByQueryRequest request, ActionListener<BulkIndexB
     static class AsyncIndexBySearchAction extends AbstractAsyncBulkIndexByScrollAction<UpdateByQueryRequest, BulkIndexByScrollResponse> {
         public AsyncIndexBySearchAction(BulkByScrollTask task, ESLogger logger, ScriptService scriptService, Client client,
                 ThreadPool threadPool, UpdateByQueryRequest request, ActionListener<BulkIndexByScrollResponse> listener) {
-            super(task, logger, scriptService, client, threadPool, request, request.getSource(), listener);
+            super(task, logger, scriptService, client, threadPool, request, request.getSearchRequest(), listener);
         }
 
         @Override

modules/reindex/src/test/java/org/elasticsearch/index/reindex/RoundTripTests.java

@@ -69,8 +69,8 @@ public void testUpdateByQueryRequest() throws IOException {
     }
 
     private void randomRequest(AbstractBulkIndexByScrollRequest<?> request) {
-        request.getSource().indices("test");
-        request.getSource().source().size(between(1, 1000));
+        request.getSearchRequest().indices("test");
+        request.getSearchRequest().source().size(between(1, 1000));
         request.setSize(random().nextBoolean() ? between(1, Integer.MAX_VALUE) : -1);
         request.setAbortOnVersionConflict(random().nextBoolean());
         request.setRefresh(rarely());
@@ -81,8 +81,8 @@ private void randomRequest(AbstractBulkIndexByScrollRequest<?> request) {
 
     private void assertRequestEquals(AbstractBulkIndexByScrollRequest<?> request,
             AbstractBulkIndexByScrollRequest<?> tripped) {
-        assertArrayEquals(request.getSource().indices(), tripped.getSource().indices());
-        assertEquals(request.getSource().source().size(), tripped.getSource().source().size());
+        assertArrayEquals(request.getSearchRequest().indices(), tripped.getSearchRequest().indices());
+        assertEquals(request.getSearchRequest().source().size(), tripped.getSearchRequest().source().size());
         assertEquals(request.isAbortOnVersionConflict(), tripped.isAbortOnVersionConflict());
         assertEquals(request.isRefresh(), tripped.isRefresh());
         assertEquals(request.getTimeout(), tripped.getTimeout());