Fixed code to use imports (#1432)

dhoard · web-flow · commit e00b2795bbe1 · 2026-03-25T12:39:58.000-04:00
Signed-off-by: dhoard &lt;doug.hoard@gmail.com&gt;
diff --git a/collector/src/main/java/io/prometheus/jmx/JmxCollector.java b/collector/src/main/java/io/prometheus/jmx/JmxCollector.java
@@ -1008,7 +1008,7 @@ public MetricSnapshots collect() {
         try {
             scraper.doScrape();
             error = 0;
-        } catch (java.io.IOException | java.lang.SecurityException e) {
+        } catch (IOException | SecurityException e) {
             errorMsg = e.getMessage();
         } catch (Exception e) {
             StringWriter sw = new StringWriter();
diff --git a/collector/src/main/java/io/prometheus/jmx/JmxScraper.java b/collector/src/main/java/io/prometheus/jmx/JmxScraper.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -148,7 +149,7 @@ public void doScrape() throws Exception {
             Map<String, Object> environment = new HashMap<>();
             if (username != null && !username.isEmpty() && password != null && !password.isEmpty()) {
                 String[] credent = new String[] {username, password};
-                environment.put(javax.management.remote.JMXConnector.CREDENTIALS, credent);
+                environment.put(JMXConnector.CREDENTIALS, credent);
             }
             if (sslProperties.enabled) {
                 environment.put(Context.SECURITY_PROTOCOL, "ssl");
@@ -366,10 +367,10 @@ private void scrapeBean(MBeanServerConnection beanConn, ObjectName mBeanName) {
                         mBeanAttributeInfo.getDescription(),
                         attribute.getValue());
             } else if (object == null) {
-                LOGGER.trace("%s object is NULL, not an instance javax.management.Attribute, skipping", mBeanName);
+                LOGGER.trace("%s object is NULL, not an instance Attribute, skipping", mBeanName);
             } else {
                 LOGGER.trace(
-                        "%s object [%s] isn't an instance javax.management.Attribute, skipping",
+                        "%s object [%s] isn't an instance Attribute, skipping",
                         mBeanName, object.getClass().getName());
             }
         }
@@ -458,10 +459,10 @@ private void processBeanValue(
         } else if (value instanceof Number
                 || value instanceof String
                 || value instanceof Boolean
-                || value instanceof java.util.Date) {
-            if (value instanceof java.util.Date) {
+                || value instanceof Date) {
+            if (value instanceof Date) {
                 attrType = "java.lang.Double";
-                value = ((java.util.Date) value).getTime() / 1000.0;
+                value = ((Date) value).getTime() / 1000.0;
             }
             LOGGER.trace("%s%s%s scrape: %s", domain, beanProperties, attrName, value);
             this.receiver.recordBean(
@@ -567,7 +568,7 @@ private void processBeanValue(
         } else if (value.getClass().isArray()) {
             LOGGER.trace("%s scrape: arrays are unsupported", domain);
         } else if (value instanceof Optional) {
-            LOGGER.trace("%s%s%s scrape: java.util.Optional", domain, beanProperties, attrName);
+            LOGGER.trace("%s%s%s scrape: Optional", domain, beanProperties, attrName);
             Optional<?> optional = (Optional<?>) value;
             if (optional.isPresent()) {
                 processBeanValue(
diff --git a/collector/src/test/java/io/prometheus/jmx/BeanWithEnumMBean.java b/collector/src/test/java/io/prometheus/jmx/BeanWithEnumMBean.java
@@ -16,6 +16,7 @@
 
 package io.prometheus.jmx;
 
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -26,7 +27,7 @@ public interface BeanWithEnumMBean {
 
 class BeanWithEnum implements BeanWithEnumMBean {
 
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mbeanName = new ObjectName("org.bean.enum:type=StateMetrics");
         BeanWithEnum mbean = new BeanWithEnum();
         mbs.registerMBean(mbean, mbeanName);
diff --git a/collector/src/test/java/io/prometheus/jmx/BoolMBean.java b/collector/src/test/java/io/prometheus/jmx/BoolMBean.java
@@ -16,6 +16,7 @@
 
 package io.prometheus.jmx;
 
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -28,7 +29,7 @@ public interface BoolMBean {
 
 class Bool implements BoolMBean {
 
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mbeanName = new ObjectName("boolean:Type=Test");
         Bool mbean = new Bool();
         mbs.registerMBean(mbean, mbeanName);
diff --git a/collector/src/test/java/io/prometheus/jmx/CamelMBean.java b/collector/src/test/java/io/prometheus/jmx/CamelMBean.java
@@ -17,6 +17,7 @@
 package io.prometheus.jmx;
 
 import java.util.Date;
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -27,7 +28,7 @@ public interface CamelMBean {
 }
 
 class Camel implements CamelMBean {
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mbeanName =
                 new ObjectName("org.apache.camel:context=my-camel-context,type=routes,name=\"my-route-name\"");
         Camel mbean = new Camel();
diff --git a/collector/src/test/java/io/prometheus/jmx/CassandraMBean.java b/collector/src/test/java/io/prometheus/jmx/CassandraMBean.java
@@ -16,6 +16,7 @@
 
 package io.prometheus.jmx;
 
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -26,7 +27,7 @@ public interface CassandraMBean {
 
 class Cassandra implements CassandraMBean {
 
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mbeanName = new ObjectName("org.apache.cassandra.concurrent:type=CONSISTENCY-MANAGER");
         Cassandra mbean = new Cassandra();
         mbs.registerMBean(mbean, mbeanName);
diff --git a/collector/src/test/java/io/prometheus/jmx/CassandraMetricsMBean.java b/collector/src/test/java/io/prometheus/jmx/CassandraMetricsMBean.java
@@ -16,6 +16,7 @@
 
 package io.prometheus.jmx;
 
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -29,7 +30,7 @@ public interface CassandraMetricsMBean {
 
 class CassandraMetrics implements CassandraMetricsMBean {
 
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mbeanName = new ObjectName("org.apache.cassandra.metrics:type=Compaction,name=CompletedTasks");
         CassandraMetricsMBean mbean = new CassandraMetrics();
         mbs.registerMBean(mbean, mbeanName);
diff --git a/collector/src/test/java/io/prometheus/jmx/CustomValueMBean.java b/collector/src/test/java/io/prometheus/jmx/CustomValueMBean.java
@@ -16,6 +16,7 @@
 
 package io.prometheus.jmx;
 
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -54,7 +55,7 @@ public String getText() {
         return "value";
     }
 
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mbeanName = new ObjectName("io.prometheus.jmx:type=customValue");
         CustomValueMBean mbean = new CustomValue();
         mbs.registerMBean(mbean, mbeanName);
diff --git a/collector/src/test/java/io/prometheus/jmx/ExistDbMXBean.java b/collector/src/test/java/io/prometheus/jmx/ExistDbMXBean.java
@@ -18,6 +18,7 @@
 
 import java.util.Map;
 import java.util.TreeMap;
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -103,7 +104,7 @@ public long getElapsedTime() {
 
 class ExistDb implements ExistDbMXBean {
 
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mxbeanName = new ObjectName("org.exist.management.exist:type=ProcessReport");
         ExistDb mxbean = new ExistDb();
         mbs.registerMBean(mxbean, mxbeanName);
diff --git a/collector/src/test/java/io/prometheus/jmx/HadoopDataNodeMXBean.java b/collector/src/test/java/io/prometheus/jmx/HadoopDataNodeMXBean.java
@@ -18,6 +18,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -28,7 +29,7 @@ public interface HadoopDataNodeMXBean {
 
 class HadoopDataNode implements HadoopDataNodeMXBean {
 
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mbeanName = new ObjectName("Hadoop:name=DataNodeInfo,service=DataNode");
         HadoopDataNode mbean = new HadoopDataNode();
         mbs.registerMBean(mbean, mbeanName);
diff --git a/collector/src/test/java/io/prometheus/jmx/HadoopMBean.java b/collector/src/test/java/io/prometheus/jmx/HadoopMBean.java
@@ -16,6 +16,7 @@
 
 package io.prometheus.jmx;
 
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -26,7 +27,7 @@ public interface HadoopMBean {
 
 class Hadoop implements HadoopMBean {
 
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mbeanName = new ObjectName("hadoop:service=DataNode,name=DataNodeActivity-ams-hdd001-50010");
         Hadoop mbean = new Hadoop();
         mbs.registerMBean(mbean, mbeanName);
diff --git a/collector/src/test/java/io/prometheus/jmx/KafkaClient.java b/collector/src/test/java/io/prometheus/jmx/KafkaClient.java
@@ -20,6 +20,7 @@
 import javax.management.AttributeList;
 import javax.management.AttributeNotFoundException;
 import javax.management.DynamicMBean;
+import javax.management.JMException;
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanException;
 import javax.management.MBeanInfo;
@@ -28,7 +29,7 @@
 
 class KafkaClient implements DynamicMBean {
 
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mbeanName =
                 new ObjectName("kafka.consumer:type=consumer-node-metrics,client-id=my-app-consumer,node-id=node-1");
         KafkaClient mbean = new KafkaClient();
diff --git a/collector/src/test/java/io/prometheus/jmx/StringValueMBean.java b/collector/src/test/java/io/prometheus/jmx/StringValueMBean.java
@@ -16,6 +16,7 @@
 
 package io.prometheus.jmx;
 
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -42,7 +43,7 @@ public String getText() {
         return "value";
     }
 
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mbeanName = new ObjectName("io.prometheus.jmx:type=stringValue");
         StringValueMBean mbean = new StringValue();
         mbs.registerMBean(mbean, mbeanName);
diff --git a/collector/src/test/java/io/prometheus/jmx/TomcatServletMBean.java b/collector/src/test/java/io/prometheus/jmx/TomcatServletMBean.java
@@ -16,6 +16,7 @@
 
 package io.prometheus.jmx;
 
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -26,7 +27,7 @@ public interface TomcatServletMBean {
 
 class TomcatServlet implements TomcatServletMBean {
 
-    public static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    public static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mbeanName = new ObjectName(
                 "Catalina:j2eeType=Servlet,WebModule=//localhost/host-manager,name=HTMLHostManager,J2EEApplication=none,J2EEServer=none");
         TomcatServlet mbean = new TomcatServlet();
diff --git a/collector/src/test/java/io/prometheus/jmx/TotalValueMBean.java b/collector/src/test/java/io/prometheus/jmx/TotalValueMBean.java
@@ -16,6 +16,7 @@
 
 package io.prometheus.jmx;
 
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -35,7 +36,7 @@ public int getTotal() {
         return 345;
     }
 
-    static void registerBean(MBeanServer mbs) throws javax.management.JMException {
+    static void registerBean(MBeanServer mbs) throws JMException {
         ObjectName mxbeanName = new ObjectName("io.prometheus.jmx.test:type=Total-Value");
         TotalValue mxbean = new TotalValue();
         mbs.registerMBean(mxbean, mxbeanName);
diff --git a/integration_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/http/ssl/SSLWithTrustStoreAndClientAuth.java b/integration_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/http/ssl/SSLWithTrustStoreAndClientAuth.java
@@ -36,6 +36,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.KeyStore;
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -91,7 +92,7 @@ private SSLContext initSSLContextForClientAuth(JmxExporterMode mode) throws Exce
         TrustManagerFactory tm = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
         tm.init(keyStore);
 
-        sslContext.init(km.getKeyManagers(), tm.getTrustManagers(), new java.security.SecureRandom());
+        sslContext.init(km.getKeyManagers(), tm.getTrustManagers(), new SecureRandom());
 
         return sslContext;
     }
