From 1cfe32cd21c8abe57b17f10d4f54aa71ed61efb2 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Sat, 27 Sep 2008 15:22:28 +0000 Subject: [PATCH] Moved the MessageMapper strategy interface from the 'gateway' package to the 'message' package. --- .../integration/gateway/DefaultMessageMapper.java | 1 + .../integration/gateway/SimpleMessagingGateway.java | 1 + .../integration/{gateway => message}/MessageMapper.java | 3 +-- .../integration/message/MessageMappingMethodInvoker.java | 1 - .../integration/message/MethodParameterMessageMapper.java | 1 - .../integration/gateway/config/TestMessageMapper.java | 2 +- 6 files changed, 4 insertions(+), 5 deletions(-) rename org.springframework.integration/src/main/java/org/springframework/integration/{gateway => message}/MessageMapper.java (88%) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/DefaultMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/DefaultMessageMapper.java index 9174d896e0..eaa68c1dd5 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/DefaultMessageMapper.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/DefaultMessageMapper.java @@ -18,6 +18,7 @@ package org.springframework.integration.gateway; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; +import org.springframework.integration.message.MessageMapper; /** * A default implementation of the {@link MessageMapper} strategy interface. 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 0e62c43a02..0d2288cea5 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 @@ -17,6 +17,7 @@ package org.springframework.integration.gateway; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageMapper; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMapper.java similarity index 88% rename from org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessageMapper.java rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMapper.java index 03f6c1969d..065a9d3abe 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/MessageMapper.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMapper.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.springframework.integration.gateway; +package org.springframework.integration.message; -import org.springframework.integration.message.Message; /** * Strategy interface for mapping between an Object and a {@link Message}. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingMethodInvoker.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingMethodInvoker.java index 59efbeaf07..9ba90f16f5 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingMethodInvoker.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingMethodInvoker.java @@ -26,7 +26,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.ConfigurationException; -import org.springframework.integration.gateway.MessageMapper; import org.springframework.integration.util.DefaultMethodInvoker; import org.springframework.integration.util.MethodInvoker; import org.springframework.integration.util.NameResolvingMethodInvoker; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java index a5ce2bfb0a..315ee3f54f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java @@ -25,7 +25,6 @@ import org.springframework.core.LocalVariableTableParameterNameDiscoverer; import org.springframework.core.MethodParameter; import org.springframework.core.ParameterNameDiscoverer; import org.springframework.integration.annotation.Header; -import org.springframework.integration.gateway.MessageMapper; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/config/TestMessageMapper.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/config/TestMessageMapper.java index b216bff50d..eea69a0bb6 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/config/TestMessageMapper.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/config/TestMessageMapper.java @@ -16,8 +16,8 @@ package org.springframework.integration.gateway.config; -import org.springframework.integration.gateway.MessageMapper; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageMapper; import org.springframework.integration.message.StringMessage; /**