Polishing

Author: jpomykala

reflect-config.json

@@ -18,7 +18,8 @@
       { "name" : "startAutoTranslation", "parameterTypes" : ["java.lang.String", "java.util.List", "java.lang.String"] },
       { "name" : "status", "parameterTypes" : ["java.lang.String", "java.lang.String"] },
       { "name" : "sync", "parameterTypes" : ["java.lang.String", "java.lang.String", "java.lang.String", "java.util.List", "java.lang.String", "java.lang.String", "java.util.List", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String"] },
-      { "name" : "upload", "parameterTypes" : ["java.lang.String", "java.lang.String", "java.lang.String", "java.lang.Boolean", "java.lang.Boolean", "java.lang.Boolean", "java.util.List", "java.lang.String", "java.lang.String", "java.lang.String"] }
+      { "name" : "upload", "parameterTypes" : ["java.lang.String", "java.lang.String", "java.lang.String", "java.lang.Boolean", "java.lang.Boolean", "java.lang.Boolean", "java.util.List", "java.lang.String", "java.lang.String", "java.lang.String"] },
+      { "name" : "purge", "parameterTypes" : ["java.lang.String", "java.lang.String", "java.lang.Boolean"] }
     ]
   },
   {
@@ -77,6 +78,13 @@
     "allDeclaredMethods" : true,
     "allPublicMethods" : true
   },
+  {
+    "name" : "io.simplelocalize.cli.client.dto.proxy.ExceptionRequest",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
   {
     "name" : "java.lang.Boolean",
     "allDeclaredConstructors" : true,

src/main/java/io/simplelocalize/cli/command/PublishHostingCommand.java

@@ -4,6 +4,7 @@
 import com.jayway.jsonpath.JsonPath;
 import io.simplelocalize.cli.client.SimpleLocalizeClient;
 import io.simplelocalize.cli.client.dto.proxy.Configuration;
+import io.simplelocalize.cli.util.EnvironmentUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,7 +35,7 @@ public void invoke() throws IOException, InterruptedException
     String projectToken = json.read("$.data.projectToken", String.class);
     log.info("Project token: {}", projectToken);
 
-    String environment = configuration.getEnvironment();
+    String environment = EnvironmentUtils.convertDefaultEnvironmentKeyFromPreviousCliVersionsToV3IfNeeded(configuration.getEnvironment());
     log.info("Environment: {}", environment);
 
     log.info("Publishing translations...");

src/main/java/io/simplelocalize/cli/command/PullHostingCommand.java

@@ -6,6 +6,7 @@
 import io.simplelocalize.cli.client.dto.proxy.Configuration;
 import io.simplelocalize.cli.client.dto.proxy.HostingResource;
 import io.simplelocalize.cli.io.JsonReader;
+import io.simplelocalize.cli.util.EnvironmentUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,7 +43,7 @@ public void invoke() throws IOException, InterruptedException
     String projectToken = json.read("$.data.projectToken", String.class);
     log.info("Project token: {}", projectToken);
 
-    String environment = configuration.getEnvironment();
+    String environment = EnvironmentUtils.convertDefaultEnvironmentKeyFromPreviousCliVersionsToV3IfNeeded(configuration.getEnvironment());
     log.info("Environment: {}", environment);
 
     String filterRegex = configuration.getFilterRegex();

src/main/java/io/simplelocalize/cli/util/EnvironmentUtils.java

@@ -0,0 +1,28 @@
+package io.simplelocalize.cli.util;
+
+import org.slf4j.Logger;
+
+public class EnvironmentUtils
+{
+  private static final Logger log = org.slf4j.LoggerFactory.getLogger(EnvironmentUtils.class);
+
+  private EnvironmentUtils()
+  {
+  }
+
+  public static String convertDefaultEnvironmentKeyFromPreviousCliVersionsToV3IfNeeded(String environment)
+  {
+    if ("latest".equals(environment))
+    {
+      log.warn("[warning] You passed 'latest' value as environment key, please use '_latest' instead.");
+      environment = "_" + environment;
+    }
+
+    if ("production".equals(environment))
+    {
+      log.warn("[warning] You passed 'production' value as environment key, please use '_production' instead.");
+      environment = "_" + environment;
+    }
+    return environment;
+  }
+}

src/main/java/io/simplelocalize/cli/util/StackTraceUtils.java

@@ -11,6 +11,11 @@ private StackTraceUtils()
 
   public static String getStackTrace(Exception exception)
   {
+    if (exception == null)
+    {
+      return "";
+    }
+
     final StringWriter sw = new StringWriter();
     final PrintWriter pw = new PrintWriter(sw, true);
     exception.printStackTrace(pw);