Move Writer creation out of WriterImpls

[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 7c86f09ed8f389e45921435854bb55d7e2492bb8..7375a5c320e6887add8e85e7b0f944113b6fd093 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -8,7 +8,6 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import org.asamk.Signal;
 import org.asamk.signal.commands.Command;
 import org.asamk.signal.commands.Commands;
 import org.asamk.Signal;
 import org.asamk.signal.commands.Command;
 import org.asamk.signal.commands.Commands;

-import org.asamk.signal.commands.ExtendedDbusCommand;

 import org.asamk.signal.commands.LocalCommand;
 import org.asamk.signal.commands.MultiLocalCommand;
 import org.asamk.signal.commands.ProvisioningCommand;
 import org.asamk.signal.commands.LocalCommand;
 import org.asamk.signal.commands.MultiLocalCommand;
 import org.asamk.signal.commands.ProvisioningCommand;


@@ -33,8 +32,11 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+import java.io.BufferedWriter;

 import java.io.File;
 import java.io.IOException;
 import java.io.File;
 import java.io.IOException;

+import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;

 import java.util.ArrayList;
 import java.util.List;
 
 import java.util.ArrayList;
 import java.util.List;
 


@@ -106,9 +108,10 @@ public class App {
         var outputType = outputTypeInput == null
                 ? command.getSupportedOutputTypes().stream().findFirst().orElse(null)
                 : outputTypeInput;
         var outputType = outputTypeInput == null
                 ? command.getSupportedOutputTypes().stream().findFirst().orElse(null)
                 : outputTypeInput;

+        var writer = new BufferedWriter(new OutputStreamWriter(System.out, Charset.defaultCharset()));

         var outputWriter = outputType == null
                 ? null
         var outputWriter = outputType == null
                 ? null

-                : outputType == OutputType.JSON ? new JsonWriterImpl(System.out) : new PlainTextWriterImpl(System.out);
+                : outputType == OutputType.JSON ? new JsonWriterImpl(writer) : new PlainTextWriterImpl(writer);

 
         if (outputWriter != null && !command.getSupportedOutputTypes().contains(outputType)) {
             throw new UserErrorException("Command doesn't support output type " + outputType);
 
         if (outputWriter != null && !command.getSupportedOutputTypes().contains(outputType)) {
             throw new UserErrorException("Command doesn't support output type " + outputType);


@@ -151,20 +154,20 @@ public class App {
                 ? TrustNewIdentity.ON_FIRST_USE
                 : trustNewIdentityCli == TrustNewIdentityCli.ALWAYS ? TrustNewIdentity.ALWAYS : TrustNewIdentity.NEVER;
 
                 ? TrustNewIdentity.ON_FIRST_USE
                 : trustNewIdentityCli == TrustNewIdentityCli.ALWAYS ? TrustNewIdentity.ALWAYS : TrustNewIdentity.NEVER;
 

-        if (command instanceof ProvisioningCommand) {
+        if (command instanceof ProvisioningCommand provisioningCommand) {

             if (username != null) {
                 throw new UserErrorException("You cannot specify a username (phone number) when linking");
             }
 
             if (username != null) {
                 throw new UserErrorException("You cannot specify a username (phone number) when linking");
             }
 

-            handleProvisioningCommand((ProvisioningCommand) command, dataPath, serviceEnvironment, outputWriter);
+            handleProvisioningCommand(provisioningCommand, dataPath, serviceEnvironment, outputWriter);

             return;
         }
 
         if (username == null) {
             var usernames = Manager.getAllLocalNumbers(dataPath);
 
             return;
         }
 
         if (username == null) {
             var usernames = Manager.getAllLocalNumbers(dataPath);
 

-            if (command instanceof MultiLocalCommand) {
-                handleMultiLocalCommand((MultiLocalCommand) command,
+            if (command instanceof MultiLocalCommand multiLocalCommand) {
+                handleMultiLocalCommand(multiLocalCommand,

                         dataPath,
                         serviceEnvironment,
                         usernames,
                         dataPath,
                         serviceEnvironment,
                         usernames,


@@ -185,8 +188,8 @@ public class App {
             throw new UserErrorException("Invalid username (phone number), make sure you include the country code.");
         }
 
             throw new UserErrorException("Invalid username (phone number), make sure you include the country code.");
         }
 

-        if (command instanceof RegistrationCommand) {
-            handleRegistrationCommand((RegistrationCommand) command, username, dataPath, serviceEnvironment);
+        if (command instanceof RegistrationCommand registrationCommand) {
+            handleRegistrationCommand(registrationCommand, username, dataPath, serviceEnvironment);

             return;
         }
 
             return;
         }
 


@@ -344,14 +347,12 @@ public class App {
     private void handleCommand(
             Command command, Signal ts, DBusConnection dBusConn, OutputWriter outputWriter
     ) throws CommandException {
     private void handleCommand(
             Command command, Signal ts, DBusConnection dBusConn, OutputWriter outputWriter
     ) throws CommandException {

-        if (command instanceof ExtendedDbusCommand) {
-            ((ExtendedDbusCommand) command).handleCommand(ns, ts, dBusConn, outputWriter);
-        } else if (command instanceof LocalCommand) {
-            try {
-                ((LocalCommand) command).handleCommand(ns, new DbusManagerImpl(ts, dBusConn), outputWriter);
+        if (command instanceof LocalCommand localCommand) {
+            try (final var m = new DbusManagerImpl(ts, dBusConn)) {
+                localCommand.handleCommand(ns, m, outputWriter);

             } catch (UnsupportedOperationException e) {
                 throw new UserErrorException("Command is not yet implemented via dbus", e);
             } catch (UnsupportedOperationException e) {
                 throw new UserErrorException("Command is not yet implemented via dbus", e);

-            } catch (DBusExecutionException e) {
+            } catch (IOException | DBusExecutionException e) {

                 throw new UnexpectedErrorException(e.getMessage(), e);
             }
         } else {
                 throw new UnexpectedErrorException(e.getMessage(), e);
             }
         } else {