From 77983fe00a8f3024d8aa29175871e21866c6d59e Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 28 Jan 2026 17:43:52 +0100 Subject: [PATCH] simplify EventualLogger init --- .../launcher/AdminPropertiesSetter.java | 2 +- .../org/cryptomator/launcher/Cryptomator.java | 2 +- .../cryptomator/launcher/EventualLogger.java | 19 +------------------ 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/cryptomator/launcher/AdminPropertiesSetter.java b/src/main/java/org/cryptomator/launcher/AdminPropertiesSetter.java index 26de38f10..76638cd70 100644 --- a/src/main/java/org/cryptomator/launcher/AdminPropertiesSetter.java +++ b/src/main/java/org/cryptomator/launcher/AdminPropertiesSetter.java @@ -36,7 +36,7 @@ import java.util.Set; */ class AdminPropertiesSetter { - private static final Logger LOG = EventualLogger.getInstance(); + private static final Logger LOG = EventualLogger.INSTANCE; private static final long MAX_CONFIG_SIZE_BYTES = 8192; private static final String LINUX_DIR = "/etc/cryptomator"; private static final String MAC_DIR = "/Library/Application Support/Cryptomator"; diff --git a/src/main/java/org/cryptomator/launcher/Cryptomator.java b/src/main/java/org/cryptomator/launcher/Cryptomator.java index 70e34a2bd..855ef6e1d 100644 --- a/src/main/java/org/cryptomator/launcher/Cryptomator.java +++ b/src/main/java/org/cryptomator/launcher/Cryptomator.java @@ -65,7 +65,7 @@ public class Cryptomator { } public static void main(String[] args) { - EventualLogger.getInstance().drainTo(LOG); + EventualLogger.INSTANCE.drainTo(LOG); var printVersion = Optional.ofNullable(args) // .stream() //Streams either one element (the args-array) or zero elements .flatMap(Arrays::stream) // diff --git a/src/main/java/org/cryptomator/launcher/EventualLogger.java b/src/main/java/org/cryptomator/launcher/EventualLogger.java index dee2af53b..fac429cfe 100644 --- a/src/main/java/org/cryptomator/launcher/EventualLogger.java +++ b/src/main/java/org/cryptomator/launcher/EventualLogger.java @@ -14,10 +14,7 @@ import java.util.Queue; class EventualLogger extends AbstractLogger { - static EventualLogger getInstance() { - return Wrapped.INSTANCE.get(); - } - + static final EventualLogger INSTANCE = new EventualLogger(); private final Queue bufferedEvents = new ArrayDeque<>(); @@ -106,18 +103,4 @@ class EventualLogger extends AbstractLogger { public boolean isErrorEnabled(Marker marker) { return true; } - - private enum Wrapped { - INSTANCE; - - EventualLogger actualInstance; - - Wrapped() { - actualInstance = new EventualLogger(); - } - - public EventualLogger get() { - return actualInstance; - } - } }