From d3817cf12354bde64ba1333ebab899e74142ca24 Mon Sep 17 00:00:00 2001 From: David Syer Date: Thu, 15 Jul 2010 14:39:19 +0000 Subject: [PATCH] INT-1232: renamed ParameterExtractor --- ...terMapper.java => DefaultParameterExtractor.java} | 4 ++-- .../http/HttpRequestExecutingMessageHandler.java | 12 ++++++------ ...{ParameterMapper.java => ParameterExtractor.java} | 2 +- .../config/HttpOutboundChannelAdapterParser.java | 2 +- .../http/config/HttpOutboundGatewayParser.java | 2 +- .../http/config/spring-integration-http-2.0.xsd | 8 ++++---- ...ests.java => DefaultParameterExtractorTests.java} | 6 +++--- ...HttpOutboundChannelAdapterParserTests-context.xml | 4 ++-- .../HttpOutboundChannelAdapterParserTests.java | 6 +++--- .../HttpOutboundGatewayParserTests-context.xml | 4 ++-- .../http/config/HttpOutboundGatewayParserTests.java | 6 +++--- 11 files changed, 28 insertions(+), 28 deletions(-) rename spring-integration-http/src/main/java/org/springframework/integration/http/{DefaultParameterMapper.java => DefaultParameterExtractor.java} (94%) rename spring-integration-http/src/main/java/org/springframework/integration/http/{ParameterMapper.java => ParameterExtractor.java} (96%) rename spring-integration-http/src/test/java/org/springframework/integration/http/{DefaultParameterMapperTests.java => DefaultParameterExtractorTests.java} (88%) diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultParameterMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultParameterExtractor.java similarity index 94% rename from spring-integration-http/src/main/java/org/springframework/integration/http/DefaultParameterMapper.java rename to spring-integration-http/src/main/java/org/springframework/integration/http/DefaultParameterExtractor.java index af75d25103..129d148021 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultParameterMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultParameterExtractor.java @@ -29,9 +29,9 @@ import org.springframework.integration.core.Message; * @since 2.0 * */ -public class DefaultParameterMapper implements ParameterMapper { +public class DefaultParameterExtractor implements ParameterExtractor { - private static Log logger = LogFactory.getLog(DefaultParameterMapper.class); + private static Log logger = LogFactory.getLog(DefaultParameterExtractor.class); private SpelExpressionParser parser = new SpelExpressionParser(); diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java index 5de1727428..a565cb41a8 100755 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java @@ -56,7 +56,7 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe private final RestTemplate restTemplate = new RestTemplate(); - private ParameterMapper parameterMapper = new DefaultParameterMapper(); + private ParameterExtractor parameterExtractor = new DefaultParameterExtractor(); /** * Create a handler that will send requests to the provided URI. @@ -144,19 +144,19 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe } /** - * Set the {@link ParameterMapper} for creating URI parameters from the outbound message. + * Set the {@link ParameterExtractor} for creating URI parameters from the outbound message. * - * @param parameterMapper the parameter mapper to set + * @param parameterExtractor the parameter extractor to set */ - public void setParameterMapper(ParameterMapper parameterMapper) { - this.parameterMapper = parameterMapper; + public void setParameterExtractor(ParameterExtractor parameterExtractor) { + this.parameterExtractor = parameterExtractor; } @Override protected Object handleRequestMessage(Message requestMessage) { try { // TODO: allow a boolean flag for treating Map as queryParams vs. uriVariables? - Map uriVariables = this.parameterMapper.fromMessage(requestMessage); + Map uriVariables = this.parameterExtractor.fromMessage(requestMessage); HttpEntity httpRequest = this.requestMapper.fromMessage(requestMessage); ResponseEntity httpResponse = this.restTemplate.exchange(this.uri, this.httpMethod, httpRequest, this.expectedResponseType, uriVariables); if (this.expectReply) { diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/ParameterMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/ParameterExtractor.java similarity index 96% rename from spring-integration-http/src/main/java/org/springframework/integration/http/ParameterMapper.java rename to spring-integration-http/src/main/java/org/springframework/integration/http/ParameterExtractor.java index be43abe166..7344ebf6da 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/ParameterMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/ParameterExtractor.java @@ -25,7 +25,7 @@ import org.springframework.integration.core.Message; * @since 2.0 * */ -public interface ParameterMapper { +public interface ParameterExtractor { /** * @param requestMessage diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParser.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParser.java index 50ea8eb8e4..325c6f0d04 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParser.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParser.java @@ -42,7 +42,7 @@ public class HttpOutboundChannelAdapterParser extends AbstractOutboundChannelAda builder.addConstructorArgValue(element.getAttribute("url")); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "http-method"); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "message-converters"); - IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "parameter-mapper"); + IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "parameter-extractor"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "charset"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-payload"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "expected-response-type"); diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundGatewayParser.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundGatewayParser.java index 243d711d24..b9c560bd01 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundGatewayParser.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpOutboundGatewayParser.java @@ -45,7 +45,7 @@ public class HttpOutboundGatewayParser extends AbstractConsumerEndpointParser { builder.addConstructorArgValue(element.getAttribute("url")); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "http-method"); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "message-converters"); - IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "parameter-mapper"); + IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "parameter-extractor"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "charset"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-request-payload", "extractPayload"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "expected-response-type"); diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd index 7b2b82de0b..b6b65e085a 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd @@ -112,11 +112,11 @@ ]]> - + - + @@ -204,11 +204,11 @@ - + - + diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultParameterMapperTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultParameterExtractorTests.java similarity index 88% rename from spring-integration-http/src/test/java/org/springframework/integration/http/DefaultParameterMapperTests.java rename to spring-integration-http/src/test/java/org/springframework/integration/http/DefaultParameterExtractorTests.java index 8dcc352f39..11b3f48e96 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultParameterMapperTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultParameterExtractorTests.java @@ -28,11 +28,11 @@ import org.springframework.integration.message.GenericMessage; * @since 2.0 * */ -public class DefaultParameterMapperTests { +public class DefaultParameterExtractorTests { @Test public void testFromMessage() throws Exception { - DefaultParameterMapper mapper = new DefaultParameterMapper(); + DefaultParameterExtractor mapper = new DefaultParameterExtractor(); Map params = mapper.fromMessage(new GenericMessage(Collections.singletonMap("foo", "bar"))); assertEquals(1, params.size()); assertEquals("bar", params.get("foo")); @@ -40,7 +40,7 @@ public class DefaultParameterMapperTests { @Test public void testFromMessageWithExpressions() throws Exception { - DefaultParameterMapper mapper = new DefaultParameterMapper(); + DefaultParameterExtractor mapper = new DefaultParameterExtractor(); mapper.setDynamicParameterExpressions(Collections.singletonMap("foo", "payload")); Map params = mapper.fromMessage(new GenericMessage("bar")); assertEquals(1, params.size()); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests-context.xml index 1a3fea50c8..f791860845 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests-context.xml @@ -16,7 +16,7 @@ - + diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java index c87e6a18af..087559eba3 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java @@ -34,7 +34,7 @@ import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.http.DefaultOutboundRequestMapper; import org.springframework.integration.http.HttpRequestExecutingMessageHandler; import org.springframework.integration.http.OutboundRequestMapper; -import org.springframework.integration.http.ParameterMapper; +import org.springframework.integration.http.ParameterExtractor; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -55,7 +55,7 @@ public class HttpOutboundChannelAdapterParserTests { private ApplicationContext applicationContext; @Autowired - private ParameterMapper parameterMapper; + private ParameterExtractor parameterExtractor; @Test @@ -105,7 +105,7 @@ public class HttpOutboundChannelAdapterParserTests { assertEquals(HttpMethod.GET, handlerAccessor.getPropertyValue("httpMethod")); assertEquals("UTF-8", mapperAccessor.getPropertyValue("charset")); assertEquals(false, mapperAccessor.getPropertyValue("extractPayload")); - assertEquals(parameterMapper, handlerAccessor.getPropertyValue("parameterMapper")); + assertEquals(parameterExtractor, handlerAccessor.getPropertyValue("parameterExtractor")); } } diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml index 9da4697e7e..df5d0e091c 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests-context.xml @@ -22,7 +22,7 @@ - + diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java index dc721eaf09..f81ddfdd74 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java @@ -36,7 +36,7 @@ import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.http.DefaultOutboundRequestMapper; import org.springframework.integration.http.HttpRequestExecutingMessageHandler; import org.springframework.integration.http.OutboundRequestMapper; -import org.springframework.integration.http.ParameterMapper; +import org.springframework.integration.http.ParameterExtractor; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -57,7 +57,7 @@ public class HttpOutboundGatewayParserTests { private ApplicationContext applicationContext; @Autowired - private ParameterMapper parameterMapper; + private ParameterExtractor parameterExtractor; @Test public void minimalConfig() { @@ -114,7 +114,7 @@ public class HttpOutboundGatewayParserTests { Object sendTimeout = new DirectFieldAccessor( handlerAccessor.getPropertyValue("channelTemplate")).getPropertyValue("sendTimeout"); assertEquals(new Long("1234"), sendTimeout); - assertEquals(parameterMapper, handlerAccessor.getPropertyValue("parameterMapper")); + assertEquals(parameterExtractor, handlerAccessor.getPropertyValue("parameterExtractor")); } }