From 6c33a89f82ffac98454c6f854e1c8877e3941f6a Mon Sep 17 00:00:00 2001 From: AsamK Date: Fri, 19 Feb 2021 18:04:08 +0100 Subject: [PATCH] Reformat code --- .../asamk/signal/ReceiveMessageHandler.java | 19 +++++++++++-------- .../asamk/signal/json/JsonSharedContact.java | 19 +++---------------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java index 9ab752cf..c3bede8b 100644 --- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java @@ -527,8 +527,9 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - System.out.println(" - Organisation: " + - (contact.getOrganization().isPresent() ? contact.getOrganization().get() : "-")); + System.out.println(" - Organisation: " + ( + contact.getOrganization().isPresent() ? contact.getOrganization().get() : "-" + )); } } if (message.getSticker().isPresent()) { @@ -608,25 +609,27 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { /** * Prints the Signal mention information * - * @param mention is the Signal mention to print - * @param m is the Manager. used to resolve UUIDs into phone numbers if possible + * @param mention is the Signal mention to print + * @param m is the Manager. used to resolve UUIDs into phone numbers if possible * @param leadingSpaces is the number of spaces you want the message to be indented by */ private void printMention(SignalServiceDataMessage.Mention mention, Manager m, int leadingSpaces) { String spaces = " ".repeat(leadingSpaces); - System.out.println(spaces + "- " + m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(), null)) - .getLegacyIdentifier() + ": " + mention.getStart() + " (length: " + mention.getLength() + ")"); + System.out.println(spaces + "- " + m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(), + null)).getLegacyIdentifier() + ": " + mention.getStart() + " (length: " + mention.getLength() + ")"); } /** * Prints the Signal attachment information * - * @param attachment is the Signal attachment to print + * @param attachment is the Signal attachment to print * @param leadingSpaces is the number of spaces you want the message to be indented by */ private void printAttachment(SignalServiceAttachment attachment, int leadingSpaces) { String spaces = " ".repeat(leadingSpaces); - System.out.println(spaces + "- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + ( + System.out.println(spaces + "- " + attachment.getContentType() + " (" + ( + attachment.isPointer() ? "Pointer" : "" + ) + ( attachment.isStream() ? "Stream" : "" ) + ")"); if (attachment.isPointer()) { diff --git a/src/main/java/org/asamk/signal/json/JsonSharedContact.java b/src/main/java/org/asamk/signal/json/JsonSharedContact.java index b1b7718c..ea15b574 100644 --- a/src/main/java/org/asamk/signal/json/JsonSharedContact.java +++ b/src/main/java/org/asamk/signal/json/JsonSharedContact.java @@ -31,7 +31,6 @@ public class JsonSharedContact { @JsonProperty final String organization; - public JsonSharedContact(SharedContact contact) { name = new JsonContactName(contact.getName()); if (contact.getAvatar().isPresent()) { @@ -41,31 +40,19 @@ public class JsonSharedContact { } if (contact.getPhone().isPresent()) { - phone = contact.getPhone() - .get() - .stream() - .map(JsonContactPhone::new) - .collect(Collectors.toList()); + phone = contact.getPhone().get().stream().map(JsonContactPhone::new).collect(Collectors.toList()); } else { phone = null; } if (contact.getEmail().isPresent()) { - email = contact.getEmail() - .get() - .stream() - .map(JsonContactEmail::new) - .collect(Collectors.toList()); + email = contact.getEmail().get().stream().map(JsonContactEmail::new).collect(Collectors.toList()); } else { email = null; } if (contact.getAddress().isPresent()) { - address = contact.getAddress() - .get() - .stream() - .map(JsonContactAddress::new) - .collect(Collectors.toList()); + address = contact.getAddress().get().stream().map(JsonContactAddress::new).collect(Collectors.toList()); } else { address = null; } -- 2.50.1