more cleanups

Author: breedx-splk

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

@@ -8,6 +8,7 @@
 import com.ibm.mq.constants.CMQC;
 import io.opentelemetry.ibm.mq.config.QueueManager;
 import java.util.Hashtable;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,7 +31,7 @@ public WmqContext(QueueManager queueManager) {
 
   /** Note: This Hashtable type is needed for IBM client classes. */
   @SuppressWarnings("JdkObsolete")
-  public Hashtable<String, ?> getMQEnvironment() {
+  public Hashtable<String, ?> getMqEnvironment() {
     Hashtable<String, ?> env = new Hashtable<>();
     addEnvProperty(env, CMQC.HOST_NAME_PROPERTY, queueManager.getHost());
     addEnvProperty(env, CMQC.PORT_PROPERTY, queueManager.getPort());
@@ -56,7 +57,7 @@ public WmqContext(QueueManager queueManager) {
   }
 
   @SuppressWarnings({"unused", "unchecked", "rawtypes"})
-  private void addEnvProperty(Hashtable env, String propName, Object propVal) {
+  private static void addEnvProperty(Hashtable env, String propName, @Nullable Object propVal) {
     if (null != propVal) {
       if (propVal instanceof String) {
         String propString = (String) propVal;

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

@@ -33,8 +33,8 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Consumer;
+import javax.annotation.Nullable;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -6,7 +6,7 @@
 package io.opentelemetry.ibm.mq.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
 /** This is a jackson databind class used purely for config. */
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -40,7 +40,8 @@ public class QueueManager {
   @Nullable private ResourceFilters listenerFilters;
   @Nullable private ResourceFilters topicFilters;
 
-  public @Nullable String getHost() {
+  @Nullable
+  public String getHost() {
     return host;
   }
 
@@ -64,31 +65,35 @@ public void setName(String name) {
     this.name = name;
   }
 
-  public @Nullable String getChannelName() {
+  @Nullable
+  public String getChannelName() {
     return channelName;
   }
 
   public void setChannelName(@Nullable String channelName) {
     this.channelName = channelName;
   }
 
-  public @Nullable String getTransportType() {
+  @Nullable
+  public String getTransportType() {
     return transportType;
   }
 
   public void setTransportType(@Nullable String transportType) {
     this.transportType = transportType;
   }
 
-  public @Nullable String getUsername() {
+  @Nullable
+  public String getUsername() {
     return username;
   }
 
   public void setUsername(@Nullable String username) {
     this.username = username;
   }
 
-  public @Nullable String getPassword() {
+  @Nullable
+  public String getPassword() {
     return password;
   }
 
@@ -107,23 +112,26 @@ public void setQueueFilters(@Nullable ResourceFilters queueFilters) {
     this.queueFilters = queueFilters;
   }
 
-  public @Nullable String getSslKeyRepository() {
+  @Nullable
+  public String getSslKeyRepository() {
     return sslKeyRepository;
   }
 
   public void setSslKeyRepository(@Nullable String sslKeyRepository) {
     this.sslKeyRepository = sslKeyRepository;
   }
 
-  public @Nullable String getCipherSuite() {
+  @Nullable
+  public String getCipherSuite() {
     return cipherSuite;
   }
 
   public void setCipherSuite(String cipherSuite) {
     this.cipherSuite = cipherSuite;
   }
 
-  public @Nullable String getCipherSpec() {
+  @Nullable
+  public String getCipherSpec() {
     return cipherSpec;
   }
 
@@ -142,15 +150,17 @@ public void setChannelFilters(@Nullable ResourceFilters channelFilters) {
     this.channelFilters = channelFilters;
   }
 
-  public @Nullable String getReplyQueuePrefix() {
+  @Nullable
+  public String getReplyQueuePrefix() {
     return replyQueuePrefix;
   }
 
   public void setReplyQueuePrefix(@Nullable String replyQueuePrefix) {
     this.replyQueuePrefix = replyQueuePrefix;
   }
 
-  public @Nullable String getModelQueueName() {
+  @Nullable
+  public String getModelQueueName() {
     return modelQueueName;
   }
 

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

@@ -20,7 +20,7 @@
 import io.opentelemetry.ibm.mq.metrics.Metrics;
 import java.io.IOException;
 import java.util.function.Consumer;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -14,9 +14,7 @@ final class Config {
 
   private static final Logger logger = LoggerFactory.getLogger(Config.class);
 
-  private Config(){
-
-  }
+  private Config() {}
 
   static void setUpSslConnection(Map<String, ?> config) {
     getConfigValueAndSetSystemProperty(config, "keyStorePath", "javax.net.ssl.keyStore");

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

@@ -81,10 +81,11 @@ public static void run(
 
     Runtime.getRuntime().addShutdownHook(new Thread(service::shutdown));
     WmqMonitor monitor = new WmqMonitor(config, service, meterProvider.get("websphere/mq"));
-    ScheduledFuture<?> unused = service.scheduleAtFixedRate(
-        monitor::run,
-        config.getTaskInitialDelaySeconds(),
-        config.getTaskDelaySeconds(),
-        TimeUnit.SECONDS);
+    ScheduledFuture<?> unused =
+        service.scheduleAtFixedRate(
+            monitor::run,
+            config.getTaskInitialDelaySeconds(),
+            config.getTaskDelaySeconds(),
+            TimeUnit.SECONDS);
   }
 }

ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/util/WmqUtil.java

@@ -58,7 +58,7 @@ && isNotNullOrEmpty(queueManager.getReplyQueuePrefix())) {
   @SuppressWarnings("rawtypes")
   public static MQQueueManager connectToQueueManager(QueueManager queueManager) {
     WmqContext auth = new WmqContext(queueManager);
-    Hashtable env = auth.getMQEnvironment();
+    Hashtable env = auth.getMqEnvironment();
     try {
       MQQueueManager ibmQueueManager = new MQQueueManager(queueManager.getName(), env);
       logger.debug(