Spring Data Elasticsearch 6.0 baseline

reta · reta · commit 23c3ef90fd66 · 2025-09-12T15:35:48.000-04:00
Signed-off-by: Andriy Redko &lt;drreta@gmail.com&gt;
diff --git a/README.md b/README.md
@@ -26,6 +26,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     | JDK    |
 |---------------------------|------------------------|----------------------------|-------------------|---------------------|------------------|----------------|-----------------------|
+| 2025.1                    | 3.0.x                  | 6.0.x                     | 2.x / 3.x         | 3.0.x and above   | 7.0.x            | 4.0.x         | 21+                   |
 | 2025.0                    | 2.0.x                  | 5.5.x                      | 2.x / 3.x         | 3.0.x and above     | 6.2.x            | 3.5.x          | 21+                   |
 | 2025.0                    | 1.8.x                  | 5.5.x                      | 1.x / 2.x / 3.x   | 2.10.x and above    | 6.2.x            | 3.5.x          | 17+                   |
 | 2025.0                    | 1.7.x                  | 5.5.x                      | 1.x / 2.x / 3.x   | 2.10.x and above    | 6.2.x            | 3.5.x          | 17+                   |
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,10 +16,10 @@ dependencyResolutionManagement {
     }
 
     create("springLibs") {
-      version("spring", "6.2.10")
-      version("spring-boot", "3.5.5")
-      library("data-commons", "org.springframework.data:spring-data-commons:3.5.3")
-      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.3")
+      version("spring", "7.0.0-M9")
+      version("spring-boot", "4.0.0-M2")
+      library("data-commons", "org.springframework.data:spring-data-commons:4.0.0-M6")
+      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:6.0.0-M6")
       library("web", "org.springframework", "spring-web").versionRef("spring")
       library("webflux", "org.springframework", "spring-webflux").versionRef("spring")
       library("context", "org.springframework", "spring-context").versionRef("spring")
@@ -29,10 +29,12 @@ dependencyResolutionManagement {
       library("boot-webflux", "org.springframework.boot", "spring-boot-starter-webflux").versionRef("spring-boot")
       library("boot-autoconfigure", "org.springframework.boot", "spring-boot-autoconfigure").versionRef("spring-boot")
       library("boot-docker-compose", "org.springframework.boot", "spring-boot-docker-compose").versionRef("spring-boot")
+      library("boot-elasticsearch", "org.springframework.boot", "spring-boot-elasticsearch").versionRef("spring-boot")
+      library("boot-data-elasticsearch", "org.springframework.boot", "spring-boot-data-elasticsearch").versionRef("spring-boot")
       library("boot-test", "org.springframework.boot", "spring-boot-test").versionRef("spring-boot")
       library("boot-test-autoconfigure", "org.springframework.boot", "spring-boot-test-autoconfigure").versionRef("spring-boot")
       library("boot-testcontainers", "org.springframework.boot", "spring-boot-testcontainers").versionRef("spring-boot")
-      library("projectreactor", "io.projectreactor:reactor-test:3.7.9")
+      library("projectreactor", "io.projectreactor:reactor-test:3.8.0-M7")
       plugin("spring-boot", "org.springframework.boot").versionRef("spring-boot")
     }
     
@@ -77,12 +79,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/")
+    }
   }
 }
 
