Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-4201: Fix Gateway Param Annotation Aliases

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4201

name<->value alias was not processed correctly so using
`@Header(name = "baz") String baz` did not work.

Use `SynthesizingMethodParameter`.
This commit is contained in:
Gary Russell
2017-01-03 10:27:24 -05:00
committed by Artem Bilan
parent 739ebb744b
commit 0cbfd6e3e0
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
import org.springframework.core.MethodParameter; import org.springframework.core.MethodParameter;
import org.springframework.core.ParameterNameDiscoverer; import org.springframework.core.ParameterNameDiscoverer;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.SynthesizingMethodParameter;
import org.springframework.expression.EvaluationContext; import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression; import org.springframework.expression.Expression;
import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -247,7 +248,7 @@ class GatewayMethodInboundMessageMapper implements InboundMessageMapper<Object[]
ParameterNameDiscoverer parameterNameDiscoverer = new LocalVariableTableParameterNameDiscoverer(); ParameterNameDiscoverer parameterNameDiscoverer = new LocalVariableTableParameterNameDiscoverer();
int parameterCount = method.getParameterTypes().length; int parameterCount = method.getParameterTypes().length;
for (int i = 0; i < parameterCount; i++) { for (int i = 0; i < parameterCount; i++) {
MethodParameter methodParameter = new MethodParameter(method, i); MethodParameter methodParameter = new SynthesizingMethodParameter(method, i);
methodParameter.initParameterNameDiscovery(parameterNameDiscoverer); methodParameter.initParameterNameDiscovery(parameterNameDiscoverer);
parameterList.add(methodParameter); parameterList.add(methodParameter);
} }

3
spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations-context.xml
View File

@@ -11,6 +11,7 @@
default-request-channel="requestChannel" default-request-channel="requestChannel"
service-interface="org.springframework.integration.gateway.GatewayWithHeaderAnnotations$TestService" /> service-interface="org.springframework.integration.gateway.GatewayWithHeaderAnnotations$TestService" />
<service-activator input-channel="requestChannel" expression="payload + headers.priority + headers.$custom"/> <service-activator input-channel="requestChannel"
expression="payload + headers.priority + headers.$custom + headers.baz"/>
</beans:beans> </beans:beans>

9
spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/** /**
* @author Mark Fisher * @author Mark Fisher
* @author Gary Russell
* @since 2.0 * @since 2.0
*/ */
@ContextConfiguration @ContextConfiguration
@@ -43,15 +44,15 @@ public class GatewayWithHeaderAnnotations {
@Test // INT-1205 @Test // INT-1205
public void priorityAsArgument() { public void priorityAsArgument() {
TestService gateway = (TestService) applicationContext.getBean("gateway"); TestService gateway = (TestService) applicationContext.getBean("gateway");
String result = gateway.test("foo", 99, "bar"); String result = gateway.test("foo", 99, "bar", "qux");
assertEquals("foo99bar", result); assertEquals("foo99barqux", result);
} }
public interface TestService { public interface TestService {
// wrt INT-1205, priority no longer has a $ prefix, so here we are testing the $custom header as well // wrt INT-1205, priority no longer has a $ prefix, so here we are testing the $custom header as well
String test(String str, @Header(IntegrationMessageHeaderAccessor.PRIORITY) int priority, String test(String str, @Header(IntegrationMessageHeaderAccessor.PRIORITY) int priority,
@Header("$custom") String custom); @Header("$custom") String custom, @Header(name = "baz") String baz);
} }