Just cleaning things up.

Author: InsertCreativityHere

java/BUILDING.md

@@ -121,7 +121,7 @@ To build the Android test controller from the command line:
 - Once the test controller is running, open a terminal, change to the java subdirectory, and execute:
 
   ```shell
-  python allTests --android --all
+  python allTests.py --android --all
   ```
 
 ## Generating the API reference

java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java

@@ -35,11 +35,11 @@ private static class TestSuiteBundle {
             _class = (Class<? extends test.TestHelper>) _loader.loadClass(name);
         }
 
-        test.TestHelper newInstance() throws IllegalAccessException, InstantiationException {
+        test.TestHelper newInstance() throws ReflectiveOperationException {
             if (_class == null) {
                 return null;
             }
-            return _class.newInstance();
+            return _class.getDeclaredConstructor().newInstance();
         }
 
         ClassLoader getClassLoader() {
@@ -119,22 +119,20 @@ public synchronized void setIpv6Address(String address) {
     public List<String> getAddresses(boolean ipv6) {
         List<String> addresses = new java.util.ArrayList<>();
         try {
-            java.util.Enumeration<java.net.NetworkInterface> ifaces =
-                    java.net.NetworkInterface.getNetworkInterfaces();
+            java.util.Enumeration<java.net.NetworkInterface> ifaces = java.net.NetworkInterface.getNetworkInterfaces();
             while (ifaces.hasMoreElements()) {
                 java.net.NetworkInterface iface = ifaces.nextElement();
                 java.util.Enumeration<java.net.InetAddress> addrs = iface.getInetAddresses();
                 while (addrs.hasMoreElements()) {
                     java.net.InetAddress addr = addrs.nextElement();
-                    if ((ipv6 && addr instanceof java.net.Inet6Address)
-                            || (!ipv6 && !(addr instanceof java.net.Inet6Address))) {
+                    boolean isInet6Address = addr instanceof java.net.Inet6Address;
+                    if ((ipv6 && isInet6Address) || (!ipv6 && !isInet6Address)) {
                         addresses.add(addr.getHostAddress());
                     }
                 }
             }
         } catch (java.net.SocketException ex) {
-            // Ignore, if we are not able to retrieve the network interfaces, we return an empty
-            // list.
+            // Ignore, if we are not able to retrieve the network interfaces, we return an empty list.
         }
         return addresses;
     }
@@ -186,27 +184,22 @@ public ControllerI(boolean bluetooth) {
             }
             else
             {
-                initData.properties.setProperty(
-                    "ControllerAdapter.AdapterId", java.util.UUID.randomUUID().toString());
+                initData.properties.setProperty("ControllerAdapter.AdapterId", java.util.UUID.randomUUID().toString());
                 initData.properties.setProperty("ControllerAdapter.Endpoints", "tcp");
                 if (bluetooth) {
-                    initData.properties.setProperty(
-                            "Ice.Plugin.IceBT", "com.zeroc.IceBT.PluginFactory");
+                    initData.properties.setProperty("Ice.Plugin.IceBT", "com.zeroc.IceBT.PluginFactory");
                 }
-                initData.properties.setProperty(
-                        "Ice.Plugin.IceDiscovery", "com.zeroc.IceDiscovery.PluginFactory");
+                initData.properties.setProperty("Ice.Plugin.IceDiscovery", "com.zeroc.IceDiscovery.PluginFactory");
                 initData.properties.setProperty("IceDiscovery.DomainId", "TestController");
             }
 
             _communicator = new com.zeroc.Ice.Communicator(initData);
-            com.zeroc.Ice.ObjectAdapter adapter =
-                    _communicator.createObjectAdapter("ControllerAdapter");
+            com.zeroc.Ice.ObjectAdapter adapter = _communicator.createObjectAdapter("ControllerAdapter");
             ProcessControllerPrx processController =
                     ProcessControllerPrx.uncheckedCast(
                             adapter.add(
                                     new ProcessControllerI(),
-                                    com.zeroc.Ice.Util.stringToIdentity(
-                                            "Android/ProcessController")));
+                                    com.zeroc.Ice.Util.stringToIdentity("Android/ProcessController")));
             adapter.activate();
 
             if (!isEmulator())
@@ -228,14 +221,11 @@ public void registerProcessController(
                                 if (e1 != null) {
                                     handleException(e1, adapter, registry, processController);
                                 } else {
-                                    com.zeroc.Ice.Connection connection =
-                                            registry.ice_getConnection();
+                                    com.zeroc.Ice.Connection connection = registry.ice_getConnection();
                                     connection.setAdapter(adapter);
                                     connection.setCloseCallback(
                                             con -> {
-                                                println(
-                                                        "connection with process controller"
-                                                                + " registry closed");
+                                                println("connection with process controller registry closed");
                                                 while (true) {
                                                     try {
                                                         Thread.sleep(500);
@@ -244,19 +234,14 @@ public void registerProcessController(
                                                         // Ignore and try again.
                                                     }
                                                 }
-                                                registerProcessController(
-                                                        adapter, registry, processController);
+                                                registerProcessController(adapter, registry, processController);
                                             });
 
                                     registry.setProcessControllerAsync(processController)
                                             .whenCompleteAsync(
                                                     (r2, e2) -> {
                                                         if (e2 != null) {
-                                                            handleException(
-                                                                    e2,
-                                                                    adapter,
-                                                                    registry,
-                                                                    processController);
+                                                            handleException(e2, adapter, registry, processController);
                                                         }
                                                     });
                                 }
@@ -268,8 +253,7 @@ public void handleException(
                 final com.zeroc.Ice.ObjectAdapter adapter,
                 final ProcessControllerRegistryPrx registry,
                 final ProcessControllerPrx processController) {
-            if (ex instanceof com.zeroc.Ice.ConnectFailedException
-                    || ex instanceof com.zeroc.Ice.TimeoutException) {
+            if (ex instanceof com.zeroc.Ice.ConnectFailedException || ex instanceof com.zeroc.Ice.TimeoutException) {
                 while (true) {
                     try {
                         Thread.sleep(500);
@@ -300,20 +284,12 @@ public ControllerHelperI(TestSuiteBundle bundle, String[] args) {
         public void communicatorInitialized(Communicator communicator) {}
 
         public java.io.InputStream loadResource(String path) {
-            switch (path) {
-                case "server.p12" -> {
-                    return getResources().openRawResource(R.raw.server);
-                }
-                case "client.p12" -> {
-                    return getResources().openRawResource(R.raw.client);
-                }
-                case "ca.p12" -> {
-                    return getResources().openRawResource(R.raw.ca);
-                }
-                default -> {
-                    return null;
-                }
-            }
+            return switch (path) {
+                case "server.p12" -> getResources().openRawResource(R.raw.server);
+                case "client.p12" -> getResources().openRawResource(R.raw.client);
+                case "ca.p12" -> getResources().openRawResource(R.raw.ca);
+                default -> null;
+            };
         }
 
         public void run() {
@@ -371,8 +347,7 @@ private synchronized void waitReady(int timeout) throws Test.Common.ProcessFaile
                 try {
                     wait(timeout * 1000L);
                     if (Time.currentMonotonicTimeMillis() - now > timeout * 1000L) {
-                        throw new Test.Common.ProcessFailedException(
-                                "timed out waiting for the process to be ready");
+                        throw new Test.Common.ProcessFailedException("timed out waiting for the process to be ready");
                     }
                 } catch (InterruptedException ex) {
                     // Ignore and try again.
@@ -390,8 +365,7 @@ private synchronized int waitSuccess(int timeout) throws Test.Common.ProcessFail
                 try {
                     wait(timeout * 1000L);
                     if (Time.currentMonotonicTimeMillis() - now > timeout * 1000L) {
-                        throw new Test.Common.ProcessFailedException(
-                                "timed out waiting for the process to complete");
+                        throw new Test.Common.ProcessFailedException("timed out waiting for the process to complete");
                     }
                 } catch (InterruptedException ex) {
                     // Ignore and try again.
@@ -428,8 +402,7 @@ public Test.Common.ProcessPrx start(
                 TestSuiteBundle bundle = new TestSuiteBundle(className, getClassLoader());
                 ControllerHelperI mainHelper = new ControllerHelperI(bundle, args);
                 mainHelper.start();
-                return Test.Common.ProcessPrx.uncheckedCast(
-                        current.adapter.addWithUUID(new ProcessI(mainHelper)));
+                return Test.Common.ProcessPrx.uncheckedCast(current.adapter.addWithUUID(new ProcessI(mainHelper)));
             } catch (Exception ex) {
                 throw new Test.Common.ProcessFailedException(
                         "testsuite `" + testsuite + "' exe ` " + exe + "' start failed:\n" + ex);