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

Merge branch '3.2.x'

This commit is contained in:
Andy Wilkinson 2024-02-12 12:36:32 +00:00
parent a27cedc3ef d597a4d56b
commit 107dc5338b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java
View File

@ -93,7 +93,7 @@ public class GsonAutoConfiguration {
map.from(properties::getFieldNamingPolicy).to(builder::setFieldNamingPolicy); map.from(properties::getFieldNamingPolicy).to(builder::setFieldNamingPolicy);
map.from(properties::getPrettyPrinting).whenTrue().toCall(builder::setPrettyPrinting); map.from(properties::getPrettyPrinting).whenTrue().toCall(builder::setPrettyPrinting);
map.from(properties::getLenient).whenTrue().toCall(builder::setLenient); map.from(properties::getLenient).whenTrue().toCall(builder::setLenient);
map.from(properties::getDisableHtmlEscaping).whenFalse().toCall(builder::disableHtmlEscaping); map.from(properties::getDisableHtmlEscaping).whenTrue().toCall(builder::disableHtmlEscaping);
map.from(properties::getDateFormat).to(builder::setDateFormat); map.from(properties::getDateFormat).to(builder::setDateFormat);
} }

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java
View File

@ -244,7 +244,7 @@ class GsonAutoConfigurationTests {
void withDisableHtmlEscapingTrue() { void withDisableHtmlEscapingTrue() {
this.contextRunner.withPropertyValues("spring.gson.disable-html-escaping:true").run((context) -> { this.contextRunner.withPropertyValues("spring.gson.disable-html-escaping:true").run((context) -> {
Gson gson = context.getBean(Gson.class); Gson gson = context.getBean(Gson.class);
assertThat(gson.htmlSafe()).isTrue(); assertThat(gson.htmlSafe()).isFalse();
}); });
} }
@ -252,7 +252,7 @@ class GsonAutoConfigurationTests {
void withDisableHtmlEscapingFalse() { void withDisableHtmlEscapingFalse() {
this.contextRunner.withPropertyValues("spring.gson.disable-html-escaping:false").run((context) -> { this.contextRunner.withPropertyValues("spring.gson.disable-html-escaping:false").run((context) -> {
Gson gson = context.getBean(Gson.class); Gson gson = context.getBean(Gson.class);
assertThat(gson.htmlSafe()).isFalse(); assertThat(gson.htmlSafe()).isTrue();
}); });
} }