Browse Source

Polishing

Closes gh-26675
pull/26684/head
MaengSol 5 years ago committed by GitHub
parent
commit
2728a9b931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      spring-web/src/main/java/org/springframework/http/ResponseEntity.java
  2. 17
      spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java

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

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

@ -16,6 +16,7 @@ @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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

Loading…
Cancel
Save