Skip to content

Commit a40ae49

Browse files
snicollsnicoll
committed
Upgrade to Testcontainers 1.20.2
Closes gh-42670
1 parent c9d0362 commit a40ae49

File tree

14 files changed

+38
-38
lines changed

14 files changed

+38
-38
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.datastax.oss.driver.api.core.CqlSession;
2020
import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
2121
import org.junit.jupiter.api.Test;
22-
import org.testcontainers.containers.CassandraContainer;
22+
import org.testcontainers.cassandra.CassandraContainer;
2323
import org.testcontainers.junit.jupiter.Container;
2424
import org.testcontainers.junit.jupiter.Testcontainers;
2525

@@ -44,7 +44,7 @@
4444
class CassandraAutoConfigurationIntegrationTests {
4545

4646
@Container
47-
static final CassandraContainer<?> cassandra = TestImage.container(CassandraContainer.class);
47+
static final CassandraContainer cassandra = TestImage.container(CassandraContainer.class);
4848

4949
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5050
.withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class))

‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.junit.jupiter.api.Test;
2828
import org.rnorth.ducttape.TimeoutException;
2929
import org.rnorth.ducttape.unreliables.Unreliables;
30-
import org.testcontainers.containers.CassandraContainer;
30+
import org.testcontainers.cassandra.CassandraContainer;
3131
import org.testcontainers.containers.ContainerLaunchException;
3232
import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
3333
import org.testcontainers.images.builder.Transferable;
@@ -53,8 +53,7 @@
5353
class CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests {
5454

5555
@Container
56-
static final PasswordAuthenticatorCassandraContainer cassandra = TestImage
57-
.container(PasswordAuthenticatorCassandraContainer.class)
56+
static final CassandraContainer cassandra = TestImage.container(PasswordAuthenticatorCassandraContainer.class)
5857
.withStartupAttempts(5)
5958
.waitingFor(new CassandraWaitStrategy());
6059

@@ -85,8 +84,7 @@ void authenticationWithInvalidCredentials() {
8584
.withMessageContaining("Authentication error"));
8685
}
8786