diff --git a/spring-data-opensearch-examples/spring-boot-gradle/src/main/java/org/opensearch/data/example/MarketplaceApplication.java b/spring-data-opensearch-examples/spring-boot-gradle/src/main/java/org/opensearch/data/example/MarketplaceApplication.java
@@ -7,7 +7,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
+import org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration;
 
 @SpringBootApplication(exclude = ElasticsearchDataAutoConfiguration.class)
 public class MarketplaceApplication {
diff --git a/spring-data-opensearch-examples/spring-boot-java-client-gradle/src/main/java/org/opensearch/data/example/MarketplaceApplication.java b/spring-data-opensearch-examples/spring-boot-java-client-gradle/src/main/java/org/opensearch/data/example/MarketplaceApplication.java
@@ -7,7 +7,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
+import org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration;
 
 @SpringBootApplication(exclude = ElasticsearchDataAutoConfiguration.class)
 public class MarketplaceApplication {
diff --git a/spring-data-opensearch-examples/spring-boot-reactive-client-gradle/src/main/java/org/opensearch/data/example/MarketplaceApplication.java b/spring-data-opensearch-examples/spring-boot-reactive-client-gradle/src/main/java/org/opensearch/data/example/MarketplaceApplication.java
@@ -7,7 +7,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
+import org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration;
 
 @SpringBootApplication(exclude = ElasticsearchDataAutoConfiguration.class)
 public class MarketplaceApplication {
diff --git a/spring-data-opensearch-starter/build.gradle.kts b/spring-data-opensearch-starter/build.gradle.kts
@@ -19,6 +19,8 @@ buildscript {
 dependencies {
   api(springLibs.boot.autoconfigure)
   api(project(":spring-data-opensearch"))
+  api(springLibs.boot.data.elasticsearch)
+  api(springLibs.boot.elasticsearch)
   implementation(opensearchLibs.client) {
     exclude("commons-logging", "commons-logging")
     exclude("org.slf4j", "slf4j-api")
diff --git a/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/OpenSearchClientAutoConfiguration.java b/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/OpenSearchClientAutoConfiguration.java
@@ -13,13 +13,13 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.jsonb.JsonbAutoConfiguration;
 import org.springframework.context.annotation.Import;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for OpenSearch's Java client.
  */
-@AutoConfiguration(after = { JsonbAutoConfiguration.class, OpenSearchRestClientAutoConfiguration.class })
+@AutoConfiguration(after = { OpenSearchRestClientAutoConfiguration.class },
+    afterName = { "org.springframework.boot.jsonb.autoconfigure.JsonbAutoConfiguration" })
 @ConditionalOnBean(RestClient.class)
 @ConditionalOnClass(OpenSearchClient.class)
 @Import({ JsonpMapperConfiguration.class, OpenSearchTransportConfiguration.class, OpenSearchClientConfiguration.class })
diff --git a/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/OpenSearchProperties.java b/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/OpenSearchProperties.java
@@ -9,13 +9,13 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties.Restclient;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchProperties.Restclient;
 
 /**
  * OpenSearch client configuration properties.
  *
- * Adaptation of the {@link org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties} to
+ * Adaptation of the {@link org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchProperties} to
  * the needs of OpenSearch.
  */
 @ConfigurationProperties("opensearch")
diff --git a/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/OpenSearchRestClientAutoConfiguration.java b/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/OpenSearchRestClientAutoConfiguration.java
@@ -21,7 +21,7 @@
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for OpenSearch REST clients.
  *
- * Adaptation of the {@link org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration} to
+ * Adaptation of the {@link org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchRestClientAutoConfiguration} to
  * the needs of OpenSearch.
  */
 @AutoConfiguration
diff --git a/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/OpenSearchRestClientConfigurations.java b/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/OpenSearchRestClientConfigurations.java
@@ -56,7 +56,7 @@ static class RestClientBuilderConfiguration {
         }
 
         @Bean
-        RestClientBuilderCustomizer defaultRestClientBuilderCustomizer(OpenSearchProperties properties, ObjectProvider<SslBundles> sslBundles) {
+        RestClientBuilderCustomizer defaultOpensearchRestClientBuilderCustomizer(OpenSearchProperties properties, ObjectProvider<SslBundles> sslBundles) {
             return new DefaultRestClientBuilderCustomizer(properties, this.connectionDetails, sslBundles);
         }
 
diff --git a/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/RestClientBuilderCustomizer.java b/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/RestClientBuilderCustomizer.java
@@ -15,7 +15,7 @@
  * {@link org.opensearch.client.RestClient} via a {@link RestClientBuilder} whilst
  * retaining default auto-configuration.
  *
- * Adaptation of the {@link org.springframework.boot.autoconfigure.elasticsearch.RestClientBuilderCustomizer} to
+ * Adaptation of the {@link org.springframework.boot.elasticsearch.autoconfigure.Rest5ClientBuilderCustomizer} to
  * the needs of OpenSearch.
  */
 @FunctionalInterface
diff --git a/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/data/OpenSearchDataAutoConfiguration.java b/spring-data-opensearch-starter/src/main/java/org/opensearch/spring/boot/autoconfigure/data/OpenSearchDataAutoConfiguration.java
@@ -17,7 +17,7 @@
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's OpenSearch support.
  *
- * Adaptation of the {@link org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration} to
+ * Adaptation of the {@link org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration} to
  * the needs of OpenSearch.
  */
 @AutoConfiguration(after = {OpenSearchClientAutoConfiguration.class, OpenSearchRestClientAutoConfiguration.class})
diff --git a/spring-data-opensearch-starter/src/test/java/org/opensearch/spring/boot/autoconfigure/OpenSearchRestClientAutoConfigurationTests.java b/spring-data-opensearch-starter/src/test/java/org/opensearch/spring/boot/autoconfigure/OpenSearchRestClientAutoConfigurationTests.java
@@ -29,8 +29,8 @@
 import org.opensearch.client.sniff.Sniffer;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
 import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
+import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchRestClientAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-data-opensearch-starter/src/test/java/org/opensearch/spring/boot/autoconfigure/data/OpenSearchDataAutoConfigurationIntegrationTests.java b/spring-data-opensearch-starter/src/test/java/org/opensearch/spring/boot/autoconfigure/data/OpenSearchDataAutoConfigurationIntegrationTests.java
@@ -26,7 +26,7 @@
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
+import org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchRepositoriesAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-data-opensearch-test-autoconfigure/src/main/java/org/opensearch/spring/boot/autoconfigure/test/AutoConfigureDataOpenSearch.java b/spring-data-opensearch-test-autoconfigure/src/main/java/org/opensearch/spring/boot/autoconfigure/test/AutoConfigureDataOpenSearch.java
@@ -12,7 +12,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
+import org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration;
 
 /**
  * {@link ImportAutoConfiguration Auto-configuration imports} for typical Data OpenSearch tests.
diff --git a/spring-data-opensearch/src/main/java/org/opensearch/data/client/orhlc/DocumentAdapters.java b/spring-data-opensearch/src/main/java/org/opensearch/data/client/orhlc/DocumentAdapters.java
@@ -190,7 +190,7 @@ public static SearchDocument from(SearchHit source) {
 
         NestedMetaData nestedMetaData = from(source.getNestedIdentity());
         Explanation explanation = from(source.getExplanation());
-        List<String> matchedQueries = from(source.getMatchedQueries());
+        Map<String, Double> matchedQueries = from(source.getMatchedQueriesAndScores());
 
         BytesReference sourceRef = source.getSourceRef();
         Map<String, DocumentField> sourceFields = source.getFields();
@@ -263,8 +263,11 @@ private static NestedMetaData from(@Nullable SearchHit.NestedIdentity nestedIden
     }
 
     @Nullable
-    private static List<String> from(@Nullable String[] matchedQueries) {
-        return matchedQueries == null ? null : Arrays.asList(matchedQueries);
+    private static Map<String, Double> from(@Nullable Map<String, Float> matchedQueries) {
+        return matchedQueries == null ? null : matchedQueries
+                .entrySet()
+                .stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, v -> v.getValue().doubleValue()));
     }
 
     /**
@@ -539,7 +542,7 @@ static class SearchDocumentAdapter implements SearchDocument {
         private final Explanation explanation;
 
         @Nullable
-        private final List<String> matchedQueries;
+        private final Map<String, Double> matchedQueries;
 
         SearchDocumentAdapter(
                 Document delegate,
@@ -550,7 +553,7 @@ static class SearchDocumentAdapter implements SearchDocument {
                 Map<String, SearchDocumentResponse> innerHits,
                 @Nullable NestedMetaData nestedMetaData,
                 @Nullable Explanation explanation,
-                @Nullable List<String> matchedQueries) {
+                @Nullable Map<String, Double> matchedQueries) {
 
             this.delegate = delegate;
             this.score = score;
@@ -751,7 +754,7 @@ public Explanation getExplanation() {
 
         @Override
         @Nullable
-        public List<String> getMatchedQueries() {
+        public Map<String, Double> getMatchedQueries() {
             return matchedQueries;
         }
 
diff --git a/spring-data-opensearch/src/main/java/org/opensearch/data/client/orhlc/RequestFactory.java b/spring-data-opensearch/src/main/java/org/opensearch/data/client/orhlc/RequestFactory.java
@@ -115,7 +115,6 @@
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.RescorerQuery;
 import org.springframework.data.elasticsearch.core.query.RescorerQuery.ScoreMode;
-import org.springframework.data.elasticsearch.core.query.ScriptType;
 import org.springframework.data.elasticsearch.core.query.SourceFilter;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
 import org.springframework.data.elasticsearch.core.query.UpdateQuery;
@@ -1143,7 +1142,7 @@ public UpdateRequest updateRequest(UpdateQuery query, IndexCoordinates index) {
                 params = new HashMap<>();
             }
             Script script =
-                    new Script(getScriptType(query.getScriptType()), query.getLang(), query.getScript(), params);
+                    new Script(getScriptType(query.getScript()), query.getLang(), query.getScript(), params);
             updateRequest.script(script);
         }
 
@@ -1438,9 +1437,8 @@ private boolean hasSeqNoPrimaryTermProperty(@Nullable Class<?> entityClass) {
         return entity.hasSeqNoPrimaryTermProperty();
     }
 
-    private org.opensearch.script.ScriptType getScriptType(@Nullable ScriptType scriptType) {
-
-        if (scriptType == null || ScriptType.INLINE.equals(scriptType)) {
+    private org.opensearch.script.ScriptType getScriptType(@Nullable String script) {
+        if (script != null) {
             return org.opensearch.script.ScriptType.INLINE;
         } else {
             return org.opensearch.script.ScriptType.STORED;
@@ -1449,16 +1447,14 @@ private org.opensearch.script.ScriptType getScriptType(@Nullable ScriptType scri
 
     @Nullable
     private Script getScript(UpdateQuery query) {
-        if (ScriptType.STORED.equals(query.getScriptType()) && query.getScriptName() != null) {
+        if (query.getScriptName() != null) { /* stored */
             final Map<String, Object> params =
                     Optional.ofNullable(query.getParams()).orElse(new HashMap<>());
-            return new Script(getScriptType(ScriptType.STORED), null, query.getScriptName(), params);
-        }
-
-        if (ScriptType.INLINE.equals(query.getScriptType()) && query.getScript() != null) {
+            return new Script(getScriptType(query.getScript()), null, query.getScriptName(), params);
+        } else if (query.getScript() != null) { /* inline */
             final Map<String, Object> params =
                     Optional.ofNullable(query.getParams()).orElse(new HashMap<>());
-            return new Script(getScriptType(ScriptType.INLINE), query.getLang(), query.getScript(), params);
+            return new Script(getScriptType(query.getScript()), query.getLang(), query.getScript(), params);
         }
 
         return null;
diff --git a/spring-data-opensearch/src/main/java/org/opensearch/data/client/orhlc/ResponseConverter.java b/spring-data-opensearch/src/main/java/org/opensearch/data/client/orhlc/ResponseConverter.java
@@ -433,7 +433,7 @@ public static ByQueryResponse.Failure byQueryResponseFailureOf(BulkItemResponse.
      */
     public static ByQueryResponse.SearchFailure byQueryResponseSearchFailureOf(
             ScrollableHitSource.SearchFailure searchFailure) {
-        return ByQueryResponse.SearchFailure.builder() //
+        return ByQueryResponse.SearchFailure.builder(searchFailure.getReason()) //
                 .withReason(searchFailure.getReason()) //
                 .withIndex(searchFailure.getIndex()) //
                 .withNodeId(searchFailure.getNodeId()) //
diff --git a/spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/DocumentAdapters.java b/spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/DocumentAdapters.java
@@ -138,7 +138,9 @@ public static SearchDocument from(Hit<?> hit, JsonpMapper jsonpMapper) {
 
         float score = hit.score() != null ? hit.score().floatValue() : Float.NaN;
         return new SearchDocumentAdapter(document, score, hit.sort().stream().toArray(),
-                documentFields, highlightFields, innerHits, nestedMetaData, explanation, matchedQueries, hit.routing());
+                documentFields, highlightFields, innerHits, nestedMetaData, explanation,
+                    matchedQueries.stream().collect(Collectors.toMap(k -> k, v -> Double.NaN /* no scores */)),
+                        hit.routing());
     }
 
     public static SearchDocument from(CompletionSuggestOption<EntityAsMap> completionSuggestOption) {
diff --git a/spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/RequestConverter.java b/spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/RequestConverter.java
@@ -776,14 +776,14 @@ private org.opensearch.client.opensearch._types.Script getScript(@Nullable Scrip
             scriptData.params().forEach((key, value) -> params.put(key, JsonData.of(value, jsonpMapper)));
         }
         return org.opensearch.client.opensearch._types.Script.of(sb -> {
-            if (scriptData.type() == ScriptType.INLINE) {
+            if (scriptData.script() != null) { /* inline */
                 sb.inline(is -> is //
                         .lang(fn -> fn.custom(scriptData.language())) //
                         .source(scriptData.script()) //
                         .params(params)); //
-            } else if (scriptData.type() == ScriptType.STORED) {
+            } else { /* stored */
                 sb.stored(ss -> ss //
-                        .id(scriptData.script()) //
+                        .id(scriptData.scriptName()) //
                         .params(params) //
                 );
             }
@@ -1121,14 +1121,15 @@ public DeleteByQueryRequest documentDeleteByQueryRequest(Query query, @Nullable
                 }
 
                 uqb.script(sb -> {
-                    if (query.getScriptType() == ScriptType.INLINE) {
+                    // inline
+                    if (query.getScript() != null) {
                         sb.inline(is -> is //
                                 .lang(fn -> fn.custom(query.getLang())) //
                                 .source(query.getScript()) //
                                 .params(params)); //
-                    } else if (query.getScriptType() == ScriptType.STORED) {
+                    } else { /* stored */
                         sb.stored(ss -> ss //
-                                .id(query.getScript()) //
+                                .id(query.getScriptName()) //
                                 .params(params) //
                         );
                     }
diff --git a/spring-data-opensearch/src/test/java/org/opensearch/data/client/core/document/DocumentAdaptersUnitTests.java b/spring-data-opensearch/src/test/java/org/opensearch/data/client/core/document/DocumentAdaptersUnitTests.java
@@ -259,9 +259,9 @@ void shouldAdaptReturnedMatchedQueries() {
 
         SearchDocument searchDocument = DocumentAdapters.from(searchHit);
 
-        List<String> matchedQueries = searchDocument.getMatchedQueries();
+        Map<String, Double> matchedQueries = searchDocument.getMatchedQueries();
         assertThat(matchedQueries).isNotNull();
         assertThat(matchedQueries).hasSize(2);
-        assertThat(matchedQueries).isEqualTo(Arrays.asList("query1", "query2"));
+        assertThat(matchedQueries).isEqualTo(Map.of("query1", Double.NaN, "query2", Double.NaN));
     }
 }
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
diff --git a/spring-data-opensearch/src/test/java/org/opensearch/data/client/osc/DocumentAdaptersUnitTests.java b/spring-data-opensearch/src/test/java/org/opensearch/data/client/osc/DocumentAdaptersUnitTests.java
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
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
diff --git a/version.properties b/version.properties

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`/**`
`22`	`22`	`* {@link EnableAutoConfiguration Auto-configuration} for OpenSearch REST clients.`
`23`	`23`	`*`
`24`		`- * Adaptation of the {@link org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration} to`
	`24`	`+ * Adaptation of the {@link org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchRestClientAutoConfiguration} to`
`25`	`25`	`* the needs of OpenSearch.`
`26`	`26`	`*/`
`27`	`27`	`@AutoConfiguration`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ static class RestClientBuilderConfiguration {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Bean`
`59`		`- RestClientBuilderCustomizer defaultRestClientBuilderCustomizer(OpenSearchProperties properties, ObjectProvider<SslBundles> sslBundles) {`
	`59`	`+ RestClientBuilderCustomizer defaultOpensearchRestClientBuilderCustomizer(OpenSearchProperties properties, ObjectProvider<SslBundles> sslBundles) {`
`60`	`60`	`return new DefaultRestClientBuilderCustomizer(properties, this.connectionDetails, sslBundles);`
`61`	`61`	`}`
`62`	`62`