Polish "Fix handling of spaces in container's document root"

Closes gh-10706

Author: wilkinsona

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

@@ -19,7 +19,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.JarURLConnection;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLConnection;
@@ -88,7 +87,7 @@ else if (this.logger.isDebugEnabled()) {
 	}
 
 	private File getExplodedWarFileDocumentRoot() {
-		return getExplodedWarFileDocumentRoot(getCodeSourceArchive(getCodeSource()));
+		return getExplodedWarFileDocumentRoot(getCodeSourceArchive());
 	}
 
 	protected List<URL> getUrlsOfJarsWithMetaInfResources() {
@@ -173,7 +172,7 @@ private File getWarFileDocumentRoot() {
 	}
 
 	private File getArchiveFileDocumentRoot(String extension) {
-		File file = getCodeSourceArchive(getCodeSource());
+		File file = getCodeSourceArchive();
 		if (this.logger.isDebugEnabled()) {
 			this.logger.debug("Code archive: " + file);
 		}
@@ -194,6 +193,10 @@ private File getCommonDocumentRoot() {
 		return null;
 	}
 
+	private File getCodeSourceArchive() {
+		return getCodeSourceArchive(getClass().getProtectionDomain().getCodeSource());
+	}
+
 	File getCodeSourceArchive(CodeSource codeSource) {
 		try {
 			URL location = (codeSource == null ? null : codeSource.getLocation());
@@ -213,16 +216,9 @@ File getCodeSourceArchive(CodeSource codeSource) {
 			}
 			return new File(path);
 		}
-		catch (IOException ex) {
+		catch (Exception ex) {
 			return null;
 		}
-		catch (URISyntaxException e) {
-			return null;
-		}
-	}
-
-	private CodeSource getCodeSource() {
-		return getClass().getProtectionDomain().getCodeSource();
 	}
 
 	protected final File getValidSessionStoreDir() {

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

@@ -678,16 +678,18 @@ public void cannotReadClassPathFiles() throws Exception {
 	@Test
 	public void codeSourceArchivePath() throws Exception {
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
-		final CodeSource codeSource = new CodeSource(new URL("file", "", "/some/test/path/"), (Certificate[]) null);
-		final File codeSourceArchive = factory.getCodeSourceArchive(codeSource);
+		CodeSource codeSource = new CodeSource(new URL("file", "", "/some/test/path/"),
+				(Certificate[]) null);
+		File codeSourceArchive = factory.getCodeSourceArchive(codeSource);
 		assertThat(codeSourceArchive).isEqualTo(new File("/some/test/path/"));
 	}
 
 	@Test
 	public void codeSourceArchivePathContainingSpaces() throws Exception {
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
-		final CodeSource codeSource = new CodeSource(new URL("file", "", "/test/path/with%20space/"), (Certificate[]) null);
-		final File codeSourceArchive = factory.getCodeSourceArchive(codeSource);
+		CodeSource codeSource = new CodeSource(
+				new URL("file", "", "/test/path/with%20space/"), (Certificate[]) null);
+		File codeSourceArchive = factory.getCodeSourceArchive(codeSource);
 		assertThat(codeSourceArchive).isEqualTo(new File("/test/path/with space/"));
 	}