update deliveryReceipt to conform

[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..ea15b5748ff379e76faf801d661b03abc09bc88b 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSharedContact.java
+++ b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
@@ -31,7 +31,6 @@ public class JsonSharedContact {
     @JsonProperty
     final String organization;
 
     @JsonProperty
     final String organization;
 

-

     public JsonSharedContact(SharedContact contact) {
         name = new JsonContactName(contact.getName());
         if (contact.getAvatar().isPresent()) {
     public JsonSharedContact(SharedContact contact) {
         name = new JsonContactName(contact.getName());
         if (contact.getAvatar().isPresent()) {


@@ -41,31 +40,19 @@ public class JsonSharedContact {
         }
 
         if (contact.getPhone().isPresent()) {
         }
 
         if (contact.getPhone().isPresent()) {

-            phone = contact.getPhone()
-                    .get()
-                    .stream()
-                    .map(JsonContactPhone::new)
-                    .collect(Collectors.toList());
+            phone = contact.getPhone().get().stream().map(JsonContactPhone::new).collect(Collectors.toList());

         } else {
             phone = null;
         }
 
         if (contact.getEmail().isPresent()) {
         } else {
             phone = null;
         }
 
         if (contact.getEmail().isPresent()) {

-            email = contact.getEmail()
-                    .get()
-                    .stream()
-                    .map(JsonContactEmail::new)
-                    .collect(Collectors.toList());
+            email = contact.getEmail().get().stream().map(JsonContactEmail::new).collect(Collectors.toList());

         } else {
             email = null;
         }
 
         if (contact.getAddress().isPresent()) {
         } else {
             email = null;
         }
 
         if (contact.getAddress().isPresent()) {

-            address = contact.getAddress()
-                    .get()
-                    .stream()
-                    .map(JsonContactAddress::new)
-                    .collect(Collectors.toList());
+            address = contact.getAddress().get().stream().map(JsonContactAddress::new).collect(Collectors.toList());

         } else {
             address = null;
         }
         } else {
             address = null;
         }