DATAES-631 - refactoring delete queries.

Author: sothawo

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

@@ -418,29 +418,30 @@ default void bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index) {
 	/**
 	 * Delete the one object with provided id
 	 *
-	 * @param indexName
-	 * @param type
 	 * @param id
+	 * @param index
 	 * @return documentId of the document deleted
 	 */
-	String delete(String indexName, String type, String id);
+	String delete(String id, IndexCoordinates index);
 
 	/**
-	 * Delete all records matching the criteria
+	 * Delete the one object with provided id
 	 *
+	 * @param id
 	 * @param clazz
-	 * @param criteriaQuery
+	 * @return documentId of the document deleted
 	 */
-	<T> void delete(CriteriaQuery criteriaQuery, Class<T> clazz);
+	default String delete(String id, Class<?> clazz) {
+		return delete(id, getIndexCoordinatesFor(clazz));
+	}
 
 	/**
-	 * Delete the one object with provided id
+	 * Delete all records matching the criteria
 	 *
 	 * @param clazz
-	 * @param id
-	 * @return documentId of the document deleted
+	 * @param criteriaQuery
 	 */
-	<T> String delete(Class<T> clazz, String id);
+	<T> void delete(CriteriaQuery criteriaQuery, Class<T> clazz);
 
 	/**
 	 * Delete all records matching the query

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

@@ -675,21 +675,15 @@ public boolean deleteIndex(String indexName) {
 	}
 
 	@Override
-	public String delete(String indexName, String type, String id) {
-		DeleteRequest request = new DeleteRequest(indexName, type, id);
+	public String delete(String id, IndexCoordinates index) {
+		DeleteRequest request = new DeleteRequest(index.getIndexName(), index.getTypeName(), id);
 		try {
 			return client.delete(request, RequestOptions.DEFAULT).getId();
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error while deleting item request: " + request.toString(), e);
 		}
 	}
 
-	@Override
-	public <T> String delete(Class<T> clazz, String id) {
-		ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz);
-		return delete(persistentEntity.getIndexName(), persistentEntity.getIndexType(), id);
-	}
-
 	@Override
 	public <T> void delete(DeleteQuery deleteQuery, Class<T> clazz) {
 

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

@@ -47,7 +47,6 @@
 import org.elasticsearch.action.search.MultiSearchResponse;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.Client;
@@ -389,8 +388,7 @@ private <T> CloseableIterator<T> doStream(long scrollTimeInMillis, ScrolledPage<
 	@Override
 	public long count(Query query, @Nullable Class<?> clazz, IndexCoordinates index) {
 		Assert.notNull(index, "index must not be null");
-		SearchRequestBuilder searchRequestBuilder = requestFactory.searchRequestBuilderFor(client, query, clazz,
-				index);
+		SearchRequestBuilder searchRequestBuilder = requestFactory.searchRequestBuilderFor(client, query, clazz, index);
 		searchRequestBuilder.setSize(0);
 
 		return SearchHitsUtil.getTotalCount(searchRequestBuilder.execute().actionGet().getHits());
@@ -447,7 +445,6 @@ public UpdateResponse update(UpdateQuery query, IndexCoordinates index) {
 		return updateRequestBuilder.execute().actionGet();
 	}
 
-
 	@Override
 	public void bulkIndex(List<IndexQuery> queries, BulkOptions bulkOptions) {
 
@@ -544,14 +541,8 @@ public boolean deleteIndex(String indexName) {
 	}
 
 	@Override
-	public String delete(String indexName, String type, String id) {
-		return client.prepareDelete(indexName, type, id).execute().actionGet().getId();
-	}
-
-	@Override
-	public <T> String delete(Class<T> clazz, String id) {
-		ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz);
-		return delete(persistentEntity.getIndexName(), persistentEntity.getIndexType(), id);
+	public String delete(String id, IndexCoordinates index) {
+		return client.prepareDelete(index.getIndexName(), index.getTypeName(), id).execute().actionGet().getId();
 	}
 
 	@Override

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

@@ -22,6 +22,7 @@
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Peter-Josef Meisch
  */
 public class DeleteQuery {
 
@@ -39,18 +40,22 @@ public void setQuery(QueryBuilder query) {
 		this.query = query;
 	}
 
+	@Deprecated
 	public String getIndex() {
 		return index;
 	}
 
+	@Deprecated
 	public void setIndex(String index) {
 		this.index = index;
 	}
 
+	@Deprecated
 	public String getType() {
 		return type;
 	}
 
+	@Deprecated
 	public void setType(String type) {
 		this.type = type;
 	}

src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java

@@ -278,9 +278,9 @@ public void deleteById(ID id) {
 
 		Assert.notNull(id, "Cannot delete entity with id 'null'.");
 
-		elasticsearchOperations.delete(entityInformation.getIndexName(), entityInformation.getType(),
-				stringIdRepresentation(id));
-		elasticsearchOperations.refresh(entityInformation.getIndexName());
+		IndexCoordinates indexCoordinates = getIndexCoordinates();
+		elasticsearchOperations.delete(stringIdRepresentation(id), indexCoordinates);
+		elasticsearchOperations.refresh(indexCoordinates.getIndexName());
 	}
 
 	@Override

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

@@ -428,7 +428,7 @@ public void shouldDeleteDocumentForGivenId() {
 		elasticsearchTemplate.index(indexQuery);
 
 		// when
-		elasticsearchTemplate.delete(INDEX_NAME_SAMPLE_ENTITY, TYPE_NAME, documentId);
+		elasticsearchTemplate.delete(documentId, indexCoordinates);
 		elasticsearchTemplate.refresh(SampleEntity.class);
 
 		// then
@@ -450,7 +450,7 @@ public void shouldDeleteEntityForGivenId() {
 		elasticsearchTemplate.index(indexQuery);
 
 		// when
-		elasticsearchTemplate.delete(SampleEntity.class, documentId);
+		elasticsearchTemplate.delete(documentId, indexCoordinates);
 		elasticsearchTemplate.refresh(SampleEntity.class);
 
 		// then
@@ -2426,7 +2426,7 @@ public void shouldDeleteDocumentForGivenIdOnly() {
 		elasticsearchTemplate.refresh(SampleEntity.class);
 
 		// when
-		elasticsearchTemplate.delete(SampleEntity.class, documentIdToDelete);
+		elasticsearchTemplate.delete(documentIdToDelete, indexCoordinates);
 		elasticsearchTemplate.refresh(SampleEntity.class);
 
 		// then