Skip to content

Commit d8cf332

Browse files
committed
Document default value of spring.thymeleaf.reactive.media-types
Closes gh-30280
1 parent 8d882fa commit d8cf332

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,6 +1766,25 @@
17661766
"name": "spring.thymeleaf.prefix",
17671767
"defaultValue": "classpath:/templates/"
17681768
},
1769+
{
1770+
"name": "spring.thymeleaf.reactive.media-types",
1771+
"defaultValue": [
1772+
"text/html",
1773+
"application/xhtml+xml",
1774+
"application/xml",
1775+
"text/xml",
1776+
"application/rss+xml",
1777+
"application/atom+xml",
1778+
"application/javascript",
1779+
"application/ecmascript",
1780+
"text/javascript",
1781+
"text/ecmascript",
1782+
"application/json",
1783+
"text/css",
1784+
"text/plain",
1785+
"text/event-stream"
1786+
]
1787+
},
17691788
{
17701789
"name": "spring.thymeleaf.suffix",
17711790
"defaultValue": ".html"

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,24 @@ void overrideCharacterEncoding() {
8787
});
8888
}
8989

90+
@Test
91+
void defaultMediaTypes() {
92+
this.contextRunner.run(
93+
(context) -> assertThat(context.getBean(ThymeleafReactiveViewResolver.class).getSupportedMediaTypes())
94+
.containsExactly(MediaType.TEXT_HTML, MediaType.APPLICATION_XHTML_XML,
95+
MediaType.APPLICATION_XML, MediaType.TEXT_XML, MediaType.APPLICATION_RSS_XML,
96+
MediaType.APPLICATION_ATOM_XML, new MediaType("application", "javascript"),
97+
new MediaType("application", "ecmascript"), new MediaType("text", "javascript"),
98+
new MediaType("text", "ecmascript"), MediaType.APPLICATION_JSON,
99+
new MediaType("text", "css"), MediaType.TEXT_PLAIN, MediaType.TEXT_EVENT_STREAM)
100+
.satisfies(System.out::println));
101+
}
102+
90103
@Test
91104
void overrideMediaTypes() {
92105
this.contextRunner.withPropertyValues("spring.thymeleaf.reactive.media-types:text/html,text/plain").run(
93106
(context) -> assertThat(context.getBean(ThymeleafReactiveViewResolver.class).getSupportedMediaTypes())
94-
.contains(MediaType.TEXT_HTML, MediaType.TEXT_PLAIN));
107+
.containsExactly(MediaType.TEXT_HTML, MediaType.TEXT_PLAIN));
95108
}
96109

97110
@Test

0 commit comments

Comments
 (0)