more cleanups

Author: breedx-splk

ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/config/ExcludeFilters.java

@@ -11,9 +11,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-/**
- * A jackson databind class used for config.
- */
+/** A jackson databind class used for config. */
 public class ExcludeFilters {
 
   private String type = "UNKNOWN";

ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/InquireTStatusCmdCollector.java

@@ -51,7 +51,7 @@ public void accept(MetricsCollectorContext context) {
       request.addParameter(CMQC.MQCA_TOPIC_STRING, topicGenericName);
 
       try {
-        processPCFRequestAndPublishQMetrics(context, topicGenericName, request);
+        processPcfRequestAndPublishQMetrics(context, topicGenericName, request);
       } catch (PCFException pcfe) {
         logger.error(
             "PCFException caught while collecting metric for Queue: {} for command MQCMD_INQUIRE_TOPIC_STATUS",
@@ -73,7 +73,7 @@ public void accept(MetricsCollectorContext context) {
         exitTime);
   }
 
-  private void processPCFRequestAndPublishQMetrics(
+  private void processPcfRequestAndPublishQMetrics(
       MetricsCollectorContext context, String topicGenericName, PCFMessage request)
       throws IOException, MQDataException {
     logger.debug(

ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/MessageFilter.java

@@ -5,12 +5,15 @@
 
 package io.opentelemetry.ibm.mq.metricscollector;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.ibm.mq.headers.pcf.PCFException;
 import com.ibm.mq.headers.pcf.PCFMessage;
 import io.opentelemetry.ibm.mq.config.ExcludeFilters;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,15 +52,16 @@ public List<PCFMessage> filter(List<PCFMessage> messages) throws PCFException {
 
   static class MessageFilterBuilder {
 
-    private Collection<ExcludeFilters> filters;
-    private String kind;
+    private final String kind;
+    private Set<ExcludeFilters> filters = new HashSet<>();
 
     public MessageFilterBuilder(String kind) {
       this.kind = kind;
     }
 
-    public MessageFilterBuilder excluding(Collection<ExcludeFilters> filters) {
-      this.filters = filters;
+    @CanIgnoreReturnValue
+    public MessageFilterBuilder excluding(Set<ExcludeFilters> filters) {
+      this.filters = new HashSet<>(filters);
       return this;
     }
 

ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/QueueCollectionBuddy.java

@@ -30,6 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -129,7 +130,7 @@ private static AllowedGauge createAllowedGauge(
   void processPcfRequestAndPublishQMetrics(
       MetricsCollectorContext context, PCFMessage request, String queueGenericName, int[] fields) {
     try {
-      doProcessPCFRequestAndPublishQMetrics(context, request, queueGenericName, fields);
+      doProcessPcfRequestAndPublishQMetrics(context, request, queueGenericName, fields);
     } catch (PCFException pcfe) {
       logger.error(
           "PCFException caught while collecting metric for Queue: {}", queueGenericName, pcfe);
@@ -150,7 +151,7 @@ void processPcfRequestAndPublishQMetrics(
     }
   }
 
-  private void doProcessPCFRequestAndPublishQMetrics(
+  private void doProcessPcfRequestAndPublishQMetrics(
       MetricsCollectorContext context, PCFMessage request, String queueGenericName, int[] fields)
       throws IOException, MQDataException {
     logger.debug(
@@ -191,6 +192,7 @@ private void handleMessage(MetricsCollectorContext context, PCFMessage message,
     getMetrics(context, message, queueName, queueType, fields);
   }
 
+  @Nullable
   private String getQueueTypeFromName(PCFMessage message, String queueName) throws PCFException {
     if (message.getParameterValue(CMQC.MQIA_Q_TYPE) == null) {
       return sharedState.getType(queueName);
@@ -216,8 +218,9 @@ private static String maybeAppendUsage(PCFMessage message, String baseQueueType)
         return baseQueueType + "-normal";
       case CMQC.MQUS_TRANSMISSION:
         return baseQueueType + "-transmission";
+      default:
+        return baseQueueType;
     }
-    return baseQueueType;
   }
 
   private static String getBaseQueueType(PCFMessage message) throws PCFException {
@@ -232,9 +235,10 @@ private static String getBaseQueueType(PCFMessage message) throws PCFException {
         return "cluster";
       case MQQT_MODEL:
         return "model";
+      default:
+        logger.warn("Unknown type of queue {}", message.getIntParameterValue(CMQC.MQIA_Q_TYPE));
+        return "unknown";
     }
-    logger.warn("Unknown type of queue {}", message.getIntParameterValue(CMQC.MQIA_Q_TYPE));
-    return "unknown";
   }
 
   private void getMetrics(

ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/ReadConfigurationEventQueueCollector.java

@@ -20,6 +20,7 @@
 import io.opentelemetry.ibm.mq.metrics.Metrics;
 import java.io.IOException;
 import java.util.function.Consumer;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,6 +37,7 @@ public ReadConfigurationEventQueueCollector(Meter meter) {
     this.maxHandlesGauge = Metrics.createMqManagerMaxHandles(meter);
   }
 
+  @Nullable
   private PCFMessage findLastUpdate(
       MetricsCollectorContext context, long entryTime, String configurationQueueName)
       throws Exception {

ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/opentelemetry/Config.java

@@ -10,11 +10,15 @@
 import org.slf4j.LoggerFactory;
 
 /** Utilities reading configuration and create domain objects */
-class Config {
+final class Config {
 
   private static final Logger logger = LoggerFactory.getLogger(Config.class);
 
-  static void setUpSSLConnection(Map<String, ?> config) {
+  private Config(){
+
+  }
+
+  static void setUpSslConnection(Map<String, ?> config) {
     getConfigValueAndSetSystemProperty(config, "keyStorePath", "javax.net.ssl.keyStore");
     getConfigValueAndSetSystemProperty(
         config, "keyStorePassword", "javax.net.ssl.keyStorePassword");

ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/opentelemetry/Main.java

@@ -13,15 +13,19 @@
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class Main {
+@SuppressWarnings("SystemOut")
+public final class Main {
 
   private static final Logger logger = LoggerFactory.getLogger(Main.class);
 
+  private Main() {}
+
   public static void main(String[] args) throws Exception {
     if (args.length == 0) {
       System.err.println("Usage: Main <config-file>");
@@ -52,12 +56,12 @@ public static void main(String[] args) throws Exception {
             });
 
     Config.configureSecurity(config);
-    Config.setUpSSLConnection(config.getSslConnection());
+    Config.setUpSslConnection(config.getSslConnection());
 
     run(config, service);
   }
 
-  public static void run(ConfigWrapper config, final ScheduledExecutorService service) {
+  public static void run(ConfigWrapper config, ScheduledExecutorService service) {
 
     AutoConfiguredOpenTelemetrySdk sdk =
         AutoConfiguredOpenTelemetrySdk.builder()
@@ -77,7 +81,7 @@ public static void run(
 
     Runtime.getRuntime().addShutdownHook(new Thread(service::shutdown));
     WmqMonitor monitor = new WmqMonitor(config, service, meterProvider.get("websphere/mq"));
-    service.scheduleAtFixedRate(
+    ScheduledFuture<?> unused = service.scheduleAtFixedRate(
         monitor::run,
         config.getTaskInitialDelaySeconds(),
         config.getTaskDelaySeconds(),

ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/opentelemetry/ConfigTest.java

@@ -28,7 +28,7 @@ public void cacheSystemProperties() {
 
   @Test
   void testSSLConnection() {
-    Config.setUpSSLConnection(
+    Config.setUpSslConnection(
         new HashMap<String, Object>() {
           {
             put("keyStorePath", "foo");