Reorder static final modifier

[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 948560af768ebd02b33dfaeab9659a7deefc5d9a..4685249cef94c5f3f40302997bd954d2beed6b4d 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -16,13 +16,11 @@ 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 static final Logger logger = LoggerFactory.getLogger(Util.class);
 
     private Util() {
     }
@@ -41,12 +39,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());
     }
@@ -86,19 +84,4 @@ 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();
-        }
-    }
 }