From 8a43ff02d4fc0fecfa1647685b0eab6b7f4adf3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Pomyka=C5=82a?= Date: Thu, 7 Sep 2023 16:17:51 +0200 Subject: [PATCH] Switch to the newer APIs version --- pom.xml | 25 +++------------ my-reflect-config.json => reflect-config.json | 15 ++------- .../cli/SimplelocalizeCliCommand.java | 2 +- .../cli/client/SimpleLocalizeUriFactory.java | 24 ++++---------- .../cli/command/PullHostingCommand.java | 4 +-- .../cli/command/UploadCommand.java | 2 +- .../configuration/ConfigurationValidator.java | 2 +- .../simplelocalize/cli/util/StringUtils.java | 31 +++++++++++++++++++ 8 files changed, 49 insertions(+), 56 deletions(-) rename my-reflect-config.json => reflect-config.json (94%) create mode 100644 src/main/java/io/simplelocalize/cli/util/StringUtils.java diff --git a/pom.xml b/pom.xml index d45a360..06365d5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,11 @@ ${jdk.version} ${jdk.version} + yyyy-MM-dd HH:mm 3.8.1 3.3.0 3.4.1 0.9.22 - - 2.22.2 2.22.2 @@ -41,7 +40,6 @@ https://sonarcloud.io jacoco reuseReports - **/dto/** ${project.basedir}/target/site/jacoco/jacoco.xml java @@ -87,23 +85,13 @@ com.jayway.jsonpath json-path - 2.4.0 - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} + 2.8.0 com.fasterxml.jackson.core jackson-databind ${jackson.version} - - org.apache.commons - commons-lang3 - 3.8.1 - @@ -185,6 +173,8 @@ + + org.apache.maven.plugins maven-jar-plugin @@ -242,13 +232,8 @@ false --no-fallback - --add-opens=java.base/java.nio=ALL-UNNAMED - --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED - --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED - --trace-class-initialization=ch.qos.logback.classic.Logger - --initialize-at-build-time=org.slf4j.LoggerFactory,ch.qos.logback -H:IncludeResources=logback.xml - -H:ReflectionConfigurationFiles=my-reflect-config.json + -H:ReflectionConfigurationFiles=reflect-config.json diff --git a/my-reflect-config.json b/reflect-config.json similarity index 94% rename from my-reflect-config.json rename to reflect-config.json index 47432dc..f31b845 100644 --- a/my-reflect-config.json +++ b/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 index 9d10450..d8c6535 100644 --- 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 index 7fa39d6..3d35072 100644 --- 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 index 38c9fa2..24881c6 100644 --- 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 hostingResources = json.read("$.data.hostingResources", new TypeRef<>() {}); // @formatter:on List 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 index 2b22c42..c05897e 100644 --- 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 index 4eb2e9c..b0f11c4 100644 --- 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 new file mode 100644 index 0000000..33e87cf --- /dev/null +++ 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); + } + +}