Use record classes

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

diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
index 5c951f0f16c0f60623c962215600cb7f6b99a596..2628844f1dcfd73cfe69a10b31154b9cc3eefdf0 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -1,7 +1,6 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

 
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;


@@ -18,76 +17,72 @@ enum JsonSyncMessageType {
     REQUEST_SYNC
 }
 
     REQUEST_SYNC
 }
 

-class JsonSyncMessage {
+record JsonSyncMessage(
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncDataMessage sentMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<String> blockedNumbers,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<String> blockedGroupIds,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonSyncReadMessage> readMessages,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncMessageType type
+) {

 
 

-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final JsonSyncDataMessage sentMessage;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<String> blockedNumbers;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<String> blockedGroupIds;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<JsonSyncReadMessage> readMessages;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final JsonSyncMessageType type;
+    JsonSyncMessage(
+            final JsonSyncDataMessage sentMessage,
+            final List<String> blockedNumbers,
+            final List<String> blockedGroupIds,
+            final List<JsonSyncReadMessage> readMessages,
+            final JsonSyncMessageType type
+    ) {
+        this.sentMessage = sentMessage;
+        this.blockedNumbers = blockedNumbers;
+        this.blockedGroupIds = blockedGroupIds;
+        this.readMessages = readMessages;
+        this.type = type;
+    }

 
 

-    JsonSyncMessage(SignalServiceSyncMessage syncMessage, Manager m) {
-        this.sentMessage = syncMessage.getSent().isPresent()
-                ? new JsonSyncDataMessage(syncMessage.getSent().get(), m)
-                : null;
+    static JsonSyncMessage from(SignalServiceSyncMessage syncMessage, Manager m) {
+        final var sentMessage = syncMessage.getSent().isPresent() ? JsonSyncDataMessage.from(syncMessage.getSent()
+                .get(), m) : null;
+        final List<String> blockedNumbers;
+        final List<String> blockedGroupIds;

         if (syncMessage.getBlockedList().isPresent()) {
             final var base64 = Base64.getEncoder();
         if (syncMessage.getBlockedList().isPresent()) {
             final var base64 = Base64.getEncoder();

-            this.blockedNumbers = syncMessage.getBlockedList()
+            blockedNumbers = syncMessage.getBlockedList()

                     .get()
                     .getAddresses()
                     .stream()
                     .map(Util::getLegacyIdentifier)
                     .collect(Collectors.toList());
                     .get()
                     .getAddresses()
                     .stream()
                     .map(Util::getLegacyIdentifier)
                     .collect(Collectors.toList());

-            this.blockedGroupIds = syncMessage.getBlockedList()
+            blockedGroupIds = syncMessage.getBlockedList()

                     .get()
                     .getGroupIds()
                     .stream()
                     .map(base64::encodeToString)
                     .collect(Collectors.toList());
         } else {
                     .get()
                     .getGroupIds()
                     .stream()
                     .map(base64::encodeToString)
                     .collect(Collectors.toList());
         } else {

-            this.blockedNumbers = null;
-            this.blockedGroupIds = null;
-        }
-        if (syncMessage.getRead().isPresent()) {
-            this.readMessages = syncMessage.getRead()
-                    .get()
-                    .stream()
-                    .map(JsonSyncReadMessage::new)
-                    .collect(Collectors.toList());
-        } else {
-            this.readMessages = null;
+            blockedNumbers = null;
+            blockedGroupIds = null;

         }
 
         }
 

+        final var readMessages = syncMessage.getRead().isPresent() ? syncMessage.getRead()
+                .get()
+                .stream()
+                .map(JsonSyncReadMessage::from)
+                .collect(Collectors.toList()) : null;
+
+        final JsonSyncMessageType type;

         if (syncMessage.getContacts().isPresent()) {
         if (syncMessage.getContacts().isPresent()) {

-            this.type = JsonSyncMessageType.CONTACTS_SYNC;
+            type = JsonSyncMessageType.CONTACTS_SYNC;

         } else if (syncMessage.getGroups().isPresent()) {
         } else if (syncMessage.getGroups().isPresent()) {

-            this.type = JsonSyncMessageType.GROUPS_SYNC;
+            type = JsonSyncMessageType.GROUPS_SYNC;

         } else if (syncMessage.getRequest().isPresent()) {
         } else if (syncMessage.getRequest().isPresent()) {

-            this.type = JsonSyncMessageType.REQUEST_SYNC;
+            type = JsonSyncMessageType.REQUEST_SYNC;

         } else {
         } else {

-            this.type = null;
+            type = null;

         }
         }

+        return new JsonSyncMessage(sentMessage, blockedNumbers, blockedGroupIds, readMessages, type);

     }
 
     }
 

-    JsonSyncMessage(Signal.SyncMessageReceived messageReceived) {
-        this.sentMessage = new JsonSyncDataMessage(messageReceived);
-        this.blockedNumbers = null;
-        this.blockedGroupIds = null;
-        this.readMessages = null;
-        this.type = null;
+    static JsonSyncMessage from(Signal.SyncMessageReceived messageReceived) {
+        return new JsonSyncMessage(JsonSyncDataMessage.from(messageReceived), null, null, null, null);

     }
 }
     }
 }