From ac4c24e450ab66924e2d8d3bfd972a0bb9692262 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 6 Sep 2024 09:40:11 +0100 Subject: [PATCH] Polish "Add config prop for Spring Data Web's serialization mode" See gh-39797 --- .../SpringDataWebAutoConfigurationTests.java | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebAutoConfigurationTests.java index e3a828e786..d3a1e92406 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebAutoConfigurationTests.java @@ -21,8 +21,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.data.domain.PageRequest; import org.springframework.data.web.PageableHandlerMethodArgumentResolver; import org.springframework.data.web.SortHandlerMethodArgumentResolver; @@ -121,22 +119,14 @@ class SpringDataWebAutoConfigurationTests { @Test void customizePageSerializationModeViaCustomBean() { - this.contextRunner.withUserConfiguration(AppConfiguration.class) - .withPropertyValues("spring.data.web.pageable.serialization-mode=VIA_DTO") + this.contextRunner + .withBean("customSpringDataWebSettings", SpringDataWebSettings.class, + () -> new SpringDataWebSettings(PageSerializationMode.VIA_DTO)) .run((context) -> { + assertThat(context).doesNotHaveBean("springDataWebSettings"); SpringDataWebSettings springDataWebSettings = context.getBean(SpringDataWebSettings.class); - assertThat(springDataWebSettings.pageSerializationMode()).isEqualTo(PageSerializationMode.DIRECT); + assertThat(springDataWebSettings.pageSerializationMode()).isEqualTo(PageSerializationMode.VIA_DTO); }); } - @Configuration - static class AppConfiguration { - - @Bean - SpringDataWebSettings springDataWebSettings() { - return new SpringDataWebSettings(PageSerializationMode.DIRECT); - } - - } - }