errorprone :: UnusedVariable (#970)

NationalSecurityAgency · Oct 18, 2024 · 80c4f84 · 80c4f84
1 parent 96fe11c
commit 80c4f84
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/emissary/admin/Startup.java b/src/main/java/emissary/admin/Startup.java
@@ -508,7 +508,6 @@ protected void stopAndWaitForPlaceCreation() {
     protected void sortPlaces(final List<String> placeList) {
 
         for (final String location : placeList) {
-            final String placeName = Startup.placeName(location);
             final String className = PlaceStarter.getClassString(location);
             if (className == null) {
                 continue;

diff --git a/src/main/java/emissary/core/MetricsFormatter.java b/src/main/java/emissary/core/MetricsFormatter.java
@@ -2,6 +2,8 @@
 
 import com.codahale.metrics.Snapshot;
 import com.codahale.metrics.Timer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.TimeUnit;
 
@@ -11,6 +13,9 @@
  * expanded to support any number of metrics classes.
  */
 public class MetricsFormatter {
+
+    private static final Logger logger = LoggerFactory.getLogger(MetricsFormatter.class);
+
     /** Create a builder */
     public static Builder builder() {
         return new Builder();
@@ -43,6 +48,7 @@ public MetricsFormatter build() {
     /** Use a builder to create MetricsFormatter instances */
     private MetricsFormatter(final TimeUnit rateUnit, final TimeUnit durationUnit) {
         this.durationFactor = 1.0 / durationUnit.toNanos(1);
+        logger.debug("Metrics formatter in {}", rateUnit);
     }
 
     @SuppressWarnings("LongDoubleConversion")

diff --git a/src/main/java/emissary/util/magic/MagicNumberFactory.java b/src/main/java/emissary/util/magic/MagicNumberFactory.java
@@ -219,15 +219,15 @@ public static MagicNumber buildMagicNumber(String entry, boolean swallowParseExc
         try {
             // column A parsing
             item.depth = getEntryDepth(columns[0]);
-            item.offsetUnary = resolveOffsetUnary(columns, item);
+            item.offsetUnary = resolveOffsetUnary(columns);
             item.offset = resolveOffset(columns, item);
         } catch (Exception e) {
             throw new ParseException("Error on column 0:" + columns[0] + ". " + e.getMessage());
         }
         try {
             // columb B parsing
-            item.dataType = resolveDataType(columns, item);
-            item.dataTypeLength = getDataTypeByteLength(columns, item);
+            item.dataType = resolveDataType(columns);
+            item.dataTypeLength = getDataTypeByteLength(item);
             item.mask = resolveMask(columns, item);
         } catch (Exception e) {
             if (swallowParseException) {
@@ -336,7 +336,7 @@ private static int resolveOffset(String[] columns, MagicNumber item) throws Pars
         }
     }
 
-    private static char resolveOffsetUnary(String[] columns, MagicNumber item) {
+    private static char resolveOffsetUnary(String[] columns) {
         if (columns[0].charAt(0) == '&') {
             return '&';
         }
@@ -359,7 +359,7 @@ public static int getEntryDepth(String entry) {
     // -----------------------------------------------------------------------
     // COLUMN B: BYTE&maskValue
     // -----------------------------------------------------------------------
-    private static int resolveDataType(String[] columns, MagicNumber item) throws ParseException {
+    private static int resolveDataType(String[] columns) throws ParseException {
         initTypeMap();
 
         String subject = columns[1];
@@ -404,7 +404,7 @@ private static byte[] resolveMask(String[] columns, MagicNumber item) {
         int ix = columns[1].indexOf("&");
         if (ix > 0) {
             byte[] maskValues = MagicMath.stringToByteArray(columns[1].substring(ix + 1));
-            maskValues = MagicMath.setLength(maskValues, item.dataTypeLength);
+            MagicMath.setLength(maskValues, item.dataTypeLength);
         }
         return null;
     }
@@ -476,7 +476,7 @@ private static int unaryPrefixLength(@Nullable String s) {
         return 0;
     }
 
-    private static int getDataTypeByteLength(String[] columns, MagicNumber item) {
+    private static int getDataTypeByteLength(MagicNumber item) {
         int dataTypeId = item.dataType;
         switch (dataTypeId) {
             case MagicNumber.TYPE_STRING: