X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/e5a67d6ce1312fe118e99b8bc8fb2f55ed1dbcf2..3e981d66e9534db61953078b3ca8faf16ed9dd2d:/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 1f7825fb..1231d3d4 100644 --- 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() { @@ -102,7 +102,9 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var groupIdString = ns.getString("group-id"); var groupId = CommandUtil.getGroupId(groupIdString); @@ -180,29 +182,33 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { } private void outputResult( - final OutputWriter outputWriter, final SendGroupMessageResults results, final GroupId groupId + 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); } } }