Update to Spring Data Elasticsearch 5.5 (#433)

reta · andrross · web-flow · commit e77c0019179c · 2025-05-20T20:56:38.000-04:00
* Update to Spring Data Elasticsearch 5.5

Signed-off-by: Andriy Redko &lt;drreta@gmail.com&gt;

* Update settings.gradle.kts

---------

Signed-off-by: Andriy Redko &lt;drreta@gmail.com&gt;
Signed-off-by: Andrew Ross &lt;andrross@amazon.com&gt;
Co-authored-by: Andrew Ross &lt;andrross@amazon.com&gt;
diff --git a/README.md b/README.md
@@ -24,6 +24,7 @@ The Spring Data OpenSearch follows the release model of the Spring Data Elastics
 
 | Spring Data Release Train | Spring Data OpenSearch | Spring Data Elasticsearch | OpenSearch Server | OpenSearch Client | Spring Framework | Spring Boot   |
 |---------------------------|------------------------|---------------------------|-------------------|-------------------|------------------|---------------|
+| 2025.0                    | 1.7.x                  | 5.5.x                     | 1.x / 2.x         | 2.10.x and above  | 6.2.x            | 3.4.x         |
 | 2024.1                    | 1.6.x                  | 5.4.x                     | 1.x / 2.x         | 2.10.x and above  | 6.2.x            | 3.4.x         |
 | 2024.0                    | 1.5.x                  | 5.3.x                     | 1.x / 2.x         | 2.10.x and above  | 6.1.x            | 3.2.x / 3.3.x |
 | 2023.1 (Vaughan)          | 1.4.x                  | 5.2.x                     | 1.x / 2.x         | 2.10.x and above  | 6.1.x            | 3.2.x         |
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -18,8 +18,8 @@ dependencyResolutionManagement {
     create("springLibs") {
       version("spring", "6.2.7")
       version("spring-boot", "3.4.5")
-      library("data-commons", "org.springframework.data:spring-data-commons:3.4.6")
-      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.4.6")
+      library("data-commons", "org.springframework.data:spring-data-commons:3.5.0")
+      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.0")
       library("web", "org.springframework", "spring-web").versionRef("spring")
       library("context", "org.springframework", "spring-context").versionRef("spring")
       library("tx", "org.springframework", "spring-tx").versionRef("spring")
diff --git a/spring-data-opensearch/src/main/java/org/opensearch/data/client/orhlc/OpenSearchRestTemplate.java b/spring-data-opensearch/src/main/java/org/opensearch/data/client/orhlc/OpenSearchRestTemplate.java
@@ -227,14 +227,6 @@ protected String doDelete(String id, @Nullable String routing, IndexCoordinates
         return execute(client -> client.delete(request, RequestOptions.DEFAULT).getId());
     }
 
-    @Override
-    public ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index) {
-        DeleteByQueryRequest deleteByQueryRequest =
-                requestFactory.deleteByQueryRequest(query, routingResolver.getRouting(), clazz, index, this.refreshPolicy);
-        return ResponseConverter.byQueryResponseOf(
-                execute(client -> client.deleteByQuery(deleteByQueryRequest, RequestOptions.DEFAULT)));
-    }
-
     @Override
     public ByQueryResponse delete(DeleteQuery query, Class<?> clazz) {
         return delete(query, clazz, getIndexCoordinatesFor(clazz));
diff --git a/spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/OpenSearchTemplate.java b/spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/OpenSearchTemplate.java
@@ -197,19 +197,6 @@ public ByQueryResponse delete(DeleteQuery query, Class<?> clazz, IndexCoordinate
         return responseConverter.byQueryResponse(response);
     }
 
-    @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 UpdateResponse update(UpdateQuery updateQuery, IndexCoordinates index) {
 
diff --git a/spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/ResponseConverter.java b/spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/ResponseConverter.java
@@ -388,7 +388,6 @@ public ReindexResponse reindexResponse(org.opensearch.client.opensearch.core.Rei
     private ReindexResponse.Failure reindexResponseFailureOf(BulkIndexByScrollFailure failure) {
         return ReindexResponse.Failure.builder() //
                 .withIndex(failure.index()) //
-                .withType(failure.type()) //
                 .withId(failure.id()) //
                 .withStatus(failure.status())//
                 .withErrorCause(toErrorCause(failure.cause())) //
@@ -399,7 +398,6 @@ private ReindexResponse.Failure reindexResponseFailureOf(BulkIndexByScrollFailur
     private ByQueryResponse.Failure byQueryResponseFailureOf(BulkIndexByScrollFailure failure) {
         return ByQueryResponse.Failure.builder() //
                 .withIndex(failure.index()) //
-                .withType(failure.type()) //
                 .withId(failure.id()) //
                 .withStatus(failure.status())//
                 .withErrorCause(toErrorCause(failure.cause())).build();
diff --git a/spring-data-opensearch/src/test/java/org/opensearch/data/client/orhlc/OpenSearchORHLCIntegrationTests.java b/spring-data-opensearch/src/test/java/org/opensearch/data/client/orhlc/OpenSearchORHLCIntegrationTests.java
@@ -15,6 +15,7 @@
 
 import java.time.Duration;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import org.json.JSONException;
@@ -44,6 +45,7 @@
 import org.springframework.data.elasticsearch.core.RefreshPolicy;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.DeleteQuery;
 import org.springframework.data.elasticsearch.core.query.FetchSourceFilterBuilder;
 import org.springframework.data.elasticsearch.core.query.IndicesOptions;
 import org.springframework.data.elasticsearch.core.query.Query;
@@ -77,6 +79,11 @@ protected Query getTermQuery(String field, String value) {
         return new NativeSearchQueryBuilder().withQuery(termQuery(field, value)).build();
     }
 
+    @Override
+    protected DeleteQuery getDeleteQuery(Query query) {
+        return DeleteQuery.builder(query).setExpandWildcards(EnumSet.of(IndicesOptions.WildcardStates.OPEN)).build();
+    }
+
     @Override
     protected BaseQueryBuilder<?, ?> getBuilderWithTermQuery(String field, String value) {
         return new NativeSearchQueryBuilder().withQuery(termQuery(field, value));
diff --git a/spring-data-opensearch/src/test/java/org/opensearch/data/client/osc/OpenSearchOSCIntegrationTests.java b/spring-data-opensearch/src/test/java/org/opensearch/data/client/osc/OpenSearchOSCIntegrationTests.java
@@ -38,6 +38,7 @@
 import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.DeleteQuery;
 import org.springframework.data.elasticsearch.core.query.FetchSourceFilterBuilder;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
@@ -99,6 +100,11 @@ protected Query getTermQuery(String field, String value) {
         return NativeQuery.builder().withQuery(termQueryAsQuery(field, value)).build();
     }
 
+    @Override
+    protected DeleteQuery getDeleteQuery(Query query) {
+        return DeleteQuery.builder(query).build();
+    }
+
     @Override
     protected BaseQueryBuilder<?, ?> getBuilderWithMatchAllQuery() {
         return Queries.getBuilderWithMatchAllQuery();
diff --git a/spring-data-opensearch/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java b/spring-data-opensearch/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java
@@ -576,7 +576,7 @@ public void shouldDeleteDocumentForGivenQuery() {
 
 		// when
 		Query query = getTermQuery("id", documentId);
-		operations.delete(query, SampleEntity.class, IndexCoordinates.of(indexNameProvider.indexName()));
+		operations.delete(DeleteQuery.builder(query).build(), SampleEntity.class, IndexCoordinates.of(indexNameProvider.indexName()));
 
 		// then
 		Query searchQuery = getTermQuery("id", documentId);
@@ -607,14 +607,17 @@ public void shouldDeleteAcrossIndex() {
 
 		// when
 		Query query = getTermQuery("message", "foo");
-		operations.delete(query, SampleEntity.class, IndexCoordinates.of(MULTI_INDEX_ALL));
+		operations.delete(getDeleteQuery(query),
+		    SampleEntity.class, IndexCoordinates.of(MULTI_INDEX_ALL));
 
 		// then
 		assertThat(operations.count(query, IndexCoordinates.of(MULTI_INDEX_1_NAME, MULTI_INDEX_2_NAME))).isEqualTo(0);
 		operations.indexOps(IndexCoordinates.of(MULTI_INDEX_PREFIX)).delete();
 	}
 
 	protected abstract Query getTermQuery(String field, String value);
+	
+	protected abstract DeleteQuery getDeleteQuery(Query query);
 
 	@Test // DATAES-547
 	public void shouldDeleteAcrossIndexWhenNoMatchingDataPresent() {
@@ -638,7 +641,8 @@ public void shouldDeleteAcrossIndexWhenNoMatchingDataPresent() {
 		// when
 		Query query = getTermQuery("message", "negative");
 
-		operations.delete(query, SampleEntity.class, IndexCoordinates.of("test-index-*"));
+		operations.delete(getDeleteQuery(query),
+		    SampleEntity.class, IndexCoordinates.of("test-index-*"));
 
 		operations.indexOps(IndexCoordinates.of(MULTI_INDEX_1_NAME)).refresh();
 		operations.indexOps(IndexCoordinates.of(MULTI_INDEX_2_NAME)).refresh();
@@ -1001,7 +1005,7 @@ public void shouldDeleteGivenCriteriaQuery() {
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").contains("test"));
 
 		// when
-		operations.delete(criteriaQuery, SampleEntity.class, IndexCoordinates.of(indexNameProvider.indexName()));
+		operations.delete(DeleteQuery.builder(criteriaQuery).build(), SampleEntity.class, IndexCoordinates.of(indexNameProvider.indexName()));
 
 		// then
 		StringQuery stringQuery = new StringQuery(matchAllQuery().toString());
@@ -2433,7 +2437,7 @@ public void shouldDeleteOnlyDocumentsMatchedByDeleteQuery() {
 
 		// when
 		Query query = operations.idsQuery(Arrays.asList(documentIdToDelete));
-		operations.delete(query, SampleEntity.class, IndexCoordinates.of(indexNameProvider.indexName()));
+		operations.delete(DeleteQuery.builder(query).build(), SampleEntity.class, IndexCoordinates.of(indexNameProvider.indexName()));
 
 		// then
 		// document with id "remainingDocumentId" should still be indexed
@@ -2463,7 +2467,8 @@ public void shouldDeleteOnlyDocumentsMatchedByCriteriaQuery() {
 
 		// when
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("id").is(documentIdToDelete));
-		operations.delete(criteriaQuery, SampleEntity.class, IndexCoordinates.of(indexNameProvider.indexName()));
+		operations.delete(DeleteQuery.builder(criteriaQuery).build(), SampleEntity.class,
+		    IndexCoordinates.of(indexNameProvider.indexName()));
 
 		// then
 		// document with id "remainingDocumentId" should still be indexed
@@ -3374,7 +3379,7 @@ private void shouldUpdateEntityWithJoinFields(String qId1, String qId2, String a
 
 	private void shouldDeleteEntityWithJoinFields(String qId2, String aId2) throws Exception {
 
-		operations.delete(getQueryForParentId("answer", qId2, qId2), SampleJoinEntity.class,
+		operations.delete(DeleteQuery.builder(getQueryForParentId("answer", qId2, qId2)).build(), SampleJoinEntity.class,
 				IndexCoordinates.of(indexNameProvider.indexName()));
 
 		SearchHits<SampleJoinEntity> deletedHits = operations.search(getQueryForParentId("answer", qId2, null),
diff --git a/spring-data-opensearch/src/test/java/org/springframework/data/elasticsearch/core/query/ElasticsearchPartQueryIntegrationTests.java b/spring-data-opensearch/src/test/java/org/springframework/data/elasticsearch/core/query/ElasticsearchPartQueryIntegrationTests.java
@@ -34,9 +34,10 @@
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 import org.springframework.data.elasticsearch.repository.query.ElasticsearchPartQuery;
 import org.springframework.data.elasticsearch.repository.query.ElasticsearchQueryMethod;
+import org.springframework.data.elasticsearch.repository.query.RepositoryPartQuery;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.lang.Nullable;
 
 /**
@@ -648,7 +649,7 @@ private String getQueryString(String methodName, Class<?>[] parameterClasses, Ob
 		ElasticsearchQueryMethod queryMethod = new ElasticsearchQueryMethod(method,
 				new DefaultRepositoryMetadata(SampleRepository.class), new SpelAwareProxyProjectionFactory(),
 				operations.getElasticsearchConverter().getMappingContext());
-		ElasticsearchPartQuery partQuery = new ElasticsearchPartQuery(queryMethod, operations, QueryMethodEvaluationContextProvider.DEFAULT);
+		RepositoryPartQuery partQuery = new RepositoryPartQuery(queryMethod, operations, ValueExpressionDelegate.create());
 		Query query = partQuery.createQuery(parameters);
 		return buildQueryString(query, Book.class);
 	}
diff --git a/version.properties b/version.properties
@@ -1 +1 @@
-version=1.6.4
+version=1.7.0
