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

Update to Spring AMQP 1.6.7

Browse Source 
Also added a note to the 5.0 migration guide about the change of
`AMQPHeaders.CORRELATION_ID` from `byte[]` to `String`.
This commit is contained in:
Gary Russell
2017-01-21 11:15:51 -05:00
parent e6e2e01951
commit f23c679f67
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -127,7 +127,7 @@ subprojects { subproject ->
slf4jVersion = "1.7.21"
tomcatVersion = "8.0.33"
smackVersion = '4.1.7'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.6.6.RELEASE'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.6.7.RELEASE'
springDataJpaVersion = '1.10.1.RELEASE'
springDataMongoVersion = '1.9.1.RELEASE'
springDataRedisVersion = '1.7.1.RELEASE'

2
spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java
View File

@@ -159,6 +159,7 @@ public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper<MessagePropert
if (StringUtils.hasText(contentType)) {
headers.put(AmqpHeaders.CONTENT_TYPE, contentType);
}
@SuppressWarnings("deprecation")
byte[] correlationId = amqpMessageProperties.getCorrelationId();
if (correlationId != null && correlationId.length > 0) {
headers.put(AmqpHeaders.CORRELATION_ID, correlationId);
@@ -248,6 +249,7 @@ public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper<MessagePropert
* Maps headers from a Spring Integration MessageHeaders instance to the MessageProperties
* of an AMQP Message.
*/
@SuppressWarnings("deprecation")
@Override
protected void populateStandardHeaders(Map<String, Object> headers, MessageProperties amqpMessageProperties) {
String appId = getHeaderIfAvailable(headers, AmqpHeaders.APP_ID, String.class);