Use var instead of explicit types

[signal-cli] / src / main / java / org / asamk / signal / commands / ReceiveCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index f7a491570722cf60dc63553f22e192533d409a1a..9693d7c230c1de12f956e19313674cebfbfaed89 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -1,38 +1,33 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-

 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import org.asamk.signal.JsonReceiveMessageHandler;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import org.asamk.signal.JsonReceiveMessageHandler;

+import org.asamk.signal.JsonWriter;
+import org.asamk.signal.OutputType;

 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.json.JsonMessageEnvelope;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.json.JsonMessageEnvelope;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;

-import org.whispersystems.util.Base64;
-
-// TODO delete later when "json" variable is removed

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;

+import java.util.Base64;
+import java.util.Map;
+import java.util.Set;

 import java.util.concurrent.TimeUnit;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 
 public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
 import java.util.concurrent.TimeUnit;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 
 public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 

-    // TODO delete later when "json" variable is removed
-    final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
+    private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);

 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {


@@ -43,38 +38,33 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--json")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--json")

-                .help("WARNING: This parameter is now deprecated! Please use the \"output\" option instead.\n\nOutput received messages in json format, one json object per line.")
+                .help("WARNING: This parameter is now deprecated! Please use the global \"--output=json\" option instead.\n\nOutput received messages in json format, one json object per line.")

                 .action(Arguments.storeTrue());
     }
 
                 .action(Arguments.storeTrue());
     }
 

-    public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
-        final ObjectMapper jsonProcessor;
+    @Override
+    public Set<OutputType> getSupportedOutputTypes() {
+        return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+    }

 
 

-        boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json");
+    public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
+        var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");

 
         // TODO delete later when "json" variable is removed
         if (ns.getBoolean("json")) {
 
         // TODO delete later when "json" variable is removed
         if (ns.getBoolean("json")) {

-            logger.warn("\"--json\" option has been deprecated, please use \"output\" instead.");
+            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");

         }
 
         }
 

