Add CommandException to abstract cli return codes for errors

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

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index fdb23ea13bad6775297913a4e9a360c2491bfda3..204dcfe2af812e5afe06e0f3ba5fa94d018c7916 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -5,19 +5,20 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import org.asamk.signal.PlainTextWriterImpl;
 
 import org.asamk.Signal;
 import org.asamk.signal.PlainTextWriterImpl;

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

 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

-import java.io.IOException;

 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;

-import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;

 
 public class UpdateGroupCommand implements DbusCommand {
 
 
 public class UpdateGroupCommand implements DbusCommand {
 


@@ -32,15 +33,14 @@ public class UpdateGroupCommand implements DbusCommand {
     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Signal signal) {
+    public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {

         final var writer = new PlainTextWriterImpl(System.out);
         byte[] groupId = null;
         if (ns.getString("group") != null) {
             try {
                 groupId = Util.decodeGroupId(ns.getString("group")).serialize();
             } catch (GroupIdFormatException e) {
         final var writer = new PlainTextWriterImpl(System.out);
         byte[] groupId = null;
         if (ns.getString("group") != null) {
             try {
                 groupId = Util.decodeGroupId(ns.getString("group")).serialize();
             } catch (GroupIdFormatException e) {

-                handleGroupIdFormatException(e);
-                return 1;
+                throw new UserErrorException("Invalid group id:" + e.getMessage());

             }
         }
         if (groupId == null) {
             }
         }
         if (groupId == null) {


@@ -65,23 +65,15 @@ public class UpdateGroupCommand implements DbusCommand {
         try {
             var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
             if (groupId.length != newGroupId.length) {
         try {
             var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
             if (groupId.length != newGroupId.length) {

-                try {
-                    writer.println("Creating new group \"{}\" …", Base64.getEncoder().encodeToString(newGroupId));
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    return 3;
-                }
+                writer.println("Created new group: \"{}\"", Base64.getEncoder().encodeToString(newGroupId));

             }
             }

-            return 0;

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

-            return 1;
+            throw e;

         } catch (Signal.Error.AttachmentInvalid e) {
         } catch (Signal.Error.AttachmentInvalid e) {

-            System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
-            return 1;
+            throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());

         } catch (DBusExecutionException e) {
         } catch (DBusExecutionException e) {

-            System.err.println("Failed to send message: " + e.getMessage());
-            return 2;
+            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());

         }
     }
 }
         }
     }
 }