Merge pull request #122 from simplelocalize/dev

Update reflection config

Author: simplelocalize-io

.github/workflows/run-tests.yml

@@ -36,8 +36,8 @@ jobs:
           restore-keys: ${{ runner.os }}-sonar
       - name: "Test with Maven"
         run: mvn --settings .maven.xml clean install -B -V
-      - name: "SonarCloud Analyze"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn clean -B verify -Ptest org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+#      - name: "SonarCloud Analyze"
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+#        run: mvn clean -B verify -Ptest org.sonarsource.scanner.maven:sonar-maven-plugin:sonar

reflect-config.json

@@ -37,6 +37,8 @@
         "parameterTypes": [
           "java.lang.String",
           "java.util.List",
+          "java.util.List",
+          "java.lang.Boolean",
           "java.lang.String"
         ]
       },
@@ -52,6 +54,7 @@
         "java.lang.Boolean",
         "java.lang.Boolean",
         "java.lang.Boolean",
+        "java.lang.Boolean",
         "java.lang.String"
       ] },
       { "name" : "purge", "parameterTypes" : ["java.lang.String", "java.lang.String", "java.lang.Boolean"] }

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

@@ -316,8 +316,8 @@ public void pull(
   public void autoTranslate(
           @Option(names = {"--apiKey"}, description = "Project API Key") String apiKey,
           @Option(names = {"--autoTranslateLanguageKey", "--languageKey", "--languageKeys"}, description = "(Optional) Project language keys to auto-translate", split = ",") List<String> languageKeys,
-          @Option(names = {"--force"}, description = "(Optional) Force auto-translation for all translations") Boolean forceAutoTranslate,
           @Option(names = {"--autoTranslateOptions", "--options"}, description = "(Optional) Auto-translate options") List<String> autoTranslateOptions,
+          @Option(names = {"--force"}, description = "(Optional) Force auto-translation for all translations") Boolean forceAutoTranslate,
           @Option(names = {"--baseUrl"}, description = "(Optional) Set custom server URL") String baseUrl
   )
   {
@@ -351,8 +351,6 @@ public void autoTranslate(
         effectiveAutoTranslateOptions.add("FORCE_REPLACE");
       }
       configuration.setAutoTranslateOptions(effectiveAutoTranslateOptions);
-
-      configuration.setAutoTranslateOptions(autoTranslateOptions);
       this.effectiveCommandConfiguration = configuration;
       SimpleLocalizeClient client = SimpleLocalizeClient.create(configuration.getBaseUrl(), configuration.getApiKey());
       AutoTranslationCommand command = new AutoTranslationCommand(client, configuration);

src/main/java/io/simplelocalize/cli/client/SimpleLocalizeClient.java

@@ -1,6 +1,8 @@
 package io.simplelocalize.cli.client;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.Option;
@@ -82,7 +84,15 @@ public String previewFile(UploadRequest uploadRequest) throws IOException, Inter
     HttpResponse<String> httpResponse = httpClient.send(httpRequest, HttpResponse.BodyHandlers.ofString());
     throwOnError(httpResponse);
     DocumentContext json = JsonPath.parse(httpResponse.body());
-    return json.read("$.data", String.class);
+    return prettyPrintJson(json);
+  }
+
+  private String prettyPrintJson(DocumentContext json) throws JsonProcessingException
+  {
+    Object data = json.read("$.data");
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.enable(SerializationFeature.INDENT_OUTPUT);
+    return mapper.writeValueAsString(data);
   }
 
   public List<DownloadableFile> exportFiles(ExportRequest exportRequest) throws IOException, InterruptedException