Polish

spring-boot-samples/spring-boot-sample-actuator-log4j/src/main/java/sample/actuator/log4j/SampleController.java

@@ -42,4 +42,5 @@ public class SampleController {
 	public String foo() {
 		throw new IllegalArgumentException("Server error");
 	}
+
 }

spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/java/sample/actuator/log4j2/SampleController.java

@@ -42,4 +42,5 @@ public class SampleController {
 	public String foo() {
 		throw new IllegalArgumentException("Server error");
 	}
+
 }

spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/web/SampleController.java

@@ -36,4 +36,5 @@ public class SampleController {
 	public String helloWorld() {
 		return this.cityService.getCity("Bath", "UK").getName();
 	}
+
 }

spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/java/sample/jetty/web/SampleController.java

@@ -34,4 +34,5 @@ public class SampleController {
 	public String helloWorld() {
 		return this.helloWorldService.getHelloMessage();
 	}
+
 }

spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/web/SampleController.java

@@ -34,4 +34,5 @@ public class SampleController {
 	public String helloWorld() {
 		return this.helloWorldService.getHelloMessage();
 	}
+
 }

spring-boot-samples/spring-boot-sample-jetty8-ssl/src/main/java/sample/jetty/web/SampleController.java

@@ -34,4 +34,5 @@ public class SampleController {
 	public String helloWorld() {
 		return this.helloWorldService.getHelloMessage();
 	}
+
 }

spring-boot-samples/spring-boot-sample-jetty8/src/main/java/sample/jetty/web/SampleController.java

@@ -34,4 +34,5 @@ public class SampleController {
 	public String helloWorld() {
 		return this.helloWorldService.getHelloMessage();
 	}
+
 }

spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/web/SampleController.java

@@ -26,4 +26,5 @@ public class SampleController {
 	public String helloWorld() {
 		return "hello";
 	}
+
 }

spring-boot-samples/spring-boot-sample-undertow-ssl/src/main/java/sample/undertow/web/SampleController.java

@@ -34,4 +34,5 @@ public class SampleController {
 	public String helloWorld() {
 		return this.helloWorldService.getHelloMessage();
 	}
+
 }

spring-boot-samples/spring-boot-sample-undertow/src/main/java/sample/undertow/web/SampleController.java

@@ -34,4 +34,5 @@ public class SampleController {
 	public String helloWorld() {
 		return this.helloWorldService.getHelloMessage();
 	}
+
 }

spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java

@@ -20,7 +20,6 @@ import io.undertow.Handlers;
 import io.undertow.Undertow;
 import io.undertow.Undertow.Builder;
 import io.undertow.server.HttpHandler;
-import io.undertow.server.handlers.PathHandler;
 import io.undertow.servlet.api.DeploymentManager;
 
 import javax.servlet.ServletException;
@@ -70,27 +69,32 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine
 			return;
 		}
 		if (this.undertow == null) {
-			try {
-				HttpHandler servletHandler = this.manager.start();
-				if (StringUtils.isEmpty(this.contextPath)) {
-					this.builder.setHandler(servletHandler);
-				}
-				else {
-					PathHandler pathHandler = Handlers.path().addPrefixPath(
-							this.contextPath, servletHandler);
-					this.builder.setHandler(pathHandler);
-				}
-				this.undertow = this.builder.build();
-			}
-			catch (ServletException ex) {
-				throw new EmbeddedServletContainerException(
-						"Unable to start embdedded Undertow", ex);
-			}
+			this.undertow = createUndertowServer();
 		}
 		this.undertow.start();
 		this.started = true;
 	}
 
+	private Undertow createUndertowServer() {
+		try {
+			HttpHandler servletHandler = this.manager.start();
+			this.builder.setHandler(getContextHandler(servletHandler));
+			return this.builder.build();
+		}
+		catch (ServletException ex) {
+			throw new EmbeddedServletContainerException(
+					"Unable to start embdedded Undertow", ex);
+		}
+	}
+
+	private HttpHandler getContextHandler(HttpHandler servletHandler) {
+		if (StringUtils.isEmpty(this.contextPath)) {
+			return servletHandler;
+		}
+		return Handlers.path().addPrefixPath(this.contextPath, servletHandler);
+
+	}
+
 	@Override
 	public synchronized void stop() throws EmbeddedServletContainerException {
 		if (this.started) {
@@ -104,4 +108,4 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine
 		return this.port;
 	}
 
-}
\ No newline at end of file
+}

spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java

@@ -93,4 +93,10 @@ public class UndertowEmbeddedServletContainerFactoryTests extends
 			ordered.verify(customizer).customize((Builder) anyObject());
 		}
 	}
+
+	@Test
+	public void basicSslClasspathKeyStore() throws Exception {
+		testBasicSllWithKeystore("classpath:test.jks");
+	}
+
 }