Remove deprecated --json parameter

[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 acb3a66289b2d4c0ac929e7863eab84cacd7e1f1..5cae9e2e899a8e723dfc2eec166beefc0ec47c9f 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -41,9 +41,6 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());

-        subparser.addArgument("--json")
-                .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());

     }
 
     @Override
     }
 
     @Override


@@ -54,30 +51,25 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
     public void handleCommand(
             final Namespace ns, final Signal signal, DBusConnection dbusconnection
     ) throws CommandException {
     public void handleCommand(
             final Namespace ns, final Signal signal, DBusConnection dbusconnection
     ) throws CommandException {

-        var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
-
-        // TODO delete later when "json" variable is removed
-        if (ns.getBoolean("json")) {
-            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");
-        }
+        var inJson = ns.get("output") == OutputType.JSON;

 
         try {
             if (inJson) {
                 final var jsonWriter = new JsonWriter(System.out);
 
 
         try {
             if (inJson) {
                 final var jsonWriter = new JsonWriter(System.out);
 

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

                     var envelope = new JsonMessageEnvelope(messageReceived);
                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });
 
                     var envelope = new JsonMessageEnvelope(messageReceived);
                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });
 

-                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
+                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, signal, receiptReceived -> {

                     var envelope = new JsonMessageEnvelope(receiptReceived);
                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });
 
                     var envelope = new JsonMessageEnvelope(receiptReceived);
                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });
 

-                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
+                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, signal, syncReceived -> {

                     var envelope = new JsonMessageEnvelope(syncReceived);
                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                     var envelope = new JsonMessageEnvelope(syncReceived);
                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);


@@ -85,7 +77,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
             } else {
                 final var writer = new PlainTextWriterImpl(System.out);
 
             } else {
                 final var writer = new PlainTextWriterImpl(System.out);
 

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

                     writer.println("Envelope from: {}", messageReceived.getSender());
                     writer.println("Timestamp: {}", DateUtils.formatTimestamp(messageReceived.getTimestamp()));
                     writer.println("Body: {}", messageReceived.getMessage());
                     writer.println("Envelope from: {}", messageReceived.getSender());
                     writer.println("Timestamp: {}", DateUtils.formatTimestamp(messageReceived.getTimestamp()));
                     writer.println("Body: {}", messageReceived.getMessage());


@@ -103,12 +95,12 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                     writer.println();
                 });
 
                     writer.println();
                 });
 

-                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
+                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, signal, receiptReceived -> {

                     writer.println("Receipt from: {}", receiptReceived.getSender());
                     writer.println("Timestamp: {}", DateUtils.formatTimestamp(receiptReceived.getTimestamp()));
                 });
 
                     writer.println("Receipt from: {}", receiptReceived.getSender());
                     writer.println("Timestamp: {}", DateUtils.formatTimestamp(receiptReceived.getTimestamp()));
                 });
 

-                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
+                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, signal, syncReceived -> {

                     writer.println("Sync Envelope from: {} to: {}",
                             syncReceived.getSource(),
                             syncReceived.getDestination());
                     writer.println("Sync Envelope from: {} to: {}",
                             syncReceived.getSource(),
                             syncReceived.getDestination());


@@ -143,12 +135,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
 
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {

-        var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
-
-        // TODO delete later when "json" variable is removed
-        if (ns.getBoolean("json")) {
-            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");
-        }
+        var inJson = ns.get("output") == OutputType.JSON;

 
         double timeout = ns.getDouble("timeout");
         var returnOnTimeout = true;
 
         double timeout = ns.getDouble("timeout");
         var returnOnTimeout = true;