Make fields in json classes final and omit unnecessary nulls when serializing

[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 1aae3104b4b17cc06cd9f7051cba5d0b31af140e..f3f809dc1fadb3d87e58c8863dd1a34de47d3399 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,28 @@
 package org.asamk.signal.json;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 
 public class JsonQuotedAttachment {
 
-    String contentType;
-    String filename;
-    JsonAttachment thumbnail;
+    @JsonProperty
+    final String contentType;
+
+    @JsonProperty
+    final String filename;
+
+    @JsonProperty
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    final JsonAttachment thumbnail;
 
     JsonQuotedAttachment(SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment) {
         contentType = quotedAttachment.getContentType();
         filename = quotedAttachment.getFileName();
         if (quotedAttachment.getThumbnail() != null) {
             thumbnail = new JsonAttachment(quotedAttachment.getThumbnail());
-        }
-        else {
+        } else {
             thumbnail = null;
         }
     }