X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/d51dd7ae575222b0baea7265c18ebc79f4a7b001..HEAD:/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 e193d253..94996ee3 100644 --- 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() { } @@ -44,7 +42,7 @@ public class Util { if (strings.isEmpty()) { return ""; } - return strings.get(0) + strings.stream() + return strings.getFirst() + strings.stream() .skip(1) .filter(s -> !s.isEmpty()) .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase(Locale.ROOT)) @@ -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(); - } - } }