Move Pulsar Docker Compose support into spring-boot-pulsar

Author: philwebb

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

@@ -9,7 +9,6 @@ org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryLog
 org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryMetricsDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryTracingDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.postgres.PostgresR2dbcDockerComposeConnectionDetailsFactory,\
-org.springframework.boot.docker.compose.service.connection.pulsar.PulsarDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.redis.RedisDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.sqlserver.SqlServerR2dbcDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.zipkin.ZipkinDockerComposeConnectionDetailsFactory

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

@@ -13,6 +13,7 @@ dependencies {
 	api(project(":spring-boot-project:spring-boot"))
 	api("org.springframework.pulsar:spring-pulsar")
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+	optional(project(":spring-boot-project:spring-boot-docker-compose"))
 	optional(project(":spring-boot-project:spring-boot-testcontainers"))
 	optional("org.springframework.pulsar:spring-pulsar-reactive")
 	optional("org.testcontainers:pulsar")
@@ -21,6 +22,7 @@ dependencies {
 dependencies {
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
+	dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-docker-compose")))
 	dockerTestImplementation("org.testcontainers:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:pulsar")
 	testImplementation(project(":spring-boot-project:spring-boot-test"))

…ctionDetailsFactoryIntegrationTests.java …ctionDetailsFactoryIntegrationTests.javaspring-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 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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.pulsar;
+package org.springframework.boot.pulsar.docker.compose;
 
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
 import org.springframework.boot.pulsar.autoconfigure.PulsarConnectionDetails;

…ce/connection/pulsar/pulsar-compose.yaml …ulsar/docker/compose/pulsar-compose.yamlspring-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 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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.pulsar;
+package org.springframework.boot.pulsar.docker.compose;
 
 import org.springframework.boot.docker.compose.core.ConnectionPorts;
 import org.springframework.boot.docker.compose.core.RunningService;

…ckerComposeConnectionDetailsFactory.java …ckerComposeConnectionDetailsFactory.javaspring-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 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

@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for Docker Compose Pulsar service connections.
+ * Support for Docker Compose Pulsar service connections.
  */
-package org.springframework.boot.docker.compose.service.connection.pulsar;
+package org.springframework.boot.pulsar.docker.compose;

…vice/connection/pulsar/package-info.java …/pulsar/docker/compose/package-info.javaspring-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 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

@@ -1,3 +1,4 @@
 # Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
+org.springframework.boot.pulsar.docker.compose.PulsarDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.pulsar.testcontainers.PulsarContainerConnectionDetailsFactory