errorprone :: InitializeInline (#806)

NationalSecurityAgency · May 29, 2024 · 61acbb5 · 61acbb5
1 parent 906d8c0
commit 61acbb5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/src/main/java/emissary/kff/KffMemcached.java b/src/main/java/emissary/kff/KffMemcached.java
@@ -236,10 +236,10 @@ public boolean check(String id, ChecksumResults sums) throws Exception {
 
         // Send the query
         Future<Object> future = client.asyncGet(key);
-        Object result;
+
 
         // Let the TimeoutException propagate up
-        result = future.get(opTimeoutMillis, TimeUnit.MILLISECONDS);
+        Object result = future.get(opTimeoutMillis, TimeUnit.MILLISECONDS);
 
         if (result != null) {
             if (storeIdDupe) {

diff --git a/src/main/java/emissary/util/Entropy.java b/src/main/java/emissary/util/Entropy.java
@@ -1,8 +1,3 @@
-/*
-  $Id$
- */
-
-
 package emissary.util;
 
 public class Entropy {
@@ -16,12 +11,10 @@ public static boolean checkText(final byte[] data) {
 
     public static boolean checkText(final byte[] data, int length) {
         int bytes = 0;
-        int[] histogramArray;
         double entropy = 0;
         double relativeFreq;
         int size = Math.min(length, data.length);
-
-        histogramArray = new int[256];
+        int[] histogramArray = new int[256];
 
 
         // ******************************************************************

diff --git a/src/main/java/emissary/util/search/ByteMatcher.java b/src/main/java/emissary/util/search/ByteMatcher.java
@@ -237,13 +237,12 @@ public int indexIgnoreCase(byte[] pattern, int beginIndex, int endIndex) {
             return NOTFOUND;
         }
 
-        int matchPos;
 
         // Use the Boyer-Moore scanner. Set it to
         // ignore case.
 
         scanner.setCaseSensitive(false);
-        matchPos = scanner.indexOf(pattern, beginIndex, endIndex);
+        int matchPos = scanner.indexOf(pattern, beginIndex, endIndex);
 
         // Reset scanner to default state.
         scanner.setCaseSensitive(true);

diff --git a/src/test/java/emissary/output/DropOffUtilTest.java b/src/test/java/emissary/output/DropOffUtilTest.java
@@ -639,8 +639,7 @@ private static void setupMetadata(IBaseDataObject bdo, String fieldValue, DropOf
     }
 
     private static void testFileType(IBaseDataObject bdo, @Nullable Map<String, String> metadata, String expectedResults, @Nullable String formsArg) {
-        String fileType;
-        fileType = DropOffUtil.getAndPutFileType(bdo, metadata, formsArg);
+        String fileType = DropOffUtil.getAndPutFileType(bdo, metadata, formsArg);
         assertEquals(expectedResults, fileType);
     }
 }
diff --git a/src/test/java/emissary/util/io/ResourceReaderTest.java b/src/test/java/emissary/util/io/ResourceReaderTest.java
@@ -38,8 +38,7 @@ void testResourceLocation() {
         // Make sure we built the resource names correctly
         // by opening each one as a stream
         for (String rez : resources) {
-            InputStream is;
-            is = rr.getResourceAsStream(rez);
+            InputStream is = rr.getResourceAsStream(rez);
             assertNotNull(is, "Failed to open " + rez);
             try {
                 is.close();