Use record classes

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

diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java
index 9a740582d895ff9943f4114f23d477d357f94173..f0d1831c5b9a7e0a6a78573e39356f5fc2ed32c1 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonQuote.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuote.java
@@ -1,42 +1,51 @@
 package org.asamk.signal.json;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 
 import java.util.ArrayList;
 import java.util.List;
-
-public class JsonQuote {
-
-    long id;
-    String author;
-    String text;
-
-    List<JsonMention> mentions;
-    List<JsonQuotedAttachment> attachments;
-
-    JsonQuote(SignalServiceDataMessage.Quote quote, Manager m) {
-        this.id = quote.getId();
-        this.author = m.resolveSignalServiceAddress(quote.getAuthor()).getLegacyIdentifier();
-        this.text = quote.getText();
-
-        if (quote.getMentions().size() > 0) {
-            this.mentions = new ArrayList<>(quote.getMentions().size());
-
-            for (SignalServiceDataMessage.Mention quotedMention: quote.getMentions()){
-                this.mentions.add(new JsonMention(quotedMention, m));
-            }
+import java.util.stream.Collectors;
+
+import static org.asamk.signal.util.Util.getLegacyIdentifier;
+
+public record JsonQuote(
+        long id,
+        @Deprecated String author,
+        String authorNumber,
+        String authorUuid,
+        String text,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonMention> mentions,
+        List<JsonQuotedAttachment> attachments
+) {
+
+    static JsonQuote from(SignalServiceDataMessage.Quote quote, Manager m) {
+        final var id = quote.getId();
+        final var address = m.resolveSignalServiceAddress(quote.getAuthor());
+        final var author = getLegacyIdentifier(address);
+        final var authorNumber = address.getNumber().orNull();
+        final var authorUuid = address.getUuid().toString();
+        final var text = quote.getText();
+
+        final List<JsonMention> mentions;
+        if (quote.getMentions() != null && quote.getMentions().size() > 0) {
+            mentions = quote.getMentions()
+                    .stream()
+                    .map(quotedMention -> JsonMention.from(quotedMention, m))
+                    .collect(Collectors.toList());
+        } else {
+            mentions = null;
         }
 
+        final List<JsonQuotedAttachment> attachments;
         if (quote.getAttachments().size() > 0) {
-            this.attachments = new ArrayList<>(quote.getAttachments().size());
-
-            for (SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment : quote.getAttachments()) {
-                this.attachments.add(new JsonQuotedAttachment(quotedAttachment));
-            }
+            attachments = quote.getAttachments().stream().map(JsonQuotedAttachment::from).collect(Collectors.toList());
         } else {
-            this.attachments = new ArrayList<>();
+            attachments = new ArrayList<>();
         }
-    }
 
+        return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments);
+    }
 }