chore: minor cleanup (#613)

crowdin · Jul 26, 2023 · dc5c57d · dc5c57d
1 parent 64a1faf
commit dc5c57d
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 56 deletions.
diff --git a/src/main/java/com/crowdin/cli/client/ClientBundle.java b/src/main/java/com/crowdin/cli/client/ClientBundle.java
@@ -2,9 +2,6 @@
 
 import com.crowdin.client.bundles.model.Bundle;
 import com.crowdin.client.bundles.model.BundleExport;
-import com.crowdin.client.tasks.model.Status;
-import com.crowdin.client.translationmemory.model.TranslationMemoryExportRequest;
-import com.crowdin.client.translationmemory.model.TranslationMemoryExportStatus;
 
 import java.net.URL;
 import java.util.List;

diff --git a/src/main/java/com/crowdin/cli/client/CrowdinClientBundle.java b/src/main/java/com/crowdin/cli/client/CrowdinClientBundle.java
@@ -3,7 +3,6 @@
 
 import com.crowdin.client.bundles.model.Bundle;
 import com.crowdin.client.bundles.model.BundleExport;
-import com.crowdin.client.glossaries.model.Glossary;
 
 import java.net.URL;
 import java.util.List;

diff --git a/src/main/java/com/crowdin/cli/client/CrowdinClientCore.java b/src/main/java/com/crowdin/cli/client/CrowdinClientCore.java
@@ -5,8 +5,6 @@
 import com.crowdin.client.core.model.DownloadLink;
 import com.crowdin.client.core.model.ResponseList;
 import com.crowdin.client.core.model.ResponseObject;
-import com.crowdin.client.stringcomments.model.AddStringCommentRequest;
-import com.crowdin.client.stringcomments.model.StringComment;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;

diff --git a/src/main/java/com/crowdin/cli/client/CrowdinProjectInfo.java b/src/main/java/com/crowdin/cli/client/CrowdinProjectInfo.java
@@ -88,7 +88,7 @@ public List<Language> getProjectLanguages(boolean withInContextLang) {
     }
 
     public enum Access {
-        TRANSLATOR, MANAGER;
+        TRANSLATOR, MANAGER
     }
 
 }
diff --git a/src/main/java/com/crowdin/cli/client/LanguageMapping.java b/src/main/java/com/crowdin/cli/client/LanguageMapping.java
@@ -62,7 +62,7 @@ public static LanguageMapping fromServerLanguageMapping(Map<String, Map<String,
      *         "uk": "Ukrainian"
      *     }
      * }
