U version utils refactored

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/packagers/BundleJre.java

@@ -13,8 +13,8 @@
 import io.github.fvarrui.javapackager.utils.CommandUtils;
 import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.JDKUtils;
-import io.github.fvarrui.javapackager.utils.JavaUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
+import io.github.fvarrui.javapackager.utils.VersionUtils;
 
 /**
  * Bundles a Java Runtime Enrironment (JRE) with the app
@@ -92,7 +92,7 @@ protected File doApply(Packager packager) throws Exception {
 				jshFile.setExecutable(true, false);
 			}
 
-		} else if (JavaUtils.getJavaMajorVersion() <= 8) {
+		} else if (VersionUtils.getJavaMajorVersion() <= 8) {
 
 			throw new Exception("Could not create a customized JRE due to JDK version is " + SystemUtils.JAVA_VERSION + ". Must use jrePath property to specify JRE location to be embedded");
 
@@ -198,13 +198,13 @@ protected String getRequiredModules(File libsFolder, boolean customizedJre, File
 					.map(module -> module.trim())
 					.collect(Collectors.toList());
 
-		} else if (customizedJre && JavaUtils.getJavaMajorVersion() >= 13) { 
+		} else if (customizedJre && VersionUtils.getJavaMajorVersion() >= 13) { 
 
 			String modules = 
 				CommandUtils.execute(
 					jdeps.getAbsolutePath(), 
 					"-q",
-					"--multi-release", JavaUtils.getJavaMajorVersion(),
+					"--multi-release", VersionUtils.getJavaMajorVersion(),
 					"--ignore-missing-deps",
 					"--print-module-deps",
 					additionalModulePathsToParams(additionalModulePaths),
@@ -219,13 +219,13 @@ protected String getRequiredModules(File libsFolder, boolean customizedJre, File
 					.filter(module -> !module.isEmpty())
 					.collect(Collectors.toList());
 
-		} else if (customizedJre && JavaUtils.getJavaMajorVersion() >= 9) { 
+		} else if (customizedJre && VersionUtils.getJavaMajorVersion() >= 9) { 
 
 			String modules = 
 				CommandUtils.execute(
 					jdeps.getAbsolutePath(), 
 					"-q",
-					"--multi-release", JavaUtils.getJavaMajorVersion(),
+					"--multi-release", VersionUtils.getJavaMajorVersion(),
 					"--ignore-missing-deps",					
 					"--list-deps",
 					additionalModulePathsToParams(additionalModulePaths),

src/main/java/io/github/fvarrui/javapackager/utils/JavaUtils.java

@@ -1,17 +1,31 @@
 package io.github.fvarrui.javapackager.utils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Java utils
  */
 public class VersionUtils {
 
-	private static int [] parseVersion(String version) {
+	/**
+	 * Splits a version string like x.y.z in an array of integers. If a part
+	 * of the version is not a number, the parsing process breaks and returns 
+	 * till this numnber. 
+	 * @param version Version string like "x.y.z"
+	 * @return An integer array like [ x, y, z ] 
+	 */
+	private static Integer [] parseVersion(String version) {
 		String [] splittedVersion = version.split("\\.");
-		int [] parsedVersion = new int[splittedVersion.length];
+		List<Integer> parsedVersion = new ArrayList<>();
 		for (int i = 0; i < splittedVersion.length; i++) {
-			parsedVersion[i] = Integer.parseInt(splittedVersion[i]);
+			try { 
+				parsedVersion.add(Integer.parseInt(splittedVersion[i]));
+			} catch (NumberFormatException e) {
+				break;
+			}
 		}
-		return parsedVersion;
+		return parsedVersion.toArray(new Integer[0]);
 	}
 
 	/**
@@ -21,14 +35,26 @@ public class VersionUtils {
 	 * @return 0 if equals, -1 if v1 less than v2, +1 if v1 greater than v2
 	 */
 	public static int compareVersions(String v1, String v2) {
-		int [] parsed1 = parseVersion(v1);
-		int [] parsed2 = parseVersion(v2);
+		Integer [] parsed1 = parseVersion(v1);
+		Integer [] parsed2 = parseVersion(v2);
 		int size = Math.min(parsed1.length, parsed2.length);
 		for (int i = 0; i < size; i++) {
 			if (parsed1[i] > parsed2[i]) return -1;
 			if (parsed1[i] < parsed2[i]) return 1;
 		}
 		return 0;
 	}
+	
+	/**
+	 * Returns Java runtime major version (e.g.: 7 for Java 1.7, 8 for Java 1.8, 
+	 * 9 for Java 9, ..., and so on)
+	 * @return Java runtime major version
+	 */
+	public static int getJavaMajorVersion() {
+		Integer [] parsed = parseVersion(System.getProperty("java.version"));
+		int major = parsed[0];
+		if (major >= 2) return major;
+		return parsed[1];
+	}
 
 }