SpringCloud/spring-cloud-bus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrates to new ConditionalOnAvailableEndpoint

Browse Source
This commit is contained in:
Spencer Gibb
2020-01-17 16:45:20 -05:00
parent 0a3fddd10d
commit 353b19b66d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
View File

@@ -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());

4
spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusRefreshAutoConfiguration.java
View File

@@ -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());