From d597a4d56b8e87c6cd72a9dd02213e563b54a416 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 12 Feb 2024 12:35:47 +0000 Subject: [PATCH] Correct handling of disable-html-escaping See gh-39504 --- .../boot/autoconfigure/gson/GsonAutoConfiguration.java | 2 +- .../boot/autoconfigure/gson/GsonAutoConfigurationTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java index f81ecacf007..94ed69c7451 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java @@ -93,7 +93,7 @@ public class GsonAutoConfiguration { map.from(properties::getFieldNamingPolicy).to(builder::setFieldNamingPolicy); map.from(properties::getPrettyPrinting).whenTrue().toCall(builder::setPrettyPrinting); 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); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java index e53b013aefa..179280d8d18 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java @@ -244,7 +244,7 @@ class GsonAutoConfigurationTests { void withDisableHtmlEscapingTrue() { this.contextRunner.withPropertyValues("spring.gson.disable-html-escaping:true").run((context) -> { Gson gson = context.getBean(Gson.class); - assertThat(gson.htmlSafe()).isTrue(); + assertThat(gson.htmlSafe()).isFalse(); }); } @@ -252,7 +252,7 @@ class GsonAutoConfigurationTests { void withDisableHtmlEscapingFalse() { this.contextRunner.withPropertyValues("spring.gson.disable-html-escaping:false").run((context) -> { Gson gson = context.getBean(Gson.class); - assertThat(gson.htmlSafe()).isFalse(); + assertThat(gson.htmlSafe()).isTrue(); }); }