From 353b19b66dede0f36011ad234d63bbcbde246b8e Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 17 Jan 2020 16:45:20 -0500 Subject: [PATCH] Migrates to new ConditionalOnAvailableEndpoint --- .../org/springframework/cloud/bus/BusAutoConfiguration.java | 4 ++-- .../cloud/bus/BusRefreshAutoConfiguration.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java index 61b0960..d8e5e88 100644 --- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java +++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java @@ -19,7 +19,7 @@ package org.springframework.cloud.bus; import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; +import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.trace.http.HttpTraceRepository; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -233,7 +233,7 @@ public class BusAutoConfiguration implements ApplicationEventPublisherAware { protected static class EnvironmentBusEndpointConfiguration { @Bean - @ConditionalOnEnabledEndpoint + @ConditionalOnAvailableEndpoint public EnvironmentBusEndpoint environmentBusEndpoint( ApplicationContext context, BusProperties bus) { return new EnvironmentBusEndpoint(context, bus.getId()); diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusRefreshAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusRefreshAutoConfiguration.java index 7dc09f0..2f62759 100644 --- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusRefreshAutoConfiguration.java +++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusRefreshAutoConfiguration.java @@ -16,7 +16,7 @@ package org.springframework.cloud.bus; -import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; +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; @@ -53,7 +53,7 @@ public class BusRefreshAutoConfiguration { protected static class BusRefreshEndpointConfiguration { @Bean - @ConditionalOnEnabledEndpoint + @ConditionalOnAvailableEndpoint public RefreshBusEndpoint refreshBusEndpoint(ApplicationContext context, BusProperties bus) { return new RefreshBusEndpoint(context, bus.getId());