errorprone :: SystemOut (#963)

NationalSecurityAgency · Oct 4, 2024 · ce9f5e6 · ce9f5e6
1 parent b3ec308
commit ce9f5e6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/src/main/java/emissary/command/BaseCommand.java b/src/main/java/emissary/command/BaseCommand.java
@@ -153,6 +153,7 @@ protected void setSystemProperty(String key, String value) {
      * @param clazz the Class of return type class
      * @param args vararg of Strings
      */
+    @SuppressWarnings("SystemOut")
     public static <T extends EmissaryCommand> T parse(Class<T> clazz, String... args) throws EmissaryException {
         T cmd;
         try {

diff --git a/src/main/java/emissary/command/HelpCommand.java b/src/main/java/emissary/command/HelpCommand.java
@@ -71,6 +71,7 @@ public static void dumpCommands(CommandLine cl) {
         LOG.info("Use 'help <command-name>' to see more detailed info about that command");
     }
 
+    @SuppressWarnings("SystemOut")
     public static void dumpHelp(CommandLine c, String subcommand) {
         LOG.info("Detailed help for: {}", subcommand);
         try {

diff --git a/src/main/java/emissary/command/MonitorCommand.java b/src/main/java/emissary/command/MonitorCommand.java
@@ -95,6 +95,7 @@ private void sendClusterRequests(final EmissaryClient client, final T entity) th
     }
 
     // Here as a hook in case commands have summarize/custom display options
+    @SuppressWarnings("SystemOut")
     protected void displayEntityResults(T entity) {
         entity.dumpToConsole();
         for (String error : entity.getErrors()) {

diff --git a/src/main/java/emissary/command/PeersCommand.java b/src/main/java/emissary/command/PeersCommand.java
@@ -36,6 +36,7 @@ public String getCommandName() {
     }
 
     @Override
+    @SuppressWarnings("SystemOut")
     public void run(CommandLine c) {
         setup();
         try {

diff --git a/src/main/java/emissary/config/ExtractResource.java b/src/main/java/emissary/config/ExtractResource.java
@@ -111,7 +111,7 @@ public static void main(final String[] args) {
             try {
                 ex.writeResource(args[i]);
             } catch (IOException iox) {
-                System.err.println(args[i] + ": " + iox);
+                logger.error("{}: {}", args[i], iox.toString());
             }
         }
     }

diff --git a/src/main/java/emissary/util/DependencyCheck.java b/src/main/java/emissary/util/DependencyCheck.java
@@ -4,6 +4,9 @@
 import emissary.config.Configurator;
 import emissary.util.shell.Executrix;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.Set;
@@ -13,6 +16,8 @@
  */
 public class DependencyCheck {
 
+    private static final Logger logger = LoggerFactory.getLogger(DependencyCheck.class);
+
     Configurator config;
 
     public static final String REQUIRED_EXECUTABLE = "REQUIRED_EXECUTABLE";
@@ -97,27 +102,27 @@ public void printDependencyReport() {
 
         for (String reqExe : reqExeSet) {
             boolean exists = DependencyCheck.executableExists(reqExe);
-            System.out.println("RequiredExecutable: " + reqExe + " exists: " + exists);
+            logger.info("RequiredExecutable: {} exists: {}", reqExe, exists);
         }
         for (String reqDir : reqDirSet) {
             boolean exists = DependencyCheck.directoryExists(reqDir);
-            System.out.println("RequiredDirectory " + reqDir + " exists: " + exists);
+            logger.info("RequiredDirectory {} exists: {}", reqDir, exists);
         }
         for (String reqFile : reqFileSet) {
             boolean exists = DependencyCheck.fileExists(reqFile);
-            System.out.println("RequiredFile: " + reqFile + " exists: " + exists);
+            logger.info("RequiredFile: {} exists: {}", reqFile, exists);
         }
         for (String optExe : optExeSet) {
             boolean exists = DependencyCheck.executableExists(optExe);
-            System.out.println("OptionalExecutable: " + optExe + " exists: " + exists);
+            logger.info("OptionalExecutable: {} exists: {}", optExe, exists);
         }
         for (String optDir : optDirSet) {
             boolean exists = DependencyCheck.directoryExists(optDir);
-            System.out.println("OptionalDirectory " + optDir + " exists: " + exists);
+            logger.info("OptionalDirectory {} exists: {}", optDir, exists);
         }
         for (String optFile : optFileSet) {
             boolean exists = DependencyCheck.fileExists(optFile);
-            System.out.println("OptionalFile: " + optFile + " exists: " + exists);
+            logger.info("OptionalFile: {} exists: {}", optFile, exists);
         }
     }
 

diff --git a/src/test/java/emissary/util/DependencyCheckTest.java b/src/test/java/emissary/util/DependencyCheckTest.java
@@ -49,6 +49,7 @@ void testFileDoesNotExists() {
     }
 
     @Test
+    @SuppressWarnings("SystemOut")
     void testDependencyReport() {
         Configurator conf = new ServiceConfigGuide();
         conf.addEntry("REQUIRED_EXECUTABLE", "bash");