Merge pull request #77 from simplelocalize/options-npe

Fixes loading empty upload options

Author: jpomykala

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.simplelocalize</groupId>
     <artifactId>simplelocalize-cli</artifactId>
-    <version>2.2.0</version>
+    <version>2.3.0</version>
     <packaging>jar</packaging>
     <name>simplelocalize-cli</name>
     <description>Official SimpleLocalize Command Line Interface</description>

src/main/java/io/simplelocalize/cli/SimplelocalizeCliCommand.java

@@ -15,7 +15,9 @@
 import picocli.CommandLine.Option;
 
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 
 @Command(
@@ -164,20 +166,27 @@ public void upload(
         configuration.setCustomerId(customerId);
       }
 
-      if (Boolean.TRUE.equals(overwrite))
+      List<String> effectiveUploadOptions = new ArrayList<>();
+      List<String> configurationUploadOptions = configuration.getUploadOptions();
+      if (configurationUploadOptions != null)
       {
-        uploadOptions.add("REPLACE_TRANSLATION_IF_FOUND");
+        effectiveUploadOptions = new ArrayList<>(configurationUploadOptions);
+      }
+      if (uploadOptions != null)
+      {
+        effectiveUploadOptions = new ArrayList<>(uploadOptions);
       }
 
-      if (Boolean.TRUE.equals(delete))
+      if (Boolean.TRUE.equals(overwrite))
       {
-        uploadOptions.add("DELETE_NOT_PRESENT_KEYS");
+        effectiveUploadOptions.add("REPLACE_TRANSLATION_IF_FOUND");
       }
 
-      if (uploadOptions != null)
+      if (Boolean.TRUE.equals(delete))
       {
-        configuration.setUploadOptions(uploadOptions);
+        effectiveUploadOptions.add("DELETE_NOT_PRESENT_KEYS");
       }
+      configuration.setUploadOptions(effectiveUploadOptions);
 
       if (Boolean.TRUE.equals(dryRun))
       {
@@ -239,10 +248,7 @@ public void download(
       {
         configuration.setCustomerId(customerId);
       }
-      if (downloadOptions != null)
-      {
-        configuration.setDownloadOptions(downloadOptions);
-      }
+      configuration.setDownloadOptions(Objects.requireNonNullElseGet(downloadOptions, ArrayList::new));
       ConfigurationValidator configurationValidator = new ConfigurationValidator();
       configurationValidator.validateDownloadConfiguration(configuration);
       SimpleLocalizeClient client = SimpleLocalizeClient.create(configuration.getBaseUrl(), configuration.getApiKey());
@@ -290,7 +296,7 @@ public void pull(
         configuration.setPullPath(pullPath);
       }
 
-      if(StringUtils.isNotEmpty(filterRegex))
+      if (StringUtils.isNotEmpty(filterRegex))
       {
         configuration.setFilterRegex(filterRegex);
       }

src/main/java/io/simplelocalize/cli/Version.java

@@ -3,7 +3,7 @@
 public class Version
 {
 
-  public static final String NUMBER = "2.2.0";
+  public static final String NUMBER = "2.3.0";
 
   private Version()
   {