From ef99ccde0e20c22d2bdcc25795469047c6e52c8c Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 3 Feb 2012 19:04:57 -0500 Subject: [PATCH] INT-2427 Fix Types of AMQP Outbound Endpoints Logic for returning gateway Vs. channel-adapter was reversed. --- .../integration/amqp/outbound/AmqpOutboundEndpoint.java | 3 ++- .../amqp/config/AmqpOutboundChannelAdapterParserTests.java | 2 ++ .../amqp/config/AmqpOutboundGatewayParserTests.java | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java index 61ef9b9218..e3972c7cf2 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java @@ -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 diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests.java index c0973ee95b..6a2e752d6d 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests.java @@ -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") diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java index 3a8b8cc127..7c9ab92417 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java @@ -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")