diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java index 363db9c1fe..ab5c190b15 100644 --- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -48,7 +48,7 @@ public class BinaryProtocol { * This properly allows to switch to non-CRC32 mode * todo: finish this feature, assuming we even need it. */ - public static boolean PLAIN_PROTOCOL = Boolean.getBoolean(USE_PLAIN_PROTOCOL_PROPERTY); + public static final boolean PLAIN_PROTOCOL = Boolean.getBoolean(USE_PLAIN_PROTOCOL_PROPERTY); private final LinkManager linkManager; private final IoStream stream; @@ -97,7 +97,7 @@ public class BinaryProtocol { public boolean isClosed; - public CommunicationLoggingListener communicationLoggingListener; + public final CommunicationLoggingListener communicationLoggingListener; public BinaryProtocol(LinkManager linkManager, IoStream stream) { this.linkManager = linkManager; diff --git a/java_console/io/src/main/java/com/rusefi/io/ConnectionStatusLogic.java b/java_console/io/src/main/java/com/rusefi/io/ConnectionStatusLogic.java index 0c4ace7b10..0bed736183 100644 --- a/java_console/io/src/main/java/com/rusefi/io/ConnectionStatusLogic.java +++ b/java_console/io/src/main/java/com/rusefi/io/ConnectionStatusLogic.java @@ -27,7 +27,7 @@ public class ConnectionStatusLogic { } } - public static ConnectionStatusLogic INSTANCE = new ConnectionStatusLogic(); + public static final ConnectionStatusLogic INSTANCE = new ConnectionStatusLogic(); private final List listeners = new CopyOnWriteArrayList<>(); private ConnectionStatusLogic() { diff --git a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java index baee6b95e8..8500a30977 100644 --- a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java +++ b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java @@ -33,9 +33,9 @@ public class LinkManager implements Closeable { private static final Logging log = getLogging(LinkManager.class); @NotNull - public static LogLevel LOG_LEVEL = LogLevel.INFO; + public static final LogLevel LOG_LEVEL = LogLevel.INFO; - public static LinkDecoder ENCODER = new LinkDecoder() { + public static final LinkDecoder ENCODER = new LinkDecoder() { @Override public String unpack(String packedLine) { return packedLine; diff --git a/java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStream.java b/java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStream.java index a61f92b31b..68c56ae38d 100644 --- a/java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStream.java +++ b/java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStream.java @@ -17,7 +17,7 @@ import java.io.IOException; import static com.devexperts.logging.Logging.getLogging; public class SerialIoStream extends AbstractIoStream { - static Logging log = getLogging(SerialIoStream.class); + static final Logging log = getLogging(SerialIoStream.class); @Nullable // null in case of port open error, for instance lack of permissions on Unix protected final SerialPort sp; diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java index 4d573ff8ac..e1470f952e 100644 --- a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java +++ b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java @@ -54,7 +54,7 @@ public class BinaryProtocolServer { log.configureDebugEnabled(false); } - public AtomicInteger unknownCommands = new AtomicInteger(); + public final AtomicInteger unknownCommands = new AtomicInteger(); private final static ConcurrentHashMap THREAD_FACTORIES_BY_NAME = new ConcurrentHashMap<>(); diff --git a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/TcpServerSandbox.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/TcpServerSandbox.java index d34fd386f1..9e4e8e5d07 100644 --- a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/TcpServerSandbox.java +++ b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/TcpServerSandbox.java @@ -72,7 +72,7 @@ public class TcpServerSandbox { static class EcuState { private final byte[] outputs = new byte[Fields.TS_TOTAL_OUTPUT_SIZE]; - long startUpTime = System.currentTimeMillis(); + final long startUpTime = System.currentTimeMillis(); public void onCommand() { int seconds = (int) ((System.currentTimeMillis() - startUpTime) / 1000); diff --git a/java_console/logging/src/main/java/com/rusefi/util/LazyFile.java b/java_console/logging/src/main/java/com/rusefi/util/LazyFile.java index 40d6f78e7b..ae2ca8410a 100644 --- a/java_console/logging/src/main/java/com/rusefi/util/LazyFile.java +++ b/java_console/logging/src/main/java/com/rusefi/util/LazyFile.java @@ -6,7 +6,7 @@ import java.io.*; * This file would override file content only of content has changed, disregarding the magic tag line. */ public class LazyFile implements Output { - public static String TEST = "test_file_name"; + public static final String TEST = "test_file_name"; private Writer fw = null; diff --git a/java_console/models/src/main/java/com/rusefi/AverageAngles.java b/java_console/models/src/main/java/com/rusefi/AverageAngles.java index c0540bfb2a..c0cf4a4d2c 100644 --- a/java_console/models/src/main/java/com/rusefi/AverageAngles.java +++ b/java_console/models/src/main/java/com/rusefi/AverageAngles.java @@ -15,8 +15,8 @@ import java.util.TreeMap; * 2/15/2015 */ public class AverageAngles { - static String PRIMARY = "T_PRIMARY"; - static String SECONDARY = "T_SECONDARY"; + static final String PRIMARY = "T_PRIMARY"; + static final String SECONDARY = "T_SECONDARY"; private int count; enum trigger_event_e { @@ -34,7 +34,7 @@ public class AverageAngles { private static final int MAX_RPM_CHANGE = 20; private int rpmAtPrevChart; - Map> angleData = new TreeMap<>(); + final Map> angleData = new TreeMap<>(); public AverageAngles() { clear(); diff --git a/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java index 09ee8f1c84..add52b815e 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java +++ b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java @@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicReference; public class rusEFIVersion { public static final int CONSOLE_VERSION = 20230220; - public static AtomicReference firmwareVersion = new AtomicReference<>("N/A"); + public static final AtomicReference firmwareVersion = new AtomicReference<>("N/A"); public static long classBuildTimeMillis() { Class clazz = rusEFIVersion.class; diff --git a/java_console/ui/src/main/java/com/rusefi/trigger/TriggerImage.java b/java_console/ui/src/main/java/com/rusefi/trigger/TriggerImage.java index 5007e3719c..19b21d066a 100644 --- a/java_console/ui/src/main/java/com/rusefi/trigger/TriggerImage.java +++ b/java_console/ui/src/main/java/com/rusefi/trigger/TriggerImage.java @@ -35,7 +35,7 @@ public class TriggerImage { /** * number of extra frames */ - public static int EXTRA_COUNT = 1; + public static final int EXTRA_COUNT = 1; private static int sleepAtEnd; private static trigger_type_e onlyOneTrigger = null; diff --git a/java_console/ui/src/main/java/com/rusefi/trigger/WaveState.java b/java_console/ui/src/main/java/com/rusefi/trigger/WaveState.java index 1ba739b4b3..1461fe85e9 100644 --- a/java_console/ui/src/main/java/com/rusefi/trigger/WaveState.java +++ b/java_console/ui/src/main/java/com/rusefi/trigger/WaveState.java @@ -14,7 +14,7 @@ public class WaveState { double prevUp = Double.NaN; double prevGap = Double.NaN; - public List list = new ArrayList<>(); + public final List list = new ArrayList<>(); private static int angleToTime(double prevUp) { return (int) (prevUp); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/UIContext.java b/java_console/ui/src/main/java/com/rusefi/ui/UIContext.java index be8cd86798..fe1d6084b1 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/UIContext.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/UIContext.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; public class UIContext { private final LinkManager linkManager = new LinkManager(); - public SensorSnifferCentral sensorSnifferCentral = new SensorSnifferCentral(linkManager); + public final SensorSnifferCentral sensorSnifferCentral = new SensorSnifferCentral(linkManager); @NotNull public LinkManager getLinkManager() { diff --git a/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java b/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java index 8849b5c0f0..b8796d1b41 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java @@ -53,7 +53,7 @@ public class MainFrame { } }; - public ConnectionFailedListener listener; + public final ConnectionFailedListener listener; public MainFrame(ConsoleUI consoleUI, TabbedPanel tabbedPane) { this.consoleUI = Objects.requireNonNull(consoleUI); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/lua/DocumentSizeFilter.java b/java_console/ui/src/main/java/com/rusefi/ui/lua/DocumentSizeFilter.java index b5ad2bb8c7..eab0b57725 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/lua/DocumentSizeFilter.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/lua/DocumentSizeFilter.java @@ -41,7 +41,7 @@ import javax.swing.text.DocumentFilter; import java.awt.*; public class DocumentSizeFilter extends DocumentFilter { - int maxCharacters; + final int maxCharacters; public DocumentSizeFilter(int maxChars) { maxCharacters = maxChars; diff --git a/java_console/ui/src/test/java/com/rusefi/models/test/SoftLimiterSandbox.java b/java_console/ui/src/test/java/com/rusefi/models/test/SoftLimiterSandbox.java index 27b7dadeee..0b0ce6060b 100644 --- a/java_console/ui/src/test/java/com/rusefi/models/test/SoftLimiterSandbox.java +++ b/java_console/ui/src/test/java/com/rusefi/models/test/SoftLimiterSandbox.java @@ -29,7 +29,7 @@ public class SoftLimiterSandbox { class State { private final int windowSize; - ArrayList states = new ArrayList<>(); + final ArrayList states = new ArrayList<>(); public State(int windowSize) { diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FieldIterator.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FieldIterator.java index be0b7b9bf4..ce59a8cee8 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FieldIterator.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FieldIterator.java @@ -11,7 +11,7 @@ import java.util.List; */ public class FieldIterator { private final List fields; - BitState bitState = new BitState(); + final BitState bitState = new BitState(); private ConfigField prev = ConfigField.VOID; ConfigField next; ConfigField cf; diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/trigger/TriggerWheelInfo.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/trigger/TriggerWheelInfo.java index 67aee47ac5..f45c47cece 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/trigger/TriggerWheelInfo.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/trigger/TriggerWheelInfo.java @@ -234,8 +234,8 @@ public class TriggerWheelInfo { } static class TriggerGaps { - public double[] gapFrom; - public double[] gapTo; + public final double[] gapFrom; + public final double[] gapTo; public TriggerGaps(int gapTrackingLength) { gapFrom = new double[gapTrackingLength]; diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java index 6a91136e05..94cddbb263 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java @@ -41,7 +41,7 @@ public class VariableRegistry { private final Pattern VAR = Pattern.compile("(@@(.*?)@@)"); private final Pattern VAR_REMOVE_QUOTE = Pattern.compile("(@#(.*?)#@)"); - public Map intValues = new HashMap<>(); + public final Map intValues = new HashMap<>(); private final Map cAllDefinitions = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); // todo: move thid logic to JavaFieldsConsumer since that's the consumer?