-        if (inJson) {
-            jsonProcessor = new ObjectMapper();
-            jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-            jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
-        } else {
-            jsonProcessor = null;
-        }
+        final var jsonWriter = inJson ? new JsonWriter(System.out) : null;

         try {
             dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
         try {
             dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {

-                if (jsonProcessor != null) {
-                    JsonMessageEnvelope envelope = new JsonMessageEnvelope(messageReceived);
-                    ObjectNode result = jsonProcessor.createObjectNode();
-                    result.putPOJO("envelope", envelope);
+                if (jsonWriter != null) {
+                    var envelope = new JsonMessageEnvelope(messageReceived);
+                    final var object = Map.of("envelope", envelope);

                     try {
                     try {

-                        jsonProcessor.writeValue(System.out, result);
-                        System.out.println();
+                        jsonWriter.write(object);

                     } catch (IOException e) {
                     } catch (IOException e) {

-                        e.printStackTrace();
+                        logger.error("Failed to write json object: {}", e.getMessage());

                     }
                 } else {
                     System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
                     }
                 } else {
                     System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",


@@ -83,11 +73,11 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                             messageReceived.getMessage()));
                     if (messageReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
                             messageReceived.getMessage()));
                     if (messageReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");

-                        System.out.println("  Id: " + Base64.encodeBytes(messageReceived.getGroupId()));
+                        System.out.println("  Id: " + Base64.getEncoder().encodeToString(messageReceived.getGroupId()));

                     }
                     if (messageReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");
                     }
                     if (messageReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");

-                        for (String attachment : messageReceived.getAttachments()) {
+                        for (var attachment : messageReceived.getAttachments()) {

                             System.out.println("-  Stored plaintext in: " + attachment);
                         }
                     }
                             System.out.println("-  Stored plaintext in: " + attachment);
                         }
                     }


@@ -96,15 +86,13 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
             });
 
             dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
             });
 
             dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {

-                if (jsonProcessor != null) {
-                    JsonMessageEnvelope envelope = new JsonMessageEnvelope(receiptReceived);
-                    ObjectNode result = jsonProcessor.createObjectNode();
-                    result.putPOJO("envelope", envelope);
+                if (jsonWriter != null) {
+                    var envelope = new JsonMessageEnvelope(receiptReceived);
+                    final var object = Map.of("envelope", envelope);

                     try {
                     try {

-                        jsonProcessor.writeValue(System.out, result);
-                        System.out.println();
+                        jsonWriter.write(object);

                     } catch (IOException e) {
                     } catch (IOException e) {

-                        e.printStackTrace();
+                        logger.error("Failed to write json object: {}", e.getMessage());

                     }
                 } else {
                     System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
                     }
                 } else {
                     System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",


@@ -114,15 +102,13 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
             });
 
             dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
             });
 
             dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {

-                if (jsonProcessor != null) {
-                    JsonMessageEnvelope envelope = new JsonMessageEnvelope(syncReceived);
-                    ObjectNode result = jsonProcessor.createObjectNode();
-                    result.putPOJO("envelope", envelope);
+                if (jsonWriter != null) {
+                    var envelope = new JsonMessageEnvelope(syncReceived);
+                    final var object = Map.of("envelope", envelope);

                     try {
                     try {

-                        jsonProcessor.writeValue(System.out, result);
-                        System.out.println();
+                        jsonWriter.write(object);

                     } catch (IOException e) {
                     } catch (IOException e) {

-                        e.printStackTrace();
+                        logger.error("Failed to write json object: {}", e.getMessage());

                     }
                 } else {
                     System.out.print(String.format("Sync Envelope from: %s to: %s\nTimestamp: %s\nBody: %s\n",
                     }
                 } else {
                     System.out.print(String.format("Sync Envelope from: %s to: %s\nTimestamp: %s\nBody: %s\n",


@@ -132,23 +118,20 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                             syncReceived.getMessage()));
                     if (syncReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
                             syncReceived.getMessage()));
                     if (syncReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");

-                        System.out.println("  Id: " + Base64.encodeBytes(syncReceived.getGroupId()));
+                        System.out.println("  Id: " + Base64.getEncoder().encodeToString(syncReceived.getGroupId()));

                     }
                     if (syncReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");
                     }
                     if (syncReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");

-                        for (String attachment : syncReceived.getAttachments()) {
+                        for (var attachment : syncReceived.getAttachments()) {

                             System.out.println("-  Stored plaintext in: " + attachment);
                         }
                     }
                     System.out.println();
                 }
             });
                             System.out.println("-  Stored plaintext in: " + attachment);
                         }
                     }
                     System.out.println();
                 }
             });

-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
-            return 1;

         } catch (DBusException e) {
             e.printStackTrace();
         } catch (DBusException e) {
             e.printStackTrace();

-            return 1;
+            return 2;

         }
         while (true) {
             try {
         }
         while (true) {
             try {


@@ -161,27 +144,25 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {

-        boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json");
+        var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");

 
         // TODO delete later when "json" variable is removed
         if (ns.getBoolean("json")) {
 
         // TODO delete later when "json" variable is removed
         if (ns.getBoolean("json")) {

-            logger.warn("\"--json\" option has been deprecated, please use \"output\" instead.");
+            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");

         }
 
         double timeout = 5;
         if (ns.getDouble("timeout") != null) {
             timeout = ns.getDouble("timeout");
         }
         }
 
         double timeout = 5;
         if (ns.getDouble("timeout") != null) {
             timeout = ns.getDouble("timeout");
         }

-        boolean returnOnTimeout = true;
+        var returnOnTimeout = true;

         if (timeout < 0) {
             returnOnTimeout = false;
             timeout = 3600;
         }
         boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
         try {
         if (timeout < 0) {
             returnOnTimeout = false;
             timeout = 3600;
         }
         boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
         try {

-            final Manager.ReceiveMessageHandler handler = inJson
-                    ? new JsonReceiveMessageHandler(m)
-                    : new ReceiveMessageHandler(m);
+            final var handler = inJson ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m);

             m.receiveMessages((long) (timeout * 1000),
                     TimeUnit.MILLISECONDS,
                     returnOnTimeout,
             m.receiveMessages((long) (timeout * 1000),
                     TimeUnit.MILLISECONDS,
                     returnOnTimeout,