Add CommandException to abstract cli return codes for errors

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

diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index c4da94a2c834f7130aac36c3a5d840c79646c509..c8ad613b9ba1fceecfaeed24416fa22916414b00 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -3,6 +3,9 @@ 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.UserErrorException;

 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 


@@ -22,25 +25,21 @@ public class UpdateContactCommand implements LocalCommand {
     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        String number = ns.getString("number");
-        String name = ns.getString("name");
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        var number = ns.getString("number");
+        var name = ns.getString("name");

 
         try {
             m.setContactName(number, name);
 
 
         try {
             m.setContactName(number, name);
 

-            Integer expiration = ns.getInt("expiration");
+            var expiration = ns.getInt("expiration");

             if (expiration != null) {
                 m.setExpirationTimer(number, expiration);
             }
         } catch (InvalidNumberException e) {
             if (expiration != null) {
                 m.setExpirationTimer(number, expiration);
             }
         } catch (InvalidNumberException e) {

-            System.err.println("Invalid contact number: " + e.getMessage());
-            return 1;
+            throw new UserErrorException("Invalid contact number: " + e.getMessage());

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

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

         }
         }

-
-        return 0;

     }
 }
     }
 }