Add Pair record

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

diff --git a/src/main/java/org/asamk/signal/json/JsonContactPhone.java b/src/main/java/org/asamk/signal/json/JsonContactPhone.java
index fce75843e3ee041e4cd9838154c5fbacd5c507af..6c23339ef21495e878935a00d29b2d2a84038b7b 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonContactPhone.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactPhone.java
@@ -1,24 +1,11 @@
 package org.asamk.signal.json;
 
 package org.asamk.signal.json;
 

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

 import org.asamk.signal.util.Util;
 import org.whispersystems.signalservice.api.messages.shared.SharedContact;
 
 import org.asamk.signal.util.Util;
 import org.whispersystems.signalservice.api.messages.shared.SharedContact;
 

-public class JsonContactPhone {
-
-    @JsonProperty
-    private final String value;
-
-    @JsonProperty
-    private final SharedContact.Phone.Type type;
-
-    @JsonProperty
-    private final String label;
+public record JsonContactPhone(String value, SharedContact.Phone.Type type, String label) {

 
 

-    public JsonContactPhone(SharedContact.Phone phone) {
-        value = phone.getValue();
-        type = phone.getType();
-        label = Util.getStringIfNotBlank(phone.getLabel());
+    static JsonContactPhone from(SharedContact.Phone phone) {
+        return new JsonContactPhone(phone.getValue(), phone.getType(), Util.getStringIfNotBlank(phone.getLabel()));

     }
 }
     }
 }