Update gradle

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

diff --git a/src/main/java/org/asamk/signal/json/JsonSharedContact.java b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
index b1b7718cf5e32863d76c6b26234ad4512763d6c1..d898c63fdfff5967b72d471e19b15e3b271c942b 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSharedContact.java
+++ b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
@@ -1,75 +1,39 @@
 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.whispersystems.signalservice.api.messages.shared.SharedContact;
+import org.asamk.signal.manager.api.MessageEnvelope;

 
 import java.util.List;
 
 import java.util.List;

-import java.util.stream.Collectors;

 
 

-public class JsonSharedContact {
+public record JsonSharedContact(
+        JsonContactName name,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonContactAvatar avatar,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonContactPhone> phone,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonContactEmail> email,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonContactAddress> address,
+        String organization
+) {

 
 

-    @JsonProperty
-    final JsonContactName name;
+    static JsonSharedContact from(MessageEnvelope.Data.SharedContact contact) {
+        final var name = JsonContactName.from(contact.name());
+        final var avatar = contact.avatar().isPresent() ? JsonContactAvatar.from(contact.avatar().get()) : null;

 
 

-    @JsonProperty
-    final JsonContactAvatar avatar;
+        final var phone = !contact.phone().isEmpty()
+                ? contact.phone().stream().map(JsonContactPhone::from).toList()
+                : null;

 
 

-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<JsonContactPhone> phone;
+        final var email = !contact.email().isEmpty()
+                ? contact.email().stream().map(JsonContactEmail::from).toList()
+                : null;

 
 

-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<JsonContactEmail> email;
+        final var address = !contact.address().isEmpty() ? contact.address()
+                .stream()
+                .map(JsonContactAddress::from)
+                .toList() : null;

 
 

-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<JsonContactAddress> address;
+        final var organization = contact.organization().orElse(null);

 
 

-    @JsonProperty
-    final String organization;
-
-
-    public JsonSharedContact(SharedContact contact) {
-        name = new JsonContactName(contact.getName());
-        if (contact.getAvatar().isPresent()) {
-            avatar = new JsonContactAvatar(contact.getAvatar().get());
-        } else {
-            avatar = null;
-        }
-
-        if (contact.getPhone().isPresent()) {
-            phone = contact.getPhone()
-                    .get()
-                    .stream()
-                    .map(JsonContactPhone::new)
-                    .collect(Collectors.toList());
-        } else {
-            phone = null;
-        }
-
-        if (contact.getEmail().isPresent()) {
-            email = contact.getEmail()
-                    .get()
-                    .stream()
-                    .map(JsonContactEmail::new)
-                    .collect(Collectors.toList());
-        } else {
-            email = null;
-        }
-
-        if (contact.getAddress().isPresent()) {
-            address = contact.getAddress()
-                    .get()
-                    .stream()
-                    .map(JsonContactAddress::new)
-                    .collect(Collectors.toList());
-        } else {
-            address = null;
-        }
-
-        organization = contact.getOrganization().orNull();
+        return new JsonSharedContact(name, avatar, phone, email, address, organization);

     }
 }
     }
 }