Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Polish "Add support for org.testcontainers.kafka.KafkaContainer"

Browse Source 
See gh-40695
This commit is contained in:
Andy Wilkinson 2024-06-27 15:04:10 +01:00
parent 769f3e9d14
commit 6749ad674f
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc
View File

@ -60,7 +60,7 @@ The following service connection factories are provided in the `spring-boot-test
| Containers of type `JdbcDatabaseContainer` | Containers of type `JdbcDatabaseContainer`
| `KafkaConnectionDetails` | `KafkaConnectionDetails`
| Containers of type `org.testcontainers.containers.KafkaContainer` or `RedpandaContainer` | Containers of type `org.testcontainers.containers.KafkaContainer`, `org.testcontainers.kafka.KafkaContainer` or `RedpandaContainer`
| `LiquibaseConnectionDetails` | `LiquibaseConnectionDetails`
| Containers of type `JdbcDatabaseContainer` | Containers of type `JdbcDatabaseContainer`

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

@ -41,7 +41,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests for {@link KafkaContainerConnectionDetailsFactory}. * Tests for {@link ConfluentKafkaContainerConnectionDetailsFactory}.
* *
* @author Moritz Halbritter * @author Moritz Halbritter
* @author Andy Wilkinson * @author Andy Wilkinson

4
spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/kafka/KafkaContainerConnectionDetailsFactoryIntegrationTests.java → spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/kafka/ConfluentKafkaContainerConnectionDetailsFactoryIntegrationTests.java
View File

@ -41,7 +41,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests for {@link KafkaContainerConnectionDetailsFactory}. * Tests for {@link ConfluentKafkaContainerConnectionDetailsFactory}.
* *
* @author Moritz Halbritter * @author Moritz Halbritter
* @author Andy Wilkinson * @author Andy Wilkinson
@ -51,7 +51,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
@TestPropertySource(properties = { "spring.kafka.consumer.group-id=test-group", @TestPropertySource(properties = { "spring.kafka.consumer.group-id=test-group",
"spring.kafka.consumer.auto-offset-reset=earliest" }) "spring.kafka.consumer.auto-offset-reset=earliest" })
class KafkaContainerConnectionDetailsFactoryIntegrationTests { class ConfluentKafkaContainerConnectionDetailsFactoryIntegrationTests {
@Container @Container
@ServiceConnection @ServiceConnection

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

@ -39,16 +39,16 @@ class ApacheKafkaContainerConnectionDetailsFactory
@Override @Override
protected KafkaConnectionDetails getContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) { protected KafkaConnectionDetails getContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) {
return new KafkaContainerConnectionDetails(source); return new ApacheKafkaContainerConnectionDetails(source);
} }
/** /**
* {@link KafkaConnectionDetails} backed by a {@link ContainerConnectionSource}. * {@link KafkaConnectionDetails} backed by a {@link ContainerConnectionSource}.
*/ */
private static final class KafkaContainerConnectionDetails extends ContainerConnectionDetails<KafkaContainer> private static final class ApacheKafkaContainerConnectionDetails extends ContainerConnectionDetails<KafkaContainer>
implements KafkaConnectionDetails { implements KafkaConnectionDetails {
private KafkaContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) { private ApacheKafkaContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) {
super(source); super(source);
} }

10
spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/kafka/KafkaContainerConnectionDetailsFactory.java → spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/kafka/ConfluentKafkaContainerConnectionDetailsFactory.java
View File

@ -33,21 +33,21 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Phillip Webb * @author Phillip Webb
*/ */
class KafkaContainerConnectionDetailsFactory class ConfluentKafkaContainerConnectionDetailsFactory
extends ContainerConnectionDetailsFactory<KafkaContainer, KafkaConnectionDetails> { extends ContainerConnectionDetailsFactory<KafkaContainer, KafkaConnectionDetails> {
@Override @Override
protected KafkaConnectionDetails getContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) { protected KafkaConnectionDetails getContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) {
return new KafkaContainerConnectionDetails(source); return new ConfluentKafkaContainerConnectionDetails(source);
} }
/** /**
* {@link KafkaConnectionDetails} backed by a {@link ContainerConnectionSource}. * {@link KafkaConnectionDetails} backed by a {@link ContainerConnectionSource}.
*/ */
private static final class KafkaContainerConnectionDetails extends ContainerConnectionDetails<KafkaContainer> private static final class ConfluentKafkaContainerConnectionDetails
implements KafkaConnectionDetails { extends ContainerConnectionDetails<KafkaContainer> implements KafkaConnectionDetails {
private KafkaContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) { private ConfluentKafkaContainerConnectionDetails(ContainerConnectionSource<KafkaContainer> source) {
super(source); super(source);
} }

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

@ -18,7 +18,7 @@ org.springframework.boot.testcontainers.service.connection.flyway.FlywayContaine
org.springframework.boot.testcontainers.service.connection.elasticsearch.ElasticsearchContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.elasticsearch.ElasticsearchContainerConnectionDetailsFactory,\
org.springframework.boot.testcontainers.service.connection.jdbc.JdbcContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.jdbc.JdbcContainerConnectionDetailsFactory,\
org.springframework.boot.testcontainers.service.connection.kafka.ApacheKafkaContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.kafka.ApacheKafkaContainerConnectionDetailsFactory,\
org.springframework.boot.testcontainers.service.connection.kafka.KafkaContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.kafka.ConfluentKafkaContainerConnectionDetailsFactory,\
org.springframework.boot.testcontainers.service.connection.ldap.OpenLdapContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.ldap.OpenLdapContainerConnectionDetailsFactory,\
org.springframework.boot.testcontainers.service.connection.liquibase.LiquibaseContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.liquibase.LiquibaseContainerConnectionDetailsFactory,\
org.springframework.boot.testcontainers.service.connection.mongo.MongoContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.mongo.MongoContainerConnectionDetailsFactory,\

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

@ -101,9 +101,9 @@ public enum TestImage {
ELASTICSEARCH_8("elasticsearch", "8.6.1"), ELASTICSEARCH_8("elasticsearch", "8.6.1"),
/** /**
* A container image suitable for testing Kafka. * A container image suitable for testing Confluent's distribution of Kafka.
*/ */
KAFKA("confluentinc/cp-kafka", "7.4.0", () -> KafkaContainer.class), CONFLUENT_KAFKA("confluentinc/cp-kafka", "7.4.0", () -> KafkaContainer.class),
/** /**
* A container image suitable for testing OpenLDAP. * A container image suitable for testing OpenLDAP.