Reorder static final modifier

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
index 0c00b3096ff464ae683c37970512b027134beae1..a5a23e56136658efa7db0741d35648e862eac0e5 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
@@ -112,7 +112,7 @@ public final class GroupInviteLinkUrl {
         return password;
     }
 
         return password;
     }
 

-    public final static class InvalidGroupLinkException extends Exception {
+    public static final class InvalidGroupLinkException extends Exception {

 
         public InvalidGroupLinkException(String message) {
             super(message);
 
         public InvalidGroupLinkException(String message) {
             super(message);


@@ -123,7 +123,7 @@ public final class GroupInviteLinkUrl {
         }
     }
 
         }
     }
 

-    public final static class UnknownGroupLinkVersionException extends Exception {
+    public static final class UnknownGroupLinkVersionException extends Exception {

 
         public UnknownGroupLinkVersionException(String message) {
             super(message);
 
         public UnknownGroupLinkVersionException(String message) {
             super(message);

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
index 7113b4b8b4ac799e8c201c10f418fc86383814fc..ea4e3f3eb6ff59fe8f7cec95bb9fc5c70ce4e570 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
@@ -59,7 +59,7 @@ public record StickerPackUrl(StickerPackId packId, byte[] packKey) {
         }
     }
 
         }
     }
 

-    public final static class InvalidStickerPackLinkException extends Exception {
+    public static final class InvalidStickerPackLinkException extends Exception {

 
         public InvalidStickerPackLinkException(String message) {
             super(message);
 
         public InvalidStickerPackLinkException(String message) {
             super(message);

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 2756f292922a5d9c74b2ae51a22d756ce174d9b7..300371bd077f0e44d44e63480f527144a0d465ad 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -22,25 +22,25 @@ import okhttp3.Interceptor;
 
 class LiveConfig {
 
 
 class LiveConfig {
 

-    private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
+    private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()

             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");

-    private final static String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private final static String SVR2_MRENCLAVE = "6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094";
+    private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
+    private static final String SVR2_MRENCLAVE = "6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094";

 
 

-    private final static String URL = "https://chat.signal.org";
-    private final static String CDN_URL = "https://cdn.signal.org";
-    private final static String CDN2_URL = "https://cdn2.signal.org";
-    private final static String STORAGE_URL = "https://storage.signal.org";
-    private final static String SIGNAL_CDSI_URL = "https://cdsi.signal.org";
-    private final static String SIGNAL_SVR2_URL = "https://svr2.signal.org";
-    private final static TrustStore TRUST_STORE = new WhisperTrustStore();
+    private static final String URL = "https://chat.signal.org";
+    private static final String CDN_URL = "https://cdn.signal.org";
+    private static final String CDN2_URL = "https://cdn2.signal.org";
+    private static final String STORAGE_URL = "https://storage.signal.org";
+    private static final String SIGNAL_CDSI_URL = "https://cdsi.signal.org";
+    private static final String SIGNAL_SVR2_URL = "https://svr2.signal.org";
+    private static final TrustStore TRUST_STORE = new WhisperTrustStore();

 
 

-    private final static Optional<Dns> dns = Optional.empty();
-    private final static Optional<SignalProxy> proxy = Optional.empty();
+    private static final Optional<Dns> dns = Optional.empty();
+    private static final Optional<SignalProxy> proxy = Optional.empty();

 
 

-    private final static byte[] zkGroupServerPublicParams = Base64.getDecoder()
+    private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()

             .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P");
             .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P");

-    private final static byte[] genericServerPublicParams = Base64.getDecoder()
+    private static final byte[] genericServerPublicParams = Base64.getDecoder()

             .decode("AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN");
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             .decode("AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN");
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 5cafbdc2d4d90d0fe177ea57185671fd8832e9be..02e4f8b5aad39fba956d7645b56bb8fe2e1f478b 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -11,19 +11,19 @@ import okhttp3.Interceptor;
 
 public class ServiceConfig {
 
 
 public class ServiceConfig {
 

-    public final static int PREKEY_MINIMUM_COUNT = 10;
-    public final static int PREKEY_BATCH_SIZE = 100;
-    public final static int PREKEY_MAXIMUM_ID = Medium.MAX_VALUE;
+    public static final int PREKEY_MINIMUM_COUNT = 10;
+    public static final int PREKEY_BATCH_SIZE = 100;
+    public static final int PREKEY_MAXIMUM_ID = Medium.MAX_VALUE;

     public static final long PREKEY_ARCHIVE_AGE = TimeUnit.DAYS.toMillis(30);
     public static final long PREKEY_STALE_AGE = TimeUnit.DAYS.toMillis(90);
     public static final long SIGNED_PREKEY_ROTATE_AGE = TimeUnit.DAYS.toMillis(2);
 
     public static final long PREKEY_ARCHIVE_AGE = TimeUnit.DAYS.toMillis(30);
     public static final long PREKEY_STALE_AGE = TimeUnit.DAYS.toMillis(90);
     public static final long SIGNED_PREKEY_ROTATE_AGE = TimeUnit.DAYS.toMillis(2);
 

-    public final static int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
-    public final static long MAX_ENVELOPE_SIZE = 0;
-    public final static long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
-    public final static boolean AUTOMATIC_NETWORK_RETRY = true;
-    public final static int GROUP_MAX_SIZE = 1001;
-    public final static int MAXIMUM_ONE_OFF_REQUEST_SIZE = 3;
+    public static final int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
+    public static final long MAX_ENVELOPE_SIZE = 0;
+    public static final long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
+    public static final boolean AUTOMATIC_NETWORK_RETRY = true;
+    public static final int GROUP_MAX_SIZE = 1001;
+    public static final int MAXIMUM_ONE_OFF_REQUEST_SIZE = 3;

 
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var giftBadges = !isPrimaryDevice;
 
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var giftBadges = !isPrimaryDevice;

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index af1963035a4c63d43b1f829d9aaa621dfa587902..f90ae48b1588741b9f85d0506488c1399902176f 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -22,25 +22,25 @@ import okhttp3.Interceptor;
 
 class StagingConfig {
 
 
 class StagingConfig {
 

-    private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
+    private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()

             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");

-    private final static String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private final static String SVR2_MRENCLAVE = "a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95";
+    private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
+    private static final String SVR2_MRENCLAVE = "a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95";

 
 

-    private final static String URL = "https://chat.staging.signal.org";
-    private final static String CDN_URL = "https://cdn-staging.signal.org";
-    private final static String CDN2_URL = "https://cdn2-staging.signal.org";
-    private final static String STORAGE_URL = "https://storage-staging.signal.org";
-    private final static String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org";
-    private final static String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org";
-    private final static TrustStore TRUST_STORE = new WhisperTrustStore();
+    private static final String URL = "https://chat.staging.signal.org";
+    private static final String CDN_URL = "https://cdn-staging.signal.org";
+    private static final String CDN2_URL = "https://cdn2-staging.signal.org";
+    private static final String STORAGE_URL = "https://storage-staging.signal.org";
+    private static final String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org";
+    private static final String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org";
+    private static final TrustStore TRUST_STORE = new WhisperTrustStore();

 
 

-    private final static Optional<Dns> dns = Optional.empty();
-    private final static Optional<SignalProxy> proxy = Optional.empty();
+    private static final Optional<Dns> dns = Optional.empty();
+    private static final Optional<SignalProxy> proxy = Optional.empty();

 
 

-    private final static byte[] zkGroupServerPublicParams = Base64.getDecoder()
+    private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()

             .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj");
             .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj");

-    private final static byte[] genericServerPublicParams = Base64.getDecoder()
+    private static final byte[] genericServerPublicParams = Base64.getDecoder()

             .decode("AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N");
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             .decode("AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N");
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 4e4eb1650eceff00f4ec2a480bab23c4e2df0866..d56b2379463d44a4a6ccc01405c503cee121f523 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -54,7 +54,7 @@ import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
 public class AccountHelper {
 
 
 public class AccountHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(AccountHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(AccountHelper.class);

 
     private final Context context;
     private final SignalAccount account;
 
     private final Context context;
     private final SignalAccount account;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index 7c2d90894041171707c0613194b67144fc01a16a..75f0fd4a26821ebe3255c626be020d9c166d9471 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -25,7 +25,7 @@ import java.util.List;
 
 public class AttachmentHelper {
 
 
 public class AttachmentHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(AttachmentHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(AttachmentHelper.class);

 
     private final SignalDependencies dependencies;
     private final AttachmentStore attachmentStore;
 
     private final SignalDependencies dependencies;
     private final AttachmentStore attachmentStore;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 532cd3e760086ea0db7631169fce054d44d1f966..af666ab678c40e51068f077f4cb7cce9a24bea39 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -62,7 +62,7 @@ import java.util.Set;
 
 public class GroupHelper {
 
 
 public class GroupHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(GroupHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(GroupHelper.class);

 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 96ecf2c076e1277a686ba2db9fbd6cfc4447c1af..83f4992610bad695983fa6db39fef58c656bfc81 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -59,7 +59,7 @@ import okio.ByteString;
 
 class GroupV2Helper {
 
 
 class GroupV2Helper {
 

-    private final static Logger logger = LoggerFactory.getLogger(GroupV2Helper.class);
+    private static final Logger logger = LoggerFactory.getLogger(GroupV2Helper.class);

 
     private final SignalDependencies dependencies;
     private final Context context;
 
     private final SignalDependencies dependencies;
     private final Context context;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index 975d517923e6e69c2f1dca10ac8b665cf2da4032..cc71e15c21b302589fddab0863abc5a8582d0348 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -19,7 +19,7 @@ import java.util.function.BiFunction;
 
 public class IdentityHelper {
 
 
 public class IdentityHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(IdentityHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(IdentityHelper.class);

 
     private final SignalAccount account;
     private final Context context;
 
     private final SignalAccount account;
     private final Context context;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 3f0abc4812c947577ca2e0f0536805ad3a370ea0..66a137673213d6a5edc607627cdc9a60e80af473 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -75,7 +75,7 @@ import java.util.stream.Collectors;
 
 public final class IncomingMessageHandler {
 
 
 public final class IncomingMessageHandler {
 

-    private final static Logger logger = LoggerFactory.getLogger(IncomingMessageHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(IncomingMessageHandler.class);

 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index de7e4dafcd3ebcdfafa0d7af3a33685707052335..824b278bca8f012034ec9d939f7ac6f8a7e1f50e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -13,7 +13,7 @@ import java.io.IOException;
 
 public class PinHelper {
 
 
 public class PinHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(PinHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(PinHelper.class);

 
     private final SecureValueRecoveryV2 secureValueRecoveryV2;
 
 
     private final SecureValueRecoveryV2 secureValueRecoveryV2;
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index c08da92c7efc583784a56a4a0d7229dcfd14ee87..5b1ae05141fca3f6a610433b62e35f7c3b83cd78 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -24,7 +24,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.SIGNED_PREKEY_ROTATE
 
 public class PreKeyHelper {
 
 
 public class PreKeyHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(PreKeyHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(PreKeyHelper.class);

 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 1631ad9d37323045bb7159177012f25d49b5ac85..d0f442cebeeb1ba6b9387d5957efbd7597b1f06a 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -47,7 +47,7 @@ import io.reactivex.rxjava3.core.Single;
 
 public final class ProfileHelper {
 
 
 public final class ProfileHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(ProfileHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProfileHelper.class);

 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index 0c003682b93b107b238b49e982333b5fc1cd5c6d..d48f125ae8be26bffe026c09730186377d209dbb 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -31,8 +31,8 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class ReceiveHelper {
 
 
 public class ReceiveHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(ReceiveHelper.class);
-    private final static int MAX_BACKOFF_COUNTER = 9;
+    private static final Logger logger = LoggerFactory.getLogger(ReceiveHelper.class);
+    private static final int MAX_BACKOFF_COUNTER = 9;

 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 086ac62cf866249289d00137b81c5c24a6d0b16d..2ab177683caba0ddbab869038039c6b0d69533a3 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -29,7 +29,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.MAXIMUM_ONE_OFF_REQU
 
 public class RecipientHelper {
 
 
 public class RecipientHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(RecipientHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(RecipientHelper.class);

 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 4975848670a3e49b7b85da585a7b5220dd56523f..7a0841e7f8b5d3ba3cff673e1c7a71c5aa36f61d 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -56,7 +56,7 @@ import okio.ByteString;
 
 public class SendHelper {
 
 
 public class SendHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(SendHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(SendHelper.class);

 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
index daa5aeb60820498bef81ee601a79038e49c1ef3a..4a0d25feb3be4452af6ba8e93e8f3b673cab398b 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
@@ -17,7 +17,7 @@ import java.util.HashSet;
 
 public class StickerHelper {
 
 
 public class StickerHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(StickerHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(StickerHelper.class);

 
     private final Context context;
     private final SignalAccount account;
 
     private final Context context;
     private final SignalAccount account;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index e9a8d68163aa8391ea1714760f04bd70ad3d01b6..600bd832b5961eb699ea55117ddeabb3604893b9 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 
 public class StorageHelper {
 
 
 public class StorageHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(StorageHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(StorageHelper.class);

 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 1be5a26822f099a489812091aa0fcc1bb2d44514..049cbff0a14a19cc981add2f499699597808c137 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -47,7 +47,7 @@ import java.util.stream.Stream;
 
 public class SyncHelper {
 
 
 public class SyncHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(SyncHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(SyncHelper.class);

 
     private final Context context;
     private final SignalAccount account;
 
     private final Context context;
     private final SignalAccount account;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index bc02e319d22169dce87341af8d2954f4a61c3fb2..7c73c80f67e70eba2ca8b13f3448298973b3a487 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit;
 
 public class UnidentifiedAccessHelper {
 
 
 public class UnidentifiedAccessHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(UnidentifiedAccessHelper.class);
-    private final static long CERTIFICATE_EXPIRATION_BUFFER = TimeUnit.DAYS.toMillis(1);
+    private static final Logger logger = LoggerFactory.getLogger(UnidentifiedAccessHelper.class);
+    private static final long CERTIFICATE_EXPIRATION_BUFFER = TimeUnit.DAYS.toMillis(1);

     private static final byte[] UNRESTRICTED_KEY = new byte[16];
 
     private final SignalAccount account;
     private static final byte[] UNRESTRICTED_KEY = new byte[16];
 
     private final SignalAccount account;

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java b/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
index 66a480e9871759741048405ad5363a4855dc27d1..541ad099edace65674b464abc5f5001e9588f5da 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory;
 
 public class LibSignalLogger implements SignalProtocolLogger {
 
 
 public class LibSignalLogger implements SignalProtocolLogger {
 

-    private final static Logger logger = LoggerFactory.getLogger("LibSignal");
+    private static final Logger logger = LoggerFactory.getLogger("LibSignal");

 
     public static void initLogger() {
         SignalProtocolLoggerProvider.setProvider(new LibSignalLogger());
 
     public static void initLogger() {
         SignalProtocolLoggerProvider.setProvider(new LibSignalLogger());

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index af001f40b0ca115f0f5bb697bb3bc87badc5fb6b..af2c6558c4d6f064b860d95d335f65a238123c0f 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -126,7 +126,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
 public class ManagerImpl implements Manager {
 
 
 public class ManagerImpl implements Manager {
 

-    private final static Logger logger = LoggerFactory.getLogger(ManagerImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(ManagerImpl.class);

 
     private SignalAccount account;
     private final SignalDependencies dependencies;
 
     private SignalAccount account;
     private final SignalDependencies dependencies;

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
index 4dc1ede28999964f1427a5ab64a360dee164a389..478e761bea037580069f0b1959cfbaa7d085d542 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
@@ -22,7 +22,7 @@ import java.util.function.Consumer;
 
 public class MultiAccountManagerImpl implements MultiAccountManager {
 
 
 public class MultiAccountManagerImpl implements MultiAccountManager {
 

-    private final static Logger logger = LoggerFactory.getLogger(MultiAccountManagerImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(MultiAccountManagerImpl.class);

 
     private final Set<Consumer<Manager>> onManagerAddedHandlers = new HashSet<>();
     private final Set<Consumer<Manager>> onManagerRemovedHandlers = new HashSet<>();
 
     private final Set<Consumer<Manager>> onManagerAddedHandlers = new HashSet<>();
     private final Set<Consumer<Manager>> onManagerRemovedHandlers = new HashSet<>();

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index 11a6a05ed11b5cab0c615f92326bb18e2a74a698..2a7ef9e4828bf68742e47c7edcfe84c602fb3933 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -49,7 +49,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.getCapabilities;
 
 public class ProvisioningManagerImpl implements ProvisioningManager {
 
 
 public class ProvisioningManagerImpl implements ProvisioningManager {
 

-    private final static Logger logger = LoggerFactory.getLogger(ProvisioningManagerImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProvisioningManagerImpl.class);

 
     private final PathConfig pathConfig;
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
 
     private final PathConfig pathConfig;
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 30355297cd6daf30c4049518cf2a5a43dd432657..13412d25e665aca7fc12c3fee1f5144a7630a831 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -53,7 +53,7 @@ import java.util.function.Consumer;
 
 public class RegistrationManagerImpl implements RegistrationManager {
 
 
 public class RegistrationManagerImpl implements RegistrationManager {
 

-    private final static Logger logger = LoggerFactory.getLogger(RegistrationManagerImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(RegistrationManagerImpl.class);

 
     private SignalAccount account;
     private final PathConfig pathConfig;
 
     private SignalAccount account;
     private final PathConfig pathConfig;

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
index 0986d62e5d8c7b79d4f88538c2d84f60325e919e..02bdd49ea52f27ed9fb0b5a496b4cb92c6393186 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
@@ -23,7 +23,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
  */
 final class SignalWebSocketHealthMonitor implements HealthMonitor {
 
  */
 final class SignalWebSocketHealthMonitor implements HealthMonitor {
 

-    private final static Logger logger = LoggerFactory.getLogger(SignalWebSocketHealthMonitor.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignalWebSocketHealthMonitor.class);

 
     private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(WebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS);
     private static final long MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE = KEEP_ALIVE_SEND_CADENCE * 3;
 
     private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(WebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS);
     private static final long MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE = KEEP_ALIVE_SEND_CADENCE * 3;


@@ -157,7 +157,7 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
         }
     }
 
         }
     }
 

-    private final static class HttpErrorTracker {
+    private static final class HttpErrorTracker {

 
         private final long[] timestamps;
         private final long errorTimeRange;
 
         private final long[] timestamps;
         private final long errorTimeRange;

diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
index 9d90a5463e0185be9ca9e250ea6b5baedc1be585..585e3161206186b91fa6176f36f1018998a082d2 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
@@ -11,7 +11,7 @@ import java.io.IOException;
 
 public class RetrieveStickerPackJob implements Job {
 
 
 public class RetrieveStickerPackJob implements Job {
 

-    private final static Logger logger = LoggerFactory.getLogger(RetrieveStickerPackJob.class);
+    private static final Logger logger = LoggerFactory.getLogger(RetrieveStickerPackJob.class);

 
     private final StickerPackId packId;
     private final byte[] packKey;
 
     private final StickerPackId packId;
     private final byte[] packKey;

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index e09cd4c2b0c2c1576c32683ef6209c2ae397053d..94dff8fcb1d70efdd4889acdf12322c2235b643b 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -31,7 +31,7 @@ import java.util.UUID;
 
 public class AccountDatabase extends Database {
 
 
 public class AccountDatabase extends Database {
 

-    private final static Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
+    private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);

     private static final long DATABASE_VERSION = 18;
 
     private AccountDatabase(final HikariDataSource dataSource) {
     private static final long DATABASE_VERSION = 18;
 
     private AccountDatabase(final HikariDataSource dataSource) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 077ff732f20757fc71aab746f6a39f415b146424..dee71275bc15d56b4d25cb595b37f62292780711 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -109,7 +109,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.getCapabilities;
 
 public class SignalAccount implements Closeable {
 
 
 public class SignalAccount implements Closeable {
 

-    private final static Logger logger = LoggerFactory.getLogger(SignalAccount.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignalAccount.class);

 
     private static final int MINIMUM_STORAGE_VERSION = 1;
     private static final int CURRENT_STORAGE_VERSION = 8;
 
     private static final int MINIMUM_STORAGE_VERSION = 1;
     private static final int CURRENT_STORAGE_VERSION = 8;

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
index 55c5adf0935e1e970a44fe3b433f16b47b0abb13..0237994105ef16799c9010f14adb77e8b9f82241 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
@@ -33,7 +33,7 @@ public class AccountsStore {
 
     private static final int MINIMUM_STORAGE_VERSION = 1;
     private static final int CURRENT_STORAGE_VERSION = 2;
 
     private static final int MINIMUM_STORAGE_VERSION = 1;
     private static final int CURRENT_STORAGE_VERSION = 2;

-    private final static Logger logger = LoggerFactory.getLogger(AccountsStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(AccountsStore.class);

     private final ObjectMapper objectMapper = Utils.createStorageObjectMapper();
 
     private final File dataPath;
     private final ObjectMapper objectMapper = Utils.createStorageObjectMapper();
 
     private final File dataPath;

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index 71fa0f9d4461c2d21640b63d832e1ff6264d1565..a281622d27cad5e6b595635afd1d68962766a931 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -32,7 +32,7 @@ import java.util.stream.Stream;
 
 public class GroupStore {
 
 
 public class GroupStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(GroupStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(GroupStore.class);

     private static final String TABLE_GROUP_V2 = "group_v2";
     private static final String TABLE_GROUP_V1 = "group_v1";
     private static final String TABLE_GROUP_V1_MEMBER = "group_v1_member";
     private static final String TABLE_GROUP_V2 = "group_v2";
     private static final String TABLE_GROUP_V1 = "group_v1";
     private static final String TABLE_GROUP_V1_MEMBER = "group_v1_member";

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
index b53b14c0ae167954a81540a915589d3521036b09..a87759b37271b221c6639c57060111bc0047f4d1 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
 
 public class LegacyGroupStore {
 
 
 public class LegacyGroupStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(LegacyGroupStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacyGroupStore.class);

 
     public static void migrate(
             final Storage storage,
 
     public static void migrate(
             final Storage storage,

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
index 3195df171a8ca6c45e338dba223cacccf8d90051..bcb40669cbc4e235caaa8400ef4d7fac7b08795f 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
@@ -23,7 +23,7 @@ import io.reactivex.rxjava3.subjects.PublishSubject;
 
 public class IdentityKeyStore {
 
 
 public class IdentityKeyStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(IdentityKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(IdentityKeyStore.class);

     private static final String TABLE_IDENTITY = "identity";
     private final Database database;
     private final TrustNewIdentity trustNewIdentity;
     private static final String TABLE_IDENTITY = "identity";
     private final Database database;
     private final TrustNewIdentity trustNewIdentity;

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
index 27cb6f84005de6d94281a480eb94234458c03596..a7f6a4aa7e4141adfdda777252bf089f5bf6e7b6 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
 
 public class LegacyIdentityKeyStore {
 
 
 public class LegacyIdentityKeyStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(LegacyIdentityKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacyIdentityKeyStore.class);

     private static final ObjectMapper objectMapper = org.asamk.signal.manager.storage.Utils.createStorageObjectMapper();
 
     public static void migrate(
     private static final ObjectMapper objectMapper = org.asamk.signal.manager.storage.Utils.createStorageObjectMapper();
 
     public static void migrate(

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
index 9b239b727e1036707686d0634c0455a1da5c7340..95980d4d4659fe64d4a3593d1eacdb91ad244576 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -14,7 +14,7 @@ import java.sql.Types;
 public class KeyValueStore {
 
     private static final String TABLE_KEY_VALUE = "key_value";
 public class KeyValueStore {
 
     private static final String TABLE_KEY_VALUE = "key_value";

-    private final static Logger logger = LoggerFactory.getLogger(KeyValueStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(KeyValueStore.class);

 
     private final Database database;
 
 
     private final Database database;
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
index e053b91fb4e23276f1f19a578f04bf5293510f7e..4b2cea9b02425f9ccffaabc91efe5aa6df869892 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
@@ -11,7 +11,7 @@ import java.nio.file.Files;
 
 public final class CachedMessage {
 
 
 public final class CachedMessage {
 

-    private final static Logger logger = LoggerFactory.getLogger(CachedMessage.class);
+    private static final Logger logger = LoggerFactory.getLogger(CachedMessage.class);

 
     private final File file;
 
 
     private final File file;
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
index 30452fbb8cdbd17e027428bffba0ccbb2692c5eb..51882a442835f1e7527235b4b273064810384220 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
@@ -17,7 +17,7 @@ import java.util.stream.Stream;
 
 public class MessageCache {
 
 
 public class MessageCache {
 

-    private final static Logger logger = LoggerFactory.getLogger(MessageCache.class);
+    private static final Logger logger = LoggerFactory.getLogger(MessageCache.class);

 
     private final File messageCachePath;
 
 
     private final File messageCachePath;
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
index 4067e2fe4e546359eaa50c2bcfa6a72dc10ed81b..7b05dff96fc1c21ca9261c9d7da6b4ae4e88fe18 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
@@ -20,7 +20,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_ARCHIVE_AGE;
 public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
 
     private static final String TABLE_KYBER_PRE_KEY = "kyber_pre_key";
 public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
 
     private static final String TABLE_KYBER_PRE_KEY = "kyber_pre_key";

-    private final static Logger logger = LoggerFactory.getLogger(KyberPreKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(KyberPreKeyStore.class);

 
     private final Database database;
     private final int accountIdType;
 
     private final Database database;
     private final int accountIdType;

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacyPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacyPreKeyStore.java
index f1151b2328b8af6570cba5d28899fa9bd65b717f..c2c236dfe05f23035e788b5abdacb5515e677ac0 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacyPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacyPreKeyStore.java
@@ -14,7 +14,7 @@ import java.util.regex.Pattern;
 
 public class LegacyPreKeyStore {
 
 
 public class LegacyPreKeyStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(LegacyPreKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacyPreKeyStore.class);

     static final Pattern preKeyFileNamePattern = Pattern.compile("(\\d+)");
 
     public static void migrate(File preKeysPath, PreKeyStore preKeyStore) {
     static final Pattern preKeyFileNamePattern = Pattern.compile("(\\d+)");
 
     public static void migrate(File preKeysPath, PreKeyStore preKeyStore) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacySignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacySignedPreKeyStore.java
index 8e34776c45a6fa90423d8790f38417b73b8fef27..a7133223225fd5078d39c9a01ac607f70f8aea0b 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacySignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacySignedPreKeyStore.java
@@ -14,7 +14,7 @@ import java.util.regex.Pattern;
 
 public class LegacySignedPreKeyStore {
 
 
 public class LegacySignedPreKeyStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(LegacySignedPreKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacySignedPreKeyStore.class);

     static final Pattern signedPreKeyFileNamePattern = Pattern.compile("(\\d+)");
 
     public static void migrate(File signedPreKeysPath, SignedPreKeyStore signedPreKeyStore) {
     static final Pattern signedPreKeyFileNamePattern = Pattern.compile("(\\d+)");
 
     public static void migrate(File signedPreKeysPath, SignedPreKeyStore signedPreKeyStore) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
index c3ac9632cfefcb11e2e1ee959598ff5ea946180f..d2d557108172d2db1fa397570be35edbd16d8cd4 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
@@ -20,7 +20,7 @@ import java.util.Collection;
 public class PreKeyStore implements SignalServicePreKeyStore {
 
     private static final String TABLE_PRE_KEY = "pre_key";
 public class PreKeyStore implements SignalServicePreKeyStore {
 
     private static final String TABLE_PRE_KEY = "pre_key";

-    private final static Logger logger = LoggerFactory.getLogger(PreKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(PreKeyStore.class);

 
     private final Database database;
     private final int accountIdType;
 
     private final Database database;
     private final int accountIdType;

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
index 7c726f16930394e96221886e3c876a87147be5a8..0de10b136d37a7ca50f4fee015f62c040c0fe727 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
@@ -23,7 +23,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_ARCHIVE_AGE;
 public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.SignedPreKeyStore {
 
     private static final String TABLE_SIGNED_PRE_KEY = "signed_pre_key";
 public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.SignedPreKeyStore {
 
     private static final String TABLE_SIGNED_PRE_KEY = "signed_pre_key";

-    private final static Logger logger = LoggerFactory.getLogger(SignedPreKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignedPreKeyStore.class);

 
     private final Database database;
     private final int accountIdType;
 
     private final Database database;
     private final int accountIdType;

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
index 1e95eaff99620a057c13c67c8919585ec3aff0b3..0d12a303c0d3b8372ae898afbe35ddd3b54edb3c 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 
 public class LegacyJsonIdentityKeyStore {
 
 
 public class LegacyJsonIdentityKeyStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(LegacyJsonIdentityKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacyJsonIdentityKeyStore.class);

 
     private final List<LegacyIdentityInfo> identities;
     private final IdentityKeyPair identityKeyPair;
 
     private final List<LegacyIdentityInfo> identities;
     private final IdentityKeyPair identityKeyPair;

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
index f1b771808f7429f6a76fc595112a10a771c1baa0..2f714c6f27bf0bf564bdeb1f9fcff58ee720eba6 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 public class LegacyRecipientStore2 {
 
 
 public class LegacyRecipientStore2 {
 

-    private final static Logger logger = LoggerFactory.getLogger(LegacyRecipientStore2.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacyRecipientStore2.class);

 
     public static void migrate(File file, RecipientStore recipientStore) {
         final var objectMapper = Utils.createStorageObjectMapper();
 
     public static void migrate(File file, RecipientStore recipientStore) {
         final var objectMapper = Utils.createStorageObjectMapper();

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
index 0afde555ac0a66fd8be6d0fd68cf97cb23ef54d9..5cf3c675e2275d8b4d201f93cbe943d37ef089ff 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
@@ -12,7 +12,7 @@ import java.util.stream.Collectors;
 
 public class MergeRecipientHelper {
 
 
 public class MergeRecipientHelper {
 

-    private final static Logger logger = LoggerFactory.getLogger(MergeRecipientHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(MergeRecipientHelper.class);

 
     static Pair<RecipientId, List<RecipientId>> resolveRecipientTrustedLocked(
             Store store, RecipientAddress address
 
     static Pair<RecipientId, List<RecipientId>> resolveRecipientTrustedLocked(
             Store store, RecipientAddress address

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index e87dd6bb0cf6eeab77c089f7c87dce9aa497a6b8..551b5c916f5cde86434206949b2aae2a8b4ab9f4 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 
 public class RecipientStore implements RecipientIdCreator, RecipientResolver, RecipientTrustedResolver, ContactsStore, ProfileStore {
 
 
 public class RecipientStore implements RecipientIdCreator, RecipientResolver, RecipientTrustedResolver, ContactsStore, ProfileStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(RecipientStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(RecipientStore.class);

     private static final String TABLE_RECIPIENT = "recipient";
     private static final String SQL_IS_CONTACT = "r.given_name IS NOT NULL OR r.family_name IS NOT NULL OR r.expiration_time > 0 OR r.profile_sharing = TRUE OR r.color IS NOT NULL OR r.blocked = TRUE OR r.archived = TRUE";
 
     private static final String TABLE_RECIPIENT = "recipient";
     private static final String SQL_IS_CONTACT = "r.given_name IS NOT NULL OR r.family_name IS NOT NULL OR r.expiration_time > 0 OR r.profile_sharing = TRUE OR r.color IS NOT NULL OR r.blocked = TRUE OR r.archived = TRUE";
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java
index 64928624ef969552e1f02c70eb990614e932b71d..2a96043da77a457cd1b04d604b9a0059561cb27e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 
 public class LegacySenderKeyRecordStore {
 
 
 public class LegacySenderKeyRecordStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(LegacySenderKeyRecordStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacySenderKeyRecordStore.class);

 
     public static void migrate(
             final File senderKeysPath,
 
     public static void migrate(
             final File senderKeysPath,


@@ -70,7 +70,7 @@ public class LegacySenderKeyRecordStore {
         }
     }
 
         }
     }
 

-    final static Pattern senderKeyFileNamePattern = Pattern.compile("(\\d+)_(\\d+)_([\\da-z\\-]+)");
+    static final Pattern senderKeyFileNamePattern = Pattern.compile("(\\d+)_(\\d+)_([\\da-z\\-]+)");

 
     private static List<Key> parseFileNames(final File[] files, final RecipientResolver resolver) {
         return Arrays.stream(files)
 
     private static List<Key> parseFileNames(final File[] files, final RecipientResolver resolver) {
         return Arrays.stream(files)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
index bbd05dea9d6f9a7b129720a0f850b983311cfbbc..cda652b23ce4367cf86bf472925030b168d055bf 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
@@ -19,7 +19,7 @@ import java.util.Set;
 
 public class LegacySenderKeySharedStore {
 
 
 public class LegacySenderKeySharedStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(LegacySenderKeySharedStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacySenderKeySharedStore.class);

 
     public static void migrate(
             final File file,
 
     public static void migrate(
             final File file,

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
index e321e9eafaefe103ccd7be66216545c6c9a9cce9..39e1df9710758a0b6550b5eaa0cf4d35cdaa859f 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
@@ -20,8 +20,8 @@ import java.util.UUID;
 
 public class SenderKeyRecordStore implements SenderKeyStore {
 
 
 public class SenderKeyRecordStore implements SenderKeyStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(SenderKeyRecordStore.class);
-    private final static String TABLE_SENDER_KEY = "sender_key";
+    private static final Logger logger = LoggerFactory.getLogger(SenderKeyRecordStore.class);
+    private static final String TABLE_SENDER_KEY = "sender_key";

 
     private final Database database;
 
 
     private final Database database;
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
index 0b17d479147d360d488d65ad0206475525cff550..284ba08f0c24b6b5ab9fe7886b98abaeb074d459 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
@@ -19,8 +19,8 @@ import java.util.stream.Collectors;
 
 public class SenderKeySharedStore {
 
 
 public class SenderKeySharedStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(SenderKeySharedStore.class);
-    private final static String TABLE_SENDER_KEY_SHARED = "sender_key_shared";
+    private static final Logger logger = LoggerFactory.getLogger(SenderKeySharedStore.class);
+    private static final String TABLE_SENDER_KEY_SHARED = "sender_key_shared";

 
     private final Database database;
 
 
     private final Database database;
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java
index 517271dad41db08bbe5b5966525b0ecdedcdfee2..984915149b8bb16116dcd7181fb537304b656800 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 
 public class LegacySessionStore {
 
 
 public class LegacySessionStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(LegacySessionStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacySessionStore.class);

 
     public static void migrate(
             final File sessionsPath,
 
     public static void migrate(
             final File sessionsPath,

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index b8c0a32256e1a42668db921ada2a23a88edf03d2..97f428baf99b8785de96f45ecae5a9397d20ec5e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
 public class SessionStore implements SignalServiceSessionStore {
 
     private static final String TABLE_SESSION = "session";
 public class SessionStore implements SignalServiceSessionStore {
 
     private static final String TABLE_SESSION = "session";

-    private final static Logger logger = LoggerFactory.getLogger(SessionStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(SessionStore.class);

 
     private final Map<Key, SessionRecord> cachedSessions = new HashMap<>();
 
 
     private final Map<Key, SessionRecord> cachedSessions = new HashMap<>();
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
index aacd18bd57ba9270e3c508f5d6afce27efd7744e..3222342482034c049f69ac510699d1fc192c1ad7 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
@@ -14,7 +14,7 @@ import java.util.List;
 
 public class StickerStore {
 
 
 public class StickerStore {
 

-    private final static Logger logger = LoggerFactory.getLogger(StickerStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(StickerStore.class);

     private static final String TABLE_STICKER = "sticker";
 
     private final Database database;
     private static final String TABLE_STICKER = "sticker";
 
     private final Database database;

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
index b3c9457baed7e92ce09ace5a36e5a159a6a57220..316c349e36054ec1f8f18bc8649d69df5e9a7b61 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
@@ -18,9 +18,9 @@ import java.util.Optional;
 
 public class MessageCacheUtils {
 
 
 public class MessageCacheUtils {
 

-    private final static Logger logger = LoggerFactory.getLogger(MessageCacheUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(MessageCacheUtils.class);

 
 

-    final static int CURRENT_VERSION = 9;
+    static final int CURRENT_VERSION = 9;

 
     public static SignalServiceEnvelope loadEnvelope(File file) throws IOException {
         try (var f = new FileInputStream(file)) {
 
     public static SignalServiceEnvelope loadEnvelope(File file) throws IOException {
         try (var f = new FileInputStream(file)) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 62474e665460dec7227c800c42bcf8f07e3e49f6..a5c91f5b3b85565952726065e2301668f5777dc5 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -26,7 +26,7 @@ import java.util.function.Consumer;
 
 public class NumberVerificationUtils {
 
 
 public class NumberVerificationUtils {
 

-    private final static Logger logger = LoggerFactory.getLogger(NumberVerificationUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(NumberVerificationUtils.class);

 
     public static String handleVerificationSession(
             SignalServiceAccountManager accountManager,
 
     public static String handleVerificationSession(
             SignalServiceAccountManager accountManager,

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
index ca55008c93ee575583284c6ceff6802736a26375..fe338e73da47087d88977668de33fd907e553ea4 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
@@ -12,7 +12,7 @@ import okio.ByteString;
 
 public class PaymentUtils {
 
 
 public class PaymentUtils {
 

-    private final static Logger logger = LoggerFactory.getLogger(PaymentUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(PaymentUtils.class);

 
     private PaymentUtils() {
     }
 
     private PaymentUtils() {
     }

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index 40fc8f7b2c2879fe7787db3d587ae6dcd9c96c33..85c9fdd60c17a7a3612380d8c0939250fbe6a46a 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -19,7 +19,7 @@ import java.util.HashSet;
 
 public class ProfileUtils {
 
 
 public class ProfileUtils {
 

-    private final static Logger logger = LoggerFactory.getLogger(ProfileUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProfileUtils.class);

 
     public static Profile decryptProfile(
             final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
 
     public static Profile decryptProfile(
             final ProfileKey profileKey, final SignalServiceProfile encryptedProfile

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index 6e9c701e13cddf4b401cb76bb3ca98fbdfdaa143..e6d8e4d3097b1df93da5c55b81a9bdb70404cd13 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -32,7 +32,7 @@ import java.util.stream.StreamSupport;
 
 public class Utils {
 
 
 public class Utils {
 

-    private final static Logger logger = LoggerFactory.getLogger(Utils.class);
+    private static final Logger logger = LoggerFactory.getLogger(Utils.class);

 
     public static Pair<StreamDetails, Optional<String>> createStreamDetailsFromDataURI(final String dataURI) {
         final DataURI uri = DataURI.of(dataURI);
 
     public static Pair<StreamDetails, Optional<String>> createStreamDetailsFromDataURI(final String dataURI) {
         final DataURI uri = DataURI.of(dataURI);

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index f0ebbfaea48012573625ed4f639b5e6c2989bb8b..83c0ef56061d2418391d58151270f48159b64daf 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -47,7 +47,7 @@ import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_S
 
 public class App {
 
 
 public class App {
 

-    private final static Logger logger = LoggerFactory.getLogger(App.class);
+    private static final Logger logger = LoggerFactory.getLogger(App.class);

 
     private final Namespace ns;
 
 
     private final Namespace ns;
 

diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index af3ce1ad8179a0435bd843e16d25f310aa955f1b..648f19d0c0791f38b9a4a07f4701f67d22bcd9aa 100644 (file)
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -2,14 +2,14 @@ package org.asamk.signal;
 
 public class BaseConfig {
 
 
 public class BaseConfig {
 

-    public final static String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
-    public final static String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
+    public static final String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
+    public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();

 
 

-    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.39.1";
-    final static String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
+    static final String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.39.1";
+    static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null

             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

-    final static String USER_AGENT = USER_AGENT_SIGNAL_ANDROID + " " + USER_AGENT_SIGNAL_CLI;
+    static final String USER_AGENT = USER_AGENT_SIGNAL_ANDROID + " " + USER_AGENT_SIGNAL_CLI;

 
     private BaseConfig() {
     }
 
     private BaseConfig() {
     }

diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index 47cf87485c32a3bec5fc27c1ff1ea5419f60268e..2813f4af59f5a74f72b84966a355183df0fe14a0 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -20,7 +20,7 @@ import java.net.URISyntaxException;
 
 public class AddDeviceCommand implements JsonRpcLocalCommand {
 
 
 public class AddDeviceCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
index a5af48d822c95709bdf8c33b8e11cac6eda47bd3..89c82200b9852bcf5dbeaf95a6029062b59fd494 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
@@ -18,7 +18,7 @@ import java.net.URISyntaxException;
 
 public class AddStickerPackCommand implements JsonRpcLocalCommand {
 
 
 public class AddStickerPackCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(AddStickerPackCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(AddStickerPackCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java
index 2a8c4f50e67a658321d998753b73e4e3ab0c8cdb..1518c53a9c8447e1f623c866a8525f2d1a2c4fb2 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -19,7 +19,7 @@ import java.io.IOException;
 
 public class BlockCommand implements JsonRpcLocalCommand {
 
 
 public class BlockCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(BlockCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(BlockCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 209b071c9f4045259a7e1cfcff504bdba99b75bb..a0683c34bc21c903d586c68d034cbde36acbc632 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -50,7 +50,7 @@ import static org.asamk.signal.util.CommandUtil.getReceiveConfig;
 
 public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
 
 public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(DaemonCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
index 2d1422aaa0126c68c48036d3d7c17bfdbf1925ae..a0fa0ab7bde875b2b9ec1f94f9576dd48780ff9a 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
@@ -18,7 +18,7 @@ import java.util.concurrent.TimeoutException;
 
 public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.FinishLinkParams> {
 
 
 public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.FinishLinkParams> {
 

-    private final static Logger logger = LoggerFactory.getLogger(FinishLinkCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(FinishLinkCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 70a55393d99d79990da3530cc072b44a7d566c4b..7cf78ec8f230ffd102ce11a836e2ad036ec3b994 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -22,7 +22,7 @@ import java.util.Map;
 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index 89457bad474e0a00a333c8a2a4b104898284eefb..0eb993512eb8444939261edf01ae24ca530d68d5 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -27,7 +27,7 @@ import static org.asamk.signal.util.CommandUtil.getReceiveConfig;
 
 public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand {
 
 
 public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java
index f49e0c24c9d18e2a84c402a7588127556bb6c7bc..ed0cc0ed4937e6e72ff408330adea89dc064f374 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -18,7 +18,7 @@ import java.util.concurrent.TimeoutException;
 
 public class LinkCommand implements ProvisioningCommand {
 
 
 public class LinkCommand implements ProvisioningCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(LinkCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
index 7adc8611cef3030a346d527072c02439af2fb021..c4ae6e72476ca19146caa99f145fed7b583ebc32 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
@@ -19,7 +19,7 @@ import java.util.List;
 
 public class ListDevicesCommand implements JsonRpcLocalCommand {
 
 
 public class ListDevicesCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(ListDevicesCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListDevicesCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index eb53516f518375f365a034a6fd380d38239ee152..debe4ad088975af9cdedbf4f0eb0e54d0bf5a1a8 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 
 public class ListGroupsCommand implements JsonRpcLocalCommand {
 
 
 public class ListGroupsCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(ListGroupsCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListGroupsCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index 53d508d8272b6073b988659fcd7fe3166d6cf6a3..3c4e7a19de8ef5796e2eae6368a1e8020bcdb0cf 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -22,7 +22,7 @@ import java.util.UUID;
 
 public class ListIdentitiesCommand implements JsonRpcLocalCommand {
 
 
 public class ListIdentitiesCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(ListIdentitiesCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListIdentitiesCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index ca745b32d9388451e010182fde2073ab69584c45..f1b8ef5b0051ae207da438bbb6d62f98fc766f41 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -23,7 +23,7 @@ import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
 
 public class QuitGroupCommand implements JsonRpcLocalCommand {
 
 
 public class QuitGroupCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 4a6f746aa804823eef7803cd7906eff8edc4cc5c..ba126f7ef585fa50a2dc74b94045f9d1e1223e0f 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 java.util.Optional;
 
 public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<ReceiveCommand.ReceiveParams> {
 
 
 public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<ReceiveCommand.ReceiveParams> {
 

-    private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 51f1fa1e1f9c3d4781ab2c9bf39f78476057c13a..7d9fe78812cc282e91a98987307757f5d1e56302 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -35,7 +35,7 @@ import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
 
 public class SendCommand implements JsonRpcLocalCommand {
 
 
 public class SendCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(SendCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(SendCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
index 70e36f40de9ff31f295f5346f88d99d144475dad..ac269e9592b76d9f3f72ed16a40a25256b1fd18a 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeoutException;
 
 public class StartLinkCommand implements JsonRpcMultiCommand<Void> {
 
 
 public class StartLinkCommand implements JsonRpcMultiCommand<Void> {
 

-    private final static Logger logger = LoggerFactory.getLogger(StartLinkCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(StartLinkCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
index a7a8b6d7ef4d81766c5e35f89b39bf2cb986f426..1299d0db098ad65a8a62d93a75a06b3283866409 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
@@ -19,7 +19,7 @@ import java.io.IOException;
 
 public class UnblockCommand implements JsonRpcLocalCommand {
 
 
 public class UnblockCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(UnblockCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(UnblockCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 5fe47417dda3462dea24c87519dba03ecab1fdd5..f29f0732066ef14fe8d16375aaa9ef520f3705a2 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -32,7 +32,7 @@ import java.util.stream.Stream;
 
 public class UpdateGroupCommand implements JsonRpcLocalCommand {
 
 
 public class UpdateGroupCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
index 89f741290c8081ad7ad1c351a151084c762824ea..b4c09b4152e96ecf0601f09952bc0d2d6650d6d1 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -20,7 +20,7 @@ import java.util.Map;
 
 public class UploadStickerPackCommand implements JsonRpcLocalCommand {
 
 
 public class UploadStickerPackCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/commands/VerifyCommand.java b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
index 4ac26955515cbe7e73c27be723b5793aa2bc1b08..54d05a4d1ced1c96020f9abcf58b8aea27bdf314 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/VerifyCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCommand<VerifyCommand.VerifyParams> {
 
 
 public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCommand<VerifyCommand.VerifyParams> {
 

-    private final static Logger logger = LoggerFactory.getLogger(VerifyCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(VerifyCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index 86ad6c1e71d042bf28e80b87470f067cc8f8e428..f21dd40d7e44555d193cd923d31d2778a11a456f 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeoutException;
 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 

-    private final static Logger logger = LoggerFactory.getLogger(DbusSignalControlImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(DbusSignalControlImpl.class);

     private final MultiAccountManager c;
 
     private final String objectPath;
     private final MultiAccountManager c;
 
     private final String objectPath;

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index e6ec70d9970e7636aead78f637bfff3013ac9036..2921533e2bc5b7581e2c757acc33791251756f03 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -76,7 +76,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     private DbusReceiveMessageHandler dbusMessageHandler;
     private int subscriberCount;
 
     private DbusReceiveMessageHandler dbusMessageHandler;
     private int subscriberCount;
 

-    private final static Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);

 
     public DbusSignalImpl(
             final Manager m, DBusConnection connection, final String objectPath, final boolean noReceiveOnStart
 
     public DbusSignalImpl(
             final Manager m, DBusConnection connection, final String objectPath, final boolean noReceiveOnStart

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index 6cd3b0ef1f07a91fa63a237568967027378bf93c..6f8b182686f897123927e7dd99f44065d61d3ca9 100644 (file)
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public class HttpServerHandler implements AutoCloseable {
 
 
 public class HttpServerHandler implements AutoCloseable {
 

-    private final static Logger logger = LoggerFactory.getLogger(HttpServerHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(HttpServerHandler.class);

 
     private final ObjectMapper objectMapper = Util.createJsonObjectMapper();
 
 
     private final ObjectMapper objectMapper = Util.createJsonObjectMapper();
 

diff --git a/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java b/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java
index da29ed6cff7c5fdccf03dbd9cde89fd8ab18da38..ca0dba2b8dbd74216d3221f2d9b3972c9a46f129 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java
@@ -10,7 +10,7 @@ import java.util.HashMap;
 
 public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
 
 public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 

-    private final static Logger logger = LoggerFactory.getLogger(JsonReceiveMessageHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(JsonReceiveMessageHandler.class);

 
     private final Manager m;
     private final JsonWriter jsonWriter;
 
     private final Manager m;
     private final JsonWriter jsonWriter;

diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index d1503d0165287f6cf0795d6941ef0af9a6193351..84805e10d84d404b2b044df22d911ddc70f477bb 100644 (file)
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -23,7 +23,7 @@ import java.util.stream.StreamSupport;
 
 public class JsonRpcReader {
 
 
 public class JsonRpcReader {
 

-    private final static Logger logger = LoggerFactory.getLogger(JsonRpcReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(JsonRpcReader.class);

 
     private final JsonRpcSender jsonRpcSender;
     private final ObjectMapper objectMapper;
 
     private final JsonRpcSender jsonRpcSender;
     private final ObjectMapper objectMapper;

diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
index 6255672558f26d8b46bb9092a1fa5b0bf882662b..3d4708200434c4aa1a6db9cc4d84b3b4fafc4650 100644 (file)
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -32,7 +32,7 @@ import java.util.function.Function;
 
 public class SignalJsonRpcCommandHandler {
 
 
 public class SignalJsonRpcCommandHandler {
 

-    private final static Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);

 
     private static final int USER_ERROR = -1;
     private static final int IO_ERROR = -3;
 
     private static final int USER_ERROR = -1;
     private static final int IO_ERROR = -3;

diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index 85ed76e68339300200b03720e2d7f3ab43139e39..00abb63522bbc22ee222d0768a013fd7c6b0baa2 100644 (file)
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -32,7 +32,7 @@ import java.util.function.Supplier;
 
 public class SignalJsonRpcDispatcherHandler {
 
 
 public class SignalJsonRpcDispatcherHandler {
 

-    private final static Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);

 
     private final ObjectMapper objectMapper;
     private final JsonRpcSender jsonRpcSender;
 
     private final ObjectMapper objectMapper;
     private final JsonRpcSender jsonRpcSender;

diff --git a/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java b/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java
index abf850a99c63220cf51b352508c08af51ccf690a..bfbb3f21a9294458501622508f5f13e758361a4a 100644 (file)
--- a/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java
+++ b/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java
@@ -38,7 +38,7 @@ public final class PlainTextWriterImpl implements PlainTextWriter {
 
     private static final class IndentedPlainTextWriter implements PlainTextWriter {
 
 
     private static final class IndentedPlainTextWriter implements PlainTextWriter {
 

-        private final static int INDENTATION = 2;
+        private static final int INDENTATION = 2;

 
         private final String spaces = " ".repeat(INDENTATION);
         private final PlainTextWriter plainTextWriter;
 
         private final String spaces = " ".repeat(INDENTATION);
         private final PlainTextWriter plainTextWriter;

diff --git a/src/main/java/org/asamk/signal/util/Hex.java b/src/main/java/org/asamk/signal/util/Hex.java
index f7a870ca13ff940fdc2db00eec3a4fc01296f380..d87f8ec900f3bf51b26599871e68e14d32027a8b 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Hex.java
+++ b/src/main/java/org/asamk/signal/util/Hex.java
@@ -2,7 +2,7 @@ package org.asamk.signal.util;
 
 public class Hex {
 
 
 public class Hex {
 

-    private final static char[] HEX_DIGITS = {
+    private static final char[] HEX_DIGITS = {

             '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
     };
 
             '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
     };
 

diff --git a/src/main/java/org/asamk/signal/util/IOUtils.java b/src/main/java/org/asamk/signal/util/IOUtils.java
index d40b4a6c734e6bc669edd487af264b406e8367d8..aea49e091f579272a0f563077b08b203c04bed54 100644 (file)
--- a/src/main/java/org/asamk/signal/util/IOUtils.java
+++ b/src/main/java/org/asamk/signal/util/IOUtils.java
@@ -35,7 +35,7 @@ import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
 
 public class IOUtils {
 
 
 public class IOUtils {
 

-    private final static Logger logger = LoggerFactory.getLogger(IOUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(IOUtils.class);

 
     private IOUtils() {
     }
 
     private IOUtils() {
     }

diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index 63717ec031b9071ea669e8c2dd3e3191a34a7c8d..4685249cef94c5f3f40302997bd954d2beed6b4d 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
 
 public class Util {
 
 
 public class Util {
 

-    private final static Logger logger = LoggerFactory.getLogger(Util.class);
+    private static final Logger logger = LoggerFactory.getLogger(Util.class);

 
     private Util() {
     }
 
     private Util() {
     }