Skip to content

Commit 1b6dc72

Browse files
committed
Move Pulsar Docker Compose support into spring-boot-pulsar
1 parent bc241ec commit 1b6dc72

File tree

7 files changed

+7
-5
lines changed

7 files changed

+7
-5
lines changed

spring-boot-project/spring-boot-docker-compose-all/src/main/resources/META-INF/spring.factories

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryLog
99
org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryMetricsDockerComposeConnectionDetailsFactory,\
1010
org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryTracingDockerComposeConnectionDetailsFactory,\
1111
org.springframework.boot.docker.compose.service.connection.postgres.PostgresR2dbcDockerComposeConnectionDetailsFactory,\
12-
org.springframework.boot.docker.compose.service.connection.pulsar.PulsarDockerComposeConnectionDetailsFactory,\
1312
org.springframework.boot.docker.compose.service.connection.redis.RedisDockerComposeConnectionDetailsFactory,\
1413
org.springframework.boot.docker.compose.service.connection.sqlserver.SqlServerR2dbcDockerComposeConnectionDetailsFactory,\
1514
org.springframework.boot.docker.compose.service.connection.zipkin.ZipkinDockerComposeConnectionDetailsFactory

spring-boot-project/spring-boot-pulsar/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ dependencies {
1414
api("org.springframework.pulsar:spring-pulsar")
1515

1616
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
17+
optional(project(":spring-boot-project:spring-boot-docker-compose"))
1718
optional(project(":spring-boot-project:spring-boot-testcontainers"))
1819
optional("org.springframework.pulsar:spring-pulsar-reactive")
1920
optional("org.testcontainers:pulsar")
2021

2122
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
2223
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
24+
dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-docker-compose")))
2325
dockerTestImplementation("org.testcontainers:junit-jupiter")
2426
dockerTestImplementation("org.testcontainers:pulsar")
2527

spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/pulsar/PulsarDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/docker/compose/PulsarDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docker.compose.service.connection.pulsar;
17+
package org.springframework.boot.pulsar.docker.compose;
1818

1919
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2020
import org.springframework.boot.pulsar.autoconfigure.PulsarConnectionDetails;

spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/pulsar/pulsar-compose.yaml renamed to spring-boot-project/spring-boot-pulsar/src/dockerTest/resources/org/springframework/boot/pulsar/docker/compose/pulsar-compose.yaml

File renamed without changes.

spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/pulsar/PulsarDockerComposeConnectionDetailsFactory.java renamed to spring-boot-project/spring-boot-pulsar/src/main/java/org/springframework/boot/pulsar/docker/compose/PulsarDockerComposeConnectionDetailsFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docker.compose.service.connection.pulsar;
17+
package org.springframework.boot.pulsar.docker.compose;
1818

1919
import org.springframework.boot.docker.compose.core.ConnectionPorts;
2020
import org.springframework.boot.docker.compose.core.RunningService;

spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/pulsar/package-info.java renamed to spring-boot-project/spring-boot-pulsar/src/main/java/org/springframework/boot/pulsar/docker/compose/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
*/
1616

1717
/**
18-
* Auto-configuration for Docker Compose Pulsar service connections.
18+
* Support for Docker Compose Pulsar service connections.
1919
*/
20-
package org.springframework.boot.docker.compose.service.connection.pulsar;
20+
package org.springframework.boot.pulsar.docker.compose;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# Connection Details Factories
22
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
3+
org.springframework.boot.pulsar.docker.compose.PulsarDockerComposeConnectionDetailsFactory,\
34
org.springframework.boot.pulsar.testcontainers.PulsarContainerConnectionDetailsFactory

0 commit comments

Comments
 (0)