Use .isEmpty() for checking lists and strings

[signal-cli] / src / main / java / org / asamk / signal / util / Util.java

diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index 338c986ab9b071567fd110b64d5228e454bc2155..e193d25330b7843fe9b67ef8c933fef8d7882045 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -5,6 +5,9 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -13,10 +16,14 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 public class Util {
 
+    private final static Logger logger = LoggerFactory.getLogger(Util.class);
+
     private Util() {
     }
 
@@ -34,12 +41,12 @@ public class Util {
     }
 
     private static String toCamelCaseString(List<String> strings) {
-        if (strings.size() == 0) {
+        if (strings.isEmpty()) {
             return "";
         }
         return strings.get(0) + strings.stream()
                 .skip(1)
-                .filter(s -> s.length() > 0)
+                .filter(s -> !s.isEmpty())
                 .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase(Locale.ROOT))
                 .collect(Collectors.joining());
     }
@@ -80,4 +87,18 @@ public class Util {
         return map;
     }
 
+    public static void closeExecutorService(ExecutorService executor) {
+        executor.shutdown();
+        try {
+            if (!executor.awaitTermination(5, TimeUnit.MINUTES)) {
+                executor.shutdownNow();
+                if (!executor.awaitTermination(1, TimeUnit.MINUTES)) {
+                    logger.warn("Failed to shutdown executor service");
+                }
+            }
+        } catch (InterruptedException e) {
+            executor.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+    }
 }