Upate to Spring Data Elasticsearch 5.5

Signed-off-by: Andriy Redko <[email protected]>

Author: reta

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         |

settings.gradle.kts

@@ -18,8 +18,8 @@ dependencyResolutionManagement {
     create("springLibs") {
       version("spring", "6.2.3")
       version("spring-boot", "3.4.3")
-      library("data-commons", "org.springframework.data:spring-data-commons:3.4.3")
-      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.4.3")
+      library("data-commons", "org.springframework.data:spring-data-commons:3.5.0-M2")
+      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.0-M2")
       library("web", "org.springframework", "spring-web").versionRef("spring")
       library("context", "org.springframework", "spring-context").versionRef("spring")
       library("tx", "org.springframework", "spring-tx").versionRef("spring")
@@ -80,6 +80,9 @@ pluginManagement {
 dependencyResolutionManagement {
   repositories {
     mavenCentral()
+    maven {
+      url = uri("https://repo.spring.io/milestone/")
+    }
   }
 }
 

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));

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) {
 

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,7 +607,7 @@ public void shouldDeleteAcrossIndex() {
 
 		// when
 		Query query = getTermQuery("message", "foo");
-		operations.delete(query, SampleEntity.class, IndexCoordinates.of(MULTI_INDEX_ALL));
+		operations.delete(DeleteQuery.builder(query).build(), SampleEntity.class, IndexCoordinates.of(MULTI_INDEX_ALL));
 
 		// then
 		assertThat(operations.count(query, IndexCoordinates.of(MULTI_INDEX_1_NAME, MULTI_INDEX_2_NAME))).isEqualTo(0);
@@ -638,7 +638,7 @@ public void shouldDeleteAcrossIndexWhenNoMatchingDataPresent() {
 		// when
 		Query query = getTermQuery("message", "negative");
 
-		operations.delete(query, SampleEntity.class, IndexCoordinates.of("test-index-*"));
+		operations.delete(DeleteQuery.builder(query).build(), 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 +1001,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 +2433,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 +2463,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 +3375,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),

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);
 	}

version.properties

@@ -1 +1 @@
-version=1.6.3
+version=1.7.0