Skip to content

Commit 7bc727c

Browse files
committed
Convert addSupportedMediaType() to var-args in FormHttpMessageConverter
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
1 parent 1ef60f2 commit 7bc727c

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,20 @@ public void setSupportedMediaTypes(List<MediaType> supportedMediaTypes) {
138138
}
139139

140140
/**
141-
* Add a {@link MediaType} to be supported by this converter.
141+
* Add {@link MediaType} objects to be supported by this converter.
142+
* <p>The supplied {@code MediaType} objects will be appended to the list
143+
* of {@linkplain #getSupportedMediaTypes() supported MediaType objects}.
144+
* @param supportedMediaTypes a var-args list of {@code MediaType} objects
145+
* to add
142146
* @since 5.2
143147
* @see #setSupportedMediaTypes(List)
144148
*/
145-
public void addSupportedMediaType(MediaType supportedMediaType) {
146-
Assert.notNull(supportedMediaType, "'supportedMediaType' must not be null");
147-
this.supportedMediaTypes.add(supportedMediaType);
149+
public void addSupportedMediaTypes(MediaType... supportedMediaTypes) {
150+
Assert.notNull(supportedMediaTypes, "'supportedMediaTypes' must not be null");
151+
Assert.noNullElements(supportedMediaTypes, "'supportedMediaTypes' must not contain null elements");
152+
for (MediaType mediaType : supportedMediaTypes) {
153+
this.supportedMediaTypes.add(mediaType);
154+
}
148155
}
149156

150157
@Override

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,11 @@ public void setSupportedMediaTypes() {
9393
}
9494

9595
@Test
96-
public void addSupportedMediaType() {
96+
public void addSupportedMediaTypes() {
9797
assertCannotWrite(MULTIPART_MIXED);
9898
assertCannotWrite(MULTIPART_RELATED);
9999

100-
this.converter.addSupportedMediaType(MULTIPART_MIXED);
101-
this.converter.addSupportedMediaType(MULTIPART_RELATED);
100+
this.converter.addSupportedMediaTypes(MULTIPART_MIXED, MULTIPART_RELATED);
102101

103102
assertCanWrite(MULTIPART_MIXED);
104103
assertCanWrite(MULTIPART_RELATED);

0 commit comments

Comments
 (0)