Add typing message to json output

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

diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 882f4a5c0131e1214e75618d2141462b64240f76..4bc209cd798c74a7e12a9f921c38611154e89759 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -1,41 +1,49 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.ObjectMapper;
-

 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

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

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;

+import java.util.Set;

 import java.util.stream.Collectors;
 
 public class GetUserStatusCommand implements LocalCommand {
 
 import java.util.stream.Collectors;
 
 public class GetUserStatusCommand implements LocalCommand {
 

+    private final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("number").help("Phone number").nargs("+");
         subparser.help("Check if the specified phone number/s have been registered");
         subparser.addArgument("--json")
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("number").help("Phone number").nargs("+");
         subparser.help("Check if the specified phone number/s have been registered");
         subparser.addArgument("--json")

-                .help("Output 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());
     }
 
     @Override
                 .action(Arguments.storeTrue());
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
+    public Set<OutputType> getSupportedOutputTypes() {
+        return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+    }

 
 

+    @Override
+    public int handleCommand(final Namespace ns, final Manager m) {

         // Setup the json object mapper
         // Setup the json object mapper

-        ObjectMapper jsonProcessor = new ObjectMapper();
-        jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+        boolean 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.");
+        }

 
         // Get a map of registration statuses
         Map<String, Boolean> registered;
 
         // Get a map of registration statuses
         Map<String, Boolean> registered;


@@ -43,21 +51,23 @@ public class GetUserStatusCommand implements LocalCommand {
             registered = m.areUsersRegistered(new HashSet<>(ns.getList("number")));
         } catch (IOException e) {
             System.err.println("Unable to check if users are registered");
             registered = m.areUsersRegistered(new HashSet<>(ns.getList("number")));
         } catch (IOException e) {
             System.err.println("Unable to check if users are registered");

-            return 1;
+            return 3;

         }
 
         // Output
         }
 
         // Output

-        if (ns.getBoolean("json")) {
-            List<JsonIsRegistered> objects = registered.entrySet()
+        if (inJson) {
+            final JsonWriter jsonWriter = new JsonWriter(System.out);
+
+            List<JsonUserStatus> jsonUserStatuses = registered.entrySet()

                     .stream()
                     .stream()

-                    .map(entry -> new JsonIsRegistered(entry.getKey(), entry.getValue()))
+                    .map(entry -> new JsonUserStatus(entry.getKey(), entry.getValue()))

                     .collect(Collectors.toList());
 
             try {
                     .collect(Collectors.toList());
 
             try {

-                jsonProcessor.writeValue(System.out, objects);
-                System.out.println();
+                jsonWriter.write(jsonUserStatuses);

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

-                System.err.println(e.getMessage());
+                logger.error("Failed to write json object: {}", e.getMessage());
+                return 3;

             }
         } else {
             for (Map.Entry<String, Boolean> entry : registered.entrySet()) {
             }
         } else {
             for (Map.Entry<String, Boolean> entry : registered.entrySet()) {


@@ -68,13 +78,13 @@ public class GetUserStatusCommand implements LocalCommand {
         return 0;
     }
 
         return 0;
     }
 

-    private static final class JsonIsRegistered {
+    private static final class JsonUserStatus {

 
         public String name;
 
         public boolean isRegistered;
 
 
         public String name;
 
         public boolean isRegistered;
 

-        public JsonIsRegistered(String name, boolean isRegistered) {
+        public JsonUserStatus(String name, boolean isRegistered) {

             this.name = name;
             this.isRegistered = isRegistered;
         }
             this.name = name;
             this.isRegistered = isRegistered;
         }