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

change prefix of enabled properties to spring.cloud.bus

Browse Source 
fixes gh-11
This commit is contained in:
Spencer Gibb
2015-01-20 11:37:37 -07:00
parent 410f07dc56
commit 04ad7c92c8
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.channel.interceptor.WireTap; import org.springframework.integration.channel.interceptor.WireTap;
import org.springframework.integration.config.GlobalChannelInterceptor; import org.springframework.integration.config.GlobalChannelInterceptor;
@@ -37,12 +36,9 @@ import org.springframework.messaging.SubscribableChannel;
* @author Dave Syer * @author Dave Syer
*/ */
@Configuration @Configuration
@ConditionalOnProperty(value = "bus.enabled", matchIfMissing = true) @ConditionalOnProperty(value = "spring.cloud.bus.enabled", matchIfMissing = true)
public class BusAutoConfiguration { public class BusAutoConfiguration {
@Autowired
private ConfigurableEnvironment environment;
@Autowired @Autowired
private ConfigurableApplicationContext context; private ConfigurableApplicationContext context;
@@ -134,13 +130,13 @@ public class BusAutoConfiguration {
protected static class BusRefreshConfiguration { protected static class BusRefreshConfiguration {
@Bean @Bean
@ConditionalOnProperty(value = "bus.refresh.enabled", matchIfMissing = true) @ConditionalOnProperty(value = "spring.cloud.bus.refresh.enabled", matchIfMissing = true)
public RefreshListener refreshListener(RefreshEndpoint refreshEndpoint) { public RefreshListener refreshListener(RefreshEndpoint refreshEndpoint) {
return new RefreshListener(refreshEndpoint); return new RefreshListener(refreshEndpoint);
} }
@Configuration @Configuration
@ConditionalOnProperty(value = "endpoints.bus.refresh.enabled", matchIfMissing = true) @ConditionalOnProperty(value = "endpoints.spring.cloud.bus.refresh.enabled", matchIfMissing = true)
protected static class BusRefreshEndpointConfiguration { protected static class BusRefreshEndpointConfiguration {
@Bean @Bean
public RefreshBusEndpoint refreshBusEndpoint(ApplicationContext context, public RefreshBusEndpoint refreshBusEndpoint(ApplicationContext context,
@@ -156,14 +152,14 @@ public class BusAutoConfiguration {
@ConditionalOnBean(EnvironmentManager.class) @ConditionalOnBean(EnvironmentManager.class)
protected static class BusEnvironmentConfiguration { protected static class BusEnvironmentConfiguration {
@Bean @Bean
@ConditionalOnProperty(value = "bus.env.enabled", matchIfMissing = true) @ConditionalOnProperty(value = "spring.cloud.bus.env.enabled", matchIfMissing = true)
public EnvironmentChangeListener environmentChangeListener() { public EnvironmentChangeListener environmentChangeListener() {
return new EnvironmentChangeListener(); return new EnvironmentChangeListener();
} }
@Configuration @Configuration
@ConditionalOnClass(Endpoint.class) @ConditionalOnClass(Endpoint.class)
@ConditionalOnProperty(value = "endpoints.bus.env.enabled", matchIfMissing = true) @ConditionalOnProperty(value = "endpoints.spring.cloud.bus.env.enabled", matchIfMissing = true)
protected static class EnvironmentBusEndpointConfiguration { protected static class EnvironmentBusEndpointConfiguration {
@Bean @Bean
public EnvironmentBusEndpoint environmentBusEndpoint( public EnvironmentBusEndpoint environmentBusEndpoint(

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

@@ -9,7 +9,7 @@ import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.dsl.IntegrationFlow;
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*/ */
@Configuration @Configuration
@ConditionalOnClass(AmqpTemplate.class) @ConditionalOnClass(AmqpTemplate.class)
@ConditionalOnExpression("${bus.enabled:true} && ${bus.amqp.enabled:true}") @ConditionalOnProperty(value = "spring.cloud.bus.amqp.enabled", matchIfMissing = true)
public class AmqpBusAutoConfiguration { public class AmqpBusAutoConfiguration {
public static final String SPRING_CLOUD_BUS = "spring.cloud.bus"; public static final String SPRING_CLOUD_BUS = "spring.cloud.bus";