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

Don't wrap SpEL result message to another message

Browse Source 
The `ExpressionEvaluatingTransactionSynchronizationProcessor` wraps
an expression evaluation result to the `Message` unconditionally

* Don't wrap one message to another if SpEL result is a `Message` per se
* Don't wrap the received message to another if the `expression` isn't
configured.

**Cherry-pick to 4.3.x**
This commit is contained in:
Artem Bilan
2017-11-21 12:12:38 -05:00
committed by Gary Russell
parent 28f1769899
commit c3ca61d4a0
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-core/src/test/java/org/springframework/integration/endpoint/PseudoTransactionalMessageSourceTests.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");
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.integration.endpoint;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
@@ -62,6 +63,7 @@ import org.springframework.transaction.support.TransactionTemplate;
* @author Gary Russell
* @author Oleg Zhurakousky
* @author Artem Bilan
*
* @since 2.2
*
*/
@@ -189,13 +191,16 @@ public class PseudoTransactionalMessageSourceTests {
QueueChannel outputChannel = new QueueChannel();
adapter.setOutputChannel(outputChannel);
final Message<?> testMessage = new GenericMessage<>("foo");
adapter.setSource(new MessageSource<String>() {
@Override
public Message<String> receive() {
GenericMessage<String> message = new GenericMessage<String>("foo");
((IntegrationResourceHolder) TransactionSynchronizationManager.getResource(this))
.addAttribute("baz", "qux");
.addAttribute("baz", testMessage);
return message;
}
});
@@ -206,7 +211,7 @@ public class PseudoTransactionalMessageSourceTests {
TransactionSynchronizationUtils.triggerAfterCompletion(TransactionSynchronization.STATUS_ROLLED_BACK);
Message<?> rollbackMessage = queueChannel.receive(1000);
assertNotNull(rollbackMessage);
assertEquals("qux", rollbackMessage.getPayload());
assertSame(testMessage, rollbackMessage);
TransactionSynchronizationManager.clearSynchronization();
TransactionSynchronizationManager.setActualTransactionActive(false);
}