Move LDAP Docker Compose support into spring-boot-ldap

Author: philwebb

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

@@ -1,8 +1,6 @@
 # Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
 org.springframework.boot.docker.compose.service.connection.clickhouse.ClickHouseR2dbcDockerComposeConnectionDetailsFactory,\
-org.springframework.boot.docker.compose.service.connection.ldap.LLdapDockerComposeConnectionDetailsFactory,\
-org.springframework.boot.docker.compose.service.connection.ldap.OpenLdapDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.mariadb.MariaDbR2dbcDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.mongo.MongoDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.mysql.MySqlR2dbcDockerComposeConnectionDetailsFactory,\

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

@@ -17,12 +17,14 @@ dependencies {
 
 	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	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("com.unboundid:unboundid-ldapsdk")
 	optional("org.testcontainers:ldap")
 
 	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")
 
 	testCompileOnly("com.fasterxml.jackson.core:jackson-annotations")

…ctionDetailsFactoryIntegrationTests.java …ctionDetailsFactoryIntegrationTests.javaspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/ldap/LLdapDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/docker/compose/LLdapDockerComposeConnectionDetailsFactoryIntegrationTests.java spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/ldap/LLdapDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/docker/compose/LLdapDockerComposeConnectionDetailsFactoryIntegrationTests.java

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

…ctionDetailsFactoryIntegrationTests.java …ctionDetailsFactoryIntegrationTests.javaspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/ldap/OpenLdapDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/docker/compose/OpenLdapDockerComposeConnectionDetailsFactoryIntegrationTests.java spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/ldap/OpenLdapDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/docker/compose/OpenLdapDockerComposeConnectionDetailsFactoryIntegrationTests.java

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

…ervice/connection/ldap/ldap-compose.yaml …ot/ldap/docker/compose/ldap-compose.yamlspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/ldap/ldap-compose.yaml renamed to spring-boot-project/spring-boot-ldap/src/dockerTest/resources/org/springframework/boot/ldap/docker/compose/ldap-compose.yaml spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/ldap/ldap-compose.yaml renamed to spring-boot-project/spring-boot-ldap/src/dockerTest/resources/org/springframework/boot/ldap/docker/compose/ldap-compose.yaml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.ldap;
+package org.springframework.boot.ldap.docker.compose;
 
 import java.util.Map;
 

…rvice/connection/ldap/lldap-compose.yaml …t/ldap/docker/compose/lldap-compose.yamlspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/ldap/lldap-compose.yaml renamed to spring-boot-project/spring-boot-ldap/src/dockerTest/resources/org/springframework/boot/ldap/docker/compose/lldap-compose.yaml spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/ldap/lldap-compose.yaml renamed to spring-boot-project/spring-boot-ldap/src/dockerTest/resources/org/springframework/boot/ldap/docker/compose/lldap-compose.yaml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.ldap;
+package org.springframework.boot.ldap.docker.compose;
 
 import java.util.Arrays;
 import java.util.Map;

…ckerComposeConnectionDetailsFactory.java …ckerComposeConnectionDetailsFactory.javaspring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/ldap/LLdapDockerComposeConnectionDetailsFactory.java renamed to spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/docker/compose/LLdapDockerComposeConnectionDetailsFactory.java spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/ldap/LLdapDockerComposeConnectionDetailsFactory.java renamed to spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/docker/compose/LLdapDockerComposeConnectionDetailsFactory.java

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

…ckerComposeConnectionDetailsFactory.java …ckerComposeConnectionDetailsFactory.javaspring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/ldap/OpenLdapDockerComposeConnectionDetailsFactory.java renamed to spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/docker/compose/OpenLdapDockerComposeConnectionDetailsFactory.java spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/ldap/OpenLdapDockerComposeConnectionDetailsFactory.java renamed to spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/docker/compose/OpenLdapDockerComposeConnectionDetailsFactory.java

@@ -1,4 +1,6 @@
 # Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
+org.springframework.boot.ldap.docker.compose.LLdapDockerComposeConnectionDetailsFactory,\
+org.springframework.boot.ldap.docker.compose.OpenLdapDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.ldap.testcontainers.LLdapContainerConnectionDetailsFactory,\
 org.springframework.boot.ldap.testcontainers.OpenLdapContainerConnectionDetailsFactory