root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

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

See gh-44040
This commit is contained in:
Stéphane Nicoll 2025-02-04 12:34:22 +01:00
parent d27fd31a3d
commit e5b03862d3
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,6 +308,11 @@ public class WebMvcProperties {
*/
private boolean favorParameter = false;
/**
* Query parameter name to use when "favor-parameter" is enabled.
*/
private String parameterName;
/**
* Map file extensions to media types for content negotiation. For instance, yml
* to text/yaml.
@ -315,12 +320,7 @@ public class WebMvcProperties {
private Map<String, MediaType> mediaTypes = new LinkedHashMap<>();
/**
* Query parameter name to use when "favor-parameter" is enabled.
*/
private String parameterName;
/**
* 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 class WebMvcProperties {
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 class WebMvcProperties {
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;
}

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

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