Add CommandException to abstract cli return codes for errors

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

diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index dab886d79ee0cf88cba835c1620bb14ebb4c8a8a..cf993e6de4b89d7064d790df40210043374200f1 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -3,7 +3,13 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

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

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

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.whispersystems.libsignal.InvalidKeyException;
 
 import java.io.IOException;
 import org.whispersystems.libsignal.InvalidKeyException;
 
 import java.io.IOException;


@@ -14,6 +20,8 @@ import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 
 public class AddDeviceCommand implements LocalCommand {
 
 
 public class AddDeviceCommand implements LocalCommand {
 

+    private final static Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("--uri")
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("--uri")


@@ -22,23 +30,20 @@ public class AddDeviceCommand implements LocalCommand {
     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {

         try {
             m.addDeviceLink(new URI(ns.getString("uri")));
         try {
             m.addDeviceLink(new URI(ns.getString("uri")));

-            return 0;

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

-            e.printStackTrace();
-            return 3;
-        } catch (InvalidKeyException | URISyntaxException e) {
-            e.printStackTrace();
-            return 2;
+            logger.error("Add device link failed", e);
+            throw new IOErrorException("Add device link failed");
+        } catch (URISyntaxException e) {
+            throw new UserErrorException("Device link uri has invalid format: {}" + e.getMessage());
+        } catch (InvalidKeyException e) {
+            logger.error("Add device link failed", e);
+            throw new UnexpectedErrorException("Add device link failed.");

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

-            return 1;
+            throw e;

         }
     }
 }
         }
     }
 }