From 2220bd960584d146aba16339f782250e18ef2089 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 17 Jul 2019 11:25:05 -0400 Subject: [PATCH] Revert "feat: remove RabbitHealthIndicator completely" This reverts commit baef3aea56652f1b204050596841ecb983a0346f. --- .../RabbitServiceAutoConfiguration.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java b/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java index 196deea68..d2a3d9957 100644 --- a/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java +++ b/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java @@ -20,6 +20,8 @@ import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.ObjectProvider; +import org.springframework.boot.actuate.amqp.RabbitHealthIndicator; +import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; import org.springframework.boot.autoconfigure.amqp.RabbitProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -51,11 +53,11 @@ import org.springframework.util.StringUtils; * @author Ilayaperumal Gopinathan * @author Artem Bilan * @author Gary Russell - * @author Arnaud Deprez */ @Configuration @ConditionalOnMissingBean(Binder.class) -@Import({ RabbitMessageChannelBinderConfiguration.class }) +@Import({ RabbitMessageChannelBinderConfiguration.class, + RabbitServiceAutoConfiguration.RabbitHealthIndicatorConfiguration.class }) public abstract class RabbitServiceAutoConfiguration { static void configureCachingConnectionFactory( @@ -196,4 +198,19 @@ public abstract class RabbitServiceAutoConfiguration { } + /** + * Configuration for Rabbit health indicator. + * + */ + @Configuration + @ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator") + public static class RabbitHealthIndicatorConfiguration { + + @Bean + public HealthIndicator binderHealthIndicator(RabbitTemplate rabbitTemplate) { + return new RabbitHealthIndicator(rabbitTemplate); + } + + } + }