root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-08-27 12:24:32 +01:00
parent a9c2eb3919 adc8cdf16a
commit 2d4e68a977
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View File

@ -225,7 +225,7 @@ public class TomcatEmbeddedServletContainerFactory extends
connector.setPort(port); connector.setPort(port);
if (connector.getProtocolHandler() instanceof AbstractProtocol) { if (connector.getProtocolHandler() instanceof AbstractProtocol) {
if (getAddress() != null) { if (getAddress() != null) {
((AbstractProtocol) connector.getProtocolHandler()) ((AbstractProtocol<?>) connector.getProtocolHandler())
.setAddress(getAddress()); .setAddress(getAddress());
} }
} }
@ -242,7 +242,7 @@ public class TomcatEmbeddedServletContainerFactory extends
connector.getProtocolHandler() instanceof AbstractHttp11JsseProtocol, connector.getProtocolHandler() instanceof AbstractHttp11JsseProtocol,
"To use SSL, the connector's protocol handler must be an " "To use SSL, the connector's protocol handler must be an "
+ "AbstractHttp11JsseProtocol subclass"); + "AbstractHttp11JsseProtocol subclass");
configureSsl((AbstractHttp11JsseProtocol) connector.getProtocolHandler(), configureSsl((AbstractHttp11JsseProtocol<?>) connector.getProtocolHandler(),
getSsl()); getSsl());
connector.setScheme("https"); connector.setScheme("https");
connector.setSecure(true); connector.setSecure(true);
@ -258,7 +258,7 @@ public class TomcatEmbeddedServletContainerFactory extends
* @param protocol the protocol * @param protocol the protocol
* @param ssl the ssl details * @param ssl the ssl details
*/ */
protected void configureSsl(AbstractHttp11JsseProtocol protocol, Ssl ssl) { protected void configureSsl(AbstractHttp11JsseProtocol<?> protocol, Ssl ssl) {
protocol.setSSLEnabled(true); protocol.setSSLEnabled(true);
protocol.setSslProtocol(ssl.getProtocol()); protocol.setSslProtocol(ssl.getProtocol());
configureSslClientAuth(protocol, ssl); configureSslClientAuth(protocol, ssl);
@ -271,7 +271,7 @@ public class TomcatEmbeddedServletContainerFactory extends
configureSslTrustStore(protocol, ssl); configureSslTrustStore(protocol, ssl);
} }
private void configureSslClientAuth(AbstractHttp11JsseProtocol protocol, Ssl ssl) { private void configureSslClientAuth(AbstractHttp11JsseProtocol<?> protocol, Ssl ssl) {
if (ssl.getClientAuth() == ClientAuth.NEED) { if (ssl.getClientAuth() == ClientAuth.NEED) {
protocol.setClientAuth(Boolean.TRUE.toString()); protocol.setClientAuth(Boolean.TRUE.toString());
} }
@ -280,7 +280,7 @@ public class TomcatEmbeddedServletContainerFactory extends
} }
} }
private void configureSslKeyStore(AbstractHttp11JsseProtocol protocol, Ssl ssl) { private void configureSslKeyStore(AbstractHttp11JsseProtocol<?> protocol, Ssl ssl) {
try { try {
File file = ResourceUtils.getFile(ssl.getKeyStore()); File file = ResourceUtils.getFile(ssl.getKeyStore());
protocol.setKeystoreFile(file.getAbsolutePath()); protocol.setKeystoreFile(file.getAbsolutePath());
@ -291,7 +291,7 @@ public class TomcatEmbeddedServletContainerFactory extends
} }
} }
private void configureSslTrustStore(AbstractHttp11JsseProtocol protocol, Ssl ssl) { private void configureSslTrustStore(AbstractHttp11JsseProtocol<?> protocol, Ssl ssl) {
if (ssl.getTrustStore() != null) { if (ssl.getTrustStore() != null) {
try { try {
File file = ResourceUtils.getFile(ssl.getTrustStore()); File file = ResourceUtils.getFile(ssl.getTrustStore());

2
spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
View File

@ -236,7 +236,7 @@ public class TomcatEmbeddedServletContainerFactoryTests extends
Tomcat tomcat = getTomcat(factory); Tomcat tomcat = getTomcat(factory);
Connector connector = tomcat.getConnector(); Connector connector = tomcat.getConnector();
AbstractHttp11JsseProtocol jsseProtocol = (AbstractHttp11JsseProtocol) connector AbstractHttp11JsseProtocol<?> jsseProtocol = (AbstractHttp11JsseProtocol<?>) connector
.getProtocolHandler(); .getProtocolHandler();
assertThat(jsseProtocol.getCiphers(), equalTo("ALPHA,BRAVO,CHARLIE")); assertThat(jsseProtocol.getCiphers(), equalTo("ALPHA,BRAVO,CHARLIE"));
} }