introduce OperationSystem.UNKNOWN to handle future operation systems

Author: sclassen

openwebstart/src/main/java/com/openwebstart/jvm/RemoteRuntimeManager.java

@@ -24,6 +24,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import static com.openwebstart.jvm.runtimes.Vendor.ANY_VENDOR;
 

openwebstart/src/main/java/com/openwebstart/jvm/json/JsonConstants.java

@@ -16,11 +16,11 @@ interface JsonConstants {
 
     String HREF_PROPERTY = "href";
 
-    String HASH_PROPERTY = "hash";
-
     String LAST_USAGE_PROPERTY = "lastUsage";
 
     String RUNTIMES_PROPERTY = "runtimes";
 
+    String RUNTIMES_1_6_PROPERTY = "runtimes_1.6";
+
     String CACHE_TIME_PROPERTY = "cacheTimeInMillis";
 }

openwebstart/src/main/java/com/openwebstart/jvm/json/RemoteRuntimeListSerializer.java

@@ -8,11 +8,13 @@
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import com.openwebstart.jvm.os.OperationSystem;
 import com.openwebstart.jvm.runtimes.RemoteJavaRuntime;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 public class RemoteRuntimeListSerializer implements JsonSerializer<RemoteRuntimeList>, JsonDeserializer<RemoteRuntimeList> {
 
@@ -37,9 +39,22 @@ public RemoteRuntimeList deserialize(final JsonElement jsonElement, final Type t
         final long cacheTime = jsonObject.getAsJsonPrimitive(JsonConstants.CACHE_TIME_PROPERTY).getAsLong();
 
         final JsonArray jsonArray = jsonObject.getAsJsonArray(JsonConstants.RUNTIMES_PROPERTY);
+        final JsonArray jsonArray_1_6 = jsonObject.getAsJsonArray(JsonConstants.RUNTIMES_1_6_PROPERTY);
 
         final List<RemoteJavaRuntime> runtimes = new ArrayList<>();
-        jsonArray.forEach(e -> runtimes.add(jsonDeserializationContext.deserialize(e, RemoteJavaRuntime.class)));
+        Optional.ofNullable(jsonArray).ifPresent(a -> a.forEach(e -> {
+            final RemoteJavaRuntime deserialize = jsonDeserializationContext.deserialize(e, RemoteJavaRuntime.class);
+            if (deserialize.getOperationSystem() != OperationSystem.UNKNOWN) {
+                runtimes.add(deserialize);
+            }
+        }));
+
+        Optional.ofNullable(jsonArray_1_6).ifPresent(a -> a.forEach(e -> {
+            final RemoteJavaRuntime deserialize = jsonDeserializationContext.deserialize(e, RemoteJavaRuntime.class);
+            if (deserialize.getOperationSystem() != OperationSystem.UNKNOWN) {
+                runtimes.add(deserialize);
+            }
+        }));
 
         return new RemoteRuntimeList(runtimes, cacheTime);
     }

openwebstart/src/main/java/com/openwebstart/jvm/json/RemoteRuntimeSerializer.java

@@ -34,7 +34,7 @@ public RemoteJavaRuntime deserialize(final JsonElement jsonElement, final Type t
 
             final String version = jsonObject.get(JsonConstants.VERSION_PROPERTY).getAsString();
             final String vendor = jsonObject.get(JsonConstants.VENDOR_PROPERTY).getAsString();
-            final OperationSystem os = OperationSystem.valueOf(jsonObject.get(JsonConstants.OS_PROPERTY).getAsString());
+            final OperationSystem os = OperationSystem.parse(jsonObject.get(JsonConstants.OS_PROPERTY).getAsString());
             final String href = jsonObject.get(JsonConstants.HREF_PROPERTY).getAsString();
 
 

openwebstart/src/main/java/com/openwebstart/jvm/os/OperationSystem.java

@@ -33,6 +33,8 @@ public enum OperationSystem {
     MACARM64("Mac OS X aarch64", AARCH64),
     WIN32("Windows x86", X86),
     WIN64("Windows x64", X64, WIN32),
+
+    UNKNOWN("Unknown", null)
     ;
 
     /**
@@ -118,4 +120,12 @@ public static Optional<OperationSystem> getOperationSystem(String osName, String
         }
         return Optional.empty();
     }
+
+    public static OperationSystem parse(String os) {
+        try {
+            return valueOf(os);
+        } catch (Exception e) {
+            return UNKNOWN;
+        }
+    }
 }

openwebstart/src/test/java/com/openwebstart/jvm/RemoteRuntimeManagerTest.java

@@ -303,4 +303,61 @@ public void testParseRemoteRuntimeJson_AdoptIsConvertedToEclipse() {
         assertEquals(1, result.getRuntimes().size());
         assertEquals(result.getRuntimes().get(0).getVendor(), ECLIPSE);
     }
+
+    @Test
+    public void testParseRemoteRuntimeJson_BrokenVendor() {
+        // given
+        final String json = "{\n" +
+                "  \"cacheTimeInMillis\":5000,\n" +
+                "  \"runtimes\":\n" +
+                "  [\n" +
+                "    {\n" +
+                "      \"version\":\"8.0.282\",\n" +
+                "      \"vendor\":\"AdoptOpenJDK\",\n" +
+                "      \"os\":\"BROKEN\",\n" +
+                "      \"href\":\"" + THE_ONE_AND_ONLY_JDK_ZIP + "\"\n" +
+                "    }\n" +
+                "  ]\n" +
+                "}\n" +
+                "\n";
+
+        // when
+        RemoteRuntimeList result = RemoteRuntimeManager.getInstance().parseRemoteRuntimeJson(json);
+
+        // then
+        assertEquals(0, result.getRuntimes().size());
+    }
+
+    @Test
+    public void testParseRemoteRuntimeJson_1_6() {
+        // given
+        final String json = "{\n" +
+                "  \"cacheTimeInMillis\":5000,\n" +
+                "  \"runtimes\":\n" +
+                "  [\n" +
+                "    {\n" +
+                "      \"version\":\"8.0.282\",\n" +
+                "      \"vendor\":\"AdoptOpenJDK\",\n" +
+                "      \"os\":\"WIN64\",\n" +
+                "      \"href\":\"" + THE_ONE_AND_ONLY_JDK_ZIP + "\"\n" +
+                "    }\n" +
+                "  ],\n" +
+                "  \"runtimes_1.6\":\n" +
+                "  [\n" +
+                "    {\n" +
+                "      \"version\":\"8.0.282\",\n" +
+                "      \"vendor\":\"AdoptOpenJDK\",\n" +
+                "      \"os\":\"MACARM64\",\n" +
+                "      \"href\":\"" + THE_ONE_AND_ONLY_JDK_ZIP + "\"\n" +
+                "    }\n" +
+                "  ]\n" +
+                "}\n" +
+                "\n";
+
+        // when
+        RemoteRuntimeList result = RemoteRuntimeManager.getInstance().parseRemoteRuntimeJson(json);
+
+        // then
+        assertEquals(2, result.getRuntimes().size());
+    }
 }