From 2728a9b931ea52515f2d4f3c77ec102e904d69bb Mon Sep 17 00:00:00 2001 From: MaengSol Date: Mon, 15 Mar 2021 20:02:40 +0900 Subject: [PATCH] Polishing Closes gh-26675 --- .../springframework/http/ResponseEntity.java | 2 +- .../HeaderWebSessionIdResolverTests.java | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java index bbdb685d67d..6fae98b2cb2 100644 --- a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java +++ b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java @@ -186,7 +186,7 @@ public class ResponseEntity extends HttpEntity { @Override public String toString() { StringBuilder builder = new StringBuilder("<"); - builder.append(this.status.toString()); + builder.append(this.status); if (this.status instanceof HttpStatus) { builder.append(' '); builder.append(((HttpStatus) this.status).getReasonPhrase()); diff --git a/spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java b/spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java index 1347e2c05cb..dec23a66407 100644 --- a/spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java @@ -16,6 +16,7 @@ package org.springframework.web.server.session; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -49,7 +50,7 @@ public class HeaderWebSessionIdResolverTests { public void expireWhenValidThenSetsEmptyHeader() { this.idResolver.expireSession(this.exchange); - assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Arrays.asList("")); + assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Collections.singletonList("")); } @Test @@ -58,7 +59,7 @@ public class HeaderWebSessionIdResolverTests { this.idResolver.expireSession(this.exchange); - assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Arrays.asList("")); + assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Collections.singletonList("")); } @Test @@ -67,7 +68,7 @@ public class HeaderWebSessionIdResolverTests { this.idResolver.expireSession(this.exchange); - assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Arrays.asList("")); + assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Collections.singletonList("")); } @Test @@ -76,7 +77,7 @@ public class HeaderWebSessionIdResolverTests { this.idResolver.setSessionId(this.exchange, id); - assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Arrays.asList(id)); + assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Collections.singletonList(id)); } @Test @@ -86,7 +87,7 @@ public class HeaderWebSessionIdResolverTests { this.idResolver.setSessionId(this.exchange, id); - assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Arrays.asList(id)); + assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Collections.singletonList(id)); } @Test @@ -97,13 +98,13 @@ public class HeaderWebSessionIdResolverTests { this.idResolver.setSessionId(this.exchange, id); - assertThat(this.exchange.getResponse().getHeaders().get(headerName)).isEqualTo(Arrays.asList(id)); + assertThat(this.exchange.getResponse().getHeaders().get(headerName)).isEqualTo(Collections.singletonList(id)); } @Test public void setSessionIdWhenNullIdThenIllegalArgumentException() { assertThatIllegalArgumentException().isThrownBy(() -> - this.idResolver.setSessionId(this.exchange, (String) null)); + this.idResolver.setSessionId(this.exchange, null)); } @Test @@ -121,7 +122,7 @@ public class HeaderWebSessionIdResolverTests { List ids = this.idResolver.resolveSessionIds(this.exchange); - assertThat(ids).isEqualTo(Arrays.asList(id)); + assertThat(ids).isEqualTo(Collections.singletonList(id)); } @Test