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

GH-3648: Fix @Gateway.payloadExpression

Browse Source 
Resolves https://github.com/spring-projects/spring-integration/issues/3648

When configuring a gateway proxy with XML, but specifying the payload expression
on the method `@Gateway` annotation, the expression was ignored, even though it
had been parsed.

`@Payload` worked.

With this change, if both `@Payload` and `@Gateway` are defined on a gateway method,
`@Gateway.payloadExpression` wins.

* Fix doc links.
This commit is contained in:
Gary Russell
2021-10-20 15:09:29 -04:00
committed by GitHub
parent 035581b421
commit e84bab6e0a
5 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
View File

@@ -113,6 +113,8 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
private final Class<?> serviceInterface;
private final Set<Method> hasPayloadExpression = new HashSet<>();
private MessageChannel defaultRequestChannel;
private String defaultRequestChannelName;
@@ -599,18 +601,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
}
private boolean findPayloadExpression(Method method) {
boolean hasPayloadExpression = method.isAnnotationPresent(Payload.class);
if (!hasPayloadExpression) {
// check for the method metadata next
if (this.methodMetadataMap != null) {
GatewayMethodMetadata metadata = this.methodMetadataMap.get(method.getName());
hasPayloadExpression = (metadata != null) && metadata.getPayloadExpression() != null;
}
else if (this.globalMethodMetadata != null) {
hasPayloadExpression = this.globalMethodMetadata.getPayloadExpression() != null;
}
}
return hasPayloadExpression;
return method.isAnnotationPresent(Payload.class) || this.hasPayloadExpression.contains(method);
}
@Nullable
@@ -696,6 +687,9 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
}
Expression payloadExpression =
extractPayloadExpressionFromAnnotationOrMetadata(gatewayAnnotation, methodMetadata);
if (payloadExpression != null) {
this.hasPayloadExpression.add(method);
}
String requestChannelName = extractRequestChannelFromAnnotationOrMetadata(gatewayAnnotation, methodMetadata);
String replyChannelName = extractReplyChannelFromAnnotationOrMetadata(gatewayAnnotation, methodMetadata);
Expression requestTimeout = extractRequestTimeoutFromAnnotationOrMetadata(gatewayAnnotation, methodMetadata);

20
spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java
View File

@@ -150,6 +150,26 @@ public class GatewayParserTests {
assertThat(result).isEqualTo("foo");
}
@Test
public void testRequestReplyNoArgsGw() {
PollableChannel requestChannel = (PollableChannel) context.getBean("requestChannel");
MessageChannel replyChannel = (MessageChannel) context.getBean("replyChannel");
this.startResponder(requestChannel, replyChannel);
TestService service = (TestService) context.getBean("requestReply");
String result = service.noArgWithGateway();
assertThat(result).isEqualTo("fromGwExpression");
}
@Test
public void testRequestReplyNoArgsBothAnn() {
PollableChannel requestChannel = (PollableChannel) context.getBean("requestChannel");
MessageChannel replyChannel = (MessageChannel) context.getBean("replyChannel");
this.startResponder(requestChannel, replyChannel);
TestService service = (TestService) context.getBean("requestReply");
String result = service.noArgWithGatewayAndPayload();
assertThat(result).isEqualTo("fromGwExpression");
}
@Test
public void testAsyncGateway() throws Exception {
PollableChannel requestChannel = (PollableChannel) context.getBean("requestChannel");

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -71,6 +71,13 @@ public interface TestService {
throw new UnsupportedOperationException();
}
@Gateway(payloadExpression = "'fromGwExpression'", requestChannel = "requestChannel")
String noArgWithGateway();
@Payload("'fromPayloadAnnExpression'")
@Gateway(payloadExpression = "'fromGwExpression'", requestChannel = "requestChannel")
String noArgWithGatewayAndPayload();
class MyCompletableFuture extends CompletableFuture<String> {
}