Skip to content

Commit 22c778f

Browse files
authored
Switch CassandraContainer implementation (#2663)
`org.testcontainers.containers.CassandraContainer` is deprecated. Signed-off-by: Eddú Meléndez <[email protected]>
1 parent dc5922f commit 22c778f

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/test/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryAutoConfigurationIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.datastax.driver.core.utils.UUIDs;
2323
import org.junit.jupiter.api.Test;
24-
import org.testcontainers.containers.CassandraContainer;
24+
import org.testcontainers.cassandra.CassandraContainer;
2525
import org.testcontainers.junit.jupiter.Container;
2626
import org.testcontainers.junit.jupiter.Testcontainers;
2727
import org.testcontainers.utility.DockerImageName;

auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-cassandra/src/test/java/org/springframework/ai/vectorstore/cassandra/autoconfigure/CassandraVectorStoreAutoConfigurationIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import io.micrometer.observation.tck.TestObservationRegistry;
2323
import org.junit.jupiter.api.Test;
24-
import org.testcontainers.containers.CassandraContainer;
24+
import org.testcontainers.cassandra.CassandraContainer;
2525
import org.testcontainers.junit.jupiter.Container;
2626
import org.testcontainers.junit.jupiter.Testcontainers;
2727
import org.testcontainers.utility.DockerImageName;

memory/spring-ai-model-chat-memory-cassandra/src/test/java/org/springframework/ai/chat/memory/cassandra/CassandraChatMemoryIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.datastax.oss.driver.api.core.CqlSessionBuilder;
2323
import org.junit.jupiter.api.Assertions;
2424
import org.junit.jupiter.api.Test;
25-
import org.testcontainers.containers.CassandraContainer;
25+
import org.testcontainers.cassandra.CassandraContainer;
2626
import org.testcontainers.junit.jupiter.Container;
2727
import org.testcontainers.junit.jupiter.Testcontainers;
2828

@@ -43,7 +43,7 @@
4343
class CassandraChatMemoryIT {
4444

4545
@Container
46-
static CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CassandraImage.DEFAULT_IMAGE);
46+
static CassandraContainer cassandraContainer = new CassandraContainer(CassandraImage.DEFAULT_IMAGE);
4747

4848
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
4949
.withUserConfiguration(CassandraChatMemoryIT.TestApplication.class);

vector-stores/spring-ai-cassandra-store/src/test/java/org/springframework/ai/vectorstore/cassandra/CassandraRichSchemaVectorStoreIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.junit.jupiter.api.Test;
3838
import org.slf4j.Logger;
3939
import org.slf4j.LoggerFactory;
40-
import org.testcontainers.containers.CassandraContainer;
40+
import org.testcontainers.cassandra.CassandraContainer;
4141
import org.testcontainers.junit.jupiter.Container;
4242
import org.testcontainers.junit.jupiter.Testcontainers;
4343
import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
@@ -87,7 +87,7 @@ class CassandraRichSchemaVectorStoreIT {
8787
private static final String URANUS_ORBIT_QUERY = "It was the first planet to be discovered using mathematics. In 1821, astronomers saw that Uranus orbit was different from what they expected. Another nearby planets mass was changing Uranus orbit.";
8888

8989
@Container
90-
static CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CassandraImage.DEFAULT_IMAGE);
90+
static CassandraContainer cassandraContainer = new CassandraContainer(CassandraImage.DEFAULT_IMAGE);
9191

9292
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
9393
.withUserConfiguration(TestApplication.class);

vector-stores/spring-ai-cassandra-store/src/test/java/org/springframework/ai/vectorstore/cassandra/CassandraVectorStoreIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import com.datastax.oss.driver.api.core.type.DataTypes;
3535
import org.junit.jupiter.api.Assertions;
3636
import org.junit.jupiter.api.Test;
37-
import org.testcontainers.containers.CassandraContainer;
37+
import org.testcontainers.cassandra.CassandraContainer;
3838
import org.testcontainers.junit.jupiter.Container;
3939
import org.testcontainers.junit.jupiter.Testcontainers;
4040

@@ -70,7 +70,7 @@
7070
class CassandraVectorStoreIT extends BaseVectorStoreTests {
7171

7272
@Container
73-
static CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CassandraImage.DEFAULT_IMAGE);
73+
static CassandraContainer cassandraContainer = new CassandraContainer(CassandraImage.DEFAULT_IMAGE);
7474

7575
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
7676
.withUserConfiguration(TestApplication.class);

vector-stores/spring-ai-cassandra-store/src/test/java/org/springframework/ai/vectorstore/cassandra/CassandraVectorStoreObservationIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import io.micrometer.observation.tck.TestObservationRegistry;
2929
import io.micrometer.observation.tck.TestObservationRegistryAssert;
3030
import org.junit.jupiter.api.Test;
31-
import org.testcontainers.containers.CassandraContainer;
31+
import org.testcontainers.cassandra.CassandraContainer;
3232
import org.testcontainers.junit.jupiter.Container;
3333
import org.testcontainers.junit.jupiter.Testcontainers;
3434

@@ -60,7 +60,7 @@
6060
public class CassandraVectorStoreObservationIT {
6161

6262
@Container
63-
static CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CassandraImage.DEFAULT_IMAGE);
63+
static CassandraContainer cassandraContainer = new CassandraContainer(CassandraImage.DEFAULT_IMAGE);
6464

6565
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
6666
.withUserConfiguration(Config.class);

0 commit comments

Comments
 (0)