Refactor command creation

[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 cf993e6de4b89d7064d790df40210043374200f1..1616a01ff1f01a828d492409c33a1d1a290a2722 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -3,6 +3,7 @@ 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.OutputWriter;

 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.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;


@@ -16,34 +17,37 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 

-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-
-public class AddDeviceCommand implements LocalCommand {
+public class AddDeviceCommand implements JsonRpcLocalCommand {

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

+    @Override
+    public String getName() {
+        return "addDevice";
+    }
+

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

+        subparser.help("Link another device to this device. Only works, if this is the master device.");

         subparser.addArgument("--uri")
                 .required(true)
                 .help("Specify the uri contained in the QR code shown by the new device.");
     }
 
     @Override
         subparser.addArgument("--uri")
                 .required(true)
                 .help("Specify the uri contained in the QR code shown by the new device.");
     }
 
     @Override

-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         try {
             m.addDeviceLink(new URI(ns.getString("uri")));
         } catch (IOException e) {
             logger.error("Add device link failed", e);
             throw new IOErrorException("Add device link failed");
         } catch (URISyntaxException e) {
         try {
             m.addDeviceLink(new URI(ns.getString("uri")));
         } catch (IOException e) {
             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());
+            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 (InvalidKeyException e) {
             logger.error("Add device link failed", e);
             throw new UnexpectedErrorException("Add device link failed.");

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

         }
     }
 }
         }
     }
 }