Spring Boot 3.5 / Spring Data Elasticsearch 6.0 baseline

Signed-off-by: Andriy Redko <[email protected]>
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.1                    | 2.0.x                  | 6.0.x                     | 1.x / 2.x         | 2.10.x and above  | 7.0.x            | 3.5.x         |
 | 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 |

settings.gradle.kts

@@ -16,10 +16,10 @@ dependencyResolutionManagement {
     }
 
     create("springLibs") {
-      version("spring", "6.2.7")
-      version("spring-boot", "3.4.5")
-      library("data-commons", "org.springframework.data:spring-data-commons:3.5.0")
-      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.0")
+      version("spring", "7.0.0-M5")
+      version("spring-boot", "3.5.0")
+      library("data-commons", "org.springframework.data:spring-data-commons:4.0.0-M3")
+      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:6.0.0-M3")
       library("web", "org.springframework", "spring-web").versionRef("spring")
       library("context", "org.springframework", "spring-context").versionRef("spring")
       library("tx", "org.springframework", "spring-tx").versionRef("spring")
@@ -74,12 +74,18 @@ pluginManagement {
     maven {
       url = uri("https://repo.spring.io/release/")
     }
+    maven {
+      url = uri("https://repo.spring.io/milestone/")
+    }
   }
 }
 
 dependencyResolutionManagement {
   repositories {
     mavenCentral()
+    maven {
+      url = uri("https://repo.spring.io/milestone/")
+    }
   }
 }
 

spring-data-opensearch/src/test/java/org/opensearch/data/client/osc/OpenSearchOSCIntegrationTests.java

@@ -110,6 +110,11 @@ protected DeleteQuery getDeleteQuery(Query query) {
         return Queries.getBuilderWithMatchAllQuery();
     }
 
+    @Override
+    protected DeleteQuery getDeleteQuery(Query query) {
+        return DeleteQuery.builder(query).build();
+    }
+
     @Override
     protected BaseQueryBuilder<?, ?> getBuilderWithMatchQuery(String field, String value) {
         return NativeQuery.builder().withQuery(matchQueryAsQuery(field, value, null, null));

spring-data-opensearch/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java

@@ -576,7 +576,8 @@ public void shouldDeleteDocumentForGivenQuery() {
 
 		// when
 		Query query = getTermQuery("id", documentId);
-		operations.delete(DeleteQuery.builder(query).build(), 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,8 +608,13 @@ public void shouldDeleteAcrossIndex() {
 
 		// when
 		Query query = getTermQuery("message", "foo");
+<<<<<<< HEAD
 		operations.delete(getDeleteQuery(query),
 		    SampleEntity.class, IndexCoordinates.of(MULTI_INDEX_ALL));
+=======
+		operations.delete(getDeleteQuery(query), SampleEntity.class,
+		        IndexCoordinates.of(MULTI_INDEX_ALL));
+>>>>>>> e4a28b2 (Spring Boot 3.5 / Spring Data Elasticsearch 6.0 baseline)
 
 		// then
 		assertThat(operations.count(query, IndexCoordinates.of(MULTI_INDEX_1_NAME, MULTI_INDEX_2_NAME))).isEqualTo(0);
@@ -619,6 +625,8 @@ public void shouldDeleteAcrossIndex() {
 
 	protected abstract DeleteQuery getDeleteQuery(Query query);
 
+	protected abstract DeleteQuery getDeleteQuery(Query query);
+
 	@Test // DATAES-547
 	public void shouldDeleteAcrossIndexWhenNoMatchingDataPresent() {
 
@@ -641,8 +649,13 @@ public void shouldDeleteAcrossIndexWhenNoMatchingDataPresent() {
 		// when
 		Query query = getTermQuery("message", "negative");
 
+<<<<<<< HEAD
 		operations.delete(getDeleteQuery(query),
 		    SampleEntity.class, IndexCoordinates.of("test-index-*"));
+=======
+		operations.delete(getDeleteQuery(query), SampleEntity.class,
+		        IndexCoordinates.of("test-index-*"));
+>>>>>>> e4a28b2 (Spring Boot 3.5 / Spring Data Elasticsearch 6.0 baseline)
 
 		operations.indexOps(IndexCoordinates.of(MULTI_INDEX_1_NAME)).refresh();
 		operations.indexOps(IndexCoordinates.of(MULTI_INDEX_2_NAME)).refresh();
@@ -1005,7 +1018,12 @@ public void shouldDeleteGivenCriteriaQuery() {
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").contains("test"));
 
 		// when
+<<<<<<< HEAD
 		operations.delete(DeleteQuery.builder(criteriaQuery).build(), SampleEntity.class, IndexCoordinates.of(indexNameProvider.indexName()));
+=======
+		operations.delete(getDeleteQuery(criteriaQuery), SampleEntity.class,
+		        IndexCoordinates.of(indexNameProvider.indexName()));
+>>>>>>> e4a28b2 (Spring Boot 3.5 / Spring Data Elasticsearch 6.0 baseline)
 
 		// then
 		StringQuery stringQuery = new StringQuery(matchAllQuery().toString());
@@ -2437,7 +2455,12 @@ public void shouldDeleteOnlyDocumentsMatchedByDeleteQuery() {
 
 		// when
 		Query query = operations.idsQuery(Arrays.asList(documentIdToDelete));
+<<<<<<< HEAD
 		operations.delete(DeleteQuery.builder(query).build(), SampleEntity.class, IndexCoordinates.of(indexNameProvider.indexName()));
+=======
+		operations.delete(getDeleteQuery(query), SampleEntity.class,
+		        IndexCoordinates.of(indexNameProvider.indexName()));
+>>>>>>> e4a28b2 (Spring Boot 3.5 / Spring Data Elasticsearch 6.0 baseline)
 
 		// then
 		// document with id "remainingDocumentId" should still be indexed
@@ -2467,8 +2490,13 @@ public void shouldDeleteOnlyDocumentsMatchedByCriteriaQuery() {
 
 		// when
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("id").is(documentIdToDelete));
+<<<<<<< HEAD
 		operations.delete(DeleteQuery.builder(criteriaQuery).build(), SampleEntity.class,
 		    IndexCoordinates.of(indexNameProvider.indexName()));
+=======
+		operations.delete(DeleteQuery.builder(criteriaQuery).build(), SampleEntity.class, 
+		        IndexCoordinates.of(indexNameProvider.indexName()));
+>>>>>>> e4a28b2 (Spring Boot 3.5 / Spring Data Elasticsearch 6.0 baseline)
 
 		// then
 		// document with id "remainingDocumentId" should still be indexed

version.properties

@@ -1 +1 @@
-version=1.7.0
+version=2.0.0