Skip to content

Commit 632c0e7

Browse files
jhoellerjhoeller
committed
added XmlAwareFormHttpMessageConverter, taking over the 3.0.2-introduced XML multipart support (avoiding a package cycle)
1 parent 392accd commit 632c0e7

File tree

6 files changed

+53
-12
lines changed

6 files changed

+53
-12
lines changed

‎org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
import org.springframework.core.convert.ConversionService;
3030
import org.springframework.format.support.FormattingConversionServiceFactoryBean;
3131
import org.springframework.http.converter.ByteArrayHttpMessageConverter;
32-
import org.springframework.http.converter.FormHttpMessageConverter;
3332
import org.springframework.http.converter.ResourceHttpMessageConverter;
3433
import org.springframework.http.converter.StringHttpMessageConverter;
3534
import org.springframework.http.converter.feed.AtomFeedHttpMessageConverter;
3635
import org.springframework.http.converter.feed.RssChannelHttpMessageConverter;
3736
import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
3837
import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
3938
import org.springframework.http.converter.xml.SourceHttpMessageConverter;
39+
import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
4040
import org.springframework.util.ClassUtils;
4141
import org.springframework.validation.Validator;
4242
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
@@ -173,8 +173,8 @@ private ManagedList<RootBeanDefinition> getMessageConverters(Object source) {
173173
messageConverters.add(new RootBeanDefinition(ByteArrayHttpMessageConverter.class));
174174
messageConverters.add(new RootBeanDefinition(StringHttpMessageConverter.class));
175175
messageConverters.add(new RootBeanDefinition(ResourceHttpMessageConverter.class));
176-
messageConverters.add(new RootBeanDefinition(FormHttpMessageConverter.class));
177176
messageConverters.add(new RootBeanDefinition(SourceHttpMessageConverter.class));
177+
messageConverters.add(new RootBeanDefinition(XmlAwareFormHttpMessageConverter.class));
178178
if (jaxb2Present) {
179179
messageConverters.add(new RootBeanDefinition(Jaxb2RootElementHttpMessageConverter.class));
180180
}

‎org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@
6363
import org.springframework.http.MediaType;
6464
import org.springframework.http.ResponseEntity;
6565
import org.springframework.http.converter.ByteArrayHttpMessageConverter;
66-
import org.springframework.http.converter.FormHttpMessageConverter;
6766
import org.springframework.http.converter.HttpMessageConverter;
6867
import org.springframework.http.converter.StringHttpMessageConverter;
6968
import org.springframework.http.converter.xml.SourceHttpMessageConverter;
69+
import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
7070
import org.springframework.http.server.ServerHttpRequest;
7171
import org.springframework.http.server.ServerHttpResponse;
7272
import org.springframework.http.server.ServletServerHttpRequest;
@@ -175,7 +175,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
175175

176176
private HttpMessageConverter<?>[] messageConverters =
177177
new HttpMessageConverter[]{new ByteArrayHttpMessageConverter(), new StringHttpMessageConverter(),
178-
new FormHttpMessageConverter(), new SourceHttpMessageConverter()};
178+
new SourceHttpMessageConverter(), new XmlAwareFormHttpMessageConverter()};
179179

180180
private int order = Ordered.LOWEST_PRECEDENCE;
181181

‎org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
import org.springframework.http.MediaType;
4848
import org.springframework.http.HttpStatus;
4949
import org.springframework.http.converter.ByteArrayHttpMessageConverter;
50-
import org.springframework.http.converter.FormHttpMessageConverter;
5150
import org.springframework.http.converter.HttpMessageConverter;
5251
import org.springframework.http.converter.StringHttpMessageConverter;
5352
import org.springframework.http.converter.xml.SourceHttpMessageConverter;
53+
import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
5454
import org.springframework.http.server.ServletServerHttpRequest;
5555
import org.springframework.http.server.ServletServerHttpResponse;
5656
import org.springframework.ui.Model;
@@ -86,7 +86,7 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc
8686

