From 85a552daed9766ff9f9c5de05181dd5fa5ec7214 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 7 Dec 2012 18:12:11 -0500 Subject: [PATCH] Fix package cycle among http message converters This change introduces a new AllEncompassingFormHttpMessageConverter class that adds JSON and XML converters for individual mime parts of a multi-part request. The new converter is used in place of the previously used XmlAwareFormHttpMessageConverter. Issue: SPR-10055 --- .../converter/FormHttpMessageConverter.java | 18 ------ ...lEncompassingFormHttpMessageConverter.java | 59 +++++++++++++++++++ .../xml/XmlAwareFormHttpMessageConverter.java | 2 + .../web/client/RestTemplate.java | 3 +- .../web/filter/HttpPutFormContentFilter.java | 3 +- .../FormHttpMessageConverterTests.java | 3 +- .../AnnotationDrivenBeanDefinitionParser.java | 3 +- .../WebMvcConfigurationSupport.java | 3 +- .../ExceptionHandlerExceptionResolver.java | 3 +- .../RequestMappingHandlerAdapter.java | 3 +- .../RequestPartIntegrationTests.java | 3 +- ...questResponseBodyMethodProcessorTests.java | 3 +- src/dist/changelog.txt | 2 +- 13 files changed, 80 insertions(+), 28 deletions(-) create mode 100644 spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java index 8cc1b63f53..0bbe671083 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java @@ -36,15 +36,11 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpOutputMessage; import org.springframework.http.MediaType; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; import org.springframework.util.Assert; -import org.springframework.util.ClassUtils; import org.springframework.util.FileCopyUtils; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; -import org.springframework.web.client.RestTemplate; /** * Implementation of {@link HttpMessageConverter} that can handle form data, including multipart form data (i.e. file @@ -76,14 +72,6 @@ import org.springframework.web.client.RestTemplate; */ public class FormHttpMessageConverter implements HttpMessageConverter> { - private static final boolean jackson2Present = - ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", RestTemplate.class.getClassLoader()) && - ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", RestTemplate.class.getClassLoader()); - - private static final boolean jacksonPresent = - ClassUtils.isPresent("org.codehaus.jackson.map.ObjectMapper", RestTemplate.class.getClassLoader()) && - ClassUtils.isPresent("org.codehaus.jackson.JsonGenerator", RestTemplate.class.getClassLoader()); - private static final byte[] BOUNDARY_CHARS = new byte[]{'-', '_', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', @@ -108,12 +96,6 @@ public class FormHttpMessageConverter implements HttpMessageConverter()); - messageConverters.add(new XmlAwareFormHttpMessageConverter()); + messageConverters.add(new AllEncompassingFormHttpMessageConverter()); if (romePresent) { messageConverters.add(new AtomFeedHttpMessageConverter()); messageConverters.add(new RssChannelHttpMessageConverter()); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java index d3a4941908..9cad5e0d5b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java @@ -37,6 +37,7 @@ import org.springframework.core.OrderComparator; import org.springframework.http.converter.ByteArrayHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; +import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.web.accept.ContentNegotiationManager; @@ -104,7 +105,7 @@ public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExce this.messageConverters.add(new ByteArrayHttpMessageConverter()); this.messageConverters.add(stringHttpMessageConverter); this.messageConverters.add(new SourceHttpMessageConverter()); - this.messageConverters.add(new XmlAwareFormHttpMessageConverter()); + this.messageConverters.add(new AllEncompassingFormHttpMessageConverter()); } /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java index 6d2597e5b6..9c1e761737 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java @@ -45,6 +45,7 @@ import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.http.converter.ByteArrayHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; +import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.ui.ModelMap; @@ -181,7 +182,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter i this.messageConverters.add(new ByteArrayHttpMessageConverter()); this.messageConverters.add(stringHttpMessageConverter); this.messageConverters.add(new SourceHttpMessageConverter()); - this.messageConverters.add(new XmlAwareFormHttpMessageConverter()); + this.messageConverters.add(new AllEncompassingFormHttpMessageConverter()); } /** diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java index f5730fcb69..2513f86e21 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java @@ -41,6 +41,7 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.ResourceHttpMessageConverter; import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; +import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.stereotype.Controller; import org.springframework.util.LinkedMultiValueMap; @@ -102,7 +103,7 @@ public class RequestPartIntegrationTests { @Before public void setUp() { - XmlAwareFormHttpMessageConverter converter = new XmlAwareFormHttpMessageConverter(); + AllEncompassingFormHttpMessageConverter converter = new AllEncompassingFormHttpMessageConverter(); converter.setPartConverters(Arrays.>asList( new ResourceHttpMessageConverter(), new MappingJacksonHttpMessageConverter())); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java index c5139a27a0..4e99948e4f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java @@ -32,6 +32,7 @@ import org.springframework.http.converter.ByteArrayHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.mock.web.test.MockHttpServletResponse; @@ -119,7 +120,7 @@ public class RequestResponseBodyMethodProcessorTests { this.servletRequest.setContentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE); List> converters = new ArrayList>(); - converters.add(new XmlAwareFormHttpMessageConverter()); + converters.add(new AllEncompassingFormHttpMessageConverter()); RequestResponseBodyMethodProcessor processor = new RequestResponseBodyMethodProcessor(converters); @SuppressWarnings("unchecked") diff --git a/src/dist/changelog.txt b/src/dist/changelog.txt index ede47fb532..c11c6346f6 100644 --- a/src/dist/changelog.txt +++ b/src/dist/changelog.txt @@ -105,7 +105,7 @@ Changes in version 3.2 RC1 (2012-11-04) * use concurrent cache to improve performance of GenericTypeResolver (SPR-8701) * cache and late resolve annotations on bean properties to improve performance (SPR-9166) * allow PropertyResolver implementations to ignore unresolvable ${placeholders} (SPR-9569) -* FormHttpMessageConverter now adds Jackson JSON converters if available on the classpath (SPR-10055) +* AllEncompassingFormHttpMessageConverter now adds XML/JSON converters for individual mime parts (SPR-10055) Changes in version 3.2 M2 (2012-09-11) --------------------------------------