8308960: Decouple internal Version and OperatingSystem classes

Reviewed-by: mchung

src/java.base/share/classes/jdk/internal/util/OSVersion.java

@@ -28,7 +28,10 @@ package jdk.internal.util;
  * @param minor minor version
  * @param micro micro version
  */
-public record Version(int major, int minor, int micro) implements Comparable<Version> {
+public record OSVersion(int major, int minor, int micro) implements Comparable<OSVersion> {
+
+    // Parse and save the current OS version
+    private static final OSVersion CURRENT_OSVERSION = initVersion();
 
     /**
      * {@return a Version for major, minor versions}
@@ -36,17 +39,36 @@ public record Version(int major, int minor, int micro) implements Comparable<Ver
      * @param major major version
      * @param minor minor version
      */
-    public Version(int major, int minor) {
+    public OSVersion(int major, int minor) {
         this(major, minor, 0);
     }
 
+    /*
+     * Initialize the current Version from the os.version system property
+     */
+    private static OSVersion initVersion() {
+        final String osVer = StaticProperty.osVersion();
+        try {
+            return parse(osVer);
+        } catch (IllegalArgumentException iae) {
+            throw new InternalError("os.version malformed: " + osVer, iae);
+        }
+    }
+
+    /**
+     * {@return the current operating system version}
+     */
+    public static OSVersion current() {
+        return CURRENT_OSVERSION;
+    }
+
     /**
      * {@return Compare this version with another version}
      *
      * @param other the object to be compared
      */
     @Override
-    public int compareTo(Version other) {
+    public int compareTo(OSVersion other) {
         int result = Integer.compare(major, other.major);
         if (result == 0) {
             result = Integer.compare(minor, other.minor);
@@ -76,7 +98,7 @@ public record Version(int major, int minor, int micro) implements Comparable<Ver
      * @throws IllegalArgumentException if the string does not start with digits
      *          or digits do not follow '.'
      */
-    public static Version parse(String str) throws IllegalArgumentException {
+    public static OSVersion parse(String str) throws IllegalArgumentException {
         int len = str.length();
         int majorStart = 0;
         int majorEnd = skipDigits(str, majorStart);
@@ -94,14 +116,13 @@ public record Version(int major, int minor, int micro) implements Comparable<Ver
                 micro = Integer.parseInt(str.substring(microStart, microEnd));
             }
         }
-        return new Version(major, minor, micro);
+        return new OSVersion(major, minor, micro);
     }
 
     /**
      * {@return The index of the first non-digit from start}
      * @throws IllegalArgumentException if there are no digits
      */
-
     private static int skipDigits(String s, int start) {
         int index = start;
         while (index < s.length() && Character.isDigit(s.charAt(index))) {

src/java.base/share/classes/jdk/internal/util/OperatingSystem.java

@@ -22,6 +22,7 @@
  */
 package jdk.internal.util;
 
+import java.util.Locale;
 import jdk.internal.util.PlatformProps;
 import jdk.internal.vm.annotation.ForceInline;
 
@@ -80,7 +81,8 @@ public enum OperatingSystem {
     AIX,
     ;
 
-    private static final OperatingSystem CURRENT_OS = initOS(PlatformProps.CURRENT_OS_STRING);
+    // The current OperatingSystem
+    private static final OperatingSystem CURRENT_OS = initOS();
 
     /**
      * {@return {@code true} if built for the Linux operating system}
@@ -126,35 +128,7 @@ public enum OperatingSystem {
      * Build time names are mapped to respective uppercase enum values.
      * Names not recognized throw ExceptionInInitializerError with IllegalArgumentException.
      */
-    private static OperatingSystem initOS(String osName) {
-        // Too early to use Locale conversions, manually do uppercase
-        StringBuilder sb = new StringBuilder(osName);
-        for (int i = 0; i < sb.length(); i++) {
-            char ch = sb.charAt(i);
-            if (ch >= 'a' && ch <= 'z') {
-                sb.setCharAt(i, (char)(ch - ('a' - 'A')));  // Map lower case down to uppercase
-            }
-        }
-        osName = sb.toString();
-        return OperatingSystem.valueOf(osName);
-    }
-
-    /**
-     * {@return the operating system version with major, minor, micro}
-     */
-    public static Version version() {
-        return CURRENT_VERSION;
-    }
-
-    // Parse and save the current version
-    private static final Version CURRENT_VERSION = initVersion();
-
-    private static Version initVersion() {
-        final String osVer = StaticProperty.osVersion();
-        try {
-            return Version.parse(osVer);
-        } catch (IllegalArgumentException iae) {
-            throw new InternalError("os.version malformed: " + osVer, iae);
-        }
+    private static OperatingSystem initOS() {
+        return OperatingSystem.valueOf(PlatformProps.CURRENT_OS_STRING.toUpperCase(Locale.ROOT));
     }
 }