IGNITE-24850 Remove unnecessary OSes

Author: shishkovilja

modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java

@@ -357,48 +357,12 @@ public abstract class IgniteUtils extends CommonUtils {
     /** JDK string. */
     private static String jdkStr;
 
-    /** Indicates whether current OS is Windows 95. */
-    private static boolean win95;
-
-    /** Indicates whether current OS is Windows 98. */
-    private static boolean win98;
-
-    /** Indicates whether current OS is Windows NT. */
-    private static boolean winNt;
-
-    /** Indicates whether current OS is Windows Vista. */
-    private static boolean winVista;
-
-    /** Indicates whether current OS is Windows 7. */
-    private static boolean win7;
-
-    /** Indicates whether current OS is Windows 8. */
-    private static boolean win8;
-
-    /** Indicates whether current OS is Windows 8.1. */
-    private static boolean win81;
-
     /** Indicates whether current OS is some version of Windows. */
-    private static boolean unknownWin;
-
-    /** Indicates whether current OS is Windows 2000. */
-    private static boolean win2k;
-
-    /** Indicates whether current OS is Windows XP. */
-    private static boolean winXp;
-
-    /** Indicates whether current OS is Windows Server 2003. */
-    private static boolean win2003;
-
-    /** Indicates whether current OS is Windows Server 2008. */
-    private static boolean win2008;
+    private static boolean win;
 
     /** Indicates whether current OS is UNIX flavor. */
     private static boolean unix;
 
-    /** Indicates whether current OS is Solaris. */
-    private static boolean solaris;
-
     /** Indicates whether current OS is Linux flavor. */
     private static boolean linux;
 
@@ -601,32 +565,8 @@ public abstract class IgniteUtils extends CommonUtils {
         String osLow = osName.toLowerCase();
 
         // OS type detection.
-        if (osLow.contains("win")) {
-            if (osLow.contains("95"))
-                win95 = true;
-            else if (osLow.contains("98"))
-                win98 = true;
-            else if (osLow.contains("nt"))
-                winNt = true;
-            else if (osLow.contains("2000"))
-                win2k = true;
-            else if (osLow.contains("vista"))
-                winVista = true;
-            else if (osLow.contains("xp"))
-                winXp = true;
-            else if (osLow.contains("2003"))
-                win2003 = true;
-            else if (osLow.contains("2008"))
-                win2008 = true;
-            else if (osLow.contains("7"))
-                win7 = true;
-            else if (osLow.contains("8.1"))
-                win81 = true;
-            else if (osLow.contains("8"))
-                win8 = true;
-            else
-                unknownWin = true;
-        }
+        if (osLow.contains("win"))
+            win = true;
         else if (osLow.contains("mac os"))
             mac = true;
         else {
@@ -638,10 +578,7 @@ else if (osLow.contains("mac os"))
                     break;
                 }
 
-            // UNIX name detection.
-            if (osLow.contains("olaris") || osLow.contains("sunos"))
-                solaris = true;
-            else if (osLow.contains("inux"))
+            if (osLow.contains("inux"))
                 linux = true;
         }
 
@@ -5762,15 +5699,6 @@ public static boolean isMacOs() {
         return mac;
     }
 
-    /**
-     * Indicates whether current OS is Solaris.
-     *
-     * @return {@code true} if current OS is Solaris (SPARC or x86) - {@code false} otherwise.
-     */
-    public static boolean isSolaris() {
-        return solaris;
-    }
-
     /**
      * Indicates whether current OS is UNIX flavor.
      *
@@ -5786,8 +5714,7 @@ public static boolean isUnix() {
      * @return {@code true} if current OS is Windows (any versions) - {@code false} otherwise.
      */
     public static boolean isWindows() {
-        return win7 || win8 || win81 || winXp || win95 || win98 || winNt || win2k ||
-            win2003 || win2008 || winVista || unknownWin;
+        return win;
     }
 
     /**

modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java

@@ -240,7 +240,6 @@ public void testOs() throws Exception {
         System.out.println("Is Windows: " + U.isWindows());
         System.out.println("Is Linux: " + U.isLinux());
         System.out.println("Is Mac OS: " + U.isMacOs());
-        System.out.println("Is Solaris: " + U.isSolaris());
     }
 
     /**

modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java

@@ -1202,7 +1202,7 @@ public void testLoopbackProblemFirstNodeOnLoopback() throws Exception {
         // On Windows and Mac machines two nodes can reside on the same port
         // (if one node has localHost="127.0.0.1" and another has localHost="0.0.0.0").
         // So two nodes do not even discover each other.
-        if (U.isWindows() || U.isMacOs() || U.isSolaris())
+        if (U.isWindows() || U.isMacOs())
             return;
 
         try {