rename DocumentRequest to DocumentWriteRequest

Author: areek

client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/RestNoopBulkAction.java

@@ -19,7 +19,7 @@
 package org.elasticsearch.plugin.noop.action.bulk;
 
 import org.elasticsearch.action.DocWriteResponse;
-import org.elasticsearch.action.DocumentRequest;
+import org.elasticsearch.action.DocumentWriteRequest;
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkShardRequest;
@@ -85,7 +85,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
     }
 
     private static class BulkRestBuilderListener extends RestBuilderListener<BulkRequest> {
-        private final BulkItemResponse ITEM_RESPONSE = new BulkItemResponse(1, DocumentRequest.OpType.UPDATE,
+        private final BulkItemResponse ITEM_RESPONSE = new BulkItemResponse(1, DocumentWriteRequest.OpType.UPDATE,
             new UpdateResponse(new ShardId("mock", "", 1), "mock_type", "1", 1L, DocWriteResponse.Result.CREATED));
 
         private final RestRequest request;

client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/TransportNoopBulkAction.java

@@ -20,7 +20,7 @@
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.DocWriteResponse;
-import org.elasticsearch.action.DocumentRequest;
+import org.elasticsearch.action.DocumentWriteRequest;
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkResponse;
@@ -35,7 +35,7 @@
 import org.elasticsearch.transport.TransportService;
 
 public class TransportNoopBulkAction extends HandledTransportAction<BulkRequest, BulkResponse> {
-    private static final BulkItemResponse ITEM_RESPONSE = new BulkItemResponse(1, DocumentRequest.OpType.UPDATE,
+    private static final BulkItemResponse ITEM_RESPONSE = new BulkItemResponse(1, DocumentWriteRequest.OpType.UPDATE,
         new UpdateResponse(new ShardId("mock", "", 1), "mock_type", "1", 1L, DocWriteResponse.Result.CREATED));
 
     @Inject

core/src/main/java/org/elasticsearch/action/DocumentRequest.java renamed to core/src/main/java/org/elasticsearch/action/DocumentWriteRequest.java

@@ -34,7 +34,7 @@
  * Generic interface to group ActionRequest, which perform writes to a single document
  * Action requests implementing this can be part of {@link org.elasticsearch.action.bulk.BulkRequest}
  */
-public abstract class DocumentRequest<T extends ReplicatedWriteRequest<T>> extends ReplicatedWriteRequest<T> {
+public abstract class DocumentWriteRequest<T extends ReplicatedWriteRequest<T>> extends ReplicatedWriteRequest<T> {
 
     /**
      * Get the type that this request operates on
@@ -153,7 +153,7 @@ public static OpType fromString(String sOpType) {
     }
 
     /** read a document write (index/delete/update) request */
-    public static DocumentRequest readDocumentRequest(StreamInput in) throws IOException {
+    public static DocumentWriteRequest readDocumentRequest(StreamInput in) throws IOException {
         byte type = in.readByte();
         if (type == 0) {
             IndexRequest indexRequest = new IndexRequest();
@@ -177,7 +177,7 @@ public static DocumentRequest readDocumentRequest(StreamInput in) throws IOExcep
     }
 
     /** write a document write (index/delete/update) request*/
-    public static void writeDocumentRequest(StreamOutput out, DocumentRequest request)  throws IOException {
+    public static void writeDocumentRequest(StreamOutput out, DocumentWriteRequest request)  throws IOException {
         if (request instanceof IndexRequest) {
             out.writeByte((byte) 0);
         } else if (request instanceof DeleteRequest) {

core/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java

@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.bulk;
 
-import org.elasticsearch.action.DocumentRequest;
+import org.elasticsearch.action.DocumentWriteRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
@@ -32,15 +32,15 @@
 public class BulkItemRequest implements Streamable {
 
     private int id;
-    private DocumentRequest<?> request;
+    private DocumentWriteRequest<?> request;
     private volatile BulkItemResponse primaryResponse;
     private volatile boolean ignoreOnReplica;
 
     BulkItemRequest() {
 
     }
 
-    public BulkItemRequest(int id, DocumentRequest<?> request) {
+    public BulkItemRequest(int id, DocumentWriteRequest<?> request) {
         this.id = id;
         this.request = request;
     }
@@ -49,7 +49,7 @@ public int id() {
         return id;
     }
 
-    public DocumentRequest<?> request() {
+    public DocumentWriteRequest<?> request() {
         return request;
     }
 
@@ -86,7 +86,7 @@ public static BulkItemRequest readBulkItem(StreamInput in) throws IOException {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         id = in.readVInt();
-        request = DocumentRequest.readDocumentRequest(in);
+        request = DocumentWriteRequest.readDocumentRequest(in);
         if (in.readBoolean()) {
             primaryResponse = BulkItemResponse.readBulkItem(in);
         }
@@ -96,7 +96,7 @@ public void readFrom(StreamInput in) throws IOException {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeVInt(id);
-        DocumentRequest.writeDocumentRequest(out, request);
+        DocumentWriteRequest.writeDocumentRequest(out, request);
         out.writeOptionalStreamable(primaryResponse);
         out.writeBoolean(ignoreOnReplica);
     }

core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java

@@ -23,7 +23,7 @@
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.DocWriteResponse;
-import org.elasticsearch.action.DocumentRequest.OpType;
+import org.elasticsearch.action.DocumentWriteRequest.OpType;
 import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.update.UpdateResponse;

core/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java

@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.bulk;
 
-import org.elasticsearch.action.DocumentRequest;
+import org.elasticsearch.action.DocumentWriteRequest;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.client.Client;
@@ -250,24 +250,24 @@ public synchronized boolean awaitClose(long timeout, TimeUnit unit) throws Inter
      * (for example, if no id is provided, one will be generated, or usage of the create flag).
      */
     public BulkProcessor add(IndexRequest request) {
-        return add((DocumentRequest<?>) request);
+        return add((DocumentWriteRequest<?>) request);
     }
 
     /**
      * Adds an {@link DeleteRequest} to the list of actions to execute.
      */
     public BulkProcessor add(DeleteRequest request) {
-        return add((DocumentRequest<?>) request);
+        return add((DocumentWriteRequest<?>) request);
     }
 
     /**
      * Adds either a delete or an index request.
      */
-    public BulkProcessor add(DocumentRequest<?> request) {
+    public BulkProcessor add(DocumentWriteRequest<?> request) {
         return add(request, null);
     }
 
-    public BulkProcessor add(DocumentRequest<?> request, @Nullable Object payload) {
+    public BulkProcessor add(DocumentWriteRequest<?> request, @Nullable Object payload) {
         internalAdd(request, payload);
         return this;
     }
@@ -282,7 +282,7 @@ protected void ensureOpen() {
         }
     }
 
-    private synchronized void internalAdd(DocumentRequest<?> request, @Nullable Object payload) {
+    private synchronized void internalAdd(DocumentWriteRequest<?> request, @Nullable Object payload) {
         ensureOpen();
         bulkRequest.add(request, payload);
         executeIfNeeded();

core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java

@@ -22,7 +22,7 @@
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.CompositeIndicesRequest;
-import org.elasticsearch.action.DocumentRequest;
+import org.elasticsearch.action.DocumentWriteRequest;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.index.IndexRequest;
@@ -72,7 +72,7 @@ public class BulkRequest extends ActionRequest<BulkRequest> implements Composite
      * {@link WriteRequest}s to this but java doesn't support syntax to declare that everything in the array has both types so we declare
      * the one with the least casts.
      */
-    final List<DocumentRequest<?>> requests = new ArrayList<>();
+    final List<DocumentWriteRequest<?>> requests = new ArrayList<>();
     List<Object> payloads = null;
 
     protected TimeValue timeout = BulkShardRequest.DEFAULT_TIMEOUT;
@@ -87,14 +87,14 @@ public BulkRequest() {
     /**
      * Adds a list of requests to be executed. Either index or delete requests.
      */
-    public BulkRequest add(DocumentRequest<?>... requests) {
-        for (DocumentRequest<?> request : requests) {
+    public BulkRequest add(DocumentWriteRequest<?>... requests) {
+        for (DocumentWriteRequest<?> request : requests) {
             add(request, null);
         }
         return this;
     }
 
-    public BulkRequest add(DocumentRequest<?> request) {
+    public BulkRequest add(DocumentWriteRequest<?> request) {
         return add(request, null);
     }
 
@@ -104,7 +104,7 @@ public BulkRequest add(DocumentRequest<?> request) {
      * @param payload Optional payload
      * @return the current bulk request
      */
-    public BulkRequest add(DocumentRequest<?> request, @Nullable Object payload) {
+    public BulkRequest add(DocumentWriteRequest<?> request, @Nullable Object payload) {
         if (request instanceof IndexRequest) {
             add((IndexRequest) request, payload);
         } else if (request instanceof DeleteRequest) {
@@ -120,8 +120,8 @@ public BulkRequest add(DocumentRequest<?> request, @Nullable Object payload) {
     /**
      * Adds a list of requests to be executed. Either index or delete requests.
      */
-    public BulkRequest add(Iterable<DocumentRequest<?>> requests) {
-        for (DocumentRequest<?> request : requests) {
+    public BulkRequest add(Iterable<DocumentWriteRequest<?>> requests) {
+        for (DocumentWriteRequest<?> request : requests) {
             add(request);
         }
         return this;
@@ -207,7 +207,7 @@ private void addPayload(Object payload) {
     /**
      * The list of requests in this bulk request.
      */
-    public List<DocumentRequest<?>> requests() {
+    public List<DocumentWriteRequest<?>> requests() {
         return this.requests;
     }
 
@@ -508,7 +508,7 @@ private int findNextMarker(byte marker, int from, BytesReference data, int lengt
      * @return Whether this bulk request contains index request with an ingest pipeline enabled.
      */
     public boolean hasIndexRequestsWithPipelines() {
-        for (DocumentRequest<?> actionRequest : requests) {
+        for (DocumentWriteRequest<?> actionRequest : requests) {
             if (actionRequest instanceof IndexRequest) {
                 IndexRequest indexRequest = (IndexRequest) actionRequest;
                 if (Strings.hasText(indexRequest.getPipeline())) {
@@ -526,7 +526,7 @@ public ActionRequestValidationException validate() {
         if (requests.isEmpty()) {
             validationException = addValidationError("no requests added", validationException);
         }
-        for (DocumentRequest<?> request : requests) {
+        for (DocumentWriteRequest<?> request : requests) {
             // We first check if refresh has been set
             if (request.getRefreshPolicy() != RefreshPolicy.NONE) {
                 validationException = addValidationError(
@@ -550,7 +550,7 @@ public void readFrom(StreamInput in) throws IOException {
         waitForActiveShards = ActiveShardCount.readFrom(in);
         int size = in.readVInt();
         for (int i = 0; i < size; i++) {
-            requests.add(DocumentRequest.readDocumentRequest(in));
+            requests.add(DocumentWriteRequest.readDocumentRequest(in));
         }
         refreshPolicy = RefreshPolicy.readFrom(in);
         timeout = new TimeValue(in);
@@ -561,8 +561,8 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         waitForActiveShards.writeTo(out);
         out.writeVInt(requests.size());
-        for (DocumentRequest<?> request : requests) {
-            DocumentRequest.writeDocumentRequest(out, request);
+        for (DocumentWriteRequest<?> request : requests) {
+            DocumentWriteRequest.writeDocumentRequest(out, request);
         }
         refreshPolicy.writeTo(out);
         timeout.writeTo(out);