errorprone :: FieldCanBeFinal (#892)

src/main/java/emissary/admin/Startup.java

@@ -46,7 +46,7 @@ public class Startup {
     static int directoryAction = DIRECTORYADD;
 
     // If we are an emissary node these will be present
-    private EmissaryNode node;
+    private final EmissaryNode node;
 
     // Our logger
     private static final Logger logger = LoggerFactory.getLogger(Startup.class);

src/main/java/emissary/client/EmissaryClient.java

@@ -82,8 +82,8 @@ public class EmissaryClient {
     // class is thread-safe
     protected static final AuthCache AUTH_CACHE = new BasicAuthCache();
 
-    private CloseableHttpClient client;
-    private RequestConfig requestConfig;
+    private final CloseableHttpClient client;
+    private final RequestConfig requestConfig;
     private ConnectionConfig connectionConfig;
 
     static {

src/main/java/emissary/command/converter/FileExistsConverter.java

@@ -11,7 +11,7 @@
 import javax.annotation.Nullable;
 
 public class FileExistsConverter implements ITypeConverter<File> {
-    private String optionName;
+    private final String optionName;
     private static final Logger LOG = LoggerFactory.getLogger(FileExistsConverter.class);
 
     public FileExistsConverter() {

src/main/java/emissary/command/converter/PathExistsConverter.java

@@ -11,7 +11,7 @@
 import javax.annotation.Nullable;
 
 public class PathExistsConverter implements ITypeConverter<Path> {
-    private String optionName;
+    private final String optionName;
 
     public PathExistsConverter() {
         this(null);

src/main/java/emissary/core/DiffCheckConfiguration.java

@@ -119,7 +119,7 @@ public static class DiffCheckBuilder {
         /**
          * Internal state whilst building
          */
-        private EnumSet<DiffCheckOptions> building;
+        private final EnumSet<DiffCheckOptions> building;
 
         /**
          * Finish building and create the final DiffCheckConfiguration object

src/main/java/emissary/core/channels/InputStreamChannelFactory.java

@@ -26,7 +26,7 @@ public static SeekableByteChannelFactory create(final long size, final InputStre
     }
 
     private static class InputStreamChannelFactoryImpl implements SeekableByteChannelFactory {
-        private long size;
+        private final long size;
         private final InputStreamFactory inputStreamFactory;
 
         public InputStreamChannelFactoryImpl(final long size, final InputStreamFactory inputStreamFactory) {

src/main/java/emissary/kff/ChecksumCalculator.java

@@ -30,7 +30,7 @@ public class ChecksumCalculator {
     private Ssdeep ssdeep = null;
 
     /** Used for hash calculations */
-    private List<MessageDigest> digest = new ArrayList<>();
+    private final List<MessageDigest> digest = new ArrayList<>();
 
     /**
      * Constructor initializes SHA-1 generator and turns on the CRC32 processing as well

src/main/java/emissary/kff/KffFile.java

@@ -35,7 +35,7 @@ public class KffFile implements KffFilter {
     protected ByteBuffer mappedBuf;
 
     /** Initial value of high index for binary search */
-    private long bSearchInitHigh;
+    private final long bSearchInitHigh;
 
     public static final int DEFAULT_RECORD_LENGTH = 24;
     protected final int recordLength;

src/main/java/emissary/kff/KffMemcached.java

@@ -46,7 +46,7 @@ public class KffMemcached implements KffFilter {
     /**
      * Logger
      */
-    private Logger logger;
+    private final Logger logger;
 
     /**
      * The hash to use as the key

src/main/java/emissary/kff/SpamSumSignature.java

@@ -13,8 +13,8 @@ public class SpamSumSignature {
      * FIELDS
      *****************************************************/
     private/* uint */long blockSize;
-    private byte[] hash1;
-    private byte[] hash2;
+    private final byte[] hash1;
+    private final byte[] hash2;
 
     /*****************************************************
      * UTILS

src/main/java/emissary/output/filter/JsonOutputFilter.java

@@ -102,7 +102,7 @@ class IbdoParameterFilter extends SimpleBeanPropertyFilter {
         protected final boolean denylistStar;
         protected final boolean emptyAllowlist;
         protected final boolean allowlistStar;
-        private char keyReplacement = '_';
+        private final char keyReplacement = '_';
 
         public IbdoParameterFilter() {
             // if all collections are empty, then output everything

src/main/java/emissary/output/io/SimpleFileNameGenerator.java

@@ -4,7 +4,7 @@
 import emissary.util.io.FileNameGenerator;
 
 public class SimpleFileNameGenerator implements FileNameGenerator {
-    private DropOffUtil dropOffUtil;
+    private final DropOffUtil dropOffUtil;
 
     /**
      * Creates a file name generator for BUD files

src/main/java/emissary/output/roller/JournaledCoalescer.java

@@ -58,7 +58,7 @@ public class JournaledCoalescer implements IJournaler, ICoalescer {
     /**
      * The name generator to use when creating new output files *
      */
-    private FileNameGenerator fileNameGenerator;
+    private final FileNameGenerator fileNameGenerator;
     /**
      * The path to read input and write rolled output *
      */

src/main/java/emissary/util/CaseInsensitiveMap.java

@@ -11,7 +11,7 @@ public class CaseInsensitiveMap<K, V> extends HashMap<K, V> {
     static final long serialVersionUID = -8692638820306464417L;
 
     // For remapping string keys to through a case-insensitive layer
-    private Map<String, String> remap = new HashMap<>();
+    private final Map<String, String> remap = new HashMap<>();
 
     /**
      * Create one

src/main/java/emissary/util/UnixFile.java

@@ -17,10 +17,10 @@ public class UnixFile {
     private static final Logger log = LoggerFactory.getLogger(UnixFile.class);
 
     /** The magic number configuration file. The file which contains all magic number entries */
-    private List<File> magicFiles = new ArrayList<>();
+    private final List<File> magicFiles = new ArrayList<>();
 
     /** The Magic number helper class */
-    private MagicNumberUtil util = new MagicNumberUtil();
+    private final MagicNumberUtil util = new MagicNumberUtil();
 
     /** The Binary file type description */
     public static final String FILETYPE_BINARY = "Binary File";

src/main/java/emissary/util/io/FileFind.java

@@ -93,7 +93,7 @@ class FileIterator implements Iterator {
         /**
          * Stack of Files and directory lists keeping track of where in the tree we are.
          */
-        private Deque<Object> currentPath = new ArrayDeque<>();
+        private final Deque<Object> currentPath = new ArrayDeque<>();
         @Nullable
         private FileFilter filter = null;
 
@@ -178,7 +178,7 @@ private void findNextFile() {
      * the added complexity of the 'Iterator' class.
      */
     static class DirectoryList {
-        private File[] contents;
+        private final File[] contents;
         private int position;
 
         public DirectoryList(File[] contents) {

src/main/java/emissary/util/io/ReadOutput.java

@@ -15,10 +15,10 @@
 
 public class ReadOutput implements Runnable {
 
-    private BufferedReader br;
+    private final BufferedReader br;
     @Nullable
     private PrintStream ps = null;
-    private String tag;
+    private final String tag;
     public boolean finished = false;
 
     public ReadOutput(InputStream is, String str) {

src/main/java/emissary/util/roll/RollableFileOutputStream.java

@@ -36,7 +36,7 @@ public class RollableFileOutputStream extends OutputStream implements Rollable {
     /** File Name Generator for creating unique file names */
     FileNameGenerator namegen;
     /** Directory we're writing to */
-    private File dir;
+    private final File dir;
     /** Number of bytes written to file */
     long bytesWritten;
     /** Whether to delete a zero byte file */

src/main/java/emissary/util/search/ByteTokenizer.java

@@ -22,10 +22,10 @@
 public class ByteTokenizer implements Iterator<String> {
     private int currentPosition;
     private int newPosition;
-    private int maxPosition;
-    private byte[] data;
+    private final int maxPosition;
+    private final byte[] data;
     private String delimiters;
-    private boolean retDelims;
+    private final boolean retDelims;
     private boolean delimsChanged;
     private String encoding;
 

src/main/java/emissary/util/search/KeywordScanner.java

@@ -8,7 +8,7 @@
  * Provides the ability to find specified {@code byte[]} patterns inside a larger {@code byte[]}.
  */
 public class KeywordScanner {
-    private int[] skip = new int[256];
+    private final int[] skip = new int[256];
     private int dataLength = -1;
     private byte[] data;
     private byte[] pattern;

src/main/java/emissary/util/search/MultiKeywordScanner.java

@@ -11,7 +11,7 @@ public class MultiKeywordScanner implements IMultiKeywordScanner {
 
     @Nullable
     private byte[] data = null;
-    private int[] skipTable = new int[256];
+    private final int[] skipTable = new int[256];
     private int standardSkip = 0;
     private BackwardsTreeScanner treeScanner;
     private String[] keywords;