Add CommandException to abstract cli return codes for errors

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

diff --git a/src/main/java/org/asamk/signal/commands/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java
index 5c7ce403a9066272d391210357f8d89f7917a017..34775773069b3b79069830374969c4c7aeaacce5 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -2,8 +2,16 @@ 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.UserAlreadyExists;
-import org.asamk.signal.manager.Manager;
+
+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.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.ProvisioningManager;
+import org.asamk.signal.manager.UserAlreadyExists;
+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;


@@ -11,40 +19,43 @@ import java.util.concurrent.TimeoutException;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 

-public class LinkCommand implements LocalCommand {
+public class LinkCommand implements ProvisioningCommand {
+
+    private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);

 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.addArgument("-n", "--name")
-                .help("Specify a name to describe this new device.");
+        subparser.addArgument("-n", "--name").help("Specify a name to describe this new device.");

     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        String deviceName = ns.getString("name");
+    public void handleCommand(final Namespace ns, final ProvisioningManager m) throws CommandException {
+        final var writer = new PlainTextWriterImpl(System.out);
+
+        var deviceName = ns.getString("name");

         if (deviceName == null) {
             deviceName = "cli";
         }
         try {
         if (deviceName == null) {
             deviceName = "cli";
         }
         try {

-            System.out.println(m.getDeviceLinkUri());
-            m.finishDeviceLink(deviceName);
-            System.out.println("Associated with: " + m.getUsername());
+            writer.println("{}", m.getDeviceLinkUri());
+            var username = m.finishDeviceLink(deviceName);
+            writer.println("Associated with: {}", username);

         } catch (TimeoutException e) {
         } catch (TimeoutException e) {

-            System.err.println("Link request timed out, please try again.");
-            return 3;
+            throw new UserErrorException("Link request timed out, please try again.");

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

-            System.err.println("Link request error: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Link request error: " + e.getMessage());

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

-            return 1;
+            throw e;

         } catch (InvalidKeyException e) {
         } catch (InvalidKeyException e) {

-            e.printStackTrace();
-            return 2;
+            logger.debug("Finish device link failed", e);
+            throw new UnexpectedErrorException("Invalid key: " + e.getMessage());

         } catch (UserAlreadyExists e) {
         } catch (UserAlreadyExists e) {

-            System.err.println("The user " + e.getUsername() + " already exists\nDelete \"" + e.getFileName() + "\" before trying again.");
-            return 1;
+            throw new UserErrorException("The user "
+                    + e.getUsername()
+                    + " already exists\nDelete \""
+                    + e.getFileName()
+                    + "\" before trying again.");

         }
         }

-        return 0;

     }
 }
     }
 }