From 3461b972861feec99b03fb185ede0f3ee7a3dc66 Mon Sep 17 00:00:00 2001 From: Stephen Oakey Date: Wed, 15 Jan 2020 15:45:28 -0500 Subject: [PATCH] Add @ConditionalOnAvailableEndpoint to Actuator Endpoints Resolves #1889 - Added @ConditionalOnAvailableEndpoint to endpoint bean definitions so that they may be managed by Spring Boot's configuration properties. --- .../cloud/stream/config/BindingsEndpointAutoConfiguration.java | 2 ++ .../cloud/stream/config/ChannelsEndpointAutoConfiguration.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingsEndpointAutoConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingsEndpointAutoConfiguration.java index 7c831274c..20a4df31c 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingsEndpointAutoConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingsEndpointAutoConfiguration.java @@ -19,6 +19,7 @@ package org.springframework.cloud.stream.config; import java.util.List; import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration; +import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -41,6 +42,7 @@ import org.springframework.context.annotation.Configuration; public class BindingsEndpointAutoConfiguration { @Bean + @ConditionalOnAvailableEndpoint public BindingsEndpoint bindingsEndpoint(List inputBindings, List outputBindings) { return new BindingsEndpoint(inputBindings, outputBindings); diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelsEndpointAutoConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelsEndpointAutoConfiguration.java index b37a0dfd7..907e26237 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelsEndpointAutoConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelsEndpointAutoConfiguration.java @@ -20,6 +20,7 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration; +import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -44,6 +45,7 @@ public class ChannelsEndpointAutoConfiguration { private List adapters; @Bean + @ConditionalOnAvailableEndpoint public ChannelsEndpoint channelsEndpoint(BindingServiceProperties properties) { return new ChannelsEndpoint(this.adapters, properties); }