Skip to content

Commit 2728a9b

Browse files
authored
Polishing
Closes gh-26675
1 parent bc261fd commit 2728a9b

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

spring-web/src/main/java/org/springframework/http/ResponseEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public int hashCode() {
186186
@Override
187187
public String toString() {
188188
StringBuilder builder = new StringBuilder("<");
189-
builder.append(this.status.toString());
189+
builder.append(this.status);
190190
if (this.status instanceof HttpStatus) {
191191
builder.append(' ');
192192
builder.append(((HttpStatus) this.status).getReasonPhrase());

spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.springframework.web.server.session;
1717

1818
import java.util.Arrays;
19+
import java.util.Collections;
1920
import java.util.List;
2021

2122
import org.junit.jupiter.api.BeforeEach;
@@ -49,7 +50,7 @@ public void setUp() {
4950
public void expireWhenValidThenSetsEmptyHeader() {
5051
this.idResolver.expireSession(this.exchange);
5152

52-
assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Arrays.asList(""));
53+
assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Collections.singletonList(""));
5354
}
5455

5556
@Test
@@ -58,7 +59,7 @@ public void expireWhenMultipleInvocationThenSetsSingleEmptyHeader() {
5859

5960
this.idResolver.expireSession(this.exchange);
6061

61-
assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Arrays.asList(""));
62+
assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Collections.singletonList(""));
6263
}
6364

6465
@Test
@@ -67,7 +68,7 @@ public void expireWhenAfterSetSessionIdThenSetsEmptyHeader() {
6768

6869
this.idResolver.expireSession(this.exchange);
6970

70-
assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Arrays.asList(""));
71+
assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Collections.singletonList(""));
7172
}
7273

7374
@Test
@@ -76,7 +77,7 @@ public void setSessionIdWhenValidThenSetsHeader() {
7677

7778
this.idResolver.setSessionId(this.exchange, id);
7879

79-
assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Arrays.asList(id));
80+
assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Collections.singletonList(id));
8081
}
8182

8283
@Test
@@ -86,7 +87,7 @@ public void setSessionIdWhenMultipleThenSetsSingleHeader() {
8687

8788
this.idResolver.setSessionId(this.exchange, id);
8889

89-
assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Arrays.asList(id));
90+
assertThat(this.exchange.getResponse().getHeaders().get(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME)).isEqualTo(Collections.singletonList(id));
9091
}
9192

9293
@Test
@@ -97,13 +98,13 @@ public void setSessionIdWhenCustomHeaderNameThenSetsHeader() {
9798

9899
this.idResolver.setSessionId(this.exchange, id);
99100

100-
assertThat(this.exchange.getResponse().getHeaders().get(headerName)).isEqualTo(Arrays.asList(id));
101+
assertThat(this.exchange.getResponse().getHeaders().get(headerName)).isEqualTo(Collections.singletonList(id));
101102
}
102103

103104
@Test
104105
public void setSessionIdWhenNullIdThenIllegalArgumentException() {
105106
assertThatIllegalArgumentException().isThrownBy(() ->
106-
this.idResolver.setSessionId(this.exchange, (String) null));
107+
this.idResolver.setSessionId(this.exchange, null));
107108
}
108109

109110
@Test
@@ -121,7 +122,7 @@ public void resolveSessionIdsWhenIdThenIdFound() {
121122

122123
List<String> ids = this.idResolver.resolveSessionIds(this.exchange);
123124

124-
assertThat(ids).isEqualTo(Arrays.asList(id));
125+
assertThat(ids).isEqualTo(Collections.singletonList(id));
125126
}
126127

127128
@Test

0 commit comments

Comments
 (0)