From 7bc727c895b5542268ea441bfc3217a680cff528 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Thu, 27 Jun 2019 16:55:03 +0300
Subject: [PATCH] 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
---
 .../http/converter/FormHttpMessageConverter.java  | 15 +++++++++++----
 .../converter/FormHttpMessageConverterTests.java  |  5 ++---
 2 files changed, 13 insertions(+), 7 deletions(-)

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 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
 	 * @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);