DATAES-18 : Add Support to specify Index Name and type in Delete Query

Author: mohsinh

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java

@@ -201,6 +201,13 @@ public interface ElasticsearchOperations {
 	 */
 	<T> void delete(DeleteQuery query, Class<T> clazz);
 
+	/**
+     * Delete all records matching the query
+     *
+     * @param query
+     */
+    void delete(DeleteQuery query);
+
 	/**
 	 * Deletes an index for given entity
 	 *

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java

@@ -295,6 +295,14 @@ public <T> void delete(DeleteQuery deleteQuery, Class<T> clazz) {
                 .setQuery(deleteQuery.getQuery()).execute().actionGet();
     }
 
+    @Override
+    public void delete(DeleteQuery deleteQuery) {
+        Assert.notNull(deleteQuery.getIndex(), "No index defined for Query");
+        Assert.notNull(deleteQuery.getType(), "No type define for Query");
+        client.prepareDeleteByQuery(deleteQuery.getIndex()).setTypes(deleteQuery.getType())
+                .setQuery(deleteQuery.getQuery()).execute().actionGet();
+    }
+
     @Override
     public String scan(SearchQuery searchQuery, long scrollTimeInMillis, boolean noFields) {
         Assert.notNull(searchQuery.getIndices(), "No index defined for Query");

src/main/java/org/springframework/data/elasticsearch/core/query/DeleteQuery.java

@@ -19,19 +19,37 @@
 
 /**
  * DeleteQuery
- * 
+ *
  * @author Rizwan Idrees
  * @author Mohsin Husen
  */
 public class DeleteQuery {
 
 	private QueryBuilder query;
+    private String index;
+    private String type;
 
 	public QueryBuilder getQuery() {
 		return query;
 	}
 
 	public void setQuery(QueryBuilder query) {
 		this.query = query;
+    }
+
+    public String getIndex() {
+        return index;
+    }
+
+    public void setIndex(String index) {
+        this.index = index;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
 	}
 }

src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java

@@ -849,4 +849,31 @@ public void shouldDeleteSpecifiedTypeFromAnIndex() {
         boolean typeExists = elasticsearchTemplate.typeExists("test-index", "test-type");
         assertThat(typeExists, is(false));
     }
+
+    @Test
+    public void shouldDeleteDocumentBySpecifiedTypeUsingDeleteQuery(){
+        // given
+        String documentId = randomNumeric(5);
+        SampleEntity sampleEntity = new SampleEntity();
+        sampleEntity.setId(documentId);
+        sampleEntity.setMessage("some message");
+        sampleEntity.setVersion(System.currentTimeMillis());
+
+        IndexQuery indexQuery = new IndexQuery();
+        indexQuery.setId(documentId);
+        indexQuery.setObject(sampleEntity);
+
+        elasticsearchTemplate.index(indexQuery);
+        // when
+        DeleteQuery deleteQuery = new DeleteQuery();
+        deleteQuery.setQuery(fieldQuery("id", documentId));
+        deleteQuery.setIndex("test-index");
+        deleteQuery.setType("test-type");
+        elasticsearchTemplate.delete(deleteQuery);
+        // then
+        SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(fieldQuery("id", documentId)).build();
+        Page<SampleEntity> sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class);
+        assertThat(sampleEntities.getTotalElements(), equalTo(0L));
+    }
+
 }