Merge branch '1.5.x'

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

@@ -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();

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

@@ -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(

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

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