-     * @param fileLanguageMapping langauge mapping from configuration file. May be null/empty
+     * @param fileLanguageMapping language mapping from configuration file. May be null/empty
      * @return immutable LanguageMapping object
      */
     public static LanguageMapping fromConfigFileLanguageMapping(Map<String, Map<String, String>> fileLanguageMapping) {

diff --git a/src/main/java/com/crowdin/cli/commands/Actions.java b/src/main/java/com/crowdin/cli/commands/Actions.java
@@ -10,7 +10,6 @@
 import com.crowdin.cli.properties.PropertiesWithFiles;
 import com.crowdin.client.core.model.Priority;
 import com.crowdin.client.glossaries.model.GlossariesFormat;
-import com.crowdin.client.stringcomments.model.Type;
 import com.crowdin.client.stringcomments.model.IssueStatus;
 import com.crowdin.client.translationmemory.model.TranslationMemoryFormat;
 import com.crowdin.client.translations.model.AutoApproveOption;

diff --git a/src/main/java/com/crowdin/cli/commands/actions/DownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/DownloadAction.java
@@ -140,7 +140,7 @@ public void act(Outputter out, PropertiesWithFiles pb, ProjectClient client) {
                     out.println(OK.withIcon(RESOURCE_BUNDLE.getString("message.build_archive_pseudo")));
                 }
                 PseudoLocalization pl = pb.getPseudoLocalization();
-                BuildProjectTranslationRequest request = null;
+                BuildProjectTranslationRequest request;
 
                 if (branchName != null) {
                     request = (pl != null)

diff --git a/src/main/java/com/crowdin/cli/commands/actions/DownloadBundleAction.java b/src/main/java/com/crowdin/cli/commands/actions/DownloadBundleAction.java
@@ -15,10 +15,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
 import static com.crowdin.cli.utils.console.ExecutionStatus.ERROR;
@@ -27,10 +24,10 @@
 public class DownloadBundleAction implements NewAction<ProjectProperties, ClientBundle> {
 
     private final Long id;
-    private FilesInterface files;
-    private boolean noProgress;
-    private boolean plainView;
-    private boolean keepArchive;
+    private final FilesInterface files;
+    private final boolean noProgress;
+    private final boolean plainView;
+    private final boolean keepArchive;
     private File to;
 
     private Outputter out;

diff --git a/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java b/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java
@@ -245,7 +245,7 @@ public void act(Outputter out, PropertiesWithFiles pb, ProjectClient client) {
                             }
 
                             return (Runnable) () -> {
-                                Long directoryId = null;
+                                Long directoryId;
                                 try {
                                     directoryId = ProjectUtils.createPath(out, client, directoryPaths, filePath, branch, plainView);
                                 } catch (Exception e) {

diff --git a/src/main/java/com/crowdin/cli/commands/functionality/ObsoleteSourcesUtils.java b/src/main/java/com/crowdin/cli/commands/functionality/ObsoleteSourcesUtils.java
@@ -50,20 +50,20 @@ public static SortedMap<String, Long> findObsoleteProjectDirectories(
             }
         }
 
-        List<String> obsoleteDirPathes = obsoleteDeletedProjectFiles.keySet().stream()
+        List<String> obsoleteDirPaths = obsoleteDeletedProjectFiles.keySet().stream()
             .map(Utils::getParentDirectory)
             .distinct()
             .collect(Collectors.toList());
-        for (int i = 0; i < obsoleteDirPathes.size(); i++) {
-            String parentDir = Utils.getParentDirectory(obsoleteDirPathes.get(i));
-            if (!obsoleteDirPathes.contains(parentDir)) {
-                obsoleteDirPathes.add(parentDir);
+        for (int i = 0; i < obsoleteDirPaths.size(); i++) {
+            String parentDir = Utils.getParentDirectory(obsoleteDirPaths.get(i));
+            if (!obsoleteDirPaths.contains(parentDir)) {
+                obsoleteDirPaths.add(parentDir);
             }
         }
-        obsoleteDirPathes.remove(Utils.PATH_SEPARATOR);
+        obsoleteDirPaths.remove(Utils.PATH_SEPARATOR);
 
         SortedMap<String, Long> obsoleteDirs = new TreeMap<>(Collections.reverseOrder());
-        for (String obsoleteDirPath : obsoleteDirPathes) {
+        for (String obsoleteDirPath : obsoleteDirPaths) {
             if (!upToDateDirs.contains(obsoleteDirPath)) {
                 obsoleteDirs.put(obsoleteDirPath, directoryIds.get(obsoleteDirPath));
             }

diff --git a/src/main/java/com/crowdin/cli/commands/functionality/RequestBuilder.java b/src/main/java/com/crowdin/cli/commands/functionality/RequestBuilder.java
@@ -11,7 +11,6 @@
 import com.crowdin.client.sourcefiles.model.AddBranchRequest;
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
 import com.crowdin.client.stringcomments.model.AddStringCommentRequest;
-import com.crowdin.client.stringcomments.model.IssueStatus;
 import com.crowdin.client.stringcomments.model.Type;
 import com.crowdin.client.tasks.model.CrowdinTaskCreateFormRequest;
 import com.crowdin.client.tasks.model.EnterpriseTaskCreateFormRequest;

diff --git a/src/main/java/com/crowdin/cli/commands/functionality/SourcesUtils.java b/src/main/java/com/crowdin/cli/commands/functionality/SourcesUtils.java
@@ -109,8 +109,8 @@ public static List<String> filterProjectFiles(
      * Try to replace ‘*’ with ‘source’ param and project file path.
      * If project file path (or part of it) does not match the pattern, do nothing.
      * @param sourcePattern should contain '*'
-     * @param projectFile
-     * @return
+     * @param projectFile file path
+     * @return source pattern with replaced ‘*’
      */
     public static String replaceUnaryAsterisk(@NonNull String sourcePattern, @NonNull String projectFile) {
         String[] parts = Utils.splitPath(sourcePattern);

diff --git a/src/main/java/com/crowdin/cli/commands/picocli/BundleListSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/BundleListSubcommand.java
@@ -1,16 +1,11 @@
 package com.crowdin.cli.commands.picocli;
 
 import com.crowdin.cli.client.ClientBundle;
-import com.crowdin.cli.client.ClientTask;
 import com.crowdin.cli.commands.Actions;
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.client.tasks.model.Status;
 import picocli.CommandLine;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @CommandLine.Command(
     name = CommandNames.BUNDLE_LIST
 )

diff --git a/src/main/java/com/crowdin/cli/commands/picocli/DownloadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/DownloadSubcommand.java
@@ -6,7 +6,6 @@
 import com.crowdin.cli.commands.functionality.FsFiles;
 import com.crowdin.cli.properties.ParamsWithFiles;
 import com.crowdin.cli.properties.PropertiesWithFiles;
-import org.apache.commons.lang3.ArrayUtils;
 import picocli.CommandLine;
 
 import java.util.ArrayList;

diff --git a/src/main/java/com/crowdin/cli/properties/PropertiesConfigurator.java b/src/main/java/com/crowdin/cli/properties/PropertiesConfigurator.java
@@ -12,6 +12,6 @@ interface PropertiesConfigurator<P extends Properties> {
 
     enum CheckType {
         STANDARD,
-        LINT;
+        LINT
     }
 }
diff --git a/src/main/java/com/crowdin/cli/utils/PlaceholderUtil.java b/src/main/java/com/crowdin/cli/utils/PlaceholderUtil.java
@@ -241,26 +241,15 @@ public static String formatSourcePatternForRegex(String toFormat) {
             .replace(QUESTION_MARK, "[^/]")
             .replace(ESCAPE_QUESTION_PLACEHOLDER, ESCAPE_QUESTION);
 
-        if (Utils.isWindows()) {
-            toFormat = toFormat
-                    .replace(ESCAPE_ASTERISK, ESCAPE_ASTERISK_PLACEHOLDER)
-                    .replace("**", ".+")
-                    .replace(ESCAPE_ASTERISK_PLACEHOLDER, ESCAPE_ASTERISK)
+        toFormat = toFormat
+            .replace(ESCAPE_ASTERISK, ESCAPE_ASTERISK_PLACEHOLDER)
+            .replace("**", ".+")
+            .replace(ESCAPE_ASTERISK_PLACEHOLDER, ESCAPE_ASTERISK)
 
-                    .replace(ESCAPE_ASTERISK, ESCAPE_ASTERISK_PLACEHOLDER)
-                    .replace(ASTERISK, "[^/]+")
-                    .replace(ESCAPE_ASTERISK_PLACEHOLDER, ESCAPE_ASTERISK)
-            ;
-        } else {
-            toFormat = toFormat
-                .replace(ESCAPE_ASTERISK, ESCAPE_ASTERISK_PLACEHOLDER)
-                .replace("**", ".+")
-                .replace(ESCAPE_ASTERISK_PLACEHOLDER, ESCAPE_ASTERISK)
+            .replace(ESCAPE_ASTERISK, ESCAPE_ASTERISK_PLACEHOLDER)
+            .replace(ASTERISK, "[^/]+")
+            .replace(ESCAPE_ASTERISK_PLACEHOLDER, ESCAPE_ASTERISK);
 
-                .replace(ESCAPE_ASTERISK, ESCAPE_ASTERISK_PLACEHOLDER)
-                .replace(ASTERISK, "[^/]+")
-                .replace(ESCAPE_ASTERISK_PLACEHOLDER, ESCAPE_ASTERISK);
-        }
         toFormat = toFormat
             .replace(ROUND_BRACKET_OPEN, ESCAPE_ROUND_BRACKET_OPEN)
 

diff --git a/src/main/java/com/crowdin/cli/utils/Utils.java b/src/main/java/com/crowdin/cli/utils/Utils.java
@@ -133,8 +133,8 @@ public static String[] splitPath(String path) {
 
     /**
      * return parent directory with slash on end, or "/" if root
-     * @param path
-     * @return
+     * @param path directory path
+     * @return parent directory
      */
     public static String getParentDirectory(String path) {
         path = noSepAtEnd(path);

diff --git a/src/main/java/com/crowdin/cli/utils/http/ServerSocketFactory.java b/src/main/java/com/crowdin/cli/utils/http/ServerSocketFactory.java
@@ -1,6 +1,5 @@
 package com.crowdin.cli.utils.http;
 
-import javax.net.ssl.SSLServerSocketFactory;
 import java.io.IOException;
 import java.net.ServerSocket;