Reorder static final modifier

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 {
 
-    private final static Logger logger = LoggerFactory.getLogger(App.class);
+    private static final Logger logger = LoggerFactory.getLogger(App.class);
 
     private final Namespace ns;
 

src/main/java/org/asamk/signal/BaseConfig.java

@@ -2,14 +2,14 @@ package org.asamk.signal;
 
 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;
-    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() {
     }

src/main/java/org/asamk/signal/commands/AddDeviceCommand.java

@@ -20,7 +20,7 @@ import java.net.URISyntaxException;
 
 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() {

src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java

@@ -18,7 +18,7 @@ import java.net.URISyntaxException;
 
 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() {

src/main/java/org/asamk/signal/commands/BlockCommand.java

@@ -19,7 +19,7 @@ import java.io.IOException;
 
 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() {

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 {
 
-    private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
 
     @Override
     public String getName() {

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> {
 
-    private final static Logger logger = LoggerFactory.getLogger(FinishLinkCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(FinishLinkCommand.class);
 
     @Override
     public String getName() {

src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java

@@ -22,7 +22,7 @@ import java.util.Map;
 
 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() {

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 {
 
-    private final static Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);
 
     @Override
     public String getName() {

src/main/java/org/asamk/signal/commands/LinkCommand.java

@@ -18,7 +18,7 @@ import java.util.concurrent.TimeoutException;
 
 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() {

src/main/java/org/asamk/signal/commands/ListDevicesCommand.java

@@ -19,7 +19,7 @@ import java.util.List;
 
 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() {

src/main/java/org/asamk/signal/commands/ListGroupsCommand.java

@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 
 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() {

src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java

@@ -22,7 +22,7 @@ import java.util.UUID;
 
 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() {

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 {
 
-    private final static Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
 
     @Override
     public String getName() {

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> {
 
-    private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
 
     @Override
     public String getName() {

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 {
 
-    private final static Logger logger = LoggerFactory.getLogger(SendCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(SendCommand.class);
 
     @Override
     public String getName() {

src/main/java/org/asamk/signal/commands/StartLinkCommand.java

@@ -14,7 +14,7 @@ import java.util.concurrent.TimeoutException;
 
 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() {

src/main/java/org/asamk/signal/commands/UnblockCommand.java

@@ -19,7 +19,7 @@ import java.io.IOException;
 
 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() {

src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java

@@ -32,7 +32,7 @@ import java.util.stream.Stream;
 
 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() {

src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java

@@ -20,7 +20,7 @@ import java.util.Map;
 
 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() {

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> {
 
-    private final static Logger logger = LoggerFactory.getLogger(VerifyCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(VerifyCommand.class);
 
     @Override
     public String getName() {

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 {
 
-    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;

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 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

src/main/java/org/asamk/signal/http/HttpServerHandler.java

@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 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();
 

src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java

@@ -10,7 +10,7 @@ import java.util.HashMap;
 
 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;

src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java

@@ -23,7 +23,7 @@ import java.util.stream.StreamSupport;
 
 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;

src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java

@@ -32,7 +32,7 @@ import java.util.function.Function;
 
 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;

src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java

@@ -32,7 +32,7 @@ import java.util.function.Supplier;
 
 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;

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 final static int INDENTATION = 2;
+        private static final int INDENTATION = 2;
 
         private final String spaces = " ".repeat(INDENTATION);
         private final PlainTextWriter plainTextWriter;

src/main/java/org/asamk/signal/util/Hex.java

@@ -2,7 +2,7 @@ package org.asamk.signal.util;
 
 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'
     };
 

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 {
 
-    private final static Logger logger = LoggerFactory.getLogger(IOUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(IOUtils.class);
 
     private IOUtils() {
     }

src/main/java/org/asamk/signal/util/Util.java

@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
 
 public class Util {
 
-    private final static Logger logger = LoggerFactory.getLogger(Util.class);
+    private static final Logger logger = LoggerFactory.getLogger(Util.class);
 
     private Util() {
     }