Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Sam Brannen
2023-11-30 19:04:59 +01:00
parent 8ff687b68c
commit 6ea9fdbf77
36 changed files with 126 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java
View File

@@ -208,7 +208,7 @@ class ResponseEntityTests {
assertThat(responseHeaders.getFirst(HttpHeaders.CONTENT_LENGTH)).isEqualTo(String.valueOf(contentLength));
assertThat(responseHeaders.getFirst(HttpHeaders.CONTENT_TYPE)).isEqualTo(contentType.toString());
assertThat((Object) responseEntity.getBody()).isNull();
assertThat(responseEntity.getBody()).isNull();
}
@Test

2
spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
View File

@@ -209,7 +209,7 @@ public class Jackson2ObjectMapperFactoryBeanTests {
@Test
public void undefinedObjectType() {
assertThat((Object) this.factory.getObjectType()).isNull();
assertThat(this.factory.getObjectType()).isNull();
}
private static SerializerFactoryConfig getSerializerFactoryConfig(ObjectMapper objectMapper) {

34
spring-web/src/test/java/org/springframework/web/cors/reactive/DefaultCorsProcessorTests.java
View File

@@ -68,7 +68,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().containsKey(ACCESS_CONTROL_ALLOW_ORIGIN)).isFalse();
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -84,7 +84,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().containsKey(ACCESS_CONTROL_ALLOW_ORIGIN)).isFalse();
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -106,7 +106,7 @@ public class DefaultCorsProcessorTests {
ServerHttpResponse response = exchange.getResponse();
assertThat(response.getHeaders().containsKey(ACCESS_CONTROL_ALLOW_ORIGIN)).isFalse();
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -122,7 +122,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().containsKey(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS)).isFalse();
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -141,7 +141,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().getFirst(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)).isEqualTo("true");
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -162,7 +162,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().getFirst(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)).isEqualTo("true");
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -172,7 +172,7 @@ public class DefaultCorsProcessorTests {
this.processor.process(this.conf, exchange);
ServerHttpResponse response = exchange.getResponse();
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
assertThat(response.getHeaders().containsKey(ACCESS_CONTROL_ALLOW_ORIGIN)).isTrue();
}
@@ -186,7 +186,7 @@ public class DefaultCorsProcessorTests {
this.processor.process(this.conf, exchange);
ServerHttpResponse response = exchange.getResponse();
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
assertThat(response.getHeaders().containsKey(ACCESS_CONTROL_ALLOW_ORIGIN)).isTrue();
}
@@ -206,7 +206,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().getFirst(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS)).contains("header2");
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -219,7 +219,7 @@ public class DefaultCorsProcessorTests {
ServerHttpResponse response = exchange.getResponse();
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@@ -244,7 +244,7 @@ public class DefaultCorsProcessorTests {
this.processor.process(this.conf, exchange);
ServerHttpResponse response = exchange.getResponse();
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat(response.getHeaders().getFirst(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS)).isEqualTo("GET,HEAD");
@@ -312,7 +312,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().containsKey(HttpHeaders.ACCESS_CONTROL_MAX_AGE)).isFalse();
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -336,7 +336,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().getFirst(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)).isEqualTo("true");
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -361,7 +361,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().getFirst(ACCESS_CONTROL_ALLOW_ORIGIN)).isEqualTo("https://domain2.com");
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -385,7 +385,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().getFirst(ACCESS_CONTROL_ALLOW_HEADERS)).doesNotContain("Header3");
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -407,7 +407,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().getFirst(ACCESS_CONTROL_ALLOW_HEADERS)).doesNotContain("*");
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test
@@ -426,7 +426,7 @@ public class DefaultCorsProcessorTests {
assertThat(response.getHeaders().containsKey(ACCESS_CONTROL_ALLOW_HEADERS)).isFalse();
assertThat(response.getHeaders().get(VARY)).contains(ORIGIN,
ACCESS_CONTROL_REQUEST_METHOD, ACCESS_CONTROL_REQUEST_HEADERS);
assertThat((Object) response.getStatusCode()).isNull();
assertThat(response.getStatusCode()).isNull();
}
@Test

