From: AsamK Date: Sun, 8 Aug 2021 08:44:23 +0000 (+0200) Subject: Remove deprecated --json parameter X-Git-Tag: v0.9.0~92 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/17d00d6ca8d10ffb783707b12181b29c8fb8a97a Remove deprecated --json parameter --- diff --git a/CHANGELOG.md b/CHANGELOG.md index 3de08199..60eaa33a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [Unreleased] +### Changed +- Removed deprecated `--json` parameter, use `--output=json` instead ## [0.8.5] - 2021-08-07 ### Added diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java index 334d9adb..8cafea10 100644 --- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java +++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java @@ -36,9 +36,6 @@ public class DaemonCommand implements MultiLocalCommand { 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 @@ -48,12 +45,7 @@ public class DaemonCommand implements MultiLocalCommand { @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; boolean ignoreAttachments = ns.getBoolean("ignore-attachments"); @@ -82,12 +74,7 @@ public class DaemonCommand implements MultiLocalCommand { @Override public void handleCommand(final Namespace ns, final List managers) 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; boolean ignoreAttachments = ns.getBoolean("ignore-attachments"); diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java index e6fc7c65..36b9777a 100644 --- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java +++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java @@ -1,6 +1,5 @@ package org.asamk.signal.commands; -import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; @@ -27,9 +26,6 @@ public class GetUserStatusCommand implements LocalCommand { public void attachToSubparser(final Subparser subparser) { subparser.help("Check if the specified phone number/s have been registered"); subparser.addArgument("number").help("Phone number").nargs("+"); - 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 @@ -40,12 +36,7 @@ public class GetUserStatusCommand implements LocalCommand { @Override public void handleCommand(final Namespace ns, final Manager m) throws CommandException { // Setup the json object mapper - 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; // Get a map of registration statuses Map registered; diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java index b87ab2ae..5cae9e2e 100644 --- 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("--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 @@ -54,12 +51,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { 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) { @@ -143,12 +135,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { @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;