Use var instead of explicit types

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

diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index 256b9751bef06753eaa5dda1131b4d4e5a5dd7da..8506d49376f4b3487f7e5e8676162ee4a5f347d7 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -7,7 +7,6 @@ import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.List;
 
@@ -20,6 +19,7 @@ public class JsonMessageEnvelope {
     final Integer sourceDevice;
 
     @JsonProperty
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     final String relay;
 
     @JsonProperty
@@ -47,7 +47,7 @@ public class JsonMessageEnvelope {
 
     public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content, Manager m) {
         if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
-            SignalServiceAddress source = envelope.getSourceAddress();
+            var source = envelope.getSourceAddress();
             this.source = source.getLegacyIdentifier();
             this.sourceDevice = envelope.getSourceDevice();
             this.relay = source.getRelay().orNull();