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

changed s-i-java-dsl to snapshot to remove java 8 requirement;

Browse Source 
renamed platform* to cloud*
This commit is contained in:
Spencer Gibb
2014-09-03 15:22:54 -06:00
parent f11a3eef26
commit cc659d3ae7
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -62,7 +62,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>1.0.0.M2</version>
<version>1.0.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>

24
src/main/java/org/springframework/cloud/bus/amqp/AmqpBusAutoConfiguration.java
View File

@@ -34,7 +34,7 @@ import org.springframework.integration.handler.LoggingHandler;
@ConditionalOnExpression("${bus.amqp.enabled:true}")
public class AmqpBusAutoConfiguration {
public static final String SPRING_PLATFORM_BUS = "spring.platform.bus";
public static final String SPRING_CLOUD_BUS = "spring.cloud.bus";
@Autowired
private ConnectionFactory connectionFactory;
@@ -50,23 +50,23 @@ public class AmqpBusAutoConfiguration {
//TODO: how to fail gracefully if no rabbit?
@Bean
protected FanoutExchange platformBusExchange() {
protected FanoutExchange cloudBusExchange() {
//TODO: change to TopicExchange?
FanoutExchange exchange = new FanoutExchange(SPRING_PLATFORM_BUS);
FanoutExchange exchange = new FanoutExchange(SPRING_CLOUD_BUS);
amqpAdmin.declareExchange(exchange);
return exchange;
}
@Bean
protected Queue localPlatformBusQueue() {
protected Queue localCloudBusQueue() {
Queue queue = amqpAdmin.declareQueue();
amqpAdmin.declareBinding(BindingBuilder.bind(queue).to(platformBusExchange()));
amqpAdmin.declareBinding(BindingBuilder.bind(queue).to(cloudBusExchange()));
return queue;
}
@SuppressWarnings("unchecked")
@Bean
public ApplicationEventListeningMessageProducer platformBusProducer() {
public ApplicationEventListeningMessageProducer cloudBusProducer() {
ApplicationEventListeningMessageProducer producer = new ApplicationEventListeningMessageProducer();
producer.setEventTypes(RemoteApplicationEvent.class);
producer.setOutputChannel(new DirectChannel());
@@ -74,10 +74,10 @@ public class AmqpBusAutoConfiguration {
}
@Bean
public IntegrationFlow platformBusOutboundFlow() {
return IntegrationFlows.from(platformBusProducer())
public IntegrationFlow cloudBusOutboundFlow() {
return IntegrationFlows.from(cloudBusProducer())
.filter(outboundFilter())
.handle(Amqp.outboundAdapter(this.amqpTemplate).exchangeName(SPRING_PLATFORM_BUS))
.handle(Amqp.outboundAdapter(this.amqpTemplate).exchangeName(SPRING_CLOUD_BUS))
.get();
}
@@ -119,9 +119,9 @@ public class AmqpBusAutoConfiguration {
}
@Bean
public IntegrationFlow platformBusInboundFlow(Environment env) {
public IntegrationFlow cloudBusInboundFlow(Environment env) {
ApplicationEventPublishingMessageHandler messageHandler = new ApplicationEventPublishingMessageHandler();
return IntegrationFlows.from(Amqp.inboundAdapter(connectionFactory, localPlatformBusQueue()))
return IntegrationFlows.from(Amqp.inboundAdapter(connectionFactory, localCloudBusQueue()))
.filter(inboundFilter())
.handle(messageHandler)
.get();
@@ -133,7 +133,7 @@ public class AmqpBusAutoConfiguration {
}
@Bean
@GlobalChannelInterceptor(patterns = "platformBusInboundFlow*")
@GlobalChannelInterceptor(patterns = "cloudBusInboundFlow*")
public WireTap wireTap() {
return new WireTap(wiretapChannel());
}