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

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

diff --git a/src/main/java/org/asamk/signal/json/JsonSticker.java b/src/main/java/org/asamk/signal/json/JsonSticker.java
index 228d2883912eac6c0e11e2fb8cafb17726bc5d52..e56ddf3fef5d4d552d6f1f1006660c6565d16e12 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSticker.java
+++ b/src/main/java/org/asamk/signal/json/JsonSticker.java
@@ -1,18 +1,25 @@
 package org.asamk.signal.json;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
-import org.whispersystems.util.Base64;
+
+import java.util.Base64;
 
 public class JsonSticker {
 
-    String packId;
-    String packKey;
-    int stickerId;
+    @JsonProperty
+    final String packId;
+
+    @JsonProperty
+    final String packKey;
+
+    @JsonProperty
+    final int stickerId;
 
     public JsonSticker(SignalServiceDataMessage.Sticker sticker) {
-        this.packId = Base64.encodeBytes(sticker.getPackId());
-        this.packKey = Base64.encodeBytes(sticker.getPackKey());
+        this.packId = Base64.getEncoder().encodeToString(sticker.getPackId());
+        this.packKey = Base64.getEncoder().encodeToString(sticker.getPackKey());
         this.stickerId = sticker.getStickerId();
-        // TODO also download sticker image ??
     }
 }