From 21147449372ea6d361e4949d89a86e8c4d73e185 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 25 Sep 2024 16:05:01 +0200 Subject: [PATCH] Polish "Add support for partitioned cookies" See gh-42316 --- .../web/servlet/server/AbstractServletWebServerFactory.java | 2 +- .../server/AbstractServletWebServerFactoryTests.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactory.java index 8f00ee02f5..44736d5aa4 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactory.java @@ -60,7 +60,7 @@ import org.springframework.util.ClassUtils; public abstract class AbstractServletWebServerFactory extends AbstractConfigurableWebServerFactory implements ConfigurableServletWebServerFactory { - static final String PARTITIONED_ATTRIBUTE_NAME = "Partitioned"; + private static final String PARTITIONED_ATTRIBUTE_NAME = "Partitioned"; protected final Log logger = LogFactory.getLog(getClass()); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java index 0e46e4e775..ca9270d209 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java @@ -873,8 +873,7 @@ public abstract class AbstractServletWebServerFactoryTests { assertThat(sessionCookieConfig.getPath()).isEqualTo("/testpath"); assertThat(sessionCookieConfig.isHttpOnly()).isTrue(); assertThat(sessionCookieConfig.isSecure()).isTrue(); - assertThat(sessionCookieConfig.getAttribute(AbstractServletWebServerFactory.PARTITIONED_ATTRIBUTE_NAME)) - .isEqualTo("true"); + assertThat(sessionCookieConfig.getAttribute("Partitioned")).isEqualTo("true"); assertThat(sessionCookieConfig.getMaxAge()).isEqualTo(60); } @@ -1182,8 +1181,7 @@ public abstract class AbstractServletWebServerFactoryTests { assertThat(servletContext.getSessionCookieConfig().isHttpOnly()).isTrue(); assertThat(servletContext.getSessionCookieConfig().isSecure()).isTrue(); assertThat(servletContext.getSessionCookieConfig().getMaxAge()).isEqualTo(60); - assertThat(servletContext.getSessionCookieConfig() - .getAttribute(AbstractServletWebServerFactory.PARTITIONED_ATTRIBUTE_NAME)).isEqualTo("false"); + assertThat(servletContext.getSessionCookieConfig().getAttribute("Partitioned")).isEqualTo("false"); } @Test