From 52df649285716ed9dd4ebabdd1b315e6d0fbfbd3 Mon Sep 17 00:00:00 2001 From: Yevheniy Oliynyk Date: Mon, 23 Sep 2024 09:19:18 +0200 Subject: [PATCH] remove export pattern --- .../java/com/crowdin/cli/commands/Actions.java | 2 +- .../cli/commands/actions/BranchEditAction.java | 8 +------- .../crowdin/cli/commands/actions/CliActions.java | 4 ++-- .../commands/picocli/BranchEditSubcommand.java | 7 ++----- src/main/resources/messages/messages.properties | 1 - .../commands/actions/BranchEditActionTest.java | 16 ++++++---------- .../picocli/BranchEditSubcommandTest.java | 2 +- .../cli/commands/picocli/PicocliTestUtils.java | 2 +- 8 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/crowdin/cli/commands/Actions.java b/src/main/java/com/crowdin/cli/commands/Actions.java index dbaf837e..03448388 100644 --- a/src/main/java/com/crowdin/cli/commands/Actions.java +++ b/src/main/java/com/crowdin/cli/commands/Actions.java @@ -120,7 +120,7 @@ NewAction preTranslate( NewAction branchDelete(String name); - NewAction branchEdit(String branch, String name, String title, Priority priority, String exportPattern, boolean noProgress, boolean plainView); + NewAction branchEdit(String branch, String name, String title, Priority priority, boolean noProgress, boolean plainView); NewAction screenshotList(Long stringId, boolean plainView); diff --git a/src/main/java/com/crowdin/cli/commands/actions/BranchEditAction.java b/src/main/java/com/crowdin/cli/commands/actions/BranchEditAction.java index e10a6241..0c9443a5 100644 --- a/src/main/java/com/crowdin/cli/commands/actions/BranchEditAction.java +++ b/src/main/java/com/crowdin/cli/commands/actions/BranchEditAction.java @@ -26,16 +26,14 @@ class BranchEditAction implements NewAction { private final String name; private final String title; private final Priority priority; - private final String exportPattern; private final boolean noProgress; private final boolean plainView; - BranchEditAction(String branch, String name, String title, Priority priority, String exportPattern, boolean noProgress, boolean plainView) { + BranchEditAction(String branch, String name, String title, Priority priority, boolean noProgress, boolean plainView) { this.branch = branch; this.name = name; this.title = title; this.priority = priority; - this.exportPattern = exportPattern; this.noProgress = noProgress; this.plainView = plainView; } @@ -63,10 +61,6 @@ public void act(Outputter out, ProjectProperties pb, ProjectClient client) { PatchRequest request = RequestBuilder.patch(priority, PatchOperation.REPLACE, "/priority"); requests.add(request); } - if (exportPattern != null) { - PatchRequest request = RequestBuilder.patch(exportPattern, PatchOperation.REPLACE, "/exportPattern"); - requests.add(request); - } Branch updatedBranch = client.editBranch(branchObj.get().getId(), requests); diff --git a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java index c5721189..b9abf9b6 100644 --- a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java +++ b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java @@ -250,8 +250,8 @@ public NewAction branchDelete(String name) { } @Override - public NewAction branchEdit(String branch, String name, String title, Priority priority, String exportPattern, boolean noProgress, boolean plainView) { - return new BranchEditAction(branch, name, title, priority, exportPattern, noProgress, plainView); + public NewAction branchEdit(String branch, String name, String title, Priority priority, boolean noProgress, boolean plainView) { + return new BranchEditAction(branch, name, title, priority, noProgress, plainView); } @Override diff --git a/src/main/java/com/crowdin/cli/commands/picocli/BranchEditSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/BranchEditSubcommand.java index a869ed6b..26f67c8b 100644 --- a/src/main/java/com/crowdin/cli/commands/picocli/BranchEditSubcommand.java +++ b/src/main/java/com/crowdin/cli/commands/picocli/BranchEditSubcommand.java @@ -28,16 +28,13 @@ class BranchEditSubcommand extends ActCommandProject { @CommandLine.Option(names = "--priority", descriptionKey = "crowdin.branch.edit.priority", paramLabel = "...", order = -2) protected Priority priority; - @CommandLine.Option(names = "--export-pattern", descriptionKey = "crowdin.branch.edit.export-pattern", paramLabel = "...", order = -2) - protected String exportPattern; - @CommandLine.Option(names = {"--plain"}, descriptionKey = "crowdin.list.usage.plain") protected boolean plainView; @Override protected List checkOptions() { List errors = new ArrayList<>(); - if (newName == null && title == null && priority == null && exportPattern == null) { + if (newName == null && title == null && priority == null) { errors.add(RESOURCE_BUNDLE.getString("error.branch_no_edit")); } return errors; @@ -45,6 +42,6 @@ protected List checkOptions() { @Override protected NewAction getAction(Actions actions) { - return actions.branchEdit(name, newName, title, priority, exportPattern, noProgress, plainView); + return actions.branchEdit(name, newName, title, priority, noProgress, plainView); } } diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties index 79a0dc59..00456082 100755 --- a/src/main/resources/messages/messages.properties +++ b/src/main/resources/messages/messages.properties @@ -255,7 +255,6 @@ crowdin.branch.edit.name=Branch name crowdin.branch.edit.new-name=Rename branch crowdin.branch.edit.title=Specify new title for the branch crowdin.branch.edit.priority=Specify new priority for the branch -crowdin.branch.edit.export-pattern=Specify new export pattern for the branch crowdin.glossary.upload.usage.description=Upload glossary to localization resources crowdin.glossary.upload.usage.customSynopsis=@|fg(green) crowdin glossary upload|@ [CONFIG OPTIONS] [OPTIONS] diff --git a/src/test/java/com/crowdin/cli/commands/actions/BranchEditActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/BranchEditActionTest.java index 9450fef3..3bdb187b 100644 --- a/src/test/java/com/crowdin/cli/commands/actions/BranchEditActionTest.java +++ b/src/test/java/com/crowdin/cli/commands/actions/BranchEditActionTest.java @@ -32,7 +32,7 @@ public class BranchEditActionTest { @ParameterizedTest @MethodSource - public void testBranchEdit(String branch, String name, String title, Priority priority, String exportPattern) { + public void testBranchEdit(String branch, String name, String title, Priority priority) { Long branchId = 1L; NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder @@ -45,7 +45,7 @@ public void testBranchEdit(String branch, String name, String title, Priority pr when(client.editBranch(any(), any())).thenReturn(new Branch()); - action = new BranchEditAction(branch, name, title, priority, exportPattern, false, false); + action = new BranchEditAction(branch, name, title, priority, false, false); action.act(Outputter.getDefault(), pb, client); List patches = new ArrayList<>() {{ @@ -58,20 +58,16 @@ public void testBranchEdit(String branch, String name, String title, Priority pr if (priority != null) { add(RequestBuilder.patch(priority, PatchOperation.REPLACE, "/priority")); } - if (exportPattern != null) { - add(RequestBuilder.patch(exportPattern, PatchOperation.REPLACE, "/exportPattern")); - } }}; verify(client).editBranch(branchId, patches); } public static Stream testBranchEdit() { return Stream.of( - arguments("main", "dev", null, null, null), - arguments("main", null, "test", null, null), - arguments("main", null, null, Priority.HIGH, null), - arguments("main", null, null, null, "%three_letters_code%"), - arguments("main", "dev", "test", Priority.HIGH, "%three_letters_code%") + arguments("main", "dev", null, null), + arguments("main", null, "test", null), + arguments("main", null, null, Priority.HIGH), + arguments("main", "dev", "test", Priority.HIGH) ); } } diff --git a/src/test/java/com/crowdin/cli/commands/picocli/BranchEditSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/BranchEditSubcommandTest.java index 54d140a6..bf0e14c9 100644 --- a/src/test/java/com/crowdin/cli/commands/picocli/BranchEditSubcommandTest.java +++ b/src/test/java/com/crowdin/cli/commands/picocli/BranchEditSubcommandTest.java @@ -13,7 +13,7 @@ public void testBranchEdit() { Priority priority = Priority.HIGH; this.execute(CommandNames.BRANCH, CommandNames.EDIT, branchName, "--priority", priority.name()); verify(actionsMock) - .branchEdit(branchName, null, null, priority, null, false, false); + .branchEdit(branchName, null, null, priority, false, false); this.check(true); } diff --git a/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java b/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java index 0b7ce495..7d43d3a3 100644 --- a/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java +++ b/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java @@ -142,7 +142,7 @@ void mockActions() { .thenReturn(actionMock); when(actionsMock.branchMerge(any(), any(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean())) .thenReturn(actionMock); - when(actionsMock.branchEdit(any(), any(), any(), any(), any(), anyBoolean(), anyBoolean())) + when(actionsMock.branchEdit(any(), any(), any(), any(), anyBoolean(), anyBoolean())) .thenReturn(actionMock); }