fix

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

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 9e410d2f10c96df4bbd79f024f2a5f319d56622a..49172f800c2f9e547373d9c6ed180c17e36a7a07 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -14,6 +14,7 @@ import org.asamk.signal.commands.LocalCommand;
 import org.asamk.signal.commands.MultiLocalCommand;
 import org.asamk.signal.commands.ProvisioningCommand;
 import org.asamk.signal.commands.RegistrationCommand;
 import org.asamk.signal.commands.MultiLocalCommand;
 import org.asamk.signal.commands.ProvisioningCommand;
 import org.asamk.signal.commands.RegistrationCommand;

+import org.asamk.signal.commands.SignalCreator;

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


@@ -76,11 +77,10 @@ public class App {
 
         var subparsers = parser.addSubparsers().title("subcommands").dest("command");
 
 
         var subparsers = parser.addSubparsers().title("subcommands").dest("command");
 

-        final var commands = Commands.getCommands();
-        for (var entry : commands.entrySet()) {
-            var subparser = subparsers.addParser(entry.getKey());
-            entry.getValue().attachToSubparser(subparser);
-        }
+        Commands.getCommandSubparserAttachers().forEach((key, value) -> {
+            var subparser = subparsers.addParser(key);
+            value.attachToSubparser(subparser);
+        });

 
         return parser;
     }
 
         return parser;
     }


@@ -90,13 +90,17 @@ public class App {
     }
 
     public void init() throws CommandException {
     }
 
     public void init() throws CommandException {

+        var outputType = ns.<OutputType>get("output");
+        var outputWriter = outputType == OutputType.JSON
+                ? new JsonWriterImpl(System.out)
+                : new PlainTextWriterImpl(System.out);
+

         var commandKey = ns.getString("command");
         var commandKey = ns.getString("command");

-        var command = Commands.getCommand(commandKey);
+        var command = Commands.getCommand(commandKey, outputWriter);

         if (command == null) {
             throw new UserErrorException("Command not implemented!");
         }
 
         if (command == null) {
             throw new UserErrorException("Command not implemented!");
         }
 

-        var outputType = ns.<OutputType>get("output");

         if (!command.getSupportedOutputTypes().contains(outputType)) {
             throw new UserErrorException("Command doesn't support output type " + outputType.toString());
         }
         if (!command.getSupportedOutputTypes().contains(outputType)) {
             throw new UserErrorException("Command doesn't support output type " + outputType.toString());
         }


@@ -232,7 +236,17 @@ public class App {
             }
         }
 
             }
         }
 

-        command.handleCommand(ns, managers);
+        command.handleCommand(ns, managers, new SignalCreator() {
+            @Override
+            public ProvisioningManager getNewProvisioningManager() {
+                return ProvisioningManager.init(dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
+            }
+
+            @Override
+            public RegistrationManager getNewRegistrationManager(String username) throws IOException {
+                return RegistrationManager.init(username, dataPath, serviceEnvironment, BaseConfig.USER_AGENT);
+            }
+        });

 
         for (var m : managers) {
             try {
 
         for (var m : managers) {
             try {