Skip to content

Commit 797c7d3

Browse files
committed
Fix a merge bug in OpenSearchConfiguration#openSearchClient
Resolves #923
1 parent f9f6247 commit 797c7d3

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/opensearch/OpenSearchVectorStoreAutoConfiguration.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,15 @@ static class OpenSearchConfiguration {
7171

7272
@Bean
7373
@ConditionalOnMissingBean
74-
OpenSearchClient openSearchClient(OpenSearchVectorStoreProperties properties) {
75-
HttpHost[] httpHosts = properties.getUris().stream().map(s -> createHttpHost(s)).toArray(HttpHost[]::new);
74+
OpenSearchClient openSearchClient(OpenSearchConnectionDetails connectionDetails) {
75+
HttpHost[] httpHosts = connectionDetails.getUris()
76+
.stream()
77+
.map(s -> createHttpHost(s))
78+
.toArray(HttpHost[]::new);
7679
ApacheHttpClient5TransportBuilder transportBuilder = ApacheHttpClient5TransportBuilder.builder(httpHosts);
77-
78-
Optional.ofNullable(properties.getUsername())
79-
.map(username -> createBasicCredentialsProvider(httpHosts[0], username, properties.getPassword()))
80+
Optional.ofNullable(connectionDetails.getUsername())
81+
.map(username -> createBasicCredentialsProvider(httpHosts[0], username,
82+
connectionDetails.getPassword()))
8083
.ifPresent(basicCredentialsProvider -> transportBuilder
8184
.setHttpClientConfigCallback(httpAsyncClientBuilder -> httpAsyncClientBuilder
8285
.setDefaultCredentialsProvider(basicCredentialsProvider)));

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/opensearch/OpenSearchVectorStoreProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class OpenSearchVectorStoreProperties {
2727
/**
2828
* Comma-separated list of the OpenSearch instances to use.
2929
*/
30-
private List<String> uris;
30+
private List<String> uris = List.of();
3131

3232
private String indexName;
3333

spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/milvus/MilvusContainerConnectionDetailsFactoryTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ class MilvusContainerConnectionDetailsFactoryTest {
5757
new Document(ResourceUtils.getText("classpath:/test/data/time.shelter.txt")), new Document(
5858
ResourceUtils.getText("classpath:/test/data/great.depression.txt"), Map.of("depression", "bad")));
5959

60-
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
61-
.withConfiguration(AutoConfigurations.of(MilvusVectorStoreAutoConfiguration.class))
62-
.withUserConfiguration(Config.class);
63-
6460
@Autowired
6561
private VectorStore vectorStore;
6662

spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/OpenSearchContainerConnectionDetailsFactoryTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
*/
1616
package org.springframework.ai.testcontainers.service.connection.opensearch;
1717

18+
import static org.assertj.core.api.Assertions.assertThat;
19+
import static org.hamcrest.Matchers.hasSize;
20+
21+
import java.io.IOException;
22+
import java.nio.charset.StandardCharsets;
23+
import java.util.List;
24+
import java.util.Map;
25+
1826
import org.awaitility.Awaitility;
1927
import org.junit.jupiter.api.Test;
2028
import org.opensearch.testcontainers.OpensearchContainer;
@@ -34,14 +42,6 @@
3442
import org.testcontainers.junit.jupiter.Container;
3543
import org.testcontainers.junit.jupiter.Testcontainers;
3644

37-
import java.io.IOException;
38-
import java.nio.charset.StandardCharsets;
39-
import java.util.List;
40-
import java.util.Map;
41-
42-
import static org.assertj.core.api.Assertions.assertThat;
43-
import static org.hamcrest.Matchers.hasSize;
44-
4545
@SpringBootTest(properties = {
4646
"spring.ai.vectorstore.opensearch.index-name=" + OpenSearchContainerConnectionDetailsFactoryTest.DOCUMENT_INDEX,
4747
"spring.ai.vectorstore.opensearch.mapping-json="

0 commit comments

Comments
 (0)