Move LDAP health auto-configuration in spring-boot-ldap

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle

@@ -44,7 +44,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-jetty"))
 	optional(project(":spring-boot-project:spring-boot-jsonb"))
 	optional(project(":spring-boot-project:spring-boot-kafka"))
-	optional(project(":spring-boot-project:spring-boot-ldap"))
 	optional(project(":spring-boot-project:spring-boot-liquibase"))
 	optional(project(":spring-boot-project:spring-boot-mail"))
 	optional(project(":spring-boot-project:spring-boot-mongodb"))
@@ -150,7 +149,6 @@ dependencies {
 	optional("org.springframework.batch:spring-batch-core")
 	optional("org.springframework.data:spring-data-couchbase")
 	optional("org.springframework.data:spring-data-jpa")
-	optional("org.springframework.data:spring-data-ldap")
 	optional("org.springframework.data:spring-data-mongodb")
 	optional("org.springframework.data:spring-data-redis")
 	optional("org.springframework.graphql:spring-graphql")

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -16,7 +16,6 @@ org.springframework.boot.actuate.autoconfigure.endpoint.jackson.JacksonEndpointA
 org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.integration.IntegrationGraphEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.ldap.LdapHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.liquibase.LiquibaseEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.logging.LogFileWebEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.logging.LoggersEndpointAutoConfiguration

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

@@ -14,7 +14,7 @@ dependencies {
 
 	compileOnly("com.fasterxml.jackson.core:jackson-annotations")
 
-	optional(project(":spring-boot-project:spring-boot-actuator"))
+	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
 	optional("com.unboundid:unboundid-ldapsdk")
 

…pHealthContributorAutoConfiguration.java …pHealthContributorAutoConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthContributorAutoConfiguration.java renamed to spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/actuate/health/autoconfigure/LdapHealthContributorAutoConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthContributorAutoConfiguration.java renamed to spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/actuate/health/autoconfigure/LdapHealthContributorAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.ldap;
+package org.springframework.boot.ldap.actuate.health.autoconfigure;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
@@ -26,6 +26,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.ldap.actuate.health.LdapHealthIndicator;
+import org.springframework.boot.ldap.autoconfigure.LdapAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.ldap.core.LdapOperations;
 
@@ -36,8 +37,8 @@
  * @author Stephane Nicoll
  * @since 2.0.0
  */
-@AutoConfiguration(afterName = "org.springframework.boot.ldap.autoconfigure.LdapAutoConfiguration")
-@ConditionalOnClass({ LdapOperations.class, LdapHealthIndicator.class })
+@AutoConfiguration(after = LdapAutoConfiguration.class)
+@ConditionalOnClass({ LdapOperations.class, LdapHealthIndicator.class, ConditionalOnEnabledHealthIndicator.class })
 @ConditionalOnBean(LdapOperations.class)
 @ConditionalOnEnabledHealthIndicator("ldap")
 public class LdapHealthContributorAutoConfiguration

…ate/autoconfigure/ldap/package-info.java …e/health/autoconfigure/package-info.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/ldap/package-info.java renamed to spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/actuate/health/autoconfigure/package-info.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/ldap/package-info.java renamed to spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/actuate/health/autoconfigure/package-info.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for actuator LDAP concerns.
+ * Auto-configuration for LDAP health integration.
  */
-package org.springframework.boot.actuate.autoconfigure.ldap;
+package org.springframework.boot.ldap.actuate.health.autoconfigure;

spring-boot-project/spring-boot-ldap/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1,3 @@
+org.springframework.boot.ldap.actuate.health.autoconfigure.LdapHealthContributorAutoConfiguration
 org.springframework.boot.ldap.autoconfigure.embedded.EmbeddedLdapAutoConfiguration
 org.springframework.boot.ldap.autoconfigure.LdapAutoConfiguration

…thContributorAutoConfigurationTests.java …thContributorAutoConfigurationTests.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthContributorAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-ldap/src/test/java/org/springframework/boot/ldap/actuate/health/autoconfigure/LdapHealthContributorAutoConfigurationTests.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthContributorAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-ldap/src/test/java/org/springframework/boot/ldap/actuate/health/autoconfigure/LdapHealthContributorAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.ldap;
+package org.springframework.boot.ldap.actuate.health.autoconfigure;
 
 import org.junit.jupiter.api.Test;