From 32d292b3c29c8623b8fd24dcc26a2969cf75faa2 Mon Sep 17 00:00:00 2001
From: Kunal Kapoor <kunalkapoor642@gmail.com>
Date: Thu, 2 Mar 2017 21:22:21 +0530
Subject: [PATCH] Added types options to DeleteByQueryRequest (#23265)

Add types setter and getter to `DeleteByQueryRequest`, which delegate to the inner `SearchRequest`.
---
 .../bulk/byscroll/DeleteByQueryRequest.java   | 12 +++++++++
 .../byscroll/DeleteByQueryRequestTests.java   | 26 +++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/action/bulk/byscroll/DeleteByQueryRequest.java b/core/src/main/java/org/elasticsearch/action/bulk/byscroll/DeleteByQueryRequest.java
index 4c261f471f2..f625152d407 100644
--- a/core/src/main/java/org/elasticsearch/action/bulk/byscroll/DeleteByQueryRequest.java
+++ b/core/src/main/java/org/elasticsearch/action/bulk/byscroll/DeleteByQueryRequest.java
@@ -111,4 +111,16 @@ public class DeleteByQueryRequest extends AbstractBulkByScrollRequest<DeleteByQu
         assert getSearchRequest() != null;
         return getSearchRequest().indicesOptions();
     }
+
+    public String[] types() {
+        assert getSearchRequest() != null;
+        return getSearchRequest().types();
+    }
+
+    public DeleteByQueryRequest types(String... types) {
+        assert getSearchRequest() != null;
+        getSearchRequest().types(types);
+        return this;
+    }
+
 }
diff --git a/core/src/test/java/org/elasticsearch/action/bulk/byscroll/DeleteByQueryRequestTests.java b/core/src/test/java/org/elasticsearch/action/bulk/byscroll/DeleteByQueryRequestTests.java
index ac7976e95c5..373ee7ab53c 100644
--- a/core/src/test/java/org/elasticsearch/action/bulk/byscroll/DeleteByQueryRequestTests.java
+++ b/core/src/test/java/org/elasticsearch/action/bulk/byscroll/DeleteByQueryRequestTests.java
@@ -19,8 +19,6 @@
 
 package org.elasticsearch.action.bulk.byscroll;
 
-import org.elasticsearch.action.bulk.byscroll.AbstractBulkByScrollRequestTestCase;
-import org.elasticsearch.action.bulk.byscroll.DeleteByQueryRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.support.IndicesOptions;
 
@@ -74,4 +72,28 @@ public class DeleteByQueryRequestTests extends AbstractBulkByScrollRequestTestCa
     protected void extraForSliceAssertions(DeleteByQueryRequest original, DeleteByQueryRequest forSliced) {
         // No extra assertions needed
     }
+
+    public void testTypesGetter() {
+        int numTypes = between(1, 50);
+        String[] types = new String[numTypes];
+        for (int i = 0; i < numTypes; i++) {
+            types[i] = randomSimpleString(random(), 1, 30);
+        }
+        SearchRequest searchRequest = new SearchRequest();
+        searchRequest.types(types);
+        DeleteByQueryRequest request = new DeleteByQueryRequest(searchRequest);
+        assertArrayEquals(request.types(), types);
+    }
+
+    public void testTypesSetter() {
+        int numTypes = between(1, 50);
+        String[] types = new String[numTypes];
+        for (int i = 0; i < numTypes; i++) {
+            types[i] = randomSimpleString(random(), 1, 30);
+        }
+        SearchRequest searchRequest = new SearchRequest();
+        DeleteByQueryRequest request = new DeleteByQueryRequest(searchRequest);
+        request.types(types);
+        assertArrayEquals(request.types(), types);
+    }
 }