diff --git a/src/main/antora/modules/ROOT/pages/migration-guides/migration-guide-5.4-5.5.adoc b/src/main/antora/modules/ROOT/pages/migration-guides/migration-guide-5.4-5.5.adoc index 494f6601f..38b2b4af2 100644 --- a/src/main/antora/modules/ROOT/pages/migration-guides/migration-guide-5.4-5.5.adoc +++ b/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) +``` diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java index 58230a3a2..70b76bc5b 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java +++ b/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"); diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java index f2d2cc158..78bd2213a 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java @@ -167,16 +167,6 @@ protected Mono doExists(String id, IndexCoordinates index) { .onErrorReturn(NoSuchIndexException.class, false); } - @Override - public Mono 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 delete(DeleteQuery query, Class entityType, IndexCoordinates index) { Assert.notNull(query, "query must not be null"); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java index 387d26e6b..d6074a4fa 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java +++ b/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())); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java index efa91084f..3fee5f2db 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java @@ -408,12 +408,6 @@ public Mono delete(String id, IndexCoordinates index) { abstract protected Mono doDeleteById(String id, @Nullable String routing, IndexCoordinates index); - @Override - @Deprecated - public Mono delete(Query query, Class entityType) { - return delete(query, entityType, getIndexCoordinatesFor(entityType)); - } - @Override public Mono delete(DeleteQuery query, Class entityType) { return delete(query, entityType, getIndexCoordinatesFor(entityType)); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/DocumentOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/DocumentOperations.java index 84f855ef5..d855b0a6a 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/DocumentOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/DocumentOperations.java @@ -272,19 +272,6 @@ default void bulkUpdate(List 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 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. * diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveDocumentOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveDocumentOperations.java index 4614f6d25..dba06262c 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveDocumentOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveDocumentOperations.java @@ -326,17 +326,6 @@ default Mono bulkUpdate(List queries, IndexCoordinates index) */ Mono 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 delete(Query query, Class entityType); - /** * Delete the documents matching the given {@link Query} extracting index from entity metadata. * @@ -347,18 +336,6 @@ default Mono bulkUpdate(List queries, IndexCoordinates index) */ Mono 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 delete(Query query, Class entityType, IndexCoordinates index); - /** * Delete the documents matching the given {@link Query} extracting index from entity metadata. * diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java index e58d9cc76..54a0928cc 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java +++ b/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) operations -> { - operations.delete(Query.findAll(), entityClass, getIndexCoordinates()); + operations.delete(DeleteQuery.builder(Query.findAll()).build(), entityClass, getIndexCoordinates()); return null; }); }