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

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

diff --git a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
index b2ab7f75597eb5e5f5d08476f6e83d71f0d3b78b..e32009e13c72879d3f07b39ab71b32c769d897e6 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
@@ -1,29 +1,35 @@
 package org.asamk.signal.json;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 
 import java.util.List;
 
 class JsonReceiptMessage {
 
-    long when;
-    boolean isDelivery;
-    boolean isRead;
-    List<Long> timestamps;
+    @JsonProperty
+    final long when;
 
-    JsonReceiptMessage(SignalServiceReceiptMessage receiptMessage) {
+    @JsonProperty
+    final boolean isDelivery;
+
+    @JsonProperty
+    final boolean isRead;
 
+    @JsonProperty
+    final List<Long> timestamps;
+
+    JsonReceiptMessage(SignalServiceReceiptMessage receiptMessage) {
         this.when = receiptMessage.getWhen();
-        if (receiptMessage.isDeliveryReceipt()) {
-            this.isDelivery = true;
-        }
-        if (receiptMessage.isReadReceipt()) {
-            this.isRead = true;
-        }
+        this.isDelivery = receiptMessage.isDeliveryReceipt();
+        this.isRead = receiptMessage.isReadReceipt();
         this.timestamps = receiptMessage.getTimestamps();
     }
 
-    private JsonReceiptMessage(final long when, final boolean isDelivery, final boolean isRead, final List<Long> timestamps) {
+    private JsonReceiptMessage(
+            final long when, final boolean isDelivery, final boolean isRead, final List<Long> timestamps
+    ) {
         this.when = when;
         this.isDelivery = isDelivery;
         this.isRead = isRead;