Use record classes

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

diff --git a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
index bcbbe2a538d49d651b196fddc2430caed9eea656..a72ba7c6d285692f8586afb9b9c4e401e110bb1a 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
@@ -1,20 +1,22 @@
 package org.asamk.signal.json;
 
 package org.asamk.signal.json;
 

-import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import com.fasterxml.jackson.annotation.JsonInclude;

 
 

-public class JsonQuotedAttachment {
+import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;

 
 

-    String contentType;
-    String filename;
-    JsonAttachment thumbnail;
+public record JsonQuotedAttachment(
+        String contentType, String filename, @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment thumbnail
+) {

 
 

-    JsonQuotedAttachment(SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment) {
-        contentType = quotedAttachment.getContentType();
-        filename = quotedAttachment.getFileName();
+    static JsonQuotedAttachment from(SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment) {
+        final var contentType = quotedAttachment.getContentType();
+        final var filename = quotedAttachment.getFileName();
+        final JsonAttachment thumbnail;

         if (quotedAttachment.getThumbnail() != null) {
         if (quotedAttachment.getThumbnail() != null) {

-            thumbnail = new JsonAttachment(quotedAttachment.getThumbnail());
+            thumbnail = JsonAttachment.from(quotedAttachment.getThumbnail());

         } else {
             thumbnail = null;
         }
         } else {
             thumbnail = null;
         }

+        return new JsonQuotedAttachment(contentType, filename, thumbnail);

     }
 }
     }
 }