Move AMQP health auto-configuration into spring-boot-amqp

Author: wilkinsona

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

@@ -1,4 +1,3 @@
-org.springframework.boot.actuate.autoconfigure.amqp.RabbitHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.audit.AuditAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.audit.AuditEventsEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.availability.AvailabilityHealthContributorAutoConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/amqp/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java

@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.amqp;
+package org.springframework.boot.actuate.autoconfigure.metrics.amqp;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.MeterBinder;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.metrics.amqp.RabbitMetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;

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

@@ -17,7 +17,7 @@ dependencies {
 
 	implementation(project(":spring-boot-project:spring-boot-tx"))
 
-	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("io.micrometer:micrometer-core")
 	optional("org.springframework.amqp:spring-rabbit-stream")

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitHealthContributorAutoConfiguration.java renamed to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/health/autoconfigure/RabbitHealthContributorAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.amqp;
+package org.springframework.boot.amqp.actuate.health.autoconfigure;
 
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -34,7 +34,7 @@
  * {@link EnableAutoConfiguration Auto-configuration} for {@link RabbitHealthIndicator}.
  *
  * @author Christian Dupuis
- * @since 2.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = RabbitAutoConfiguration.class)
 @ConditionalOnClass({ RabbitHealthIndicator.class, RabbitTemplate.class })

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/amqp/package-info.java renamed to spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/health/autoconfigure/package-info.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for actuator AMQP concerns.
+ * Auto-configuration of health integration for AMQP and RabbitMQ.
  */
-package org.springframework.boot.actuate.autoconfigure.amqp;
+package org.springframework.boot.amqp.actuate.health.autoconfigure;

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

@@ -1 +1,2 @@
+org.springframework.boot.amqp.actuate.health.autoconfigure.RabbitHealthContributorAutoConfiguration
 org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitHealthContributorAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/actuate/health/autoconfigure/RabbitHealthContributorAutoConfigurationTests.java

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