Move Couchbase health auto-configuration into spring-boot-couchbase

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -41,21 +41,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "management.health.couchbase.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether to enable Couchbase health check.",
-      "defaultValue": true
-    },
-    {
-      "name": "management.health.couchbase.timeout",
-      "type": "java.time.Duration",
-      "description": "Timeout for getting the Bucket information from the server.",
-      "defaultValue": "1000ms",
-      "deprecation": {
-        "level": "error"
-      }
-    },
     {
       "name": "management.health.db.enabled",
       "type": "java.lang.Boolean",

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

@@ -8,8 +8,6 @@ org.springframework.boot.actuate.autoconfigure.cloudfoundry.servlet.CloudFoundry
 org.springframework.boot.actuate.autoconfigure.condition.ConditionsReportEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.context.properties.ConfigurationPropertiesReportEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.context.ShutdownEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.couchbase.CouchbaseHealthContributorAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.couchbase.CouchbaseReactiveHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.data.elasticsearch.ElasticsearchReactiveHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.data.mongo.MongoHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.data.mongo.MongoReactiveHealthContributorAutoConfiguration

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

@@ -19,7 +19,7 @@ dependencies {
 	dockerTestImplementation("org.testcontainers:couchbase")
 	dockerTestImplementation("org.testcontainers:junit-jupiter")
 
-	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(project(":spring-boot-project:spring-boot-jackson"))
 

…eHealthContributorAutoConfiguration.java …eHealthContributorAutoConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthContributorAutoConfiguration.java renamed to spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/actuate/health/autoconfigure/CouchbaseHealthContributorAutoConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthContributorAutoConfiguration.java renamed to spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/actuate/health/autoconfigure/CouchbaseHealthContributorAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.couchbase;
+package org.springframework.boot.couchbase.actuate.health.autoconfigure;
 
 import com.couchbase.client.java.Cluster;
 
@@ -28,6 +28,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.couchbase.actuate.health.CouchbaseHealthIndicator;
+import org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 
 /**
@@ -37,11 +38,11 @@
  * @author Eddú Meléndez
  * @author Stephane Nicoll
  * @author Andy Wilkinson Nicoll
- * @since 2.0.0
+ * @since 4.0.0
  */
-@AutoConfiguration(after = CouchbaseReactiveHealthContributorAutoConfiguration.class,
-		afterName = "org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration")
-@ConditionalOnClass({ Cluster.class, CouchbaseHealthIndicator.class })
+@AutoConfiguration(
+		after = { CouchbaseAutoConfiguration.class, CouchbaseReactiveHealthContributorAutoConfiguration.class })
+@ConditionalOnClass({ Cluster.class, CouchbaseHealthIndicator.class, ConditionalOnEnabledHealthIndicator.class })
 @ConditionalOnBean(Cluster.class)
 @ConditionalOnEnabledHealthIndicator("couchbase")
 public class CouchbaseHealthContributorAutoConfiguration

…eHealthContributorAutoConfiguration.java …eHealthContributorAutoConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthContributorAutoConfiguration.java renamed to spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/actuate/health/autoconfigure/CouchbaseReactiveHealthContributorAutoConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthContributorAutoConfiguration.java renamed to spring-boot-project/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/actuate/health/autoconfigure/CouchbaseReactiveHealthContributorAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.couchbase;
+package org.springframework.boot.couchbase.actuate.health.autoconfigure;
 
 import com.couchbase.client.java.Cluster;
 import reactor.core.publisher.Flux;
@@ -29,6 +29,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.couchbase.actuate.health.CouchbaseReactiveHealthIndicator;
+import org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 
 /**
@@ -37,10 +38,11 @@
  *
  * @author Mikalai Lushchytski
  * @author Stephane Nicoll
- * @since 2.1.0
+ * @since 4.0.0
  */
-@AutoConfiguration(afterName = "org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration")
-@ConditionalOnClass({ Cluster.class, Flux.class, CouchbaseReactiveHealthIndicator.class })
+@AutoConfiguration(after = CouchbaseAutoConfiguration.class)
+@ConditionalOnClass({ Cluster.class, Flux.class, CouchbaseReactiveHealthIndicator.class,
+		ConditionalOnEnabledHealthIndicator.class })
 @ConditionalOnBean(Cluster.class)
 @ConditionalOnEnabledHealthIndicator("couchbase")
 public class CouchbaseReactiveHealthContributorAutoConfiguration

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

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for actuator Couchbase concerns.
  */
-package org.springframework.boot.actuate.autoconfigure.couchbase;
+package org.springframework.boot.couchbase.actuate.health.autoconfigure;

spring-boot-project/spring-boot-couchbase/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,6 +1,21 @@
 {
   "groups": [],
   "properties": [
+    {
+      "name": "management.health.couchbase.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable Couchbase health check.",
+      "defaultValue": true
+    },
+    {
+      "name": "management.health.couchbase.timeout",
+      "type": "java.time.Duration",
+      "description": "Timeout for getting the Bucket information from the server.",
+      "defaultValue": "1000ms",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.couchbase.bootstrap-hosts",
       "type": "java.util.List<java.lang.String>",

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

@@ -1 +1,3 @@
+org.springframework.boot.couchbase.actuate.health.autoconfigure.CouchbaseHealthContributorAutoConfiguration
+org.springframework.boot.couchbase.actuate.health.autoconfigure.CouchbaseReactiveHealthContributorAutoConfiguration
 org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration

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

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

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

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