Simplify JmxTest.

- Avoid redundant exception handling
- Drop `final` from locals

Author: fniephaus

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jmx/JmxTest.java

@@ -54,7 +54,6 @@
 
 import javax.management.MBeanServer;
 import javax.management.MBeanServerConnection;
-import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
@@ -63,7 +62,6 @@
 
 import org.graalvm.nativeimage.ImageInfo;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -101,7 +99,7 @@ public class JmxTest {
     private static Path tempDirectory;
 
     @BeforeClass
-    public static void setup() throws IOException {
+    public static void setup() throws Exception {
         assumeTrue("skipping JMX tests", !ImageInfo.inImageCode() ||
                         (VMInspectionOptions.hasJmxClientSupport() && VMInspectionOptions.hasJmxServerSupport()));
 
@@ -139,13 +137,9 @@ public static void setup() throws IOException {
         // Password file must have restricted access.
         Files.setPosixFilePermissions(jmxRemotePassword, Set.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE));
 
-        try {
-            // We need to rerun the startup hook with the correct properties set.
-            ManagementAgentStartupHook startupHook = new ManagementAgentStartupHook();
-            startupHook.execute(false);
-        } catch (Exception e) {
-            Assert.fail("Failed to start server. Cause: " + e.getMessage());
-        }
+        // We need to rerun the startup hook with the correct properties set.
+        ManagementAgentStartupHook startupHook = new ManagementAgentStartupHook();
+        startupHook.execute(false);
     }
 
     @AfterClass
@@ -166,7 +160,7 @@ private static void delete(Path file) throws IOException {
         Files.deleteIfExists(file);
     }
 
-    private static void createClientKey() throws IOException {
+    private static void createClientKey() throws Exception {
         runCommand(List.of("keytool", "-genkey",
                         "-keystore", KEYSTORE_FILENAME,
                         "-alias", "clientkey",
@@ -177,53 +171,44 @@ private static void createClientKey() throws IOException {
                         "-keyalg", "rsa"));
     }
 
-    private static void createClientCert() throws IOException {
+    private static void createClientCert() throws Exception {
         runCommand(List.of("keytool", "-exportcert",
                         "-keystore", KEYSTORE_FILENAME,
                         "-alias", "clientkey",
                         "-storepass", KEYSTORE_PASSWORD,
                         "-file", "client.cer"));
     }
 
-    private static void createServerTrustStore() throws IOException {
+    private static void createServerTrustStore() throws Exception {
         runCommand(List.of("keytool", "-importcert",
                         "-noprompt",
                         "-file", "client.cer",
                         "-keystore", TRUSTSTORE_FILENAME,
                         "-storepass", TRUSTSTORE_PASSWORD));
     }
 
-    private static void runCommand(List<String> command) throws IOException {
+    private static void runCommand(List<String> command) throws Exception {
         ProcessBuilder pb = new ProcessBuilder().command(command);
         pb.directory(tempDirectory.toFile());
-        final Process process = pb.start();
-        try {
-            process.waitFor(5, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            throw new IOException("Keytool execution error");
-        }
+        Process process = pb.start();
+        process.waitFor(5, TimeUnit.SECONDS);
         if (process.exitValue() > 0) {
-            final String processError = String.join(" \\ ", FileUtils.readAllLines(process.getErrorStream()));
-            final String processOutput = String.join(" \\ ", FileUtils.readAllLines(process.getInputStream()));
+            String processError = String.join(" \\ ", FileUtils.readAllLines(process.getErrorStream()));
+            String processOutput = String.join(" \\ ", FileUtils.readAllLines(process.getInputStream()));
             throw new IOException(
                             "Keytool execution error: " + processError + ", output: " + processOutput + ", command: " + command);
         }
     }
 
-    private static MBeanServerConnection getLocalMBeanServerConnectionStatic() {
-        try {
-            JMXServiceURL jmxUrl = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + "localhost" + ":" + TEST_PORT + "/jmxrmi");
-            Map<String, Object> env = new HashMap<>();
-            String[] credentials = {TEST_ROLE, TEST_ROLE_PASSWORD};
-            env.put(JMXConnector.CREDENTIALS, credentials);
-            // Include below if protecting registry with SSL
-            env.put(SOCKET_FACTORY_PROPERTY, new SslRMIClientSocketFactory());
-            JMXConnector connector = JMXConnectorFactory.connect(jmxUrl, env);
-            return connector.getMBeanServerConnection();
-        } catch (IOException e) {
-            Assert.fail("Failed to establish connection Cause: " + e.getMessage());
-        }
-        return null;
+    private static MBeanServerConnection getLocalMBeanServerConnectionStatic() throws IOException {
+        JMXServiceURL jmxUrl = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + "localhost" + ":" + TEST_PORT + "/jmxrmi");
+        Map<String, Object> env = new HashMap<>();
+        String[] credentials = {TEST_ROLE, TEST_ROLE_PASSWORD};
+        env.put(JMXConnector.CREDENTIALS, credentials);
+        // Include below if protecting registry with SSL
+        env.put(SOCKET_FACTORY_PROPERTY, new SslRMIClientSocketFactory());
+        JMXConnector connector = JMXConnectorFactory.connect(jmxUrl, env);
+        return connector.getMBeanServerConnection();
     }
 
     @Test
@@ -240,59 +225,38 @@ public void testRegistration() throws Exception {
         // from the client via the connection
         ObjectName objectName = new ObjectName("com.jmx.test.basic:type=basic,name=simple");
         MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-        try {
-            server.getDefaultDomain();
-            server.registerMBean(new Simple(), objectName);
-
-        } catch (Exception e) {
-            Assert.fail("Failed to register bean. Cause: " + e.getMessage());
-        }
+        server.getDefaultDomain();
+        server.registerMBean(new Simple(), objectName);
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
         assertTrue("Expected bean is not registered.", mbsc.isRegistered(objectName));
 
     }
 
     @Test
-    public void testRuntimeMXBeanProxy() {
+    public void testRuntimeMXBeanProxy() throws IOException {
         // This test checks to make sure we are able to get the MXBean and do simple things with it.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
-        RuntimeMXBean runtimeMXBean = null;
-        try {
-            runtimeMXBean = ManagementFactory.getPlatformMXBean(mbsc, RuntimeMXBean.class);
-        } catch (IOException e) {
-            Assert.fail("Failed to get RuntimeMXBean. : " + e.getMessage());
-        }
-
+        RuntimeMXBean runtimeMXBean = ManagementFactory.getPlatformMXBean(mbsc, RuntimeMXBean.class);
         assertTrue("PID should be positive.", runtimeMXBean.getPid() > 0);
         assertNotNull("Class Path should not be null: ", runtimeMXBean.getClassPath());
         assertTrue("Start time should be positive", runtimeMXBean.getStartTime() > 0);
     }
 
     @Test
-    public void testRuntimeMXBeanDirect() throws MalformedObjectNameException {
+    public void testRuntimeMXBeanDirect() throws Exception {
         // Basic test to make sure reflective accesses are set up correctly.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
         ObjectName objectName = new ObjectName("java.lang:type=Runtime");
-        try {
-            assertTrue("Uptime should be positive. ", (long) mbsc.getAttribute(objectName, "Pid") > 0);
-            assertNotNull("Class Path should not be null: ", mbsc.getAttribute(objectName, "ClassPath"));
-            assertTrue("Start time should be positive", (long) mbsc.getAttribute(objectName, "StartTime") > 0);
-        } catch (Exception e) {
-            Assert.fail("Remote invocations failed : " + e.getMessage());
-        }
+        assertTrue("Uptime should be positive. ", (long) mbsc.getAttribute(objectName, "Pid") > 0);
+        assertNotNull("Class Path should not be null: ", mbsc.getAttribute(objectName, "ClassPath"));
+        assertTrue("Start time should be positive", (long) mbsc.getAttribute(objectName, "StartTime") > 0);
     }
 
     @Test
-    public void testClassLoadingMXBeanProxy() {
+    public void testClassLoadingMXBeanProxy() throws IOException {
         // This test checks to make sure we are able to get the MXBean and do simple things with it.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
-
-        ClassLoadingMXBean classLoadingMXBean = null;
-        try {
-            classLoadingMXBean = ManagementFactory.getPlatformMXBean(mbsc, ClassLoadingMXBean.class);
-        } catch (IOException e) {
-            Assert.fail("Failed to get ClassLoadingMXBean. : " + e.getMessage());
-        }
+        ClassLoadingMXBean classLoadingMXBean = ManagementFactory.getPlatformMXBean(mbsc, ClassLoadingMXBean.class);
         if (ImageInfo.inImageRuntimeCode()) {
             assertEquals("Loaded Class count should be 0 (hardcoded at 0): ", 0, classLoadingMXBean.getLoadedClassCount());
         } else {
@@ -301,15 +265,10 @@ public void testClassLoadingMXBeanProxy() {
     }
 
     @Test
-    public void testThreadMXBeanProxy() {
+    public void testThreadMXBeanProxy() throws IOException {
         // This test checks to make sure we are able to get the MXBean and do simple things with it.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
-        ThreadMXBean threadMXBean = null;
-        try {
-            threadMXBean = ManagementFactory.getPlatformMXBean(mbsc, ThreadMXBean.class);
-        } catch (IOException e) {
-            Assert.fail("Failed to get ThreadMXBean. : " + e.getMessage());
-        }
+        ThreadMXBean threadMXBean = ManagementFactory.getPlatformMXBean(mbsc, ThreadMXBean.class);
         int count = threadMXBean.getPeakThreadCount();
         assertTrue("Peak thread count should be positive ", count > 0);
         threadMXBean.resetPeakThreadCount();
@@ -320,149 +279,93 @@ public void testThreadMXBeanProxy() {
     }
 
     @Test
-    public void testThreadMXBeanDirect() throws MalformedObjectNameException {
+    public void testThreadMXBeanDirect() throws Exception {
         // Basic test to make sure reflective accesses are set up correctly.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
         ObjectName objectName = new ObjectName("java.lang:type=Threading");
-        try {
-            mbsc.invoke(objectName, "resetPeakThreadCount", null, null);
-            assertTrue("Peak thread count should be positive ", (int) mbsc.getAttribute(objectName, "PeakThreadCount") > 0);
-        } catch (Exception e) {
-            Assert.fail("Remote invocations failed : " + e.getMessage());
-        }
+        mbsc.invoke(objectName, "resetPeakThreadCount", null, null);
+        assertTrue("Peak thread count should be positive ", (int) mbsc.getAttribute(objectName, "PeakThreadCount") > 0);
     }
 
     @Test
-    public void testMemoryMXBeanProxy() {
+    public void testMemoryMXBeanProxy() throws IOException {
         // This test checks to make sure we are able to get the MXBean and do simple things with it.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
-        MemoryMXBean memoryMXBean = null;
-        try {
-            memoryMXBean = ManagementFactory.getPlatformMXBean(mbsc, MemoryMXBean.class);
-
-        } catch (Exception e) {
-            Assert.fail("Failed to get MemoryMXBean. : " + e.getMessage());
-        }
+        MemoryMXBean memoryMXBean = ManagementFactory.getPlatformMXBean(mbsc, MemoryMXBean.class);
         MemoryUsage memoryUsage = memoryMXBean.getHeapMemoryUsage();
         assertTrue("Memory usage should be positive: ", memoryUsage.getUsed() > 0);
-
     }
 
     @Test
-    public void testMemoryMXBeanDirect() throws MalformedObjectNameException {
+    public void testMemoryMXBeanDirect() throws Exception {
         // Basic test to make sure reflective accesses are set up correctly.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
         ObjectName objectName = new ObjectName("java.lang:type=Memory");
-        try {
-            mbsc.invoke(objectName, "gc", null, null);
-        } catch (Exception e) {
-            Assert.fail("Remote invocations failed : " + e.getMessage());
-        }
+        mbsc.invoke(objectName, "gc", null, null);
     }
 
     @Test
-    public void testGarbageCollectorMXBeanProxy() {
+    public void testGarbageCollectorMXBeanProxy() throws IOException {
         // This test checks to make sure we are able to get the MXBean and do simple things with it.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
-        List<GarbageCollectorMXBean> garbageCollectorMXBeans = null;
-        try {
-            garbageCollectorMXBeans = ManagementFactory.getPlatformMXBeans(mbsc, GarbageCollectorMXBean.class);
-
-        } catch (Exception e) {
-            Assert.fail("Failed to get GarbageCollectorMXBean. : " + e.getMessage());
-        }
+        List<GarbageCollectorMXBean> garbageCollectorMXBeans = ManagementFactory.getPlatformMXBeans(mbsc, GarbageCollectorMXBean.class);
         for (GarbageCollectorMXBean gcBean : garbageCollectorMXBeans) {
             assertNotNull("GC object name should not be null", gcBean.getObjectName());
             assertTrue("Number of GC should not be negative", gcBean.getCollectionCount() >= 0);
         }
     }
 
     @Test
-    public void testOperatingSystemMXBeanProxy() {
+    public void testOperatingSystemMXBeanProxy() throws IOException {
         // This test checks to make sure we are able to get the MXBean and do simple things with it.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
-
-        OperatingSystemMXBean operatingSystemMXBean = null;
-        try {
-            operatingSystemMXBean = ManagementFactory.getPlatformMXBean(mbsc, OperatingSystemMXBean.class);
-
-        } catch (Exception e) {
-            Assert.fail("Failed to get OperatingSystemMXBean. : " + e.getMessage());
-        }
+        OperatingSystemMXBean operatingSystemMXBean = ManagementFactory.getPlatformMXBean(mbsc, OperatingSystemMXBean.class);
         assertNotNull("OS version can't be null. ", operatingSystemMXBean.getVersion());
     }
 
     @Test
-    public void testOperatingSystemMXBeanDirect() throws MalformedObjectNameException {
+    public void testOperatingSystemMXBeanDirect() throws Exception {
         // Basic test to make sure reflective accesses are set up correctly.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
         ObjectName objectName = new ObjectName("java.lang:type=OperatingSystem");
-        try {
-            assertNotNull("OS version can't be null. ", mbsc.getAttribute(objectName, "Version"));
-        } catch (Exception e) {
-            Assert.fail("Remote invokations failed : " + e.getMessage());
-        }
+        assertNotNull("OS version can't be null. ", mbsc.getAttribute(objectName, "Version"));
     }
 
     @Test
-    public void testMemoryManagerMXBeanProxy() {
+    public void testMemoryManagerMXBeanProxy() throws IOException {
         // This test checks to make sure we are able to get the MXBean and do simple things with it.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
-        List<MemoryManagerMXBean> memoryManagerMXBeans = null;
-        try {
-            memoryManagerMXBeans = ManagementFactory.getPlatformMXBeans(mbsc, MemoryManagerMXBean.class);
-
-        } catch (Exception e) {
-            Assert.fail("Failed to get MemoryManagerMXBean. : " + e.getMessage());
-        }
+        List<MemoryManagerMXBean> memoryManagerMXBeans = ManagementFactory.getPlatformMXBeans(mbsc, MemoryManagerMXBean.class);
         for (MemoryManagerMXBean memoryManagerMXBean : memoryManagerMXBeans) {
             assertNotNull("Memory pool names should not be null. ", memoryManagerMXBean.getMemoryPoolNames());
         }
     }
 
     @Test
-    public void testMemoryPoolMXBeanProxy() {
+    public void testMemoryPoolMXBeanProxy() throws IOException {
         // This test checks to make sure we are able to get the MXBean and do simple things with it.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
-
-        List<MemoryPoolMXBean> memoryPoolMXBeans = null;
-        try {
-            memoryPoolMXBeans = ManagementFactory.getPlatformMXBeans(mbsc, MemoryPoolMXBean.class);
-
-        } catch (Exception e) {
-            Assert.fail("Failed to get MemoryPoolMXBean. : " + e.getMessage());
-        }
+        List<MemoryPoolMXBean> memoryPoolMXBeans = ManagementFactory.getPlatformMXBeans(mbsc, MemoryPoolMXBean.class);
         for (MemoryPoolMXBean memoryPoolMXBean : memoryPoolMXBeans) {
             assertNotNull("Memory Pool name should not be null ", memoryPoolMXBean.getName());
         }
     }
 
     @Test
-    public void testFlightRecorderMXBeanProxy() {
+    public void testFlightRecorderMXBeanProxy() throws IOException {
         // This test checks to make sure we are able to get the MXBean and do simple things with it.
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
-
-        FlightRecorderMXBean flightRecorderMXBean = null;
-        try {
-            flightRecorderMXBean = ManagementFactory.getPlatformMXBean(mbsc, FlightRecorderMXBean.class);
-
-        } catch (Exception e) {
-            Assert.fail("Failed to get FlightRecorderMXBean. : " + e.getMessage());
-        }
+        FlightRecorderMXBean flightRecorderMXBean = ManagementFactory.getPlatformMXBean(mbsc, FlightRecorderMXBean.class);
         flightRecorderMXBean.newRecording();
         assertFalse("Flight recordings should be available because we just created one.", flightRecorderMXBean.getRecordings().isEmpty());
     }
 
     @Test
-    public void testFlightRecorderMXBeanDirect() throws MalformedObjectNameException {
+    public void testFlightRecorderMXBeanDirect() throws Exception {
         MBeanServerConnection mbsc = getLocalMBeanServerConnectionStatic();
         ObjectName objectName = new ObjectName("jdk.management.jfr:type=FlightRecorder");
-        try {
-            long recording = (long) mbsc.invoke(objectName, "newRecording", null, null);
-            mbsc.invoke(objectName, "startRecording", new Object[]{recording}, new String[]{"long"});
-            mbsc.invoke(objectName, "stopRecording", new Object[]{recording}, new String[]{"long"});
-        } catch (Exception e) {
-            Assert.fail("Remote invocations failed : " + e.getMessage());
-        }
+        long recording = (long) mbsc.invoke(objectName, "newRecording", null, null);
+        mbsc.invoke(objectName, "startRecording", new Object[]{recording}, new String[]{"long"});
+        mbsc.invoke(objectName, "stopRecording", new Object[]{recording}, new String[]{"long"});
     }
 }