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

Fix LambdaMessageProcessor for conversion

Browse Source 
SO: https://stackoverflow.com/questions/53378821

There is no need to jump into the `MessageConverter` if payload type
is assignable to the target type
This commit is contained in:
Artem Bilan
2018-11-19 13:11:20 -05:00
committed by Gary Russell
parent e9c554534a
commit b3cf864675
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-core/src/main/java/org/springframework/integration/handler/LambdaMessageProcessor.java
View File

@@ -30,6 +30,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.messaging.converter.MessageConverter;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
/**
@@ -104,7 +105,8 @@ public class LambdaMessageProcessor implements MessageProcessor<Object>, BeanFac
}
}
else {
if (this.payloadType != null) {
if (this.payloadType != null &&
!ClassUtils.isAssignable(this.payloadType, message.getPayload().getClass())) {
if (Message.class.isAssignableFrom(this.payloadType)) {
args[i] = message;
}

8
spring-integration-core/src/test/java/org/springframework/integration/dsl/flows/IntegrationFlowTests.java
View File

@@ -302,7 +302,7 @@ public class IntegrationFlowTests {
assertTrue(this.beanFactory.containsBean("lambdasFlow.transformer#0"));
QueueChannel replyChannel = new QueueChannel();
Message<?> message = MessageBuilder.withPayload("World")
Message<?> message = MessageBuilder.withPayload("World".getBytes())
.setHeader(MessageHeaders.REPLY_CHANNEL, replyChannel)
.build();
this.lambdasInput.send(message);
@@ -336,7 +336,7 @@ public class IntegrationFlowTests {
}
@Test
public void testGatewayFlow() throws Exception {
public void testGatewayFlow() {
PollableChannel replyChannel = new QueueChannel();
Message<String> message = MessageBuilder.withPayload("foo").setReplyChannel(replyChannel).build();
@@ -815,8 +815,8 @@ public class IntegrationFlowTests {
@Bean
public IntegrationFlow lambdasFlow() {
return IntegrationFlows.from("lambdasInput")
.filter("World"::equals)
.transform("Hello "::concat)
.filter(String.class, "World"::equals)
.transform(String.class, "Hello "::concat)
.get();
}