From 7fcc04766aacd5335753926a792dba24ca5fb0fb Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 27 Aug 2010 21:29:01 +0000 Subject: [PATCH] renamed ArgumentArrayMessageMapper to GatewayMethodInboundMessageMapper and moved from the 'handler' package to 'gateway' (only place it's used now) --- .../GatewayMethodInboundMessageMapper.java} | 8 ++-- .../gateway/GatewayProxyFactoryBean.java | 3 +- ...odInboundMessageMapperToMessageTests.java} | 42 +++++++++---------- 3 files changed, 26 insertions(+), 27 deletions(-) rename spring-integration-core/src/main/java/org/springframework/integration/{handler/ArgumentArrayMessageMapper.java => gateway/GatewayMethodInboundMessageMapper.java} (97%) rename spring-integration-core/src/test/java/org/springframework/integration/{handler/ArgumentArrayMessageMapperToMessageTests.java => gateway/GatewayMethodInboundMessageMapperToMessageTests.java} (82%) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java similarity index 97% rename from spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java rename to spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java index 20f18ea55e..356d2170fc 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.handler; +package org.springframework.integration.gateway; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -101,7 +101,7 @@ import org.springframework.util.StringUtils; * @author Oleg Zhurakousky * @since 2.0 */ -public class ArgumentArrayMessageMapper implements InboundMessageMapper, BeanFactoryAware { +public class GatewayMethodInboundMessageMapper implements InboundMessageMapper, BeanFactoryAware { private static final SpelExpressionParser PARSER = new SpelExpressionParser(); @@ -121,11 +121,11 @@ public class ArgumentArrayMessageMapper implements InboundMessageMapper headerExpressions) { + public GatewayMethodInboundMessageMapper(Method method, Map headerExpressions) { Assert.notNull(method, "method must not be null"); this.method = method; this.headerExpressions = headerExpressions; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java index e8cbaaf703..1218bbd04f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java @@ -41,7 +41,6 @@ import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractEndpoint; -import org.springframework.integration.handler.ArgumentArrayMessageMapper; import org.springframework.integration.history.TrackableComponent; import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.util.Assert; @@ -326,7 +325,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint implements Trackab } } } - ArgumentArrayMessageMapper messageMapper = new ArgumentArrayMessageMapper(method, headerExpressions); + GatewayMethodInboundMessageMapper messageMapper = new GatewayMethodInboundMessageMapper(method, headerExpressions); if (StringUtils.hasText(payloadExpression)) { messageMapper.setPayloadExpression(payloadExpression); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperToMessageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java similarity index 82% rename from spring-integration-core/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperToMessageTests.java rename to spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java index cfd0983da7..47910c5581 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperToMessageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.handler; +package org.springframework.integration.gateway; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -33,17 +33,17 @@ import org.springframework.integration.MessageHeaders; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.handler.ArgumentArrayMessageMapper; +import org.springframework.integration.gateway.GatewayMethodInboundMessageMapper; /** * @author Mark Fisher */ -public class ArgumentArrayMessageMapperToMessageTests { +public class GatewayMethodInboundMessageMapperToMessageTests { @Test public void toMessageWithPayload() throws Exception { Method method = TestService.class.getMethod("sendPayload", String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Message message = mapper.toMessage(new Object[] { "test" }); assertEquals("test", message.getPayload()); } @@ -51,14 +51,14 @@ public class ArgumentArrayMessageMapperToMessageTests { @Test(expected = IllegalArgumentException.class) public void toMessageWithTooManyParameters() throws Exception { Method method = TestService.class.getMethod("sendPayload", String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.toMessage(new Object[] { "test" , "oops" }); } @Test(expected = IllegalArgumentException.class) public void toMessageWithEmptyParameterArray() throws Exception { Method method = TestService.class.getMethod("sendPayload", String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.toMessage(new Object[] {}); } @@ -66,7 +66,7 @@ public class ArgumentArrayMessageMapperToMessageTests { public void toMessageWithPayloadAndHeader() throws Exception { Method method = TestService.class.getMethod( "sendPayloadAndHeader", String.class, String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Message message = mapper.toMessage(new Object[] { "test", "bar" }); assertEquals("test", message.getPayload()); assertEquals("bar", message.getHeaders().get("foo")); @@ -76,7 +76,7 @@ public class ArgumentArrayMessageMapperToMessageTests { public void toMessageWithPayloadAndRequiredHeaderButNullValue() throws Exception { Method method = TestService.class.getMethod( "sendPayloadAndHeader", String.class, String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.toMessage(new Object[] { "test", null }); } @@ -84,7 +84,7 @@ public class ArgumentArrayMessageMapperToMessageTests { public void toMessageWithPayloadAndOptionalHeaderWithValueProvided() throws Exception { Method method = TestService.class.getMethod( "sendPayloadAndOptionalHeader", String.class, String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Message message = mapper.toMessage(new Object[] { "test", "bar" }); assertEquals("test", message.getPayload()); assertEquals("bar", message.getHeaders().get("foo")); @@ -94,7 +94,7 @@ public class ArgumentArrayMessageMapperToMessageTests { public void toMessageWithPayloadAndOptionalHeaderWithNullValue() throws Exception { Method method = TestService.class.getMethod( "sendPayloadAndOptionalHeader", String.class, String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Message message = mapper.toMessage(new Object[] { "test", null }); assertEquals("test", message.getPayload()); assertNull(message.getHeaders().get("foo")); @@ -104,7 +104,7 @@ public class ArgumentArrayMessageMapperToMessageTests { public void toMessageWithPayloadAndHeadersMap() throws Exception { Method method = TestService.class.getMethod( "sendPayloadAndHeadersMap", String.class, Map.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Map headers = new HashMap(); headers.put("abc", 123); headers.put("def", 456); @@ -118,7 +118,7 @@ public class ArgumentArrayMessageMapperToMessageTests { public void toMessageWithPayloadAndNullHeadersMap() throws Exception { Method method = TestService.class.getMethod( "sendPayloadAndHeadersMap", String.class, Map.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Message message = mapper.toMessage(new Object[] { "test", null }); assertEquals("test", message.getPayload()); } @@ -127,7 +127,7 @@ public class ArgumentArrayMessageMapperToMessageTests { public void toMessageWithPayloadAndHeadersMapWithNonStringKey() throws Exception { Method method = TestService.class.getMethod( "sendPayloadAndHeadersMap", String.class, Map.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Map headers = new HashMap(); headers.put(123, "abc"); mapper.toMessage(new Object[] { "test", headers }); @@ -136,7 +136,7 @@ public class ArgumentArrayMessageMapperToMessageTests { @Test public void toMessageWithMessageParameter() throws Exception { Method method = TestService.class.getMethod("sendMessage", Message.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Message inputMessage = MessageBuilder.withPayload("test message").build(); Message message = mapper.toMessage(new Object[] { inputMessage }); assertEquals("test message", message.getPayload()); @@ -145,7 +145,7 @@ public class ArgumentArrayMessageMapperToMessageTests { @Test public void toMessageWithMessageParameterAndHeader() throws Exception { Method method = TestService.class.getMethod("sendMessageAndHeader", Message.class, String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Message inputMessage = MessageBuilder.withPayload("test message").build(); Message message = mapper.toMessage(new Object[] { inputMessage, "bar" }); assertEquals("test message", message.getPayload()); @@ -155,7 +155,7 @@ public class ArgumentArrayMessageMapperToMessageTests { @Test(expected = IllegalArgumentException.class) public void toMessageWithMessageParameterAndRequiredHeaderButNullValue() throws Exception { Method method = TestService.class.getMethod("sendMessageAndHeader", Message.class, String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Message inputMessage = MessageBuilder.withPayload("test message").build(); mapper.toMessage(new Object[] { inputMessage, null }); } @@ -163,7 +163,7 @@ public class ArgumentArrayMessageMapperToMessageTests { @Test public void toMessageWithMessageParameterAndOptionalHeaderWithValue() throws Exception { Method method = TestService.class.getMethod("sendMessageAndOptionalHeader", Message.class, String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Message inputMessage = MessageBuilder.withPayload("test message").build(); Message message = mapper.toMessage(new Object[] { inputMessage, "bar" }); assertEquals("test message", message.getPayload()); @@ -173,7 +173,7 @@ public class ArgumentArrayMessageMapperToMessageTests { @Test public void toMessageWithMessageParameterAndOptionalHeaderWithNull() throws Exception { Method method = TestService.class.getMethod("sendMessageAndOptionalHeader", Message.class, String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); Message inputMessage = MessageBuilder.withPayload("test message").build(); Message message = mapper.toMessage(new Object[] { inputMessage, null }); assertEquals("test message", message.getPayload()); @@ -183,14 +183,14 @@ public class ArgumentArrayMessageMapperToMessageTests { @Test(expected = IllegalArgumentException.class) public void noArgs() throws Exception { Method method = TestService.class.getMethod("noArgs", new Class[] {}); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.toMessage(new Object[] {}); } @Test(expected = IllegalArgumentException.class) public void onlyHeaders() throws Exception { Method method = TestService.class.getMethod("onlyHeaders", String.class, String.class); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.toMessage(new Object[] { "abc", "def" }); } @@ -201,7 +201,7 @@ public class ArgumentArrayMessageMapperToMessageTests { headers.put("foo", new LiteralExpression("foo")); headers.put("bar", new SpelExpressionParser().parseExpression("6 * 7")); headers.put(MessageHeaders.PREFIX + "baz", new LiteralExpression("hello")); - ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method, headers); + GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method, headers); Message message = mapper.toMessage(new Object[] { "test" }); assertEquals("test", message.getPayload()); assertEquals("foo", message.getHeaders().get("foo"));