Merge pull request #895 from eclipse-mylyn/894-coreutilgetruntimeversion-fails-to-parse-java-version-properly

CoreUtil.getRuntimeVersion() fails to parse Java version properly #894

Author: gnl42

mylyn.commons/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/CoreUtil.java

@@ -170,61 +170,33 @@ private static void defaultSystemProperty(String key, String defaultValue) {
 	 * Returns the version of the Java runtime.
 	 *
 	 * @since 3.7
-	 * @return {@link Version#emptyVersion} if the version can not be determined
+	 * @return Version
 	 */
 	public static Version getRuntimeVersion() {
-		Version result = parseRuntimeVersion(Runtime.version().toString());
-		return result;
+		return convertToOsgiVersion(Runtime.version());
 	}
 
 	/**
 	 * @since 4.3
+	 * @return {@link Version#emptyVersion} if the version can not be determined
 	 */
-	public static Version parseRuntimeVersion(String versionString) {
-		if (versionString != null) {
-			int firstSeparator = versionString.indexOf('.');
-			if (firstSeparator != -1) {
-				try {
-					int secondSeparator = versionString.indexOf('.', firstSeparator + 1);
-					if (secondSeparator != -1) {
-						int index = findLastNumberIndex(versionString, secondSeparator);
-						String qualifier = versionString.substring(index + 1);
-						if ((qualifier.startsWith("_") || qualifier.startsWith("+")) && qualifier.length() > 1) { //$NON-NLS-1$
-							versionString = versionString.substring(0, index + 1) + "." + qualifier.substring(1); //$NON-NLS-1$
-						} else {
-							versionString = versionString.substring(0, index + 1);
-						}
-						return new Version(versionString);
-					}
-					return new Version(
-							versionString.substring(0, findLastNumberIndex(versionString, firstSeparator) + 1));
-				} catch (IllegalArgumentException e) {
-					// ignore
-				}
-			} else { // Java 22 seems to have changed the format for some reason to "nn+nn"
-				int plusSeparator = versionString.indexOf('+');
-				if (plusSeparator != -1) {
-					return new Version(
-							versionString.substring(0, plusSeparator));
-				}
-			}
+	public static Version parseRuntimeVersion(String version) {
+		try {
+			return convertToOsgiVersion(java.lang.Runtime.Version.parse(version));
+		} catch (IllegalArgumentException e) {
+			return Version.emptyVersion;
 		}
-		return Version.emptyVersion;
 	}
 
-	private static int findLastNumberIndex(String versionString, int secondSeparator) {
-		int lastDigit = secondSeparator;
-		for (int i = secondSeparator + 1; i < versionString.length(); i++) {
-			if (Character.isDigit(versionString.charAt(i))) {
-				lastDigit++;
-			} else {
-				break;
-			}
-		}
-		if (lastDigit == secondSeparator) {
-			return secondSeparator - 1;
+	private static Version convertToOsgiVersion(java.lang.Runtime.Version version) {
+		if (version != null) {
+			int feature = version.feature();
+			int interim = version.interim();
+			int update = version.update();
+			String pre = version.pre().orElse(""); //$NON-NLS-1$
+			return new Version(feature, interim, update, pre);
 		}
-		return lastDigit;
+		return Version.emptyVersion;
 	}
 
 	/**

mylyn.commons/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/core/CoreUtilTest.java

@@ -135,9 +135,10 @@ public void testAreEqualUnequalStrings() {
 		assertFalse(CoreUtil.areEqual("a", "b"));
 	}
 
+
 	@Test
 	public void testGetRuntimeVersion() {
-		assertEquals(new Version(1, 5, 0, "2"), CoreUtil.parseRuntimeVersion("1.5.0_2"));
+		assertEquals(new Version(1, 5, 0), CoreUtil.parseRuntimeVersion("1.5.0.2"));
 	}
 
 	@Test
@@ -147,24 +148,33 @@ public void testGetRuntimeVersionShort() {
 
 	@Test
 	public void testGetRuntimeVersionLetters() {
-		assertEquals(new Version(1, 7, 0), CoreUtil.parseRuntimeVersion("1.7-CUSTOM"));
+		assertEquals(new Version(1, 7, 0, "CUSTOM"), CoreUtil.parseRuntimeVersion("1.7-CUSTOM"));
 	}
 
 	@Test
 	public void testGetRuntimeVersionTrailingUnderscore() {
-		assertEquals(new Version(1, 5, 0), CoreUtil.parseRuntimeVersion("1.5.0_"));
+		assertEquals(new Version(1, 5, 0, "A"), CoreUtil.parseRuntimeVersion("1.5.0.1-A"));
+	}
+
+	@Test
+	public void testGetRuntimeVersionQualifier() {
+		assertEquals(new Version(1, 2, 1), CoreUtil.parseRuntimeVersion("1.2.1"));
 	}
 
 	@Test
-	public void testGetRuntimeVersionNoQualifier() {
-		assertEquals(new Version(1, 2, 0), CoreUtil.parseRuntimeVersion("1.2.0"));
+	public void testGetRuntimeVersionJava21Ubuntu() {
+		assertEquals(new Version(21, 0, 8), CoreUtil.parseRuntimeVersion("21.0.8+9-Ubuntu-0ubuntu124.04.1"));
 	}
 
 	@Test
 	public void testGetRuntimeVersionJava22() {
 		assertEquals(new Version(22, 0, 0), CoreUtil.parseRuntimeVersion("22+38"));
 	}
 
+	@Test
+	public void testGetBadRuntimeVersion() {
+		assertEquals(new Version(0, 0, 0), CoreUtil.parseRuntimeVersion("21.0.A"));
+	}
 
 	@Test
 	public void testAsFileName() {