From 188bb8555ec4e2080aca2ff85ed97468f1daba25 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Wed, 10 Feb 2016 15:21:59 -0500
Subject: [PATCH] Fix Amqp Header Mapper MimeType

Remove unnecessary class name comparison; `MediaType` is a subclass of `MimeType`.
---
 .../amqp/support/DefaultAmqpHeaderMapper.java          |  8 +++-----
 .../amqp/support/DefaultAmqpHeaderMapperTests.java     | 10 +++++++++-
 2 files changed, 12 insertions(+), 6 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 4c62abe477..2c4c797d8b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -348,8 +348,7 @@ public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper<MessagePropert
 
 	/**
 	 * Will extract Content-Type from MessageHeaders and convert it to String if possible
-	 * Required since Content-Type can be represented as org.springframework.http.MediaType
-	 * see INT-2713 for more details
+	 * Required since Content-Type can be represented as org.springframework.util.MimeType.
 	 *
 	 */
 	private String extractContentTypeAsString(Map<String, Object> headers) {
@@ -360,8 +359,7 @@ public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper<MessagePropert
 		if (contentType != null) {
 			String contentTypeClassName = contentType.getClass().getName();
 
-			if (contentType instanceof MimeType ||
-					contentTypeClassName.equals("org.springframework.http.MediaType")) { // see INT-2713
+			if (contentType instanceof MimeType) {
 				contentTypeStringValue = contentType.toString();
 			}
 			else if (contentType instanceof String) {
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 b0121e4e36..c45d8f188c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -38,6 +38,7 @@ import org.springframework.http.MediaType;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.util.MimeType;
+import org.springframework.util.MimeTypeUtils;
 
 /**
  * @author Mark Fisher
@@ -121,6 +122,13 @@ public class DefaultAmqpHeaderMapperTests {
 		headerMapper.fromHeadersToRequest(integrationHeaders, amqpProperties);
 
 		assertEquals("text/html", amqpProperties.getContentType());
+
+		headerMap.put(AmqpHeaders.CONTENT_TYPE, MimeTypeUtils.APPLICATION_JSON);
+		integrationHeaders = new MessageHeaders(headerMap);
+		amqpProperties = new MessageProperties();
+		headerMapper.fromHeadersToRequest(integrationHeaders, amqpProperties);
+
+		assertEquals(MimeTypeUtils.APPLICATION_JSON_VALUE, amqpProperties.getContentType());
 	}
 
 	@Test