Merge pull request #28 from nqminhuit/fix-sonarqube

fix sonarqube issues

Author: nqminhuit

src/main/java/org/nqm/command/GitCommand.java

@@ -1,6 +1,6 @@
 package org.nqm.command;
 
-import static java.lang.System.out;
+import static java.lang.System.out; // NOSONAR
 import static org.nqm.command.Wrapper.deployVertx;
 import static org.nqm.command.Wrapper.forEachModuleDo;
 import static org.nqm.command.Wrapper.forEachModuleWith;
@@ -66,12 +66,12 @@ void checkoutNewBranch(@Parameters(index = "0", paramLabel = "<new_branch_name>"
         System.exit(0); // TODO: should centralize system exit to 1 place?
       }
       Consumer<Path> deployCommand = path -> deployVertx(path, "checkout", "-b", newBranch);
-      if (streamOf(input).filter(ALL_MODULES::equals).findFirst().isPresent()) {
+      if (streamOf(input).anyMatch(ALL_MODULES::equals)) {
         forEachModuleDo(deployCommand);
         return;
       }
 
-      if (streamOf(input).filter(ALL_SUBMODULES::equals).findFirst().isPresent()) {
+      if (streamOf(input).anyMatch(ALL_SUBMODULES::equals)) {
         forEachSubmoduleDo(deployCommand);
         return;
       }
@@ -88,7 +88,7 @@ void checkoutNewBranch(@Parameters(index = "0", paramLabel = "<new_branch_name>"
     }
   }
 
-  private static Stream<String> streamOf(String[] input) throws IOException {
+  private static Stream<String> streamOf(String[] input) {
     return Stream.of(input).map(String::trim).distinct();
   }
 
@@ -114,7 +114,7 @@ void push(@Parameters(index = "0", paramLabel = "<branch name>") String branch,
 
   private boolean isSameBranchUnderPath(String branch, Path path) {
     try {
-      var proc = new ProcessBuilder("git", "branch", "--show-current")
+      var proc = new ProcessBuilder(GisConfig.GIT_HOME_DIR, "branch", "--show-current")
         .directory(path.toFile())
         .start();
       var currentBranch = new BufferedReader(new InputStreamReader(proc.getInputStream())).readLine();
@@ -130,10 +130,7 @@ private boolean isConfirmed(String question) {
     out.print(question + " ");
     try (var reader = new BufferedReader(new InputStreamReader(System.in))) {
       var input = reader.readLine();
-      return Stream.of(new String[] { "y", "ye", "yes" })
-        .filter(s -> s.equalsIgnoreCase(input))
-        .findFirst()
-        .isPresent();
+      return Stream.of("y", "ye", "yes").anyMatch(s -> s.equalsIgnoreCase(input));
     }
     catch (IOException e) {
       GisLog.debug(e);

src/main/java/org/nqm/config/GisConfig.java

@@ -15,7 +15,6 @@ private static VertxOptions vertxOptions() {
     options.setEventLoopPoolSize(1);
     options.setWorkerPoolSize(1);
     options.setInternalBlockingPoolSize(1);
-    // options.setWarningExceptionTime(100);
     options.setBlockedThreadCheckInterval(10000);
     return options;
   }

src/main/java/org/nqm/config/GisLog.java

@@ -11,6 +11,8 @@ public class GisLog {
 
   private static Boolean isDebugEnabled;
 
+  private GisLog() {}
+
   public static void setIsDebugEnabled(boolean b) {
     if (isDebugEnabled == null) {
       isDebugEnabled = b;

src/main/java/org/nqm/utils/StdOutUtils.java

@@ -1,7 +1,7 @@
 package org.nqm.utils;
 
-import static java.lang.System.err;
-import static java.lang.System.out;
+import static java.lang.System.err; // NOSONAR
+import static java.lang.System.out; // NOSONAR
 
 public class StdOutUtils {
 

src/main/java/org/nqm/vertx/CommandVerticle.java

@@ -1,6 +1,6 @@
 package org.nqm.vertx;
 
-import static java.lang.System.out;
+import static java.lang.System.out; // NOSONAR
 import static java.util.function.Predicate.not;
 import static org.nqm.utils.GisStringUtils.isNotBlank;
 import static org.nqm.utils.StdOutUtils.CL_GREEN;
@@ -14,7 +14,7 @@
 import java.io.InputStreamReader;
 import java.nio.file.Path;
 import java.util.Optional;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.nqm.config.GisConfig;
@@ -83,7 +83,7 @@ else if (line.startsWith("# branch.ab")) {
         }
         else {
           final var immutableLine = line;
-          Function<String, String> getFiles = filesChange -> immutableLine.startsWith("2")
+          UnaryOperator<String> getFiles = filesChange -> immutableLine.startsWith("2")
             ? Optional.of(filesChange.split("\t")).map(s -> s[1] + " -> " + s[0]).orElse("")
             : filesChange;
 
@@ -102,10 +102,14 @@ else if (line.startsWith("# branch.ab")) {
           warnln("Could not perform on module: '%s'".formatted(this.path.getFileName()));
         });
     }
-    catch (IOException | InterruptedException e) {
+    catch (IOException e) {
       errln(e.getMessage());
       GisLog.debug(e);
     }
+    catch (InterruptedException e) {
+      GisLog.debug(e);
+      Thread.currentThread().interrupt();
+    }
   }
 
   private static String buildAheadBehind(String[] splitS) {

src/main/java/org/nqm/vertx/GisVertx.java

@@ -18,6 +18,8 @@ public class GisVertx {
   public static final String ADDR_ADD_DIR = "add.dir";
   public static final String ADDR_REM_DIR = "remove.dir";
 
+  private GisVertx() {}
+
   public static Vertx instance() {
     if (vertxInstance == null) {
       vertxInstance = Vertx.vertx(VERTX_OPTIONS);
@@ -50,7 +52,7 @@ private static void handleAddProcessedDir(Message<Object> msg) {
   private static void handleRemoveProcessedDir(Message<Object> msg) {
     processedModules().removeIf(d -> d.equals("" + msg.body()));
     GisLog.debug("### queue size = '%s'".formatted(processedModules().size()));
-    if (processedModules().size() < 1) {
+    if (processedModules().isEmpty()) {
       System.exit(0);
     }
   }