Browse Source

Rename customize to reflect type that it customizes

See gh-20961
pull/21283/head
Andy Wilkinson 6 years ago
parent
commit
04c7132eb3
  1. 4
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/DefaultCookieSerializerCustomizer.java
  2. 4
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java
  3. 8
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/CookieSerializerCustomizer.java → spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/DefaultCookieSerializerCustomizer.java

@ -26,11 +26,11 @@ import org.springframework.session.web.http.DefaultCookieSerializer;
* @since 2.3.0 * @since 2.3.0
*/ */
@FunctionalInterface @FunctionalInterface
public interface CookieSerializerCustomizer { public interface DefaultCookieSerializerCustomizer {
/** /**
* Customize the cookie serializer. * Customize the cookie serializer.
* @param cookieSerializer the {@code CookieSerializer} to customize * @param cookieSerializer the {@code DefaultCookieSerializer} to customize
*/ */
void customize(DefaultCookieSerializer cookieSerializer); void customize(DefaultCookieSerializer cookieSerializer);

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java

@ -91,7 +91,7 @@ public class SessionAutoConfiguration {
@Bean @Bean
@Conditional(DefaultCookieSerializerCondition.class) @Conditional(DefaultCookieSerializerCondition.class)
DefaultCookieSerializer cookieSerializer(ServerProperties serverProperties, DefaultCookieSerializer cookieSerializer(ServerProperties serverProperties,
ObjectProvider<CookieSerializerCustomizer> cookieSerializerCustomizers) { ObjectProvider<DefaultCookieSerializerCustomizer> cookieSerializerCustomizers) {
Cookie cookie = serverProperties.getServlet().getSession().getCookie(); Cookie cookie = serverProperties.getServlet().getSession().getCookie();
DefaultCookieSerializer cookieSerializer = new DefaultCookieSerializer(); DefaultCookieSerializer cookieSerializer = new DefaultCookieSerializer();
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
@ -110,7 +110,7 @@ public class SessionAutoConfiguration {
static class RememberMeServicesConfiguration { static class RememberMeServicesConfiguration {
@Bean @Bean
CookieSerializerCustomizer rememberMeServicesCookieSerializerCustomizer() { DefaultCookieSerializerCustomizer rememberMeServicesCookieSerializerCustomizer() {
return (cookieSerializer) -> cookieSerializer return (cookieSerializer) -> cookieSerializer
.setRememberMeRequestAttribute(SpringSessionRememberMeServices.REMEMBER_ME_LOGIN_ATTR); .setRememberMeRequestAttribute(SpringSessionRememberMeServices.REMEMBER_ME_LOGIN_ATTR);
} }

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java

@ -294,19 +294,19 @@ class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurationTest
@EnableSpringHttpSession @EnableSpringHttpSession
static class CookieSerializerCustomization extends SessionRepositoryConfiguration { static class CookieSerializerCustomization extends SessionRepositoryConfiguration {
private final CookieSerializerCustomizer customizer1 = mock(CookieSerializerCustomizer.class); private final DefaultCookieSerializerCustomizer customizer1 = mock(DefaultCookieSerializerCustomizer.class);
private final CookieSerializerCustomizer customizer2 = mock(CookieSerializerCustomizer.class); private final DefaultCookieSerializerCustomizer customizer2 = mock(DefaultCookieSerializerCustomizer.class);
@Bean @Bean
@Order(1) @Order(1)
CookieSerializerCustomizer customizer1() { DefaultCookieSerializerCustomizer customizer1() {
return this.customizer1; return this.customizer1;
} }
@Bean @Bean
@Order(2) @Order(2)
CookieSerializerCustomizer customizer2() { DefaultCookieSerializerCustomizer customizer2() {
return this.customizer2; return this.customizer2;
} }

Loading…
Cancel
Save