Remove deprecated methods.

src/main/antora/modules/ROOT/pages/migration-guides/migration-guide-5.4-5.5.adoc

@@ -20,3 +20,11 @@ Some classes that probably are not used by a library user have been renamed, the
 |===
 
 === Removals
+
+The following methods that had been deprecated since release 5.3 have been removed:
+```
+DocumentOperations.delete(Query, Class<?>)
+DocumentOperations.delete(Query, Class<?>, IndexCoordinates)
+ReactiveDocumentOperations.delete(Query, Class<?>)
+ReactiveDocumentOperations.delete(Query, Class<?>, IndexCoordinates)
+```

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java

@@ -181,19 +181,6 @@ public ByQueryResponse delete(DeleteQuery query, Class<?> clazz) {
 		return delete(query, clazz, getIndexCoordinatesFor(clazz));
 	}
 
-	@Override
-	public ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index) {
-
-		Assert.notNull(query, "query must not be null");
-
-		DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, routingResolver.getRouting(),
-				clazz, index, getRefreshPolicy());
-
-		DeleteByQueryResponse response = execute(client -> client.deleteByQuery(request));
-
-		return responseConverter.byQueryResponse(response);
-	}
-
 	@Override
 	public ByQueryResponse delete(DeleteQuery query, Class<?> clazz, IndexCoordinates index) {
 		Assert.notNull(query, "query must not be null");

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java

@@ -167,16 +167,6 @@ protected Mono<Boolean> doExists(String id, IndexCoordinates index) {
 				.onErrorReturn(NoSuchIndexException.class, false);
 	}
 
-	@Override
-	public Mono<ByQueryResponse> delete(Query query, Class<?> entityType, IndexCoordinates index) {
-
-		Assert.notNull(query, "query must not be null");
-
-		DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, routingResolver.getRouting(),
-				entityType, index, getRefreshPolicy());
-		return Mono.from(execute(client -> client.deleteByQuery(request))).map(responseConverter::byQueryResponse);
-	}
-
 	@Override
 	public Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType, IndexCoordinates index) {
 		Assert.notNull(query, "query must not be null");

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

@@ -298,12 +298,6 @@ public String delete(String id, Class<?> entityType) {
 		return this.delete(id, getIndexCoordinatesFor(entityType));
 	}
 
-	@Override
-	@Deprecated
-	public ByQueryResponse delete(Query query, Class<?> clazz) {
-		return delete(query, clazz, getIndexCoordinatesFor(clazz));
-	}
-
 	@Override
 	public String delete(Object entity) {
 		return delete(entity, getIndexCoordinatesFor(entity.getClass()));

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

@@ -408,12 +408,6 @@ public Mono<String> delete(String id, IndexCoordinates index) {
 
 	abstract protected Mono<String> doDeleteById(String id, @Nullable String routing, IndexCoordinates index);
 
-	@Override
-	@Deprecated
-	public Mono<ByQueryResponse> delete(Query query, Class<?> entityType) {
-		return delete(query, entityType, getIndexCoordinatesFor(entityType));
-	}
-
 	@Override
 	public Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType) {
 		return delete(query, entityType, getIndexCoordinatesFor(entityType));

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

@@ -272,19 +272,6 @@ default void bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index) {
 	 */
 	String delete(Object entity, IndexCoordinates index);
 
-	/**
-	 * Delete all records matching the query.
-	 *
-	 * @param query query defining the objects
-	 * @param clazz The entity class, must be annotated with
-	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
-	 * @return response with detailed information
-	 * @since 4.1
-	 * @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class)}
-	 */
-	@Deprecated
-	ByQueryResponse delete(Query query, Class<?> clazz);
-
 	/**
 	 * Delete all records matching the query.
 	 *
@@ -296,19 +283,6 @@ default void bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index) {
 	 */
 	ByQueryResponse delete(DeleteQuery query, Class<?> clazz);
 
-	/**
-	 * Delete all records matching the query.
-	 *
-	 * @param query query defining the objects
-	 * @param clazz The entity class, must be annotated with
-	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
-	 * @param index the index from which to delete
-	 * @return response with detailed information
-	 * @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class, IndexCoordinates)}
-	 */
-	@Deprecated
-	ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index);
-
 	/**
 	 * Delete all records matching the query.
 	 *

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

@@ -326,17 +326,6 @@ default Mono<Void> bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index)
 	 */
 	Mono<String> delete(String id, Class<?> entityType);
 
-	/**
-	 * Delete the documents matching the given {@link Query} extracting index from entity metadata.
-	 *
-	 * @param query must not be {@literal null}.
-	 * @param entityType must not be {@literal null}.
-	 * @return a {@link Mono} emitting the number of the removed documents.
-	 * @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class)}
-	 */
-	@Deprecated
-	Mono<ByQueryResponse> delete(Query query, Class<?> entityType);
-
 	/**
 	 * Delete the documents matching the given {@link Query} extracting index from entity metadata.
 	 *
@@ -347,18 +336,6 @@ default Mono<Void> bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index)
 	 */
 	Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType);
 
-	/**
-	 * Delete the documents matching the given {@link Query} extracting index from entity metadata.
-	 *
-	 * @param query must not be {@literal null}.
-	 * @param entityType must not be {@literal null}.
-	 * @param index the target index, must not be {@literal null}
-	 * @return a {@link Mono} emitting the number of the removed documents.
-	 * @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class, IndexCoordinates)}
-	 */
-	@Deprecated
-	Mono<ByQueryResponse> delete(Query query, Class<?> entityType, IndexCoordinates index);
-
 	/**
 	 * Delete the documents matching the given {@link Query} extracting index from entity metadata.
 	 *

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

@@ -384,7 +384,7 @@ private void doDelete(@Nullable ID id, @Nullable String routing, IndexCoordinate
 	public void deleteAll() {
 
 		executeAndRefresh((OperationsCallback<Void>) operations -> {
-			operations.delete(Query.findAll(), entityClass, getIndexCoordinates());
+			operations.delete(DeleteQuery.builder(Query.findAll()).build(), entityClass, getIndexCoordinates());
 			return null;
 		});
 	}