Delete redundant variables

See gh-17864
This commit is contained in:
lijuny 2019-08-14 17:53:34 +08:00 committed by Stephane Nicoll
parent ba4c5be2fd
commit 64344214e1
4 changed files with 5 additions and 9 deletions

View File

@ -198,8 +198,7 @@ class ValidationBindHandlerTests {
action.run();
}
catch (BindException ex) {
BindValidationException cause = (BindValidationException) ex.getCause();
return cause;
return (BindValidationException) ex.getCause();
}
throw new IllegalStateException("Did not throw");
}

View File

@ -176,9 +176,8 @@ class JsonObjectDeserializerTests {
@Test
void getRequiredNodeWhenNodeIsFoundShouldReturnNode() {
JsonNode node = mock(JsonNode.class);
JsonNode tree = node;
given(tree.get("test")).willReturn(node);
assertThat(this.testDeserializer.testGetRequiredNode(tree, "test")).isEqualTo(node);
given(node.get("test")).willReturn(node);
assertThat(this.testDeserializer.testGetRequiredNode(node, "test")).isEqualTo(node);
}
static class TestJsonObjectDeserializer<T> extends JsonObjectDeserializer<T> {

View File

@ -187,9 +187,8 @@ class ServletWebServerMvcIntegrationTests {
@Bean
DispatcherServlet dispatcherServlet() {
DispatcherServlet dispatcherServlet = new DispatcherServlet();
// Can configure dispatcher servlet here as would usually do via init-params
return dispatcherServlet;
return new DispatcherServlet();
}
@Bean

View File

@ -1084,8 +1084,7 @@ public abstract class AbstractServletWebServerFactoryTests {
String[] parts = header.split(":");
request.getHeaders().add(parts[0], parts[1]);
}
ClientHttpResponse response = request.execute();
return response;
return request.execute();
}
protected void assertForwardHeaderIsUsed(ServletWebServerFactory factory) throws IOException, URISyntaxException {