From 80007d4d6c9cb0ec9bd8e804ecc904b91451d0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 6 Aug 2024 00:18:25 -0500 Subject: [PATCH] Update testcontainers version to 1.20.1 Weaviate module contains the wait strategy. --- pom.xml | 2 +- .../weaviate/WeaviateVectorStoreAutoConfigurationIT.java | 4 +--- .../WeaviateContainerConnectionDetailsFactoryTest.java | 4 +--- .../ai/vectorstore/WeaviateVectorStoreIT.java | 6 +----- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 6ae128a32..fad014fe9 100644 --- a/pom.xml +++ b/pom.xml @@ -191,7 +191,7 @@ 5.3.1 - 1.19.7 + 1.20.1 2.0.1 diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/weaviate/WeaviateVectorStoreAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/weaviate/WeaviateVectorStoreAutoConfigurationIT.java index da5f5c94c..823f17c70 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/weaviate/WeaviateVectorStoreAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/weaviate/WeaviateVectorStoreAutoConfigurationIT.java @@ -19,7 +19,6 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -46,8 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class WeaviateVectorStoreAutoConfigurationIT { @Container - static WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.25.4") - .waitingFor(Wait.forHttp("/v1/.well-known/ready").forPort(8080)); + static WeaviateContainer weaviate = new WeaviateContainer("semitechnologies/weaviate:1.25.4"); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(WeaviateVectorStoreAutoConfiguration.class)) diff --git a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/weaviate/WeaviateContainerConnectionDetailsFactoryTest.java b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/weaviate/WeaviateContainerConnectionDetailsFactoryTest.java index 83e6e5af2..24df41bb7 100644 --- a/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/weaviate/WeaviateContainerConnectionDetailsFactoryTest.java +++ b/spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/weaviate/WeaviateContainerConnectionDetailsFactoryTest.java @@ -31,7 +31,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.weaviate.WeaviateContainer; @@ -52,8 +51,7 @@ class WeaviateContainerConnectionDetailsFactoryTest { @Container @ServiceConnection - static WeaviateContainer weaviateContainer = new WeaviateContainer("semitechnologies/weaviate:1.25.4") - .waitingFor(Wait.forHttp("/v1/.well-known/ready").forPort(8080)); + static WeaviateContainer weaviateContainer = new WeaviateContainer("semitechnologies/weaviate:1.25.4"); @Autowired private WeaviateVectorStoreProperties properties; diff --git a/vector-stores/spring-ai-weaviate-store/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java b/vector-stores/spring-ai-weaviate-store/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java index 35b98cc8b..ad51b2d15 100644 --- a/vector-stores/spring-ai-weaviate-store/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java +++ b/vector-stores/spring-ai-weaviate-store/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java @@ -35,7 +35,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; import org.springframework.core.io.DefaultResourceLoader; -import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.weaviate.WeaviateContainer; @@ -52,10 +51,7 @@ import io.weaviate.client.WeaviateClient; public class WeaviateVectorStoreIT { @Container - static WeaviateContainer weaviateContainer = new WeaviateContainer("semitechnologies/weaviate:1.25.4") - .waitingFor(Wait.forHttp("/v1/.well-known/ready").forPort(8080)); - - ; + static WeaviateContainer weaviateContainer = new WeaviateContainer("semitechnologies/weaviate:1.25.4"); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withUserConfiguration(TestApplication.class);