6
spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
View File

@@ -45,12 +45,13 @@ public class DelegatingPhaseListenerTests {
}
};
@SuppressWarnings("unchecked")
@Test
public void beforeAndAfterPhaseWithSingleTarget() {
TestListener target = new TestListener();
beanFactory.addBean("testListener", target);
assertThat((Object) delPhaseListener.getPhaseId()).isEqualTo(PhaseId.ANY_PHASE);
assertThat(delPhaseListener.getPhaseId()).isEqualTo(PhaseId.ANY_PHASE);
PhaseEvent event = new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, new MockLifecycle());
delPhaseListener.beforePhase(event);
@@ -60,6 +61,7 @@ public class DelegatingPhaseListenerTests {
assertThat(target.afterCalled).isTrue();
}
@SuppressWarnings("unchecked")
@Test
public void beforeAndAfterPhaseWithMultipleTargets() {
TestListener target1 = new TestListener();
@@ -67,7 +69,7 @@ public class DelegatingPhaseListenerTests {
beanFactory.addBean("testListener1", target1);
beanFactory.addBean("testListener2", target2);
assertThat((Object) delPhaseListener.getPhaseId()).isEqualTo(PhaseId.ANY_PHASE);
assertThat(delPhaseListener.getPhaseId()).isEqualTo(PhaseId.ANY_PHASE);
PhaseEvent event = new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, new MockLifecycle());
delPhaseListener.beforePhase(event);

18
spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java
View File

@@ -361,10 +361,10 @@ public class PathPatternTests {
@Test
public void pathRemainingCornerCases_spr15336() {
// No match when the literal path element is a longer form of the segment in the pattern
assertThat((Object) parse("/foo").matchStartOfPath(toPathContainer("/footastic/bar"))).isNull();
assertThat((Object) parse("/f?o").matchStartOfPath(toPathContainer("/footastic/bar"))).isNull();
assertThat((Object) parse("/f*o*p").matchStartOfPath(toPathContainer("/flooptastic/bar"))).isNull();
assertThat((Object) parse("/{abc}abc").matchStartOfPath(toPathContainer("/xyzabcbar/bar"))).isNull();
assertThat(parse("/foo").matchStartOfPath(toPathContainer("/footastic/bar"))).isNull();
assertThat(parse("/f?o").matchStartOfPath(toPathContainer("/footastic/bar"))).isNull();
assertThat(parse("/f*o*p").matchStartOfPath(toPathContainer("/flooptastic/bar"))).isNull();
assertThat(parse("/{abc}abc").matchStartOfPath(toPathContainer("/xyzabcbar/bar"))).isNull();
// With a /** on the end have to check if there is any more data post
// 'the match' it starts with a separator
@@ -614,7 +614,7 @@ public class PathPatternTests {
pp = parse("/*/{foo}/b*");
pri = getPathRemaining(pp, "/foo");
assertThat((Object) pri).isNull();
assertThat(pri).isNull();
pri = getPathRemaining(pp, "/abc/def/bhi");
assertThat(pri.getPathRemaining().value()).isEmpty();
assertThat(pri.getUriVariables()).containsEntry("foo", "def");
@@ -838,8 +838,8 @@ public class PathPatternTests {
checkCapture("/A-{B}-C", "/A-b-C", "B", "b");
checkCapture("/{name}.{extension}", "/test.html", "name", "test", "extension", "html");
assertThat((Object) checkCapture("/{one}/", "//")).isNull();
assertThat((Object) checkCapture("", "/abc")).isNull();
assertThat(checkCapture("/{one}/", "//")).isNull();
assertThat(checkCapture("", "/abc")).isNull();
assertThat(checkCapture("", "").getUriVariables()).isEmpty();
checkCapture("{id}", "99", "id", "99");
@@ -1043,8 +1043,8 @@ public class PathPatternTests {
paths.add(null);
paths.add(null);
paths.sort(comparator);
assertThat((Object) paths.get(0)).isNull();
assertThat((Object) paths.get(1)).isNull();
assertThat(paths.get(0)).isNull();
assertThat(paths.get(1)).isNull();
paths.clear();
paths.add(null);