From b00f4f926a662dc2877015d28cd8b36133c18f57 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 23 Nov 2022 16:48:32 +0100 Subject: [PATCH] Create a HTTP connector in the custom tomcat connector example Closes gh-28707 --- .../MyTomcatConfiguration.java | 31 +++---------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultipleconnectorsintomcat/MyTomcatConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultipleconnectorsintomcat/MyTomcatConfiguration.java index 218a9cc9d674..5e4b842ac009 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultipleconnectorsintomcat/MyTomcatConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultipleconnectorsintomcat/MyTomcatConfiguration.java @@ -16,46 +16,25 @@ package org.springframework.boot.docs.howto.webserver.enablemultipleconnectorsintomcat; -import java.io.IOException; -import java.net.URL; - import org.apache.catalina.connector.Connector; -import org.apache.coyote.http11.Http11NioProtocol; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.util.ResourceUtils; @Configuration(proxyBeanMethods = false) public class MyTomcatConfiguration { @Bean - public WebServerFactoryCustomizer sslConnectorCustomizer() { - return (tomcat) -> tomcat.addAdditionalTomcatConnectors(createSslConnector()); + public WebServerFactoryCustomizer connectorCustomizer() { + return (tomcat) -> tomcat.addAdditionalTomcatConnectors(createConnector()); } - private Connector createSslConnector() { + private Connector createConnector() { Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol"); - Http11NioProtocol protocol = (Http11NioProtocol) connector.getProtocolHandler(); - try { - URL keystore = ResourceUtils.getURL("keystore"); - URL truststore = ResourceUtils.getURL("truststore"); - connector.setScheme("https"); - connector.setSecure(true); - connector.setPort(8443); - protocol.setSSLEnabled(true); - protocol.setKeystoreFile(keystore.toString()); - protocol.setKeystorePass("changeit"); - protocol.setTruststoreFile(truststore.toString()); - protocol.setTruststorePass("changeit"); - protocol.setKeyAlias("apitester"); - return connector; - } - catch (IOException ex) { - throw new IllegalStateException("Fail to create ssl connector", ex); - } + connector.setPort(8081); + return connector; } }