Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert addSupportedMediaType() to var-args in FormHttpMessageConverter

Browse Source 
This commit changes the new addSupportedMediaType(MediaType) method
to addSupportedMediaTypes(MediaType...), in order to allow registration
of multiple supported media types simultaneously.

See gh-23203
This commit is contained in:
Sam Brannen
2019-06-27 16:55:03 +03:00
parent 1ef60f2d3b
commit 7bc727c895
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
View File

@@ -138,13 +138,20 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
} }
/** /**
* Add a {@link MediaType} to be supported by this converter. * Add {@link MediaType} objects to be supported by this converter.
* <p>The supplied {@code MediaType} objects will be appended to the list
* of {@linkplain #getSupportedMediaTypes() supported MediaType objects}.
* @param supportedMediaTypes a var-args list of {@code MediaType} objects
* to add
* @since 5.2 * @since 5.2
* @see #setSupportedMediaTypes(List) * @see #setSupportedMediaTypes(List)
*/ */
public void addSupportedMediaType(MediaType supportedMediaType) { public void addSupportedMediaTypes(MediaType... supportedMediaTypes) {
Assert.notNull(supportedMediaType, "'supportedMediaType' must not be null"); Assert.notNull(supportedMediaTypes, "'supportedMediaTypes' must not be null");
this.supportedMediaTypes.add(supportedMediaType); Assert.noNullElements(supportedMediaTypes, "'supportedMediaTypes' must not contain null elements");
for (MediaType mediaType : supportedMediaTypes) {
this.supportedMediaTypes.add(mediaType);
}
} }
@Override @Override

5
spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
View File

@@ -93,12 +93,11 @@ public class FormHttpMessageConverterTests {
} }
@Test @Test
public void addSupportedMediaType() { public void addSupportedMediaTypes() {
assertCannotWrite(MULTIPART_MIXED); assertCannotWrite(MULTIPART_MIXED);
assertCannotWrite(MULTIPART_RELATED); assertCannotWrite(MULTIPART_RELATED);
this.converter.addSupportedMediaType(MULTIPART_MIXED); this.converter.addSupportedMediaTypes(MULTIPART_MIXED, MULTIPART_RELATED);
this.converter.addSupportedMediaType(MULTIPART_RELATED);
assertCanWrite(MULTIPART_MIXED); assertCanWrite(MULTIPART_MIXED);
assertCanWrite(MULTIPART_RELATED); assertCanWrite(MULTIPART_RELATED);