8787
private HttpMessageConverter<?>[] messageConverters =
8888
new HttpMessageConverter[] {new ByteArrayHttpMessageConverter(), new StringHttpMessageConverter(),
89-
new FormHttpMessageConverter(), new SourceHttpMessageConverter()};
89+
new SourceHttpMessageConverter(), new XmlAwareFormHttpMessageConverter()};
9090

9191

9292
/**

‎org.springframework.web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.springframework.http.HttpInputMessage;
3939
import org.springframework.http.HttpOutputMessage;
4040
import org.springframework.http.MediaType;
41-
import org.springframework.http.converter.xml.SourceHttpMessageConverter;
4241
import org.springframework.util.Assert;
4342
import org.springframework.util.FileCopyUtils;
4443
import org.springframework.util.LinkedMultiValueMap;
@@ -104,15 +103,22 @@ public FormHttpMessageConverter() {
104103
stringHttpMessageConverter.setWriteAcceptCharset(false);
105104
this.partConverters.add(stringHttpMessageConverter);
106105
this.partConverters.add(new ResourceHttpMessageConverter());
107-
this.partConverters.add(new SourceHttpMessageConverter());
108106
}
109107

110108

109+
/**
110+
* Add a message body converter. Such a converters is used to convert objects to MIME parts.
111+
*/
112+
public final void addPartConverter(HttpMessageConverter<?> partConverter) {
113+
Assert.notNull(partConverter, "'partConverter' must not be NULL");
114+
this.partConverters.add(partConverter);
115+
}
116+
111117
/**
112118
* Set the message body converters to use. These converters are used to convert objects to MIME parts.
113119
*/
114-
public void setPartConverters(List<HttpMessageConverter<?>> partConverters) {
115-
Assert.notEmpty(partConverters, "'messageConverters' must not be empty");
120+
public final void setPartConverters(List<HttpMessageConverter<?>> partConverters) {
121+
Assert.notEmpty(partConverters, "'partConverters' must not be empty");
116122
this.partConverters = partConverters;
117123
}
118124

‎org.springframework.web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright 2002-2010 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.http.converter.xml;
18+
19+
import org.springframework.http.converter.FormHttpMessageConverter;
20+
21+
/**
22+
* Extension of {@link org.springframework.http.converter.FormHttpMessageConverter},
23+
* adding support for XML-based parts through a {@link SourceHttpMessageConverter}.
24+
*
25+
* @author Juergen Hoeller
26+
* @since 3.0.3
27+
*/
28+
public class XmlAwareFormHttpMessageConverter extends FormHttpMessageConverter {
29+
30+
public XmlAwareFormHttpMessageConverter() {
31+
super();
32+
addPartConverter(new SourceHttpMessageConverter());
33+
}
34+
35+
}

‎org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.springframework.http.client.ClientHttpResponse;
3636
import org.springframework.http.client.support.HttpAccessor;
3737
import org.springframework.http.converter.ByteArrayHttpMessageConverter;
38-
import org.springframework.http.converter.FormHttpMessageConverter;
3938
import org.springframework.http.converter.HttpMessageConverter;
4039
import org.springframework.http.converter.ResourceHttpMessageConverter;
4140
import org.springframework.http.converter.StringHttpMessageConverter;
@@ -44,6 +43,7 @@
4443
import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
4544
import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
4645
import org.springframework.http.converter.xml.SourceHttpMessageConverter;
46+
import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
4747
import org.springframework.util.Assert;
4848
import org.springframework.util.ClassUtils;
4949
import org.springframework.web.util.UriTemplate;
@@ -138,8 +138,8 @@ public RestTemplate() {
138138
this.messageConverters.add(new ByteArrayHttpMessageConverter());
139139
this.messageConverters.add(new StringHttpMessageConverter());
140140
this.messageConverters.add(new ResourceHttpMessageConverter());
141-
this.messageConverters.add(new FormHttpMessageConverter());
142141
this.messageConverters.add(new SourceHttpMessageConverter());
142+
this.messageConverters.add(new XmlAwareFormHttpMessageConverter());
143143
if (jaxb2Present) {
144144
this.messageConverters.add(new Jaxb2RootElementHttpMessageConverter());
145145
}

0 commit comments

Comments
 (0)