diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfigurationTests.java index 9aa403bc0e..5874b0afda 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfigurationTests.java @@ -74,7 +74,7 @@ public class ManagementSecurityAutoConfigurationTests { this.context.refresh(); assertNotNull(this.context.getBean(AuthenticationManagerBuilder.class)); // 6 for static resources, one for management endpoints and one for the rest - assertEquals(9, this.context.getBean(FilterChainProxy.class).getFilterChains() + assertEquals(8, this.context.getBean(FilterChainProxy.class).getFilterChains() .size()); } @@ -144,7 +144,7 @@ public class ManagementSecurityAutoConfigurationTests { this.context.refresh(); // Just the management endpoints (one filter) and ignores now plus the backup // filter on app endpoints - assertEquals(9, this.context.getBean(FilterChainProxy.class).getFilterChains() + assertEquals(8, this.context.getBean(FilterChainProxy.class).getFilterChains() .size()); } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java index f78d2030a5..b69baf379d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java @@ -16,7 +16,6 @@ package org.springframework.boot.autoconfigure.jdbc; -import javax.annotation.PostConstruct; import javax.sql.DataSource; import org.springframework.beans.factory.annotation.Autowired; @@ -62,10 +61,7 @@ public class DataSourceTransactionManagerAutoConfiguration implements Ordered { @Configuration @EnableTransactionManagement protected static class TransactionManagementConfiguration { - @PostConstruct - public void init() { - System.err.println("*************"); - } + } } diff --git a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java index 222e220d75..b6c5fa3545 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java @@ -63,4 +63,5 @@ public class SampleTomcatSslApplicationTests { assertEquals(HttpStatus.OK, entity.getStatusCode()); assertEquals("Hello, world", entity.getBody()); } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java index 2206e6b82a..59ea4c88c5 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java @@ -258,6 +258,15 @@ public abstract class AbstractConfigurableEmbeddedServletContainer implements this.jspServletClassName = jspServletClassName; } + @Override + public void setSsl(Ssl ssl) { + this.ssl = ssl; + } + + public Ssl getSsl() { + return this.ssl; + } + /** * @return the JSP servlet class name */ diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java index 957ab5e71b..ff06841579 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java @@ -145,4 +145,5 @@ public interface ConfigurableEmbeddedServletContainer { * @param ssl the SSL configuration */ void setSsl(Ssl ssl); + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java index cd1d18b6c3..3a8a7ffdb6 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java @@ -21,7 +21,7 @@ package org.springframework.boot.context.embedded; * * @author Andy Wilkinson * @author Vladimir Tsanev - * @since 1.2.0 + * @since 1.1.7 */ public class Ssl { @@ -158,4 +158,5 @@ public class Ssl { public enum ClientAuth { WANT, NEED; } + }