Skip to content

Commit ac4c24e

Browse files
committed
Polish "Add config prop for Spring Data Web's serialization mode"
See gh-39797
1 parent 81c903c commit ac4c24e

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebAutoConfigurationTests.java

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import org.springframework.boot.autoconfigure.AutoConfigurations;
2222
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2323
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
24-
import org.springframework.context.annotation.Bean;
25-
import org.springframework.context.annotation.Configuration;
2624
import org.springframework.data.domain.PageRequest;
2725
import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
2826
import org.springframework.data.web.SortHandlerMethodArgumentResolver;
@@ -121,22 +119,14 @@ void customizePageSerializationModeViaConfigProps() {
121119

122120
@Test
123121
void customizePageSerializationModeViaCustomBean() {
124-
this.contextRunner.withUserConfiguration(AppConfiguration.class)
125-
.withPropertyValues("spring.data.web.pageable.serialization-mode=VIA_DTO")
122+
this.contextRunner
123+
.withBean("customSpringDataWebSettings", SpringDataWebSettings.class,
124+
() -> new SpringDataWebSettings(PageSerializationMode.VIA_DTO))
126125
.run((context) -> {
126+
assertThat(context).doesNotHaveBean("springDataWebSettings");
127127
SpringDataWebSettings springDataWebSettings = context.getBean(SpringDataWebSettings.class);
128-
assertThat(springDataWebSettings.pageSerializationMode()).isEqualTo(PageSerializationMode.DIRECT);
128+
assertThat(springDataWebSettings.pageSerializationMode()).isEqualTo(PageSerializationMode.VIA_DTO);
129129
});
130130
}
131131

132-
@Configuration
133-
static class AppConfiguration {
134-
135-
@Bean
136-
SpringDataWebSettings springDataWebSettings() {
137-
return new SpringDataWebSettings(PageSerializationMode.DIRECT);
138-
}
139-
140-
}
141-
142132
}

0 commit comments

Comments
 (0)