Switch to the newer APIs version

simplelocalize · Sep 7, 2023 · 8a43ff0 · 8a43ff0
1 parent e1bef7b
commit 8a43ff0
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 56 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,12 +23,11 @@
         <!-- maven -->
         <maven.compiler.target>${jdk.version}</maven.compiler.target>
         <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
         <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
         <native-maven-plugin.version>0.9.22</native-maven-plugin.version>
-
-        <!-- maven plugins -->
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
 
@@ -41,7 +40,6 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-        <sonar.coverage.exclusions>**/dto/**</sonar.coverage.exclusions>
         <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
         <sonar.language>java</sonar.language>
@@ -87,23 +85,13 @@
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
-            <version>2.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
+            <version>2.8.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
-        </dependency>
 
         <!-- test -->
         <dependency>
@@ -185,6 +173,8 @@
             </activation>
             <build>
                 <plugins>
+
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-jar-plugin</artifactId>
@@ -242,13 +232,8 @@
                             <quickBuild>false</quickBuild>
                             <buildArgs>
                                 <arg>--no-fallback</arg>
-                                <arg>--add-opens=java.base/java.nio=ALL-UNNAMED</arg>
-                                <arg>--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED</arg>
-                                <arg>--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED</arg>
-                                <arg>--trace-class-initialization=ch.qos.logback.classic.Logger</arg>
-                                <arg>--initialize-at-build-time=org.slf4j.LoggerFactory,ch.qos.logback</arg>
                                 <arg>-H:IncludeResources=logback.xml</arg>
-                                <arg>-H:ReflectionConfigurationFiles=my-reflect-config.json</arg>
+                                <arg>-H:ReflectionConfigurationFiles=reflect-config.json</arg>
                             </buildArgs>
                         </configuration>
                     </plugin>

diff --git a/my-reflect-config.json → reflect-config.json b/my-reflect-config.json → reflect-config.json
@@ -10,14 +10,14 @@
       { "name" : "debug" }
     ],
     "methods" : [
-      { "name" : "download", "parameterTypes" : ["java.lang.String", "java.lang.String", "java.lang.String", "java.util.List", "java.lang.String", "java.lang.String", "java.lang.String"] },
+      { "name" : "download", "parameterTypes" : ["java.lang.String", "java.lang.String", "java.lang.String", "java.util.List", "java.lang.String","java.lang.String", "java.lang.String", "java.lang.String"] },
       { "name" : "extract", "parameterTypes" : ["java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String"] },
       { "name" : "init", "parameterTypes" : [] },
       { "name" : "publish", "parameterTypes" : ["java.lang.String", "java.lang.String", "java.lang.String"] },
       { "name" : "pull", "parameterTypes" : ["java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String"] },
       { "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"] },
+      { "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"] }
     ]
   },
@@ -204,16 +204,5 @@
     "allPublicFields": true,
     "allDeclaredClasses": true,
     "allPublicClasses": true
-  },
-  {
-    "name": "ch.qos.logback.core.FileAppender",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true,
-    "allDeclaredClasses": true,
-    "allPublicClasses": true
   }
 ]
diff --git a/src/main/java/io/simplelocalize/cli/SimplelocalizeCliCommand.java b/src/main/java/io/simplelocalize/cli/SimplelocalizeCliCommand.java
@@ -6,7 +6,7 @@
 import io.simplelocalize.cli.command.*;
 import io.simplelocalize.cli.configuration.ConfigurationLoader;
 import io.simplelocalize.cli.configuration.ConfigurationValidator;
-import org.apache.commons.lang3.StringUtils;
+import io.simplelocalize.cli.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine;

diff --git a/src/main/java/io/simplelocalize/cli/client/SimpleLocalizeUriFactory.java b/src/main/java/io/simplelocalize/cli/client/SimpleLocalizeUriFactory.java
@@ -2,16 +2,13 @@
 
 import io.simplelocalize.cli.client.dto.DownloadRequest;
 import io.simplelocalize.cli.client.dto.UploadRequest;
-import org.apache.commons.lang3.StringUtils;
+import io.simplelocalize.cli.util.StringUtils;
 
 import java.net.URI;
 import java.util.List;
 
 public class SimpleLocalizeUriFactory
 {
-  private static final String CLI_VERSION_1_API = "/cli/v1";
-  private static final String CLI_VERSION_2_API = "/cli/v2";
-  private static final String VERSION_1_API = "/api/v1";
   private final String baseUrl;
 
   public SimpleLocalizeUriFactory(String baseUrl)
@@ -21,12 +18,12 @@ public SimpleLocalizeUriFactory(String baseUrl)
 
   URI buildSendKeysURI()
   {
-    return URI.create(baseUrl + CLI_VERSION_1_API + "/keys");
+    return URI.create(baseUrl + "/cli/v1/keys");
   }
 
   URI buildDownloadUri(DownloadRequest downloadRequest)
   {
-    String endpointUrl = baseUrl + CLI_VERSION_2_API + "/download?downloadFormat=" + downloadRequest.format();
+    String endpointUrl = baseUrl + "/cli/v2/download?downloadFormat=" + downloadRequest.format();
     String languageKey = downloadRequest.languageKey();
     boolean isRequestedTranslationsForSpecificLanguage = StringUtils.isNotEmpty(languageKey);
     if (isRequestedTranslationsForSpecificLanguage)
@@ -58,7 +55,7 @@ URI buildDownloadUri(DownloadRequest downloadRequest)
 
   URI buildUploadUri(UploadRequest uploadRequest)
   {
-    String endpointUrl = baseUrl + CLI_VERSION_2_API + "/upload?uploadFormat=" + uploadRequest.format();
+    String endpointUrl = baseUrl + "/cli/v2/upload?uploadFormat=" + uploadRequest.format();
     String languageKey = uploadRequest.languageKey();
     if (StringUtils.isNotEmpty(languageKey))
     {
@@ -88,21 +85,12 @@ URI buildUploadUri(UploadRequest uploadRequest)
 
   URI buildGetProjectUri()
   {
-    return URI.create(baseUrl + VERSION_1_API + "/project");
+    return URI.create(baseUrl + "/api/v1/project");
   }
 
   public URI buildPublishUri(String environment)
   {
-    if (environment.equals("latest"))
-    {
-      return URI.create(baseUrl + "/api/v1/translations/publish");
-    }
-
-    if (environment.equals("production"))
-    {
-      return URI.create(baseUrl + "/api/v1/translations/deploy?sourceEnvironment=_latest&targetEnvironment=_production");
-    }
-    throw new IllegalArgumentException("Unknown environment: " + environment);
+    return URI.create(baseUrl + "/api/v2/environments/" + environment + "/publish?source=CLI");
   }
 
   URI buildGetRunningAutoTranslationJobsUri()

diff --git a/src/main/java/io/simplelocalize/cli/command/PullHostingCommand.java b/src/main/java/io/simplelocalize/cli/command/PullHostingCommand.java
@@ -57,7 +57,7 @@ public void invoke() throws IOException, InterruptedException
     List<HostingResource> hostingResources = json.read("$.data.hostingResources", new TypeRef<>() {});
     // @formatter:on
     List<String> resourcePaths = hostingResources.stream()
-            .filter(hostingResource -> hostingResource.environment().equals(environment))
+            .filter(hostingResource -> hostingResource.key().equals(environment))
             .map(HostingResource::path)
             .sorted()
             .toList();
@@ -68,7 +68,7 @@ public void invoke() throws IOException, InterruptedException
     for (String resourcePath : resourcePaths)
     {
       String downloadUrl = BASE_URI_CDN + "/" + resourcePath;
-      String resourcePrefix = projectToken + "/_" + environment + "/";
+      String resourcePrefix = projectToken + "/" + environment + "/";
       String plainResource = resourcePath.replace(resourcePrefix, "");
       String filePath = plainResource + ".json";
       if (filterPattern != null)

diff --git a/src/main/java/io/simplelocalize/cli/command/UploadCommand.java b/src/main/java/io/simplelocalize/cli/command/UploadCommand.java
@@ -6,8 +6,8 @@
 import io.simplelocalize.cli.client.dto.proxy.Configuration;
 import io.simplelocalize.cli.configuration.ConfigurationValidator;
 import io.simplelocalize.cli.io.FileListReader;
+import io.simplelocalize.cli.util.StringUtils;
 import io.simplelocalize.cli.util.WindowsUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/io/simplelocalize/cli/configuration/ConfigurationValidator.java b/src/main/java/io/simplelocalize/cli/configuration/ConfigurationValidator.java
@@ -2,7 +2,7 @@
 
 import io.simplelocalize.cli.client.dto.proxy.Configuration;
 import io.simplelocalize.cli.exception.ConfigurationException;
-import org.apache.commons.lang3.StringUtils;
+import io.simplelocalize.cli.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/io/simplelocalize/cli/util/StringUtils.java b/src/main/java/io/simplelocalize/cli/util/StringUtils.java
@@ -0,0 +1,31 @@
+package io.simplelocalize.cli.util;
+
+public class StringUtils
+{
+
+  public static boolean isEmpty(final CharSequence cs) {
+    return cs == null || cs.length() == 0;
+  }
+
+  public static boolean isNotEmpty(final CharSequence cs) {
+    return !isEmpty(cs);
+  }
+
+  public static boolean isBlank(final CharSequence cs) {
+    int strLen;
+    if (cs == null || (strLen = cs.length()) == 0) {
+      return true;
+    }
+    for (int i = 0; i < strLen; i++) {
+      if (!Character.isWhitespace(cs.charAt(i))) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  public static boolean isNotBlank(final CharSequence cs) {
+    return !isBlank(cs);
+  }
+
+}