feat: extracted jdk package installation into public util function

Author: quintesse

src/main/java/dev/jbang/devkitman/jdkinstallers/FoojayJdkInstaller.java

@@ -5,7 +5,6 @@
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Function;
@@ -236,39 +235,21 @@ private Comparator<JdkResult> majorVersionSort() {
 				"Downloading JDK {0}. Be patient, this can take several minutes...",
 				version);
 		String url = foojayJdk.downloadUrl;
-		LOGGER.log(Level.FINE, "Downloading {0}", url);
-		Path jdkTmpDir = jdkDir.getParent().resolve(jdkDir.getFileName() + ".tmp");
-		Path jdkOldDir = jdkDir.getParent().resolve(jdkDir.getFileName() + ".old");
-		FileUtils.deletePath(jdkTmpDir);
-		FileUtils.deletePath(jdkOldDir);
+
 		try {
+			LOGGER.log(Level.FINE, "Downloading {0}", url);
 			Path jdkPkg = remoteAccessProvider.downloadFromUrl(url);
+
 			LOGGER.log(Level.INFO, "Installing JDK {0}...", version);
-			LOGGER.log(Level.FINE, "Unpacking to {0}", jdkDir);
-			UnpackUtils.unpackJdk(jdkPkg, jdkTmpDir);
-			if (Files.isDirectory(jdkDir)) {
-				Files.move(jdkDir, jdkOldDir);
-			} else if (Files.isSymbolicLink(jdkDir)) {
-				// This means we have a broken/invalid link
-				FileUtils.deletePath(jdkDir);
-			}
-			Files.move(jdkTmpDir, jdkDir);
-			FileUtils.deletePath(jdkOldDir);
+			JavaUtils.installJdk(jdkPkg, jdkDir);
+
 			Jdk.InstalledJdk newJdk = jdkProvider.createJdk(foojayJdk.id(), jdkDir);
 			if (newJdk == null) {
 				throw new IllegalStateException("Cannot obtain version of recently installed JDK");
 			}
 			return newJdk;
 		} catch (Exception e) {
-			FileUtils.deletePath(jdkTmpDir);
-			if (!Files.isDirectory(jdkDir) && Files.isDirectory(jdkOldDir)) {
-				try {
-					Files.move(jdkOldDir, jdkDir);
-				} catch (IOException ex) {
-					// Ignore
-				}
-			}
-			String msg = "Required Java version not possible to download or install.";
+			String msg = "Required Java version not possible to download or install: " + version;
 			LOGGER.log(Level.FINE, msg);
 			throw new IllegalStateException(
 					"Unable to download or install JDK version " + version, e);

src/main/java/dev/jbang/devkitman/jdkinstallers/MetadataJdkInstaller.java

@@ -4,7 +4,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URI;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Function;
@@ -314,39 +313,21 @@ private Comparator<MetadataResult> majorVersionSort() {
 				"Downloading JDK {0}. Be patient, this can take several minutes...",
 				version);
 		String url = metadataJdk.downloadUrl;
-		LOGGER.log(Level.FINE, "Downloading {0}", url);
-		Path jdkTmpDir = jdkDir.getParent().resolve(jdkDir.getFileName() + ".tmp");
-		Path jdkOldDir = jdkDir.getParent().resolve(jdkDir.getFileName() + ".old");
-		FileUtils.deletePath(jdkTmpDir);
-		FileUtils.deletePath(jdkOldDir);
+
 		try {
+			LOGGER.log(Level.FINE, "Downloading {0}", url);
 			Path jdkPkg = remoteAccessProvider.downloadFromUrl(url);
+
 			LOGGER.log(Level.INFO, "Installing JDK {0}...", version);
-			LOGGER.log(Level.FINE, "Unpacking to {0}", jdkDir);
-			UnpackUtils.unpackJdk(jdkPkg, jdkTmpDir);
-			if (Files.isDirectory(jdkDir)) {
-				Files.move(jdkDir, jdkOldDir);
-			} else if (Files.isSymbolicLink(jdkDir)) {
-				// This means we have a broken/invalid link
-				FileUtils.deletePath(jdkDir);
-			}
-			Files.move(jdkTmpDir, jdkDir);
-			FileUtils.deletePath(jdkOldDir);
+			JavaUtils.installJdk(jdkPkg, jdkDir);
+
 			Jdk.InstalledJdk newJdk = jdkProvider.createJdk(metadataJdk.id(), jdkDir);
 			if (newJdk == null) {
 				throw new IllegalStateException("Cannot obtain version of recently installed JDK");
 			}
 			return newJdk;
 		} catch (Exception e) {
-			FileUtils.deletePath(jdkTmpDir);
-			if (!Files.isDirectory(jdkDir) && Files.isDirectory(jdkOldDir)) {
-				try {
-					Files.move(jdkOldDir, jdkDir);
-				} catch (IOException ex) {
-					// Ignore
-				}
-			}
-			String msg = "Required Java version not possible to download or install.";
+			String msg = "Required Java version not possible to download or install: " + version;
 			LOGGER.log(Level.FINE, msg);
 			throw new IllegalStateException(
 					"Unable to download or install JDK version " + version, e);

src/main/java/dev/jbang/devkitman/util/JavaUtils.java

@@ -157,7 +157,7 @@ public static Path jre2jdk(@NonNull Path jdkHome) {
 		return jdkHome;
 	}
 
-	static public void safeDeleteJdk(@NonNull Path jdkHome) {
+	public static void safeDeleteJdk(@NonNull Path jdkHome) {
 		if (OsUtils.isWindows()) {
 			// On Windows we have to check nobody is currently using the JDK or we could
 			// be causing all kinds of trouble
@@ -175,4 +175,42 @@ static public void safeDeleteJdk(@NonNull Path jdkHome) {
 			FileUtils.deletePath(jdkHome);
 		}
 	}
+
+	public static void installJdk(Path jdkPkg, Path jdkDir) throws IOException {
+		Path jdkTmpDir = jdkDir.getParent().resolve(jdkDir.getFileName() + ".tmp");
+		Path jdkOldDir = jdkDir.getParent().resolve(jdkDir.getFileName() + ".old");
+		FileUtils.deletePath(jdkTmpDir);
+		FileUtils.deletePath(jdkOldDir);
+		try {
+			LOGGER.log(Level.FINE, "Unpacking to {0}", jdkDir);
+			// Unpack JDK package to temp dir
+			UnpackUtils.unpackJdk(jdkPkg, jdkTmpDir);
+			// Check if the package contains a valid JDK
+			Optional<String> v = JavaUtils.resolveJavaVersionStringFromPath(jdkTmpDir);
+			if (!v.isPresent()) {
+				throw new IllegalStateException("The JDK package does not seem to contain a valid JDK");
+			}
+			if (Files.isDirectory(jdkDir)) {
+				// Rename existing JDK dir to have an .old extension
+				Files.move(jdkDir, jdkOldDir);
+			} else if (Files.isSymbolicLink(jdkDir)) {
+				// This means we have a broken/invalid link
+				FileUtils.deletePath(jdkDir);
+			}
+			// Rename temp dir to the final JDK dir name
+			Files.move(jdkTmpDir, jdkDir);
+			// Delete old JDK dir
+			FileUtils.deletePath(jdkOldDir);
+		} catch (Exception e) {
+			FileUtils.deletePath(jdkTmpDir);
+			if (!Files.isDirectory(jdkDir) && Files.isDirectory(jdkOldDir)) {
+				try {
+					Files.move(jdkOldDir, jdkDir);
+				} catch (IOException ex) {
+					// Ignore
+				}
+			}
+			throw new IOException("Unable to install JDK", e);
+		}
+	}
 }