Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-2427 Fix Types of AMQP Outbound Endpoints

Browse Source 
Logic for returning gateway Vs. channel-adapter was
reversed.
This commit is contained in:
Gary Russell
2012-02-03 19:04:57 -05:00
committed by Mark Fisher
parent 797806811b
commit ef99ccde0e
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java
View File

@@ -38,6 +38,7 @@ import org.springframework.util.Assert;
*
* @author Mark Fisher
* @author Oleg Zhurakousky
* @author Gary Russell
* @since 2.1
*/
public class AmqpOutboundEndpoint extends AbstractReplyProducingMessageHandler {
@@ -111,7 +112,7 @@ public class AmqpOutboundEndpoint extends AbstractReplyProducingMessageHandler {
@Override
public String getComponentType() {
return expectReply ? "amqp:outbound-channel-adapter" : "amqp:outbound-gateway";
return expectReply ? "amqp:outbound-gateway" : "amqp:outbound-channel-adapter";
}
@Override

2
spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests.java
View File

@@ -46,6 +46,7 @@ import static junit.framework.Assert.assertEquals;
/**
* @author Mark Fisher
* @author Oleg Zhurakousky
* @author Gary Russell
* @since 2.1
*/
@ContextConfiguration
@@ -63,6 +64,7 @@ public class AmqpOutboundChannelAdapterParserTests {
assertEquals(EventDrivenConsumer.class, adapter.getClass());
MessageHandler handler = TestUtils.getPropertyValue(adapter, "handler", MessageHandler.class);
assertEquals(AmqpOutboundEndpoint.class, handler.getClass());
assertEquals("amqp:outbound-channel-adapter", ((AmqpOutboundEndpoint) handler).getComponentType());
}
@SuppressWarnings("rawtypes")

3
spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java
View File

@@ -42,6 +42,8 @@ import static org.junit.Assert.assertTrue;
/**
* @author Oleg Zhurakousky
* @author Gary Russell
* @since 2.1
*
*/
public class AmqpOutboundGatewayParserTests {
@@ -54,6 +56,7 @@ public class AmqpOutboundGatewayParserTests {
assertEquals(5, gateway.getOrder());
assertTrue(context.containsBean("rabbitGateway"));
assertEquals(context.getBean("fromRabbit"), TestUtils.getPropertyValue(gateway, "outputChannel"));
assertEquals("amqp:outbound-gateway", gateway.getComponentType());
}
@SuppressWarnings("rawtypes")