Refactor receive api

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

diff --git a/src/main/java/org/asamk/signal/json/JsonContactEmail.java b/src/main/java/org/asamk/signal/json/JsonContactEmail.java
index 070cfb72745495282be0c52f37f445f3df441cc6..7db600db19d600327fdb18c0c32c24d1881f9b7e 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonContactEmail.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactEmail.java
@@ -1,24 +1,11 @@
 package org.asamk.signal.json;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
+import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
-import org.whispersystems.signalservice.api.messages.shared.SharedContact;
-
-public class JsonContactEmail {
-
-    @JsonProperty
-    private final String value;
-
-    @JsonProperty
-    private final SharedContact.Email.Type type;
 
-    @JsonProperty
-    private final String label;
+public record JsonContactEmail(String value, String type, String label) {
 
-    public JsonContactEmail(SharedContact.Email email) {
-        value = email.getValue();
-        type = email.getType();
-        label = Util.getStringIfNotBlank(email.getLabel());
+    static JsonContactEmail from(MessageEnvelope.Data.SharedContact.Email email) {
+        return new JsonContactEmail(email.value(), email.type().name(), Util.getStringIfNotBlank(email.label()));
     }
 }