88-
static final class PasswordAuthenticatorCassandraContainer
89-
extends CassandraContainer<PasswordAuthenticatorCassandraContainer> {
87+
static final class PasswordAuthenticatorCassandraContainer extends CassandraContainer {
9088

9189
PasswordAuthenticatorCassandraContainer(DockerImageName dockerImageName) {
9290
super(dockerImageName);

‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.datastax.oss.driver.api.core.CqlSession;
2020
import com.datastax.oss.driver.api.core.CqlSessionBuilder;
2121
import org.junit.jupiter.api.Test;
22-
import org.testcontainers.containers.CassandraContainer;
22+
import org.testcontainers.cassandra.CassandraContainer;
2323
import org.testcontainers.junit.jupiter.Container;
2424
import org.testcontainers.junit.jupiter.Testcontainers;
2525

@@ -47,7 +47,7 @@
4747
class CassandraDataAutoConfigurationIntegrationTests {
4848

4949
@Container
50-
static final CassandraContainer<?> cassandra = TestImage.container(CassandraContainer.class);
50+
static final CassandraContainer cassandra = TestImage.container(CassandraContainer.class);
5151

5252
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5353
.withConfiguration(

‎spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2180,7 +2180,7 @@ bom {
21802180
releaseNotes("https://github.com/xerial/sqlite-jdbc/releases/tag/{version}")
21812181
}
21822182
}
2183-
library("Testcontainers", "1.20.1") {
2183+
library("Testcontainers", "1.20.2") {
21842184
group("org.testcontainers") {
21852185
imports = [
21862186
"testcontainers-bom"

‎spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The following service connection factories are provided in the `spring-boot-test
6060
| Containers of type `JdbcDatabaseContainer`
6161

6262
| `KafkaConnectionDetails`
63-
| Containers of type `org.testcontainers.containers.KafkaContainer`, `org.testcontainers.kafka.KafkaContainer` or `RedpandaContainer`
63+
| Containers of type `org.testcontainers.kafka.KafkaContainer`, `org.testcontainers.kafka.ConfluentKafkaContainer` or `RedpandaContainer`
6464

6565
| `LiquibaseConnectionDetails`
6666
| Containers of type `JdbcDatabaseContainer`

‎spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.datastax.oss.driver.api.core.CqlSession;
2222
import com.datastax.oss.driver.api.core.CqlSessionBuilder;
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

@@ -56,7 +56,7 @@ class DataCassandraTestIntegrationTests {
5656

5757
@Container
5858
@ServiceConnection
59-
static final CassandraContainer<?> cassandra = TestImage.container(CassandraContainer.class);
59+
static final CassandraContainer cassandra = TestImage.container(CassandraContainer.class);
6060

6161
@Autowired
6262
private CassandraTemplate cassandraTemplate;

‎spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.datastax.oss.driver.api.core.CqlSession;
2222
import com.datastax.oss.driver.api.core.CqlSessionBuilder;
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

@@ -53,7 +53,7 @@ class DataCassandraTestWithIncludeFilterIntegrationTests {
5353

5454
@Container
5555
@ServiceConnection
56-
static final CassandraContainer<?> cassandra = TestImage.container(CassandraContainer.class);
56+
static final CassandraContainer cassandra = TestImage.container(CassandraContainer.class);
5757

5858
@Autowired
5959
private ExampleRepository exampleRepository;

‎spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/cassandra/CassandraContainerConnectionDetailsFactoryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.datastax.oss.driver.api.core.CqlSession;
2020
import org.junit.jupiter.api.Test;
21-
import org.testcontainers.containers.CassandraContainer;
21+
import org.testcontainers.cassandra.CassandraContainer;
2222
import org.testcontainers.junit.jupiter.Container;
2323
import org.testcontainers.junit.jupiter.Testcontainers;
2424

@@ -44,7 +44,7 @@ class CassandraContainerConnectionDetailsFactoryTests {
4444

4545
@Container
4646
@ServiceConnection
47-
static final CassandraContainer<?> cassandra = TestImage.container(CassandraContainer.class);
47+
static final CassandraContainer cassandra = TestImage.container(CassandraContainer.class);
4848

4949
@Autowired(required = false)
5050
private CassandraConnectionDetails connectionDetails;

‎spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/kafka/ConfluentKafkaContainerConnectionDetailsFactoryIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
import org.awaitility.Awaitility;
2424
import org.junit.jupiter.api.Test;
25-
import org.testcontainers.containers.KafkaContainer;
2625
import org.testcontainers.junit.jupiter.Container;
2726
import org.testcontainers.junit.jupiter.Testcontainers;
27+
import org.testcontainers.kafka.ConfluentKafkaContainer;
2828

2929
import org.springframework.beans.factory.annotation.Autowired;
3030
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -55,7 +55,7 @@ class ConfluentKafkaContainerConnectionDetailsFactoryIntegrationTests {
5555

5656
@Container
5757
@ServiceConnection
58-
static final KafkaContainer kafka = TestImage.container(KafkaContainer.class);
58+
static final ConfluentKafkaContainer kafka = TestImage.container(ConfluentKafkaContainer.class);
5959

6060
@Autowired
6161
private KafkaTemplate<String, String> kafkaTemplate;

‎spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/cassandra/CassandraContainerConnectionDetailsFactory.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
import java.net.InetSocketAddress;
2020
import java.util.List;
2121

22-
import org.testcontainers.containers.CassandraContainer;
22+
import org.testcontainers.cassandra.CassandraContainer;
2323

2424
import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails;
2525
import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory;
@@ -36,21 +36,21 @@
3636
* @author Phillip Webb
3737
*/
3838
class CassandraContainerConnectionDetailsFactory
39-
extends ContainerConnectionDetailsFactory<CassandraContainer<?>, CassandraConnectionDetails> {
39+
extends ContainerConnectionDetailsFactory<CassandraContainer, CassandraConnectionDetails> {
4040

4141
@Override
4242
protected CassandraConnectionDetails getContainerConnectionDetails(
43-
ContainerConnectionSource<CassandraContainer<?>> source) {
43+
ContainerConnectionSource<CassandraContainer> source) {
4444
return new CassandraContainerConnectionDetails(source);
4545
}
4646

4747
/**
4848
* {@link CassandraConnectionDetails} backed by a {@link ContainerConnectionSource}.
4949
*/
5050
private static final class CassandraContainerConnectionDetails
51-
extends ContainerConnectionDetails<CassandraContainer<?>> implements CassandraConnectionDetails {
51+
extends ContainerConnectionDetails<CassandraContainer> implements CassandraConnectionDetails {
5252

53-
private CassandraContainerConnectionDetails(ContainerConnectionSource<CassandraContainer<?>> source) {
53+
private CassandraContainerConnectionDetails(ContainerConnectionSource<CassandraContainer> source) {
5454
super(source);
5555
}
5656

0 commit comments

Comments
 (0)