Polish "Add property to configure Spring MVC default content types"

See gh-44040

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java

@@ -309,18 +309,18 @@ public static class Contentnegotiation {
 		private boolean favorParameter = false;
 
 		/**
-		 * Map file extensions to media types for content negotiation. For instance, yml
-		 * to text/yaml.
+		 * Query parameter name to use when "favor-parameter" is enabled.
 		 */
-		private Map<String, MediaType> mediaTypes = new LinkedHashMap<>();
+		private String parameterName;
 
 		/**
-		 * Query parameter name to use when "favor-parameter" is enabled.
+		 * Map file extensions to media types for content negotiation. For instance, yml
+		 * to text/yaml.
 		 */
-		private String parameterName;
+		private Map<String, MediaType> mediaTypes = new LinkedHashMap<>();
 
 		/**
-		 * The default content types to be used when no specific content type is
+		 * List of default content types to be used when no specific content type is
 		 * requested.
 		 */
 		private List<MediaType> defaultContentTypes = new ArrayList<>();
@@ -333,14 +333,6 @@ public void setFavorParameter(boolean favorParameter) {
 			this.favorParameter = favorParameter;
 		}
 
-		public Map<String, MediaType> getMediaTypes() {
-			return this.mediaTypes;
-		}
-
-		public void setMediaTypes(Map<String, MediaType> mediaTypes) {
-			this.mediaTypes = mediaTypes;
-		}
-
 		public String getParameterName() {
 			return this.parameterName;
 		}
@@ -349,6 +341,14 @@ public void setParameterName(String parameterName) {
 			this.parameterName = parameterName;
 		}
 
+		public Map<String, MediaType> getMediaTypes() {
+			return this.mediaTypes;
+		}
+
+		public void setMediaTypes(Map<String, MediaType> mediaTypes) {
+			this.mediaTypes = mediaTypes;
+		}
+
 		public List<MediaType> getDefaultContentTypes() {
 			return this.defaultContentTypes;
 		}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java

@@ -580,7 +580,7 @@ void customMediaTypes() {
 	}
 
 	@Test
-	void defaultContentTypes() {
+	void customDefaultContentTypes() {
 		this.contextRunner
 			.withPropertyValues("spring.mvc.contentnegotiation.default-content-types:application/json,application/xml")
 			.run((context) -> {