From c4908426fc1661b5d3736995735bdf1439fa9296 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 10 Oct 2016 14:57:48 -0400 Subject: [PATCH] Revert "INT-4135: Ignore case check for HTTP Content-Type" This reverts commit a82bca653b3435a2ff20314490cfee5bd0a6ef5d. Backporting causes some breaking changes. The work around is to use a header enricher/filter to move the content-type header to contentType. --- .../http/support/DefaultHttpHeaderMapper.java | 2 +- .../DefaultHttpHeaderMapperFromMessageInboundTests.java | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java index 7f1a69531f..2bdaa9771e 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java @@ -462,7 +462,7 @@ public class DefaultHttpHeaderMapper implements HeaderMapper, BeanF if (logger.isDebugEnabled()) { logger.debug(MessageFormat.format("setting headerName=[{0}], value={1}", name, value)); } - if (CONTENT_TYPE.equalsIgnoreCase(name)) { + if (CONTENT_TYPE.equals(name)) { name = MessageHeaders.CONTENT_TYPE; } this.setMessageHeader(target, name, value); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java index ffe4c70077..ca162933f2 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java @@ -581,15 +581,6 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { assertEquals(MediaType.valueOf("text/plain"), httpHeaders.getContentType()); } - @Test - public void testContentTypeInboundHeader() throws Exception { - HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); - HttpHeaders headers = new HttpHeaders(); - headers.add(HttpHeaders.CONTENT_TYPE.toLowerCase(), "text/plain"); - Map result = mapper.toHeaders(headers); - assertEquals(MediaType.valueOf("text/plain"), result.get(MessageHeaders.CONTENT_TYPE)); - } - public static class TestClass {