From 228250a97708a3257fd4be47da6185126729cb7e Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 28 Dec 2007 22:43:51 +0000 Subject: [PATCH] Relocated commonly used method invoker classes to util package. They are no longer endpoint-specific. --- .../{endpoint => adapter}/ArgumentListPreparer.java | 2 +- .../integration/adapter/MethodInvokingSource.java | 4 ++-- .../integration/adapter/MethodInvokingTarget.java | 3 +-- .../integration/handler/AbstractMessageHandlerAdapter.java | 2 +- .../integration/handler/DefaultMessageHandlerAdapter.java | 2 +- .../integration/router/RouterMessageHandlerAdapter.java | 2 +- .../integration/router/SplitterMessageHandlerAdapter.java | 2 +- .../integration/{endpoint => util}/MethodValidator.java | 2 +- .../integration/{endpoint => util}/SimpleMethodInvoker.java | 2 +- 9 files changed, 10 insertions(+), 11 deletions(-) rename spring-integration-core/src/main/java/org/springframework/integration/{endpoint => adapter}/ArgumentListPreparer.java (94%) rename spring-integration-core/src/main/java/org/springframework/integration/{endpoint => util}/MethodValidator.java (95%) rename spring-integration-core/src/main/java/org/springframework/integration/{endpoint => util}/SimpleMethodInvoker.java (97%) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ArgumentListPreparer.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/ArgumentListPreparer.java similarity index 94% rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/ArgumentListPreparer.java rename to spring-integration-core/src/main/java/org/springframework/integration/adapter/ArgumentListPreparer.java index 41419af973..3dd80ecd4f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ArgumentListPreparer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/ArgumentListPreparer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.endpoint; +package org.springframework.integration.adapter; /** * A strategy for preparing an argument list from a single source object. 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/adapter/MethodInvokingSource.java index e7b6d23d72..3da57229da 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/MethodInvokingSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/MethodInvokingSource.java @@ -22,8 +22,8 @@ import java.util.Collection; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.MessagingConfigurationException; -import org.springframework.integration.endpoint.MethodValidator; -import org.springframework.integration.endpoint.SimpleMethodInvoker; +import org.springframework.integration.util.MethodValidator; +import org.springframework.integration.util.SimpleMethodInvoker; import org.springframework.util.Assert; /** 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/adapter/MethodInvokingTarget.java index 3d40ad2a46..73b76baa06 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/MethodInvokingTarget.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/MethodInvokingTarget.java @@ -20,8 +20,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.endpoint.ArgumentListPreparer; -import org.springframework.integration.endpoint.SimpleMethodInvoker; +import org.springframework.integration.util.SimpleMethodInvoker; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandlerAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandlerAdapter.java index 1dbaffba8a..f71323cf30 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandlerAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandlerAdapter.java @@ -21,10 +21,10 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.Ordered; -import org.springframework.integration.endpoint.SimpleMethodInvoker; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageMapper; import org.springframework.integration.message.SimplePayloadMessageMapper; +import org.springframework.integration.util.SimpleMethodInvoker; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/DefaultMessageHandlerAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/DefaultMessageHandlerAdapter.java index 54827f9270..e7eae7c9e0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/DefaultMessageHandlerAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/DefaultMessageHandlerAdapter.java @@ -18,9 +18,9 @@ package org.springframework.integration.handler; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.Ordered; -import org.springframework.integration.endpoint.SimpleMethodInvoker; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageMapper; +import org.springframework.integration.util.SimpleMethodInvoker; /** * An implementation of {@link MessageHandler} that invokes the specified method diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java index e6d786e3b6..a2bc41a4c1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java @@ -25,9 +25,9 @@ import org.springframework.integration.annotation.Router; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.ChannelRegistryAware; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.endpoint.SimpleMethodInvoker; import org.springframework.integration.handler.AbstractMessageHandlerAdapter; import org.springframework.integration.message.Message; +import org.springframework.integration.util.SimpleMethodInvoker; import org.springframework.util.StringUtils; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java index c52f3f4a0c..270492cf10 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java @@ -25,10 +25,10 @@ import org.springframework.integration.annotation.Splitter; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.ChannelRegistryAware; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.endpoint.SimpleMethodInvoker; import org.springframework.integration.handler.AbstractMessageHandlerAdapter; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; +import org.springframework.integration.util.SimpleMethodInvoker; /** * MessageHandler adapter for methods annotated with {@link Splitter @Splitter}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodValidator.java b/spring-integration-core/src/main/java/org/springframework/integration/util/MethodValidator.java similarity index 95% rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodValidator.java rename to spring-integration-core/src/main/java/org/springframework/integration/util/MethodValidator.java index 8da2754fb9..101cf3141b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodValidator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/MethodValidator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.endpoint; +package org.springframework.integration.util; import java.lang.reflect.Method; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SimpleMethodInvoker.java b/spring-integration-core/src/main/java/org/springframework/integration/util/SimpleMethodInvoker.java similarity index 97% rename from spring-integration-core/src/main/java/org/springframework/integration/endpoint/SimpleMethodInvoker.java rename to spring-integration-core/src/main/java/org/springframework/integration/util/SimpleMethodInvoker.java index 0bcd3ac724..1c480ef88b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SimpleMethodInvoker.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/SimpleMethodInvoker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.endpoint; +package org.springframework.integration.util; import java.lang.reflect.InvocationTargetException;