From f2186b815cbc4f02e255e0df02410a5232588db0 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 16 May 2008 02:28:00 +0000 Subject: [PATCH] Refactored MethodInvokingSource to the "message" package and MethodInvokingTarget to the "handler" package. The "adapter" package has been removed (INT-215). --- .../config/MessageEndpointAnnotationPostProcessor.java | 4 ++-- .../integration/config/MethodInvokingAdapterParser.java | 4 ++-- .../integration/config/TargetEndpointParser.java | 2 +- .../{adapter => handler}/MethodInvokingTarget.java | 3 +-- .../{adapter => message}/MethodInvokingSource.java | 6 +----- .../MethodInvokingAdapterTests.java} | 4 ++-- .../{adapter => handler}/MethodInvokingTargetTests.java | 3 ++- .../integration/{adapter => handler}/TestSink.java | 2 +- .../integration/{adapter => handler}/TestSource.java | 2 +- .../integration/{adapter => handler}/adapterTests.xml | 8 ++++---- .../{adapter => handler}/adapterTestsWithNamespace.xml | 4 ++-- .../{adapter => message}/MethodInvokingSourceTests.java | 3 ++- 12 files changed, 21 insertions(+), 24 deletions(-) rename spring-integration-core/src/main/java/org/springframework/integration/{adapter => handler}/MethodInvokingTarget.java (91%) rename spring-integration-core/src/main/java/org/springframework/integration/{adapter => message}/MethodInvokingSource.java (89%) rename spring-integration-core/src/test/java/org/springframework/integration/{adapter/AdapterTests.java => handler/MethodInvokingAdapterTests.java} (96%) rename spring-integration-core/src/test/java/org/springframework/integration/{adapter => handler}/MethodInvokingTargetTests.java (97%) rename spring-integration-core/src/test/java/org/springframework/integration/{adapter => handler}/TestSink.java (95%) rename spring-integration-core/src/test/java/org/springframework/integration/{adapter => handler}/TestSource.java (95%) rename spring-integration-core/src/test/java/org/springframework/integration/{adapter => handler}/adapterTests.xml (84%) rename spring-integration-core/src/test/java/org/springframework/integration/{adapter => handler}/adapterTestsWithNamespace.xml (86%) rename spring-integration-core/src/test/java/org/springframework/integration/{adapter => message}/MethodInvokingSourceTests.java (95%) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java index a9244d3303..cc92aac092 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java @@ -34,8 +34,6 @@ import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.OrderComparator; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.integration.ConfigurationException; -import org.springframework.integration.adapter.MethodInvokingSource; -import org.springframework.integration.adapter.MethodInvokingTarget; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.CompletionStrategy; import org.springframework.integration.annotation.Concurrency; @@ -54,8 +52,10 @@ import org.springframework.integration.endpoint.PollingSourceEndpoint; import org.springframework.integration.handler.AbstractMessageHandlerAdapter; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.MessageHandlerChain; +import org.springframework.integration.handler.MethodInvokingTarget; import org.springframework.integration.handler.config.DefaultMessageHandlerCreator; import org.springframework.integration.handler.config.MessageHandlerCreator; +import org.springframework.integration.message.MethodInvokingSource; import org.springframework.integration.router.AggregatingMessageHandler; import org.springframework.integration.router.CompletionStrategyAdapter; import org.springframework.integration.router.config.AggregatorMessageHandlerCreator; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java index 86c2611f8a..5a3ca11362 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/MethodInvokingAdapterParser.java @@ -21,8 +21,8 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.integration.ConfigurationException; -import org.springframework.integration.adapter.MethodInvokingSource; -import org.springframework.integration.adapter.MethodInvokingTarget; +import org.springframework.integration.handler.MethodInvokingTarget; +import org.springframework.integration.message.MethodInvokingSource; import org.springframework.util.StringUtils; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/TargetEndpointParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/TargetEndpointParser.java index 6b24f217b9..c9f8d5293e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/TargetEndpointParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/TargetEndpointParser.java @@ -18,8 +18,8 @@ package org.springframework.integration.config; import org.w3c.dom.Element; -import org.springframework.integration.adapter.MethodInvokingTarget; import org.springframework.integration.endpoint.TargetEndpoint; +import org.springframework.integration.handler.MethodInvokingTarget; /** * Parser for the <target-endpoint> element. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/MethodInvokingTarget.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingTarget.java similarity index 91% rename from spring-integration-core/src/main/java/org/springframework/integration/adapter/MethodInvokingTarget.java rename to spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingTarget.java index 45f685ca5e..e971bb59d1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/MethodInvokingTarget.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingTarget.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.springframework.integration.adapter; +package org.springframework.integration.handler; -import org.springframework.integration.handler.AbstractMessageHandlerAdapter; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.Target; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/MethodInvokingSource.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingSource.java similarity index 89% rename from spring-integration-core/src/main/java/org/springframework/integration/adapter/MethodInvokingSource.java rename to spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingSource.java index fe8805c46b..26d6469f2f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/MethodInvokingSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingSource.java @@ -14,17 +14,13 @@ * limitations under the License. */ -package org.springframework.integration.adapter; +package org.springframework.integration.message; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.ConfigurationException; -import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; -import org.springframework.integration.message.MessagingException; -import org.springframework.integration.message.Source; import org.springframework.integration.util.MethodValidator; import org.springframework.integration.util.NameResolvingMethodInvoker; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/AdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingAdapterTests.java similarity index 96% rename from spring-integration-core/src/test/java/org/springframework/integration/adapter/AdapterTests.java rename to spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingAdapterTests.java index 420986231b..bf524ab84e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/AdapterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingAdapterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter; +package org.springframework.integration.handler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -32,7 +32,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; /** * @author Mark Fisher */ -public class AdapterTests { +public class MethodInvokingAdapterTests { @Test public void testAdaptersWithBeanDefinitions() throws IOException, InterruptedException { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingTargetTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingTargetTests.java similarity index 97% rename from spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingTargetTests.java rename to spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingTargetTests.java index d7054341b4..fc974fdd06 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingTargetTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingTargetTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter; +package org.springframework.integration.handler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -29,6 +29,7 @@ import org.junit.Test; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.handler.MethodInvokingTarget; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessagingException; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/TestSink.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/TestSink.java similarity index 95% rename from spring-integration-core/src/test/java/org/springframework/integration/adapter/TestSink.java rename to spring-integration-core/src/test/java/org/springframework/integration/handler/TestSink.java index 313ee6e070..85fe8030ab 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/TestSink.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/TestSink.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter; +package org.springframework.integration.handler; import java.util.concurrent.CountDownLatch; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/TestSource.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/TestSource.java similarity index 95% rename from spring-integration-core/src/test/java/org/springframework/integration/adapter/TestSource.java rename to spring-integration-core/src/test/java/org/springframework/integration/handler/TestSource.java index da6cafc459..f77d7c95bf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/TestSource.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/TestSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter; +package org.springframework.integration.handler; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/handler/adapterTests.xml similarity index 84% rename from spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTests.xml rename to spring-integration-core/src/test/java/org/springframework/integration/handler/adapterTests.xml index 218b9d8c1e..7f84348b71 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTests.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/adapterTests.xml @@ -12,9 +12,9 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -41,6 +41,6 @@ - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTestsWithNamespace.xml b/spring-integration-core/src/test/java/org/springframework/integration/handler/adapterTestsWithNamespace.xml similarity index 86% rename from spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTestsWithNamespace.xml rename to spring-integration-core/src/test/java/org/springframework/integration/handler/adapterTestsWithNamespace.xml index b0d44fcc79..02a64bebc1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTestsWithNamespace.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/adapterTestsWithNamespace.xml @@ -19,8 +19,8 @@ - + - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java similarity index 95% rename from spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingSourceTests.java rename to spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java index eca72652a5..ae52d38dc1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingSourceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter; +package org.springframework.integration.message; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -23,6 +23,7 @@ import org.junit.Test; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessagingException; +import org.springframework.integration.message.MethodInvokingSource; /** * @author Mark Fisher