Add Arch.unknown (#22 fixes #20)

Author: nedtwigg

CHANGES.md

@@ -1,6 +1,8 @@
 # DurianSwt releases
 
 ## [Unreleased]
+### Added
+- When `OS.getNative` or `getRunning` is called on an OS which is unsupported by SWT, instead of throwing an exception, we now return `Arch.unknown`. You can't get platform-specific artifacts for it, but if you don't need them then you get to keep running instead of dying. ([#21](https://github.com/diffplug/durian-swt/pull/21))
 
 ## [4.1.1] - 2022-10-31
 ### Fixed

durian-swt.os/src/main/java/com/diffplug/common/swt/os/Arch.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright (C) 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 /** Enum for handling different processor architectures supported by SWT. */
 public enum Arch {
-	x86, x64, arm64;
+	x86, x64, arm64, unknown;
 
 	/** Returns the appropriate value depending on the arch. */
 	public <T> T x86x64(T val86, T val64) {
@@ -57,6 +57,22 @@ public <T> T x86x64arm64(T val86, T val64, T arm64) {
 		}
 	}
 
+	/** Returns the appropriate value depending on the arch. */
+	public <T> T x86x64arm64unknown(T val86, T val64, T arm64, T unknown) {
+		switch (this) {
+		case x86:
+			return val86;
+		case x64:
+			return val64;
+		case arm64:
+			return arm64;
+		case unknown:
+			return unknown;
+		default:
+			throw unsupportedException(this);
+		}
+	}
+
 	/** Returns the Arch for the native platform: 32-bit JVM on 64-bit Windows returns Arch.x64. */
 	public static Arch getNative() {
 		return OS.getNative().getArch();

durian-swt.os/src/main/java/com/diffplug/common/swt/os/OS.java

@@ -15,7 +15,6 @@
  */
 package com.diffplug.common.swt.os;
 
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,18 +26,18 @@
 
 /** Enum representing an OS and its underlying CPU architecture. */
 public enum OS {
-	WIN_x64, WIN_x86, LINUX_x64, LINUX_x86, MAC_x64, MAC_silicon;
+	WIN_x64, WIN_x86, LINUX_x64, LINUX_x86, MAC_x64, MAC_silicon, WIN_unknown, LINUX_unknown, MAC_unknown;
 
 	public boolean isWindows() {
-		return this == WIN_x64 || this == WIN_x86;
+		return this == WIN_x64 || this == WIN_x86 || this == WIN_unknown;
 	}
 
 	public boolean isLinux() {
-		return this == LINUX_x64 || this == LINUX_x86;
+		return this == LINUX_x64 || this == LINUX_x86 || this == LINUX_unknown;
 	}
 
 	public boolean isMac() {
-		return this == MAC_x64 || this == MAC_silicon;
+		return this == MAC_x64 || this == MAC_silicon || this == MAC_unknown;
 	}
 
 	public boolean isMacOrLinux() {
@@ -70,6 +69,10 @@ public Arch getArch() {
 			return Arch.x86;
 		case MAC_silicon:
 			return Arch.arm64;
+		case WIN_unknown:
+		case MAC_unknown:
+		case LINUX_unknown:
+			return Arch.unknown;
 		default:
 			throw unsupportedException(this);
 		}
@@ -82,7 +85,7 @@ public String os() {
 
 	/** SWT-style x86/x86_64 */
 	public String arch() {
-		return getArch().x86x64arm64("x86", "x86_64", "aarch64");
+		return getArch().x86x64arm64unknown("x86", "x86_64", "aarch64", "unknown");
 	}
 
 	/** os().arch() */
@@ -92,7 +95,7 @@ public String osDotArch() {
 
 	/** windowing.os.arch */
 	public String toSwt() {
-		return winMacLinux("win32", "cocoa", "gtk") + "." + winMacLinux("win32", "macosx", "linux") + "." + getArch().x86x64arm64("x86", "x86_64", "aarch64");
+		return SwtPlatform.fromOS(this).toString();
 	}
 
 	/** Returns the native OS: 32-bit JVM on 64-bit Windows returns OS.WIN_64. */
@@ -144,7 +147,7 @@ private static OS calculateNative(Function<String, String> systemProperty, Funct
 			case "amd64":
 				return LINUX_x64;
 			default:
-				throw new IllegalArgumentException("Unknown os.arch " + os_arch + "'.");
+				return LINUX_unknown;
 			}
 		} else {
 			throw new IllegalArgumentException("Unknown os.name '" + os_name + "'.");
@@ -175,14 +178,10 @@ private static void drain(InputStream input, OutputStream output) throws IOExcep
 	/** Calculates the running OS. */
 	private static OS calculateRunning(Function<String, String> systemProperty) {
 		Arch runningArch = runningJvm(systemProperty);
-		OS runningOs = NATIVE_OS.winMacLinux(
-				runningArch.x86x64arm64(OS.WIN_x86, OS.WIN_x64, null),
-				runningArch.x86x64arm64(null, OS.MAC_x64, OS.MAC_silicon),
-				runningArch.x86x64arm64(OS.LINUX_x86, OS.LINUX_x64, null));
-		if (runningOs == null) {
-			throw new IllegalArgumentException("Unsupported OS/Arch combo: " + runningOs + " " + runningArch);
-		}
-		return runningOs;
+		return NATIVE_OS.winMacLinux(
+				runningArch.x86x64arm64unknown(OS.WIN_x86, OS.WIN_x64, OS.WIN_unknown, OS.WIN_unknown),
+				runningArch.x86x64arm64unknown(OS.MAC_unknown, OS.MAC_x64, OS.MAC_silicon, OS.MAC_unknown),
+				runningArch.x86x64arm64unknown(OS.LINUX_x86, OS.LINUX_x64, OS.LINUX_unknown, OS.LINUX_unknown));
 	}
 
 	/** Returns the arch of the currently running JVM. */
@@ -194,7 +193,7 @@ private static Arch runningJvm(Function<String, String> systemProperty) {
 		case "64":
 			return "aarch64".equals(systemProperty.apply("os.arch")) ? Arch.arm64 : Arch.x64;
 		default:
-			throw new IllegalArgumentException("Expcted 32 or 64, was " + sunArchDataModel);
+			return Arch.unknown;
 		}
 	}
 

durian-swt.os/src/main/java/com/diffplug/common/swt/os/SwtPlatform.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright (C) 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.common.swt.os;
 
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -129,7 +128,7 @@ public static SwtPlatform getRunning() {
 	public static SwtPlatform fromOS(OS raw) {
 		String ws = raw.winMacLinux("win32", "cocoa", "gtk");
 		String os = raw.winMacLinux("win32", "macosx", "linux");
-		String arch = raw.getArch().x86x64arm64("x86", "x86_64", "aarch64");
+		String arch = raw.getArch().x86x64arm64unknown("x86", "x86_64", "aarch64", "unknown");
 		return new SwtPlatform(ws, os, arch);
 	}