Improve addDevice error message

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

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 1f7825fb84a671fd8b7e4feacc65e7885174ffd7..f29f0732066ef14fe8d16375aaa9ef520f3705a2 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -32,7 +32,7 @@ import java.util.stream.Stream;
 
 public class UpdateGroupCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
 
     @Override
     public String getName() {
@@ -182,27 +182,29 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
     private void outputResult(
             final OutputWriter outputWriter, final SendGroupMessageResults results, final GroupId groupId
     ) {
-        if (outputWriter instanceof PlainTextWriter writer) {
-            if (groupId != null) {
-                writer.println("Created new group: \"{}\"", groupId.toBase64());
-            }
-            if (results != null) {
-                var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results());
-                SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
-                writer.println("{}", results.timestamp());
-            }
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            final var response = new HashMap<>();
-            if (results != null) {
-                response.put("timestamp", results.timestamp());
-                var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.results());
-                response.put("results", jsonResults);
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                if (groupId != null) {
+                    writer.println("Created new group: \"{}\"", groupId.toBase64());
+                }
+                if (results != null) {
+                    var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results());
+                    SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
+                    writer.println("{}", results.timestamp());
+                }
             }
-            if (groupId != null) {
-                response.put("groupId", groupId.toBase64());
+            case JsonWriter writer -> {
+                final var response = new HashMap<>();
+                if (results != null) {
+                    response.put("timestamp", results.timestamp());
+                    var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.results());
+                    response.put("results", jsonResults);
+                }
+                if (groupId != null) {
+                    response.put("groupId", groupId.toBase64());
+                }
+                writer.write(response);
             }
-            writer.write(response);
         }
     }
 }