From 7c9697b1e5e2ec7f48d8b7c174b313d8f5036609 Mon Sep 17 00:00:00 2001
From: Steve Singer <steve@ssinger.info>
Date: Thu, 12 Jul 2018 17:52:23 -0400
Subject: [PATCH] INT-4500: Fix DefAmqpHeaderMapper correlationId

JIRA https://jira.spring.io/browse/INT-4500

The `correlationId` condition was against a `contentType` by mistake

* Code style polishing, add `@author`

(cherry picked from commit 0dcbde0)
---
 .../amqp/support/DefaultAmqpHeaderMapper.java    |  6 ++++--
 .../support/DefaultAmqpHeaderMapperTests.java    | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java
index e5f76c7a59..f513c753f3 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java
@@ -50,11 +50,13 @@ import org.springframework.util.StringUtils;
  * @author Gary Russell
  * @author Artem Bilan
  * @author Stephane Nicoll
+ * @author Steve Singer
+ *
  * @since 2.1
  */
 public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper<MessageProperties> implements AmqpHeaderMapper {
 
-	private static final List<String> STANDARD_HEADER_NAMES = new ArrayList<String>();
+	private static final List<String> STANDARD_HEADER_NAMES = new ArrayList<>();
 
 	static {
 		STANDARD_HEADER_NAMES.add(AmqpHeaders.APP_ID);
@@ -123,7 +125,7 @@ public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper<MessagePropert
 				headers.put(AmqpHeaders.CONTENT_TYPE, contentType);
 			}
 			String correlationId = amqpMessageProperties.getCorrelationId();
-			if (StringUtils.hasText(contentType)) {
+			if (StringUtils.hasText(correlationId)) {
 				headers.put(AmqpHeaders.CORRELATION_ID, correlationId);
 			}
 			MessageDeliveryMode receivedDeliveryMode = amqpMessageProperties.getReceivedDeliveryMode();
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java
index 2f950aea2f..1a285c8b92 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java
@@ -46,6 +46,8 @@ import org.springframework.util.MimeTypeUtils;
  * @author Oleg Zhurakousky
  * @author Stephane Nicoll
  * @author Artem Bilan
+ * @author Steve Singer
+ *
  * @since 2.1
  */
 public class DefaultAmqpHeaderMapperTests {
@@ -201,6 +203,20 @@ public class DefaultAmqpHeaderMapperTests {
 		assertEquals("test.replyTo2", headerMap.get(AmqpHeaders.SPRING_REPLY_TO_STACK));
 	}
 
+	@Test
+	public void toHeadersNonContenType() {
+		DefaultAmqpHeaderMapper headerMapper = DefaultAmqpHeaderMapper.inboundMapper();
+		MessageProperties amqpProperties = new MessageProperties();
+		amqpProperties.setAppId("test.appId");
+		amqpProperties.setClusterId("test.clusterId");
+		amqpProperties.setContentType(null);
+		String testCorrelationId = "foo";
+		amqpProperties.setCorrelationId(testCorrelationId);
+		Map<String, Object> headerMap = headerMapper.toHeadersFromReply(amqpProperties);
+		assertEquals(testCorrelationId, headerMap.get(AmqpHeaders.CORRELATION_ID));
+	}
+
+
 	@Test
 	public void testToHeadersConsumerMetadata() {
 		DefaultAmqpHeaderMapper headerMapper = DefaultAmqpHeaderMapper.inboundMapper();