From 0624d6a808b8b2a247aadd96450319bc94e3729f Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 13 Jan 2021 20:19:34 +0100 Subject: [PATCH] Make loggers private --- src/main/java/org/asamk/signal/Main.java | 2 +- .../java/org/asamk/signal/commands/GetUserStatusCommand.java | 2 +- src/main/java/org/asamk/signal/commands/ReceiveCommand.java | 2 +- src/main/java/org/asamk/signal/manager/Manager.java | 2 +- src/main/java/org/asamk/signal/manager/helper/GroupHelper.java | 2 +- .../java/org/asamk/signal/manager/storage/SignalAccount.java | 2 +- .../org/asamk/signal/manager/storage/groups/JsonGroupStore.java | 2 +- .../signal/manager/storage/messageCache/CachedMessage.java | 2 +- .../asamk/signal/manager/storage/messageCache/MessageCache.java | 2 +- .../signal/manager/storage/protocol/JsonIdentityKeyStore.java | 2 +- .../asamk/signal/manager/storage/protocol/JsonPreKeyStore.java | 2 +- .../asamk/signal/manager/storage/protocol/JsonSessionStore.java | 2 +- .../signal/manager/storage/protocol/JsonSignedPreKeyStore.java | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java index b90b7cba..2185e2f7 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -56,7 +56,7 @@ import java.util.Map; public class Main { - final static Logger logger = LoggerFactory.getLogger(Main.class); + private final static Logger logger = LoggerFactory.getLogger(Main.class); public static void main(String[] args) { installSecurityProviderWorkaround(); diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java index cd347137..8b694cb6 100644 --- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java +++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; public class GetUserStatusCommand implements LocalCommand { // TODO delete later when "json" variable is removed - final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class); + private final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class); @Override public void attachToSubparser(final Subparser subparser) { diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java index 4d4fdc10..9d718abb 100644 --- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java +++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java @@ -30,7 +30,7 @@ import static org.asamk.signal.util.ErrorUtils.handleAssertionError; public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { // TODO delete later when "json" variable is removed - final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class); + private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class); @Override public void attachToSubparser(final Subparser subparser) { diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java index bfb74724..4dff4b82 100644 --- a/src/main/java/org/asamk/signal/manager/Manager.java +++ b/src/main/java/org/asamk/signal/manager/Manager.java @@ -182,7 +182,7 @@ import static org.asamk.signal.manager.ServiceConfig.getIasKeyStore; public class Manager implements Closeable { - final static Logger logger = LoggerFactory.getLogger(Manager.class); + private final static Logger logger = LoggerFactory.getLogger(Manager.class); private final CertificateValidator certificateValidator = new CertificateValidator(ServiceConfig.getUnidentifiedSenderTrustRoot()); diff --git a/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java index 8a2320e0..75c2fd61 100644 --- a/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java +++ b/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; public class GroupHelper { - final static Logger logger = LoggerFactory.getLogger(GroupHelper.class); + private final static Logger logger = LoggerFactory.getLogger(GroupHelper.class); private final ProfileKeyCredentialProvider profileKeyCredentialProvider; diff --git a/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java index 6d592573..87b1efd4 100644 --- a/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java +++ b/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java @@ -59,7 +59,7 @@ import java.util.stream.Collectors; public class SignalAccount implements Closeable { - final static Logger logger = LoggerFactory.getLogger(SignalAccount.class); + private final static Logger logger = LoggerFactory.getLogger(SignalAccount.class); private final ObjectMapper jsonProcessor = new ObjectMapper(); private final FileChannel fileChannel; diff --git a/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java b/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java index fdcd28a3..5c06aeee 100644 --- a/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java +++ b/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java @@ -37,7 +37,7 @@ import java.util.Map; public class JsonGroupStore { - final static Logger logger = LoggerFactory.getLogger(JsonGroupStore.class); + private final static Logger logger = LoggerFactory.getLogger(JsonGroupStore.class); private static final ObjectMapper jsonProcessor = new ObjectMapper(); public File groupCachePath; diff --git a/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java b/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java index 6c20cf62..8ea723cc 100644 --- a/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java +++ b/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java @@ -11,7 +11,7 @@ import java.nio.file.Files; public final class CachedMessage { - final static Logger logger = LoggerFactory.getLogger(CachedMessage.class); + private final static Logger logger = LoggerFactory.getLogger(CachedMessage.class); private final File file; diff --git a/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java index 4e48ee76..3e728c28 100644 --- a/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java +++ b/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java @@ -18,7 +18,7 @@ import java.util.stream.Stream; public class MessageCache { - final static Logger logger = LoggerFactory.getLogger(MessageCache.class); + private final static Logger logger = LoggerFactory.getLogger(MessageCache.class); private final File messageCachePath; diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java index 5bc1c11f..19131e13 100644 --- a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java +++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java @@ -29,7 +29,7 @@ import java.util.UUID; public class JsonIdentityKeyStore implements IdentityKeyStore { - final static Logger logger = LoggerFactory.getLogger(JsonIdentityKeyStore.class); + private final static Logger logger = LoggerFactory.getLogger(JsonIdentityKeyStore.class); private final List identities = new ArrayList<>(); diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java index 4d884c3e..9ec4b64f 100644 --- a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java +++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java @@ -21,7 +21,7 @@ import java.util.Map; class JsonPreKeyStore implements PreKeyStore { - final static Logger logger = LoggerFactory.getLogger(JsonPreKeyStore.class); + private final static Logger logger = LoggerFactory.getLogger(JsonPreKeyStore.class); private final Map store = new HashMap<>(); diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java index 6e300214..79790598 100644 --- a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java +++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java @@ -26,7 +26,7 @@ import java.util.UUID; class JsonSessionStore implements SessionStore { - final static Logger logger = LoggerFactory.getLogger(JsonSessionStore.class); + private final static Logger logger = LoggerFactory.getLogger(JsonSessionStore.class); private final List sessions = new ArrayList<>(); diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java index 5eae4500..00543620 100644 --- a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java +++ b/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java @@ -23,7 +23,7 @@ import java.util.Map; class JsonSignedPreKeyStore implements SignedPreKeyStore { - final static Logger logger = LoggerFactory.getLogger(JsonSignedPreKeyStore.class); + private final static Logger logger = LoggerFactory.getLogger(JsonSignedPreKeyStore.class); private final Map store = new HashMap<>(); -- 2.50.1