Merge branch 'feature/JAL-3954-ebi-phmmer' into mmw/JAL-4199-task-execution-update

[jalview.git] / src / jalview / ws2 / client / slivka / SlivkaParamStoreFactory.java

diff --git a/src/jalview/ws2/client/slivka/SlivkaParamStoreFactory.java b/src/jalview/ws2/client/slivka/SlivkaParamStoreFactory.java
index a848798..fba6d2b 100644 (file)
--- a/src/jalview/ws2/client/slivka/SlivkaParamStoreFactory.java
+++ b/src/jalview/ws2/client/slivka/SlivkaParamStoreFactory.java
@@ -1,7 +1,5 @@
 package jalview.ws2.client.slivka;
 
-import static java.util.Objects.requireNonNullElse;
-
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -31,6 +29,7 @@ import uk.ac.dundee.compbio.slivkaclient.SlivkaService;
 class SlivkaParamStoreFactory
 {
   private final SlivkaService service;
+
   private final ParamManager manager;
 
   SlivkaParamStoreFactory(SlivkaService service, ParamManager manager)
@@ -38,7 +37,7 @@ class SlivkaParamStoreFactory
     this.service = service;
     this.manager = manager;
   }
-  
+
   ParamDatastoreI createParamDatastore()
   {
     URL url = null;
@@ -57,7 +56,7 @@ class SlivkaParamStoreFactory
     List<ArgumentI> arguments = createPresetArguments(Collections.emptyMap());
     return new SimpleParamDatastore(url, arguments, presets, manager);
   }
-  
+
   WsParamSetI createPreset(SlivkaService.Preset preset)
   {
     var builder = SimpleParamSet.newBuilder();
@@ -156,7 +155,7 @@ class SlivkaParamStoreFactory
 
   private List<Option> createChoiceOptions(Parameter.ChoiceParameter param, List<String> value)
   {
-    value = requireNonNullElse(value, Collections.emptyList());
+    value = value != null ? value : Collections.emptyList();
     if (param.isArray())
     {
       /*
@@ -164,8 +163,9 @@ class SlivkaParamStoreFactory
        * Use multiple boolean checkboxes to represent the value.
        */
       List<Option> options = new ArrayList<>();
-      List<?> selected = requireNonNullElse(
-          (List<?>) param.getDefault(), Collections.emptyList());
+      List<?> selected = param.getDefault() != null
+              ? (List<?>) param.getDefault()
+              : Collections.emptyList();
       int i = 0;
       var builder = BooleanOption.newBuilder();
       setCommonProperties(param, builder);