Make loggers private

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index b90b7cba1ad0706fb2ee1c0edb461868210f7f11..2185e2f7e7616667cc8f34e1922aa8aa332cdc24 100644 (file)
--- 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 cd347137d181fb8c3824deadfdd234c447aed7e2..8b694cb620647c84176ec9eac9f40a1f430ef2c7 100644 (file)
--- 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 4d4fdc10f33fd3644053b03ddda16dcd7dc97a95..9d718abbd903250b037ec3d050c66b2f84cddc88 100644 (file)
--- 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 bfb74724ec7754ce73b425684574dc31e63d00f4..4dff4b82bf7afb2d5c3a208e40e7e26e6699d704 100644 (file)
--- 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 8a2320e0141b06fd29c70de48d42194255ddfd26..75c2fd614eecdb2f63f374f5b0b9e9600b410cc0 100644 (file)
--- 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 6d5925739c41aabf2f13e283380ec1af08f45af6..87b1efd4db5c954d6fbb6ad8d63aee72c3ac234e 100644 (file)
--- 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 fdcd28a3d1738c79fb6e6b68968ceb646c931efa..5c06aeeeb112cee9db873cebfe2afa1ce2a7300f 100644 (file)
--- 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 6c20cf628053dd380aa55d3144a0945b7ec15584..8ea723cc4b1bb92f54eea6a5098be28ee1aff8d1 100644 (file)
--- 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 4e48ee76502adf8099e898a2cac3f3294006f3b5..3e728c2877efdf7efa105a17281b8277d8ce9d38 100644 (file)
--- 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 5bc1c11f6d915c716e59887d14455df8af77e7c4..19131e13cfcb583061c716d7bf6ce320bd55a633 100644 (file)
--- 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<IdentityInfo> 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 4d884c3e483168ee755f3f1f102709c1240bb409..9ec4b64fc74b9a522c49519e95c1e8d744fd1c0c 100644 (file)
--- 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<Integer, byte[]> 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 6e300214c68f8992e3f828427c185ef9c667062d..79790598cf036eed5cc28eae78600eecb9154a71 100644 (file)
--- 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<SessionInfo> 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 5eae4500399293e4fa101696bd46bcaad84263f2..005436205f660cb021c6d937e0664a441633d058 100644 (file)
--- 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<Integer, byte[]> store = new HashMap<>();