INT-1232: renamed ParameterExtractor
This commit is contained in:
@@ -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<String, ?> params = mapper.fromMessage(new GenericMessage<Object>(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<String, ?> params = mapper.fromMessage(new GenericMessage<Object>("bar"));
|
||||
assertEquals(1, params.size());
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
<outbound-channel-adapter id="fullConfig"
|
||||
url="http://localhost/test2"
|
||||
parameter-mapper="testParameterMapper"
|
||||
parameter-extractor="testParameterMapper"
|
||||
http-method="GET"
|
||||
channel="requests"
|
||||
charset="UTF-8"
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
<beans:bean id="testRequestFactory" class="org.springframework.http.client.SimpleClientHttpRequestFactory"/>
|
||||
|
||||
<beans:bean id="testParameterMapper" class="org.springframework.integration.http.DefaultParameterMapper"/>
|
||||
<beans:bean id="testParameterMapper" class="org.springframework.integration.http.DefaultParameterExtractor"/>
|
||||
|
||||
<util:list id="converterList">
|
||||
<beans:bean class="org.springframework.integration.http.config.StubHttpMessageConverter"/>
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
<outbound-gateway id="fullConfig"
|
||||
url="http://localhost/test2"
|
||||
parameter-mapper="testParameterMapper"
|
||||
parameter-extractor="testParameterMapper"
|
||||
http-method="PUT"
|
||||
request-channel="requests"
|
||||
request-factory="testRequestFactory"
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
<beans:bean id="testRequestFactory" class="org.springframework.http.client.SimpleClientHttpRequestFactory"/>
|
||||
|
||||
<beans:bean id="testParameterMapper" class="org.springframework.integration.http.DefaultParameterMapper"/>
|
||||
<beans:bean id="testParameterMapper" class="org.springframework.integration.http.DefaultParameterExtractor"/>
|
||||
|
||||
<util:list id="converterList">
|
||||
<beans:bean class="org.springframework.integration.http.config.StubHttpMessageConverter"/>
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user