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

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2017-04-07 12:21:09 +01:00
parent ef72c22563 c74f0a70ca
commit 7a4b87be6b
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java
View File

@@ -244,7 +244,6 @@ public class WebRequestTraceFilterTests {
}
@Test
@SuppressWarnings("unchecked")
public void filterAddsTimeTaken() throws Exception {
MockHttpServletRequest request = spy(new MockHttpServletRequest("GET", "/foo"));
MockHttpServletResponse response = new MockHttpServletResponse();

2
spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
View File

@@ -339,7 +339,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
Compression compression = getCompression();
protocol.setCompression("on");
protocol.setCompressionMinSize(compression.getMinResponseSize());
protocol.setCompressableMimeType(
protocol.setCompressibleMimeType(
StringUtils.arrayToCommaDelimitedString(compression.getMimeTypes()));
if (getCompression().getExcludedUserAgents() != null) {
protocol.setNoCompressionUserAgents(

2
spring-boot/src/test/java/org/springframework/boot/web/server/CompressionTests.java
View File

@@ -36,7 +36,7 @@ public class CompressionTests {
private String[] getTomcatDefaultCompressableMimeTypes() {
Http11NioProtocol protocol = new Http11NioProtocol();
return protocol.getCompressableMimeTypes();
return protocol.getCompressibleMimeTypes();
}
}