Make loggers private

[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 c4bdf3d9febc432f2493dfe5a462f5b82eade7c5..8b694cb620647c84176ec9eac9f40a1f430ef2c7 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -1,9 +1,6 @@
 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.core.JsonGenerator;

-import com.fasterxml.jackson.databind.DeserializationFeature;

 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import net.sourceforge.argparse4j.impl.Arguments;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import net.sourceforge.argparse4j.impl.Arguments;


@@ -11,60 +8,64 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;

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

 
 import java.io.IOException;
 
 import java.io.IOException;

-import java.util.ArrayList;

 import java.util.HashSet;
 import java.util.HashSet;

-import java.util.Set;
-import java.util.Map;

 import java.util.List;
 import java.util.List;

+import java.util.Map;
+import java.util.stream.Collectors;

 
 public class GetUserStatusCommand implements LocalCommand {
 
 
 public class GetUserStatusCommand implements LocalCommand {
 

+    // TODO delete later when "json" variable is removed
+    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
     public int handleCommand(final Namespace ns, final Manager m) {
                 .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;
-        }
-

         // Setup the json object mapper
         ObjectMapper jsonProcessor = new ObjectMapper();
         // Setup the json object mapper
         ObjectMapper jsonProcessor = new ObjectMapper();

-        jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); // disable autodetect
-        jsonProcessor.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);

         jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
 
         jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
 

+        boolean inJson = ns.getString("output").equals("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;
         try {
         // Get a map of registration statuses
         Map<String, Boolean> registered;
         try {

-            registered = m.areUsersRegistered(new HashSet<>(ns.<String>getList("number")));
+            registered = m.areUsersRegistered(new HashSet<>(ns.getList("number")));

         } catch (IOException e) {
             System.err.println("Unable to check if users are registered");
             return 1;
         }
 
         // Output
         } catch (IOException e) {
             System.err.println("Unable to check if users are registered");
             return 1;
         }
 
         // Output

-        if (ns.getBoolean("json")) {
-            List<JsonIsRegistered> objects = new ArrayList<>();
-            for (Map.Entry<String, Boolean> entry : registered.entrySet()) {
-                objects.add(new JsonIsRegistered(entry.getKey(), entry.getValue()));
-            }
+        if (inJson) {
+            List<JsonIsRegistered> objects = registered.entrySet()
+                    .stream()
+                    .map(entry -> new JsonIsRegistered(entry.getKey(), entry.getValue()))
+                    .collect(Collectors.toList());

 
             try {
 
             try {

-                System.out.println(jsonProcessor.writeValueAsString(objects));
+                jsonProcessor.writeValue(System.out, objects);
+                System.out.println();

             } catch (IOException e) {
                 System.err.println(e.getMessage());
             }
             } catch (IOException e) {
                 System.err.println(e.getMessage());
             }

-

         } else {
             for (Map.Entry<String, Boolean> entry : registered.entrySet()) {
                 System.out.println(entry.getKey() + ": " + entry.getValue());
         } else {
             for (Map.Entry<String, Boolean> entry : registered.entrySet()) {
                 System.out.println(entry.getKey() + ": " + entry.getValue());


@@ -74,14 +75,15 @@ public class GetUserStatusCommand implements LocalCommand {
         return 0;
     }
 
         return 0;
     }
 

-    private class JsonIsRegistered {
-        String name;
-        boolean isRegistered;
+    private static final class JsonIsRegistered {
+
+        public String name;
+
+        public boolean isRegistered;

 
         public JsonIsRegistered(String name, boolean isRegistered) {
             this.name = name;
             this.isRegistered = isRegistered;
         }
     }
 
         public JsonIsRegistered(String name, boolean isRegistered) {
             this.name = name;
             this.isRegistered = isRegistered;
         }
     }

-

 }
 }