Skip to content

Commit 6749ad6

Browse files
committed
Polish "Add support for org.testcontainers.kafka.KafkaContainer"
See gh-40695
1 parent 769f3e9 commit 6749ad6

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

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` or `RedpandaContainer`
63+
| Containers of type `org.testcontainers.containers.KafkaContainer`, `org.testcontainers.kafka.KafkaContainer` or `RedpandaContainer`
6464

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import static org.assertj.core.api.Assertions.assertThat;
4242

4343
/**
44-
* Tests for {@link KafkaContainerConnectionDetailsFactory}.
44+
* Tests for {@link ConfluentKafkaContainerConnectionDetailsFactory}.
4545
*
4646
* @author Moritz Halbritter
4747
* @author Andy Wilkinson
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import static org.assertj.core.api.Assertions.assertThat;
4242

4343
/**
44-
* Tests for {@link KafkaContainerConnectionDetailsFactory}.
44+
* Tests for {@link ConfluentKafkaContainerConnectionDetailsFactory}.
4545
*
4646
* @author Moritz Halbritter
4747
* @author Andy Wilkinson
@@ -51,7 +51,7 @@
5151
@Testcontainers(disabledWithoutDocker = true)
5252
@TestPropertySource(properties = { "spring.kafka.consumer.group-id=test-group",
5353
"spring.kafka.consumer.auto-offset-reset=earliest" })
54-
class KafkaContainerConnectionDetailsFactoryIntegrationTests {
54+
class ConfluentKafkaContainerConnectionDetailsFactoryIntegrationTests {
5555

5656
@Container
5757
@ServiceConnection

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/kafka/ApacheKafkaContainerConnectionDetailsFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ class ApacheKafkaContainerConnectionDetailsFactory
3939

4040
@Override
4141
protected KafkaConnectionDetails getContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) {
42-
return new KafkaContainerConnectionDetails(source);
42+
return new ApacheKafkaContainerConnectionDetails(source);
4343
}
4444

4545
/**
4646
* {@link KafkaConnectionDetails} backed by a {@link ContainerConnectionSource}.
4747
*/
48-
private static final class KafkaContainerConnectionDetails extends ContainerConnectionDetails<KafkaContainer>
48+
private static final class ApacheKafkaContainerConnectionDetails extends ContainerConnectionDetails<KafkaContainer>
4949
implements KafkaConnectionDetails {
5050

51-
private KafkaContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) {
51+
private ApacheKafkaContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) {
5252
super(source);
5353
}
5454

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@
3333
* @author Andy Wilkinson
3434
* @author Phillip Webb
3535
*/
36-
class KafkaContainerConnectionDetailsFactory
36+
class ConfluentKafkaContainerConnectionDetailsFactory
3737
extends ContainerConnectionDetailsFactory<KafkaContainer, KafkaConnectionDetails> {
3838

3939
@Override
4040
protected KafkaConnectionDetails getContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) {
41-
return new KafkaContainerConnectionDetails(source);
41+
return new ConfluentKafkaContainerConnectionDetails(source);
4242
}
4343

4444
/**
4545
* {@link KafkaConnectionDetails} backed by a {@link ContainerConnectionSource}.
4646
*/
47-
private static final class KafkaContainerConnectionDetails extends ContainerConnectionDetails<KafkaContainer>
48-
implements KafkaConnectionDetails {
47+
private static final class ConfluentKafkaContainerConnectionDetails
48+
extends ContainerConnectionDetails<KafkaContainer> implements KafkaConnectionDetails {
4949

50-
private KafkaContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) {
50+
private ConfluentKafkaContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) {
5151
super(source);
5252
}
5353

spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring.factories

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ org.springframework.boot.testcontainers.service.connection.flyway.FlywayContaine
1818
org.springframework.boot.testcontainers.service.connection.elasticsearch.ElasticsearchContainerConnectionDetailsFactory,\
1919
org.springframework.boot.testcontainers.service.connection.jdbc.JdbcContainerConnectionDetailsFactory,\
2020
org.springframework.boot.testcontainers.service.connection.kafka.ApacheKafkaContainerConnectionDetailsFactory,\
21-
org.springframework.boot.testcontainers.service.connection.kafka.KafkaContainerConnectionDetailsFactory,\
21+
org.springframework.boot.testcontainers.service.connection.kafka.ConfluentKafkaContainerConnectionDetailsFactory,\
2222
org.springframework.boot.testcontainers.service.connection.ldap.OpenLdapContainerConnectionDetailsFactory,\
2323
org.springframework.boot.testcontainers.service.connection.liquibase.LiquibaseContainerConnectionDetailsFactory,\
2424
org.springframework.boot.testcontainers.service.connection.mongo.MongoContainerConnectionDetailsFactory,\

spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ public enum TestImage {
101101
ELASTICSEARCH_8("elasticsearch", "8.6.1"),
102102

103103
/**
104-
* A container image suitable for testing Kafka.
104+
* A container image suitable for testing Confluent's distribution of Kafka.
105105
*/
106-
KAFKA("confluentinc/cp-kafka", "7.4.0", () -> KafkaContainer.class),
106+
CONFLUENT_KAFKA("confluentinc/cp-kafka", "7.4.0", () -> KafkaContainer.class),
107107

108108
/**
109109
* A container image suitable for testing OpenLDAP.

0 commit comments

Comments
 (0)