From a3f6254856b4ab1084b8afe4cf0ed4fc139516b3 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 13 Aug 2008 15:03:45 +0000 Subject: [PATCH] AbstractHandlerEndpointParser's default endpoint type is now SimpleEndpoint instead of HandlerEndpoint. The latter will be removed shortly. --- .../config/AbstractHandlerEndpointParser.java | 4 ++-- .../integration/config/RouterParser.java | 7 ------- .../config/ServiceActivatorParser.java | 7 ------- .../integration/config/SplitterParser.java | 7 ------- .../gateway/SimpleMessagingGateway.java | 6 +++--- .../config/AggregatorParserTests.java | 21 +++++++++++-------- 6 files changed, 17 insertions(+), 35 deletions(-) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractHandlerEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractHandlerEndpointParser.java index 3c15582375..3dcfc71a4d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractHandlerEndpointParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractHandlerEndpointParser.java @@ -27,8 +27,8 @@ import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.ConfigurationException; -import org.springframework.integration.endpoint.HandlerEndpoint; import org.springframework.integration.endpoint.MessageEndpoint; +import org.springframework.integration.endpoint.SimpleEndpoint; import org.springframework.integration.handler.MessageHandler; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; @@ -127,7 +127,7 @@ public abstract class AbstractHandlerEndpointParser extends AbstractSingleBeanDe * Subclasses may override this to return a specific MessageEndpoint class. */ protected Class getEndpointClass() { - return HandlerEndpoint.class; + return SimpleEndpoint.class; } protected void postProcessEndpointBean(BeanDefinitionBuilder builder, Element element, ParserContext parserContext) { diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterParser.java index b81e8be60b..857c9657b3 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterParser.java @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import org.springframework.integration.endpoint.MessageEndpoint; -import org.springframework.integration.endpoint.SimpleEndpoint; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.router.RouterMessageHandler; @@ -28,11 +26,6 @@ import org.springframework.integration.router.RouterMessageHandler; */ public class RouterParser extends AbstractHandlerEndpointParser { - @Override - protected Class getEndpointClass() { - return SimpleEndpoint.class; - } - @Override protected Class getHandlerAdapterClass() { return RouterMessageHandler.class; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ServiceActivatorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/ServiceActivatorParser.java index b15b722ce1..6b790db11d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ServiceActivatorParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/ServiceActivatorParser.java @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import org.springframework.integration.endpoint.MessageEndpoint; -import org.springframework.integration.endpoint.SimpleEndpoint; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.DefaultMessageHandler; @@ -28,11 +26,6 @@ import org.springframework.integration.handler.DefaultMessageHandler; */ public class ServiceActivatorParser extends AbstractHandlerEndpointParser { - @Override - protected Class getEndpointClass() { - return SimpleEndpoint.class; - } - @Override protected Class getHandlerAdapterClass() { return DefaultMessageHandler.class; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterParser.java index d4f6e227a8..42d91ccd98 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterParser.java @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import org.springframework.integration.endpoint.MessageEndpoint; -import org.springframework.integration.endpoint.SimpleEndpoint; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.splitter.SplitterMessageHandler; @@ -28,11 +26,6 @@ import org.springframework.integration.splitter.SplitterMessageHandler; */ public class SplitterParser extends AbstractHandlerEndpointParser { - @Override - protected Class getEndpointClass() { - return SimpleEndpoint.class; - } - @Override protected Class getHandlerAdapterClass() { return SplitterMessageHandler.class; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java index 6dcd6e7b90..1e47547b83 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java @@ -22,8 +22,8 @@ import org.springframework.integration.bus.MessageBusAware; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.endpoint.EndpointRegistry; -import org.springframework.integration.endpoint.HandlerEndpoint; import org.springframework.integration.endpoint.MessagingGateway; +import org.springframework.integration.endpoint.SimpleEndpoint; import org.springframework.integration.handler.ReplyMessageCorrelator; import org.springframework.integration.message.DefaultMessageCreator; import org.springframework.integration.message.DefaultMessageMapper; @@ -205,9 +205,9 @@ public class SimpleMessagingGateway extends MessagingGatewaySupport implements M throw new ConfigurationException("No EndpointRegistry available. Cannot register ReplyMessageCorrelator."); } ReplyMessageCorrelator correlator = new ReplyMessageCorrelator(this.replyMapCapacity); - HandlerEndpoint endpoint = new HandlerEndpoint(correlator); + SimpleEndpoint endpoint = new SimpleEndpoint(correlator); + endpoint.setBeanName("internal.correlator." + this); endpoint.setSource(this.replyChannel); - endpoint.setName("internal.correlator." + this); this.endpointRegistry.registerEndpoint(endpoint); this.replyMessageCorrelator = correlator; } diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java index 882a4e850d..8fd545039c 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java @@ -33,7 +33,7 @@ import org.springframework.integration.aggregator.CompletionStrategy; import org.springframework.integration.aggregator.CompletionStrategyAdapter; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.endpoint.HandlerEndpoint; +import org.springframework.integration.endpoint.SimpleEndpoint; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.util.MethodInvoker; @@ -54,8 +54,9 @@ public class AggregatorParserTests { @Test public void testAggregation() { - HandlerEndpoint endpoint = (HandlerEndpoint) context.getBean("aggregatorWithReference"); - AggregatingMessageHandler aggregatingHandler = (AggregatingMessageHandler) endpoint.getHandler(); + SimpleEndpoint endpoint = (SimpleEndpoint) context.getBean("aggregatorWithReference"); + AggregatingMessageHandler aggregatingHandler = + (AggregatingMessageHandler) new DirectFieldAccessor(endpoint).getPropertyValue("handler"); TestAggregator aggregatorBean = (TestAggregator) context.getBean("aggregatorBean"); List> outboundMessages = new ArrayList>(); outboundMessages.add(createMessage("123", "id1", 3, 1, null)); @@ -73,9 +74,9 @@ public class AggregatorParserTests { @Test public void testPropertyAssignment() throws Exception { - HandlerEndpoint endpoint = (HandlerEndpoint) context.getBean("completelyDefinedAggregator"); + SimpleEndpoint endpoint = (SimpleEndpoint) context.getBean("completelyDefinedAggregator"); AggregatingMessageHandler completeAggregatingMessageHandler = - (AggregatingMessageHandler) endpoint.getHandler(); + (AggregatingMessageHandler) new DirectFieldAccessor(endpoint).getPropertyValue("handler"); TestAggregator testAggregator = (TestAggregator) context.getBean("aggregatorBean"); CompletionStrategy completionStrategy = (CompletionStrategy) context.getBean("completionStrategy"); MessageChannel outputChannel = (MessageChannel) context.getBean("outputChannel"); @@ -107,8 +108,9 @@ public class AggregatorParserTests { @Test public void testSimpleJavaBeanAggregator() { List> outboundMessages = new ArrayList>(); - HandlerEndpoint endpoint = (HandlerEndpoint) context.getBean("aggregatorWithReferenceAndMethod"); - AggregatingMessageHandler addingAggregator = (AggregatingMessageHandler) endpoint.getHandler(); + SimpleEndpoint endpoint = (SimpleEndpoint) context.getBean("aggregatorWithReferenceAndMethod"); + AggregatingMessageHandler addingAggregator = + (AggregatingMessageHandler) new DirectFieldAccessor(endpoint).getPropertyValue("handler"); outboundMessages.add(createMessage(1l, "id1", 3, 1, null)); outboundMessages.add(createMessage(2l, "id1", 3, 3, null)); outboundMessages.add(createMessage(3l, "id1", 3, 2, null)); @@ -133,8 +135,9 @@ public class AggregatorParserTests { @Test public void testAggregatorWithPojoCompletionStrategy(){ - HandlerEndpoint endpoint = (HandlerEndpoint) context.getBean("aggregatorWithPojoCompletionStrategy"); - AggregatingMessageHandler aggregatorWithPojoCompletionStrategy = (AggregatingMessageHandler) endpoint.getHandler(); + SimpleEndpoint endpoint = (SimpleEndpoint) context.getBean("aggregatorWithPojoCompletionStrategy"); + AggregatingMessageHandler aggregatorWithPojoCompletionStrategy = + (AggregatingMessageHandler) new DirectFieldAccessor(endpoint).getPropertyValue("handler"); CompletionStrategy completionStrategy = (CompletionStrategy) new DirectFieldAccessor(aggregatorWithPojoCompletionStrategy).getPropertyValue("completionStrategy"); Assert.assertTrue(completionStrategy instanceof CompletionStrategyAdapter);