Try to satisfy pmd executor service closing.

Author: phipag

powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/internal/KeyBufferTest.java

@@ -17,6 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.nio.channels.FileChannel;
@@ -228,12 +229,12 @@ void shouldNotLogWarningWhenNoOverflow() {
     }
 
     @Test
-    void shouldBeThreadSafeForDifferentKeys() throws InterruptedException {
+    void shouldBeThreadSafeForDifferentKeys() throws InterruptedException, IOException {
         int threadCount = 10;
         int eventsPerThread = 100;
         KeyBuffer<String, String> largeBuffer = new KeyBuffer<>(10000, String::length);
         ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-        try {
+        try (Closeable close = executor::shutdown) {
             CountDownLatch latch = new CountDownLatch(threadCount);
 
             // Each thread works with different key
@@ -260,18 +261,16 @@ void shouldBeThreadSafeForDifferentKeys() throws InterruptedException {
                         .isNotNull()
                         .hasSize(eventsPerThread);
             }
-        } finally {
-            executor.shutdown();
         }
     }
 
     @Test
-    void shouldBeThreadSafeForSameKey() throws InterruptedException {
+    void shouldBeThreadSafeForSameKey() throws InterruptedException, IOException {
         int threadCount = 5;
         int eventsPerThread = 20;
         KeyBuffer<String, String> largeBuffer = new KeyBuffer<>(10000, String::length);
         ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-        try {
+        try (Closeable close = executor::shutdown) {
             CountDownLatch latch = new CountDownLatch(threadCount);
 
             // All threads work with same key
@@ -294,8 +293,6 @@ void shouldBeThreadSafeForSameKey() throws InterruptedException {
             assertThat(events)
                     .isNotNull()
                     .hasSize(threadCount * eventsPerThread);
-        } finally {
-            executor.shutdown();
         }
     }
 

powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/internal/LoggingManagerRegistryTest.java

@@ -17,6 +17,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.IOException;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -110,32 +112,30 @@ void testGetLoggingManager_shouldReturnSameInstance() {
     }
 
     @Test
-    void testGetLoggingManager_shouldBeThreadSafe() throws InterruptedException {
+    void testGetLoggingManager_shouldBeThreadSafe() throws InterruptedException, IOException {
         // GIVEN
         int threadCount = 10;
         ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-        CountDownLatch latch = new CountDownLatch(threadCount);
-        AtomicReference<LoggingManager> sharedInstance = new AtomicReference<>();
-
-        // WHEN
-        for (int i = 0; i < threadCount; i++) {
-            executor.submit(() -> {
-                try {
-                    LoggingManager instance = LoggingManagerRegistry.getLoggingManager();
-                    sharedInstance.compareAndSet(null, instance);
-                    assertThat(instance).isSameAs(sharedInstance.get());
-                } finally {
-                    latch.countDown();
-                }
-            });
-        }
-
-        // THEN
-        try {
+        try (Closeable close = executor::shutdown) {
+            CountDownLatch latch = new CountDownLatch(threadCount);
+            AtomicReference<LoggingManager> sharedInstance = new AtomicReference<>();
+
+            // WHEN
+            for (int i = 0; i < threadCount; i++) {
+                executor.submit(() -> {
+                    try {
+                        LoggingManager instance = LoggingManagerRegistry.getLoggingManager();
+                        sharedInstance.compareAndSet(null, instance);
+                        assertThat(instance).isSameAs(sharedInstance.get());
+                    } finally {
+                        latch.countDown();
+                    }
+                });
+            }
+
+            // THEN
             latch.await(5, TimeUnit.SECONDS);
             assertThat(sharedInstance.get()).isNotNull();
-        } finally {
-            executor.shutdown();
         }
     }
 }