diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java index b967f8949eb4..d4b76ee4c834 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java @@ -436,7 +436,7 @@ protected Map getDefaultMediaTypes() { if (supportedMediaTypes.contains(MediaType.APPLICATION_CBOR)) { map.put("cbor", MediaType.APPLICATION_CBOR); } - if (supportedMediaTypes.contains(MediaType.APPLICATION_ATOM_XML)) { + if (supportedMediaTypes.contains(MediaType.APPLICATION_YAML)) { map.put("yaml", MediaType.APPLICATION_YAML); } return map; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java index a0688a268a11..3680a20caceb 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java @@ -48,6 +48,8 @@ import org.springframework.http.MediaType; import org.springframework.http.converter.AbstractJacksonHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.HttpMessageConverters; +import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.xml.JacksonXmlHttpMessageConverter; import org.springframework.stereotype.Controller; import org.springframework.util.AntPathMatcher; @@ -232,6 +234,32 @@ void contentNegotiationManager() { .containsEntry("yaml", MediaType.APPLICATION_YAML); } + @Test + void contentNegotiationManagerWithYamlConverterOnly() { + assertThat(mediaTypeMappingsFor(MediaType.APPLICATION_YAML)) + .containsOnlyKeys("yaml") + .containsEntry("yaml", MediaType.APPLICATION_YAML); + } + + @Test + void contentNegotiationManagerWithAtomConverterOnly() { + assertThat(mediaTypeMappingsFor(MediaType.APPLICATION_ATOM_XML)) + .containsOnlyKeys("atom") + .containsEntry("atom", MediaType.APPLICATION_ATOM_XML); + } + + private Map mediaTypeMappingsFor(MediaType mediaType) { + StringHttpMessageConverter converter = new StringHttpMessageConverter(); + converter.setSupportedMediaTypes(List.of(mediaType)); + WebMvcConfigurationSupport configuration = new WebMvcConfigurationSupport() { + @Override + protected void configureMessageConverters(HttpMessageConverters.ServerBuilder builder) { + builder.disableDefaults().addCustomConverter(converter); + } + }; + return configuration.mvcContentNegotiationManager().getMediaTypeMappings(); + } + @Test void uriComponentsContributor() { ApplicationContext context = initContext(WebConfig.class);