mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Polish
This commit is contained in:
parent
441beee2fa
commit
e3f203a8a5
@ -477,6 +477,7 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer, Ord
|
||||
}
|
||||
|
||||
factory.addConnectorCustomizers(new TomcatConnectorCustomizer() {
|
||||
|
||||
@Override
|
||||
public void customize(Connector connector) {
|
||||
ProtocolHandler handler = connector.getProtocolHandler();
|
||||
@ -489,14 +490,15 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer, Ord
|
||||
}
|
||||
|
||||
private String coerceCompression(String compression) {
|
||||
if (Boolean.toString(true).equals(compression)) {
|
||||
if ("true".equalsIgnoreCase(compression)) {
|
||||
return "on";
|
||||
}
|
||||
else if (Boolean.toString(false).equals(compression)) {
|
||||
if ("false".equalsIgnoreCase(compression)) {
|
||||
return "off";
|
||||
}
|
||||
return compression;
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
if (this.accessLogEnabled) {
|
||||
|
@ -205,13 +205,13 @@ public class ServerPropertiesTests {
|
||||
@Test
|
||||
public void disableTomcatCompressionWithYaml() throws Exception {
|
||||
// YAML interprets "off" as false, check that it's mapped back to off
|
||||
assertThat("off", is(equalTo(configureCompression("false"))));
|
||||
assertThat("off", is(equalTo(configureCompression("faLSe"))));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void enableTomcatCompressionWithYaml() throws Exception {
|
||||
// YAML interprets "on" as true, check that it's mapped back to on
|
||||
assertThat("on", is(equalTo(configureCompression("true"))));
|
||||
assertThat("on", is(equalTo(configureCompression("trUE"))));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -325,9 +325,7 @@ public class ErrorPageFilterTests {
|
||||
@Test
|
||||
public void responseIsNotCommitedWhenRequestIsAsync() throws Exception {
|
||||
this.request.setAsyncStarted(true);
|
||||
|
||||
this.filter.doFilter(this.request, this.response, this.chain);
|
||||
|
||||
assertThat(this.chain.getRequest(), equalTo((ServletRequest) this.request));
|
||||
assertThat(((HttpServletResponseWrapper) this.chain.getResponse()).getResponse(),
|
||||
equalTo((ServletResponse) this.response));
|
||||
@ -347,9 +345,7 @@ public class ErrorPageFilterTests {
|
||||
throw new RuntimeException("BAD");
|
||||
}
|
||||
};
|
||||
|
||||
this.filter.doFilter(this.request, this.response, this.chain);
|
||||
|
||||
assertThat(this.chain.getRequest(), equalTo((ServletRequest) this.request));
|
||||
assertThat(((HttpServletResponseWrapper) this.chain.getResponse()).getResponse(),
|
||||
equalTo((ServletResponse) this.response));
|
||||
@ -368,9 +364,7 @@ public class ErrorPageFilterTests {
|
||||
((HttpServletResponse) response).sendError(400, "BAD");
|
||||
}
|
||||
};
|
||||
|
||||
this.filter.doFilter(this.request, this.response, this.chain);
|
||||
|
||||
assertThat(this.chain.getRequest(), equalTo((ServletRequest) this.request));
|
||||
assertThat(((HttpServletResponseWrapper) this.chain.getResponse()).getResponse(),
|
||||
equalTo((ServletResponse) this.response));
|
||||
@ -380,9 +374,7 @@ public class ErrorPageFilterTests {
|
||||
@Test
|
||||
public void responseIsNotCommitedDuringAsyncDispatch() throws Exception {
|
||||
setUpAsyncDispatch();
|
||||
|
||||
this.filter.doFilter(this.request, this.response, this.chain);
|
||||
|
||||
assertThat(this.chain.getRequest(), equalTo((ServletRequest) this.request));
|
||||
assertThat(((HttpServletResponseWrapper) this.chain.getResponse()).getResponse(),
|
||||
equalTo((ServletResponse) this.response));
|
||||
@ -402,9 +394,7 @@ public class ErrorPageFilterTests {
|
||||
throw new RuntimeException("BAD");
|
||||
}
|
||||
};
|
||||
|
||||
this.filter.doFilter(this.request, this.response, this.chain);
|
||||
|
||||
assertThat(this.chain.getRequest(), equalTo((ServletRequest) this.request));
|
||||
assertThat(((HttpServletResponseWrapper) this.chain.getResponse()).getResponse(),
|
||||
equalTo((ServletResponse) this.response));
|
||||
@ -424,9 +414,7 @@ public class ErrorPageFilterTests {
|
||||
((HttpServletResponse) response).sendError(400, "BAD");
|
||||
}
|
||||
};
|
||||
|
||||
this.filter.doFilter(this.request, this.response, this.chain);
|
||||
|
||||
assertThat(this.chain.getRequest(), equalTo((ServletRequest) this.request));
|
||||
assertThat(((HttpServletResponseWrapper) this.chain.getResponse()).getResponse(),
|
||||
equalTo((ServletResponse) this.response));
|
||||
@ -439,9 +427,7 @@ public class ErrorPageFilterTests {
|
||||
HttpServletResponse committedResponse = mock(HttpServletResponse.class);
|
||||
given(committedResponse.isCommitted()).willReturn(true);
|
||||
given(committedResponse.getStatus()).willReturn(200);
|
||||
|
||||
this.filter.doFilter(this.request, committedResponse, this.chain);
|
||||
|
||||
verify(committedResponse, times(0)).flushBuffer();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user