Merge branch '2.6.x' into 2.7.x

Closes gh-33331
spring-projects · Nov 23, 2022 · 9af2a57 · 9af2a57
2 parents d430779 + b00f4f9
commit 9af2a57
Showing 1 changed file with 5 additions and 26 deletions.
diff --git a/...ork/boot/docs/howto/webserver/enablemultipleconnectorsintomcat/MyTomcatConfiguration.java b/...ork/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<TomcatServletWebServerFactory> sslConnectorCustomizer() {
-		return (tomcat) -> tomcat.addAdditionalTomcatConnectors(createSslConnector());
+	public WebServerFactoryCustomizer<TomcatServletWebServerFactory> 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;
 	}
 
 }