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 4b62f09577d..40d8f5aa7e6 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 @@ -138,13 +138,20 @@ public class FormHttpMessageConverter implements HttpMessageConverterThe 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 * @see #setSupportedMediaTypes(List) */ - public void addSupportedMediaType(MediaType supportedMediaType) { - Assert.notNull(supportedMediaType, "'supportedMediaType' must not be null"); - this.supportedMediaTypes.add(supportedMediaType); + public void addSupportedMediaTypes(MediaType... supportedMediaTypes) { + Assert.notNull(supportedMediaTypes, "'supportedMediaTypes' must not be null"); + Assert.noNullElements(supportedMediaTypes, "'supportedMediaTypes' must not contain null elements"); + for (MediaType mediaType : supportedMediaTypes) { + this.supportedMediaTypes.add(mediaType); + } } @Override diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java index a1b6fec9f0d..d18fa7b4726 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java @@ -93,12 +93,11 @@ public class FormHttpMessageConverterTests { } @Test - public void addSupportedMediaType() { + public void addSupportedMediaTypes() { assertCannotWrite(MULTIPART_MIXED); assertCannotWrite(MULTIPART_RELATED); - this.converter.addSupportedMediaType(MULTIPART_MIXED); - this.converter.addSupportedMediaType(MULTIPART_RELATED); + this.converter.addSupportedMediaTypes(MULTIPART_MIXED, MULTIPART_RELATED); assertCanWrite(MULTIPART_MIXED); assertCanWrite(MULTIPART_RELATED);