root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing 

Closes gh-26675
This commit is contained in:
MaengSol 2021-03-15 20:02:40 +09:00 committed by GitHub
parent bc261fd995
commit 2728a9b931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,7 @@ public class ResponseEntity<T> extends HttpEntity<T> {
@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());

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

@ -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<String> ids = this.idResolver.resolveSessionIds(this.exchange);
assertThat(ids).isEqualTo(Arrays.asList(id));
assertThat(ids).isEqualTo(Collections.singletonList(id));
}
@Test