Minor cleanup

Author: manuelbl

java-does-usb/src/main/java/net/codecrete/usb/macos/TransferTimeout.java

@@ -59,9 +59,9 @@ static synchronized ScheduledExecutorService getScheduledExecutorService() {
         return scheduledExecutorService;
     }
 
-    ScheduledFuture<?> future;
-    MacosUSBDevice.EndpointInfo endpointInfo;
-    boolean completed;
+    private final ScheduledFuture<?> future;
+    private final MacosUSBDevice.EndpointInfo endpointInfo;
+    private boolean completed;
 
     private static ScheduledExecutorService scheduledExecutorService;
 }

java-does-usb/src/test/java/net/codecrete/usb/AlternateInterfaceTest.java

@@ -38,13 +38,9 @@ void selectAlternateIntf_succeeds() {
 
     @Test
     void selectInvalidAlternateIntf_fails() {
-        assertThrows(USBException.class, () -> {
-            testDevice.selectAlternateSetting(1, 0);
-        });
+        assertThrows(USBException.class, () -> testDevice.selectAlternateSetting(1, 0));
 
-        assertThrows(USBException.class, () -> {
-            testDevice.selectAlternateSetting(LOOPBACK_INTF_LOOPBACK, 2);
-        });
+        assertThrows(USBException.class, () -> testDevice.selectAlternateSetting(LOOPBACK_INTF_LOOPBACK, 2));
     }
 
     @Test
@@ -61,12 +57,8 @@ void transferOnValidEndpoint_succeeds() {
     void transferOnInvalidEndpoint_fails() {
         testDevice.selectAlternateSetting(LOOPBACK_INTF_LOOPBACK, 1);
 
-        assertThrows(USBException.class, () -> {
-            testDevice.transferOut(ECHO_EP_OUT, new byte[] { 1, 2, 3 });
-        });
+        assertThrows(USBException.class, () -> testDevice.transferOut(ECHO_EP_OUT, new byte[] { 1, 2, 3 }));
 
-        assertThrows(USBException.class, () -> {
-            testDevice.transferIn(ECHO_EP_IN, 16);
-        });
+        assertThrows(USBException.class, () -> testDevice.transferIn(ECHO_EP_IN, 16));
     }
 }

java-does-usb/src/test/java/net/codecrete/usb/StallTest.java

@@ -21,9 +21,7 @@ void stalledBulkTransferOut_recovers() {
         haltEndpoint(USBDirection.OUT, LOOPBACK_EP_OUT);
 
         byte[] data = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-        assertThrows(USBStallException.class, () -> {
-            testDevice.transferOut(LOOPBACK_EP_OUT, data);
-        });
+        assertThrows(USBStallException.class, () -> testDevice.transferOut(LOOPBACK_EP_OUT, data));
 
         testDevice.clearHalt(USBDirection.OUT, LOOPBACK_EP_OUT);
 
@@ -36,9 +34,7 @@ void stalledBulkTransferOut_recovers() {
     void stalledBulkTransferIn_recovers() {
         haltEndpoint(USBDirection.IN, LOOPBACK_EP_IN);
 
-        assertThrows(USBStallException.class, () -> {
-            testDevice.transferIn(LOOPBACK_EP_IN, LOOPBACK_MAX_PACKET_SIZE);
-        });
+        assertThrows(USBStallException.class, () -> testDevice.transferIn(LOOPBACK_EP_IN, LOOPBACK_MAX_PACKET_SIZE));
 
         testDevice.clearHalt(USBDirection.IN, LOOPBACK_EP_IN);
 
@@ -50,9 +46,9 @@ void stalledBulkTransferIn_recovers() {
 
     @Test
     void invalidControlTransfer_throws() {
-        assertThrows(USBStallException.class, () -> {
-            testDevice.controlTransferIn(new USBControlTransfer(USBRequestType.VENDOR, USBRecipient.INTERFACE, (byte) 0x08, (short) 0, (short) interfaceNumber), 2);
-        });
+        assertThrows(USBStallException.class, () -> testDevice.controlTransferIn(
+                new USBControlTransfer(USBRequestType.VENDOR, USBRecipient.INTERFACE, (byte) 0x08,
+                        (short) 0, (short) interfaceNumber), 2));
     }
 
     void haltEndpoint(USBDirection direction, int endpointNumber) {

java-does-usb/src/test/java/net/codecrete/usb/StreamTest.java

@@ -39,7 +39,7 @@ void mediumTransfer_succeeds() {
     }
 
     @Test
-    void transferWithZLP_succeeds() throws Throwable {
+    void transferWithZLP_succeeds() {
         final byte[] sampleData = generateRandomBytes(2 * LOOPBACK_MAX_PACKET_SIZE, 197007894);
         var writer = CompletableFuture.runAsync(() -> {
             testDevice.transferOut(LOOPBACK_EP_OUT, Arrays.copyOfRange(sampleData, 0, LOOPBACK_MAX_PACKET_SIZE));
@@ -66,7 +66,7 @@ void largeTransferSmallChunks_succeeds() {
     }
 
     @Test
-    void largeTransferBigChunks_succeeds() throws Throwable {
+    void largeTransferBigChunks_succeeds() {
         final int numBytes = 230763;
         byte[] sampleData = generateRandomBytes(numBytes, 3829007493L);
         var writer = CompletableFuture.runAsync(() -> writeBytes(sampleData, 150));

java-does-usb/src/test/java/net/codecrete/usb/TimeoutTest.java

@@ -23,9 +23,7 @@ public class TimeoutTest extends TestDeviceBase {
     @Test
     @Timeout(value = 1, unit = TimeUnit.SECONDS)
     void bulkTransferIn_timesOut() {
-        assertThrows(USBTimeoutException.class, () -> {
-            testDevice.transferIn(LOOPBACK_EP_IN, 200);
-        });
+        assertThrows(USBTimeoutException.class, () -> testDevice.transferIn(LOOPBACK_EP_IN, 200));
     }
 
     @Test
@@ -70,9 +68,7 @@ void interruptTransferIn_timesOut() {
         Assumptions.assumeTrue(isLoopbackDevice(),
                 "Interrupt transfer only supported by loopback test device");
 
-        assertThrows(USBTimeoutException.class, () -> {
-            testDevice.transferIn(ECHO_EP_IN, 200);
-        });
+        assertThrows(USBTimeoutException.class, () -> testDevice.transferIn(ECHO_EP_IN, 200));
     }
 
     @Test