Add new 'branch' subcommands and remove requirement for 'files' block for many commands

src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java

@@ -118,6 +118,15 @@ public Branch addBranch(AddBranchRequest request) {
             .getData());
     }
 
+    @Override
+    public void deleteBranch(Long branchId) {
+        executeRequest(() -> {
+            this.client.getSourceFilesApi()
+                .deleteBranch(this.projectId, branchId);
+            return null;
+        });
+    }
+
     @Override
     public List<Branch> listBranches() {
         return executeRequestFullList((limit, offset) -> this.client.getSourceFilesApi()

src/main/java/com/crowdin/cli/client/ProjectClient.java

@@ -33,6 +33,8 @@ public interface ProjectClient extends Client {
 
     Branch addBranch(AddBranchRequest request);
 
+    void deleteBranch(Long branchId);
+
     List<Branch> listBranches();
 
     Long uploadStorage(String fileName, InputStream content);

src/main/java/com/crowdin/cli/commands/Actions.java

@@ -7,9 +7,11 @@
 import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.functionality.FilesInterface;
 import com.crowdin.cli.properties.BaseProperties;
+import com.crowdin.cli.properties.ProjectProperties;
 import com.crowdin.cli.properties.NoProperties;
 import com.crowdin.cli.properties.PropertiesWithTargets;
 import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.client.core.model.Priority;
 import com.crowdin.client.glossaries.model.GlossariesFormat;
 import com.crowdin.client.translationmemory.model.TranslationMemoryFormat;
 import com.crowdin.client.translations.model.AutoApproveOption;
@@ -29,9 +31,9 @@ NewAction<PropertiesWithFiles, ProjectClient> download(
 
     NewAction<NoProperties, NoClient> generate(FilesInterface files, Path destinationPath, boolean skipGenerateDescription);
 
-    NewAction<PropertiesWithFiles, ProjectClient> listBranches(boolean noProgress, boolean plainView);
+    NewAction<ProjectProperties, ProjectClient> listBranches(boolean noProgress, boolean plainView);
 
-    NewAction<PropertiesWithFiles, ProjectClient> listProject(
+    NewAction<ProjectProperties, ProjectClient> listProject(
         boolean noProgress, String branchName, boolean treeView, boolean plainView);
 
     NewAction<PropertiesWithFiles, ProjectClient> listSources(
@@ -40,21 +42,21 @@ NewAction<PropertiesWithFiles, ProjectClient> listSources(
     NewAction<PropertiesWithFiles, ProjectClient> listTranslations(
         boolean noProgress, boolean treeView, boolean isLocal, boolean plainView, boolean useServerSources, boolean withInContextLang);
 
-    NewAction<PropertiesWithFiles, ProjectClient> listLanguages(BaseCli.LanguageCode code, boolean noProgress, boolean plainView);
+    NewAction<ProjectProperties, ProjectClient> listLanguages(BaseCli.LanguageCode code, boolean noProgress, boolean plainView);
 
-    NewAction<PropertiesWithFiles, ProjectClient> status(
+    NewAction<ProjectProperties, ProjectClient> status(
         boolean noProgress, String branchName, String languageId, boolean isVerbose, boolean showTranslated, boolean showApproved);
 
-    NewAction<PropertiesWithFiles, ProjectClient> stringAdd(
+    NewAction<ProjectProperties, ProjectClient> stringAdd(
         boolean noProgress, String text, String identifier, Integer maxLength, String context, List<String> files, List<String> labelNames, Boolean hidden);
 
-    NewAction<PropertiesWithFiles, ProjectClient> stringDelete(
+    NewAction<ProjectProperties, ProjectClient> stringDelete(
         boolean noProgress, List<Long> ids, List<String> texts, List<String> identifiers);
 
-    NewAction<PropertiesWithFiles, ProjectClient> stringEdit(
+    NewAction<ProjectProperties, ProjectClient> stringEdit(
         boolean noProgress, Long id, String identifier, String newText, String newContext, Integer newMaxLength, List<String> labelNames, Boolean isHidden);
 
-    NewAction<PropertiesWithFiles, ProjectClient> stringList(
+    NewAction<ProjectProperties, ProjectClient> stringList(
         boolean noProgress, boolean isVerbose, String file, String filter);
 
     NewAction<PropertiesWithFiles, ProjectClient> uploadSources(
@@ -91,4 +93,8 @@ NewAction<PropertiesWithFiles, ProjectClient> preTranslate(
         List<String> languageIds, Method method, Long engineId, String branchName, AutoApproveOption autoApproveOption, Boolean duplicateTranslations,
         Boolean translateUntranslatedOnly, Boolean translateWithPerfectMatchOnly, boolean noProgress, boolean debug, boolean verbose, boolean plainView);
 
+    NewAction<ProjectProperties, ProjectClient> branchAdd(String name, String title, String exportPattern, Priority priority);
+
+    NewAction<ProjectProperties, ProjectClient> branchDelete(String name);
+
 }

src/main/java/com/crowdin/cli/commands/actions/BranchAddAction.java

@@ -0,0 +1,43 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.commands.functionality.RequestBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.console.ExecutionStatus;
+import com.crowdin.client.core.model.Priority;
+import com.crowdin.client.sourcefiles.model.Branch;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
+
+class BranchAddAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final String name;
+    private final String title;
+    private final String exportPattern;
+    private final Priority priority;
+
+    public BranchAddAction(String name, String title, String exportPattern, Priority priority) {
+        this.name = name;
+        this.title = title;
+        this.exportPattern = exportPattern;
+        this.priority = priority;
+    }
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        Map<String, Long> branches = client.listBranches().stream()
+            .collect(Collectors.toMap(Branch::getName, Branch::getId));
+        if (!branches.containsKey(name)) {
+            client.addBranch(RequestBuilder.addBranch(name, title, exportPattern, priority));
+            out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch"), name)));
+        } else {
+            out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch_already_exists"), name)));
+        }
+    }
+}

src/main/java/com/crowdin/cli/commands/actions/BranchDeleteAction.java

@@ -0,0 +1,35 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.console.ExecutionStatus;
+import com.crowdin.client.sourcefiles.model.Branch;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
+
+class BranchDeleteAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final String name;
+
+    public BranchDeleteAction(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        Map<String, Long> branches = client.listBranches().stream()
+            .collect(Collectors.toMap(Branch::getName, Branch::getId));
+        if (branches.containsKey(name)) {
+            client.deleteBranch(branches.get(name));
+            out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch_deleted"), name)));
+        } else {
+            out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch_does_not_exist"), name)));
+        }
+    }
+}

src/main/java/com/crowdin/cli/commands/actions/CliActions.java

@@ -9,9 +9,11 @@
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.functionality.FilesInterface;
 import com.crowdin.cli.properties.BaseProperties;
+import com.crowdin.cli.properties.ProjectProperties;
 import com.crowdin.cli.properties.NoProperties;
 import com.crowdin.cli.properties.PropertiesWithTargets;
 import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.client.core.model.Priority;
 import com.crowdin.client.glossaries.model.GlossariesFormat;
 import com.crowdin.client.translationmemory.model.TranslationMemoryFormat;
 import com.crowdin.client.translations.model.AutoApproveOption;
@@ -38,12 +40,12 @@ public NewAction<NoProperties, NoClient> generate(FilesInterface files, Path des
     }
 
     @Override
-    public NewAction<PropertiesWithFiles, ProjectClient> listBranches(boolean noProgress, boolean plainView) {
+    public NewAction<ProjectProperties, ProjectClient> listBranches(boolean noProgress, boolean plainView) {
         return new ListBranchesAction(noProgress, plainView);
     }
 
     @Override
-    public NewAction<PropertiesWithFiles, ProjectClient> listProject(
+    public NewAction<ProjectProperties, ProjectClient> listProject(
         boolean noProgress, String branchName, boolean treeView, boolean plainView
     ) {
         return new ListProjectAction(noProgress, branchName, treeView, plainView);
@@ -64,40 +66,40 @@ public NewAction<PropertiesWithFiles, ProjectClient> listTranslations(
     }
 
     @Override
-    public NewAction<PropertiesWithFiles, ProjectClient> listLanguages(BaseCli.LanguageCode code, boolean noProgress, boolean plainView) {
+    public NewAction<ProjectProperties, ProjectClient> listLanguages(BaseCli.LanguageCode code, boolean noProgress, boolean plainView) {
         return new ListLanguagesAction(code, noProgress, plainView);
     }
 
     @Override
-    public NewAction<PropertiesWithFiles, ProjectClient> status(
+    public NewAction<ProjectProperties, ProjectClient> status(
         boolean noProgress, String branchName, String languageId, boolean isVerbose, boolean showTranslated, boolean showApproved
     ) {
         return new StatusAction(noProgress, branchName, languageId, isVerbose, showTranslated, showApproved);
     }
 
     @Override
-    public NewAction<PropertiesWithFiles, ProjectClient> stringAdd(
+    public NewAction<ProjectProperties, ProjectClient> stringAdd(
         boolean noProgress, String text, String identifier, Integer maxLength, String context, List<String> files, List<String> labelNames, Boolean hidden
     ) {
         return new StringAddAction(noProgress, text, identifier, maxLength, context, files, labelNames, hidden);
     }
 
     @Override
-    public NewAction<PropertiesWithFiles, ProjectClient> stringDelete(
+    public NewAction<ProjectProperties, ProjectClient> stringDelete(
         boolean noProgress, List<Long> ids, List<String> texts, List<String> identifiers
     ) {
         return new StringDeleteAction(noProgress, ids, texts, identifiers);
     }
 
     @Override
-    public NewAction<PropertiesWithFiles, ProjectClient> stringEdit(
+    public NewAction<ProjectProperties, ProjectClient> stringEdit(
         boolean noProgress, Long id, String identifier, String newText, String newContext, Integer newMaxLength, List<String> labelNames, Boolean isHidden
     ) {
         return new StringEditAction(noProgress, id, identifier, newText, newContext, newMaxLength, labelNames, isHidden);
     }
 
     @Override
-    public NewAction<PropertiesWithFiles, ProjectClient> stringList(
+    public NewAction<ProjectProperties, ProjectClient> stringList(
         boolean noProgress, boolean isVerbose, String file, String filter
     ) {
         return new StringListAction(noProgress, isVerbose, file, filter);
@@ -179,4 +181,13 @@ public NewAction<PropertiesWithFiles, ProjectClient> preTranslate(
             translateUntranslatedOnly, translateWithPerfectMatchOnly, noProgress, debug, verbose, plainView);
     }
 
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> branchAdd(String name, String title, String exportPattern, Priority priority) {
+        return new BranchAddAction(name, title, exportPattern, priority);
+    }
+
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> branchDelete(String name) {
+        return new BranchDeleteAction(name);
+    }
 }

src/main/java/com/crowdin/cli/commands/actions/ListBranchesAction.java

@@ -5,10 +5,10 @@
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.commands.functionality.DryrunBranches;
-import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.ProjectProperties;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
 
-class ListBranchesAction implements NewAction<PropertiesWithFiles, ProjectClient> {
+class ListBranchesAction implements NewAction<ProjectProperties, ProjectClient> {
 
     private boolean noProgress;
     private boolean plainView;
@@ -19,7 +19,7 @@ public ListBranchesAction(boolean noProgress,  boolean plainView) {
     }
 
     @Override
-    public void act(Outputter out, PropertiesWithFiles pb, ProjectClient client) {
+    public void act(Outputter out, ProjectProperties pb, ProjectClient client) {
         CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
                 this.noProgress, this.plainView, client::downloadFullProject);
 

src/main/java/com/crowdin/cli/commands/actions/ListLanguagesAction.java

@@ -6,7 +6,7 @@
 import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.Outputter;
-import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.ProjectProperties;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
 import com.crowdin.client.languages.model.Language;
 
@@ -20,7 +20,7 @@
 import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
 import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
 
-class ListLanguagesAction implements NewAction<PropertiesWithFiles, ProjectClient> {
+class ListLanguagesAction implements NewAction<ProjectProperties, ProjectClient> {
 
     private BaseCli.LanguageCode code;
     private boolean noProgress;
@@ -33,7 +33,7 @@ public ListLanguagesAction(BaseCli.LanguageCode code, boolean noProgress,  boole
     }
 
     @Override
-    public void act(Outputter out, PropertiesWithFiles properties, ProjectClient client) {
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
         CrowdinProjectInfo project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
             this.noProgress, this.plainView, client::downloadProjectInfo);
 

src/main/java/com/crowdin/cli/commands/actions/ListProjectAction.java

@@ -5,14 +5,14 @@
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.commands.functionality.DryrunProjectFiles;
-import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.ProjectProperties;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
 import com.crowdin.client.sourcefiles.model.Branch;
 import org.apache.commons.lang3.StringUtils;
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
 
-class ListProjectAction implements NewAction<PropertiesWithFiles, ProjectClient> {
+class ListProjectAction implements NewAction<ProjectProperties, ProjectClient> {
 
     private boolean noProgress;
     private String branchName;
@@ -27,7 +27,7 @@ public ListProjectAction(boolean noProgress, String branchName, boolean treeView
     }
 
     @Override
-    public void act(Outputter out, PropertiesWithFiles pb, ProjectClient client) {
+    public void act(Outputter out, ProjectProperties pb, ProjectClient client) {
         CrowdinProjectFull project = ConsoleSpinner
             .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
                 this.noProgress, this.plainView, client::downloadFullProject);

src/main/java/com/crowdin/cli/commands/actions/StatusAction.java

@@ -4,7 +4,7 @@
 import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.Outputter;
-import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.ProjectProperties;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
 import com.crowdin.client.sourcefiles.model.Branch;
 import com.crowdin.client.translationstatus.model.LanguageProgress;
@@ -14,7 +14,7 @@
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
 
-class StatusAction implements NewAction<PropertiesWithFiles, ProjectClient> {
+class StatusAction implements NewAction<ProjectProperties, ProjectClient> {
 
     private boolean noProgress;
     private String branchName;
@@ -33,7 +33,7 @@ public StatusAction(boolean noProgress, String branchName, String languageId, bo
     }
 
     @Override
-    public void act(Outputter out, PropertiesWithFiles pb, ProjectClient client) {
+    public void act(Outputter out, ProjectProperties pb, ProjectClient client) {
         CrowdinProject project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
             this.noProgress, false, client::downloadProjectWithLanguages);
 

src/main/java/com/crowdin/cli/commands/actions/StringAddAction.java

@@ -6,7 +6,7 @@
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.commands.functionality.ProjectFilesUtils;
 import com.crowdin.cli.commands.functionality.RequestBuilder;
-import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.ProjectProperties;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
 import com.crowdin.client.labels.model.Label;
 import com.crowdin.client.sourcefiles.model.FileInfo;
@@ -20,7 +20,7 @@
 import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
 import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
 
-class StringAddAction implements NewAction<PropertiesWithFiles, ProjectClient> {
+class StringAddAction implements NewAction<ProjectProperties, ProjectClient> {
 
     private final boolean noProgress;
     private final String text;
@@ -45,7 +45,7 @@ public StringAddAction(
     }
 
     @Override
-    public void act(Outputter out, PropertiesWithFiles pb, ProjectClient client) {
+    public void act(Outputter out, ProjectProperties pb, ProjectClient client) {
         CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
             this.noProgress, false, client::downloadFullProject);