Add CommandException to abstract cli return codes for errors

[signal-cli] / src / main / java / org / asamk / signal / commands / QuitGroupCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index cdbccf19a7fc4c962e39787eefd7708110e2d2a3..d8a865854e3110b3cd3f3d39d3a2ca8741a55dd8 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -4,7 +4,11 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.PlainTextWriterImpl;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.PlainTextWriterImpl;

+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.groups.GroupId;

 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;


@@ -13,10 +17,6 @@ import org.asamk.signal.util.Util;
 import java.io.IOException;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 import java.io.IOException;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;

-import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
-import static org.asamk.signal.util.ErrorUtils.handleGroupNotFoundException;
-import static org.asamk.signal.util.ErrorUtils.handleIOException;
-import static org.asamk.signal.util.ErrorUtils.handleNotAGroupMemberException;

 import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults;
 
 public class QuitGroupCommand implements LocalCommand {
 import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults;
 
 public class QuitGroupCommand implements LocalCommand {


@@ -27,28 +27,28 @@ public class QuitGroupCommand implements LocalCommand {
     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        final var writer = new PlainTextWriterImpl(System.out);
+
+        final GroupId groupId;

         try {
         try {

-            final var writer = new PlainTextWriterImpl(System.out);
+            groupId = Util.decodeGroupId(ns.getString("group"));
+        } catch (GroupIdFormatException e) {
+            throw new UserErrorException("Invalid group id:" + e.getMessage());
+        }

 
 

-            final var groupId = Util.decodeGroupId(ns.getString("group"));
+        try {

             final var results = m.sendQuitGroupMessage(groupId);
             final var results = m.sendQuitGroupMessage(groupId);

-            return handleTimestampAndSendMessageResults(writer, results.first(), results.second());
+            handleTimestampAndSendMessageResults(writer, results.first(), results.second());

         } catch (IOException e) {
         } catch (IOException e) {

-            handleIOException(e);
-            return 3;
+            throw new IOErrorException("Failed to send message: " + e.getMessage());

         } catch (AssertionError e) {
             handleAssertionError(e);
         } catch (AssertionError e) {
             handleAssertionError(e);

-            return 1;
+            throw e;

         } catch (GroupNotFoundException e) {
         } catch (GroupNotFoundException e) {

-            handleGroupNotFoundException(e);
-            return 1;
+            throw new UserErrorException("Failed to send to group: " + e.getMessage());

         } catch (NotAGroupMemberException e) {
         } catch (NotAGroupMemberException e) {

-            handleNotAGroupMemberException(e);
-            return 1;
-        } catch (GroupIdFormatException e) {
-            handleGroupIdFormatException(e);
-            return 1;
+            throw new UserErrorException("Failed to send to group: " + e.getMessage());

         }
     }
 }
         }
     }
 }