chore: #sonarlint

redlink-gmbh · Sep 10, 2024 · 3e1a9fb · 3e1a9fb
1 parent 46f602d
commit 3e1a9fb
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 35 deletions.
diff --git a/pom.xml b/pom.xml
@@ -226,6 +226,7 @@
                     <version>3.8.0</version>
                     <configuration>
                         <source>${java.version}</source>
+                        <release>${java.version}</release>
                     </configuration>
                 </plugin>
                 <plugin>

diff --git a/slf4j/src/test/java/io/redlink/utils/logging/LoggingContextTest.java b/slf4j/src/test/java/io/redlink/utils/logging/LoggingContextTest.java
@@ -151,23 +151,22 @@ void testWrapInCopyRunable() throws Throwable {
         final String value2 = UUID.randomUUID().toString();
 
         MDC.put("mdc", value);
-        try (ExecutorService executor = Executors.newSingleThreadExecutor()) {
-            try (LoggingContext ctx = LoggingContext.create()) {
-                MDC.put("mdc", value2);
-
-                final Future<?> future = executor.submit(
-                        ctx.wrapInCopy(() -> {
-                            assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
-                            MDC.put("mdc", UUID.randomUUID().toString());
-                        }));
-                assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
-                future.get();
-                assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
-            } catch (ExecutionException e) {
-                throw e.getCause();
-            } finally {
-                executor.shutdownNow();
-            }
+        final ExecutorService executor = Executors.newSingleThreadExecutor();
+        try (LoggingContext ctx = LoggingContext.create()) {
+            MDC.put("mdc", value2);
+
+            final Future<?> future = executor.submit(
+                    ctx.wrapInCopy(() -> {
+                        assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
+                        MDC.put("mdc", UUID.randomUUID().toString());
+                    }));
+            assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
+            future.get();
+            assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
+        } catch (ExecutionException e) {
+            throw e.getCause();
+        } finally {
+            executor.shutdownNow();
         }
     }
 
@@ -177,24 +176,23 @@ void testWrapInCopyCallable() throws Throwable {
         final String value2 = UUID.randomUUID().toString();
 
         MDC.put("mdc", value);
-        try (ExecutorService executor = Executors.newSingleThreadExecutor()) {
-            try (LoggingContext ctx = LoggingContext.create()) {
-                MDC.put("mdc", value2);
-
-                final Future<?> future = executor.submit(
-                        ctx.wrapInCopy((Callable<String>) () -> {
-                            assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
-                            MDC.put("mdc", UUID.randomUUID().toString());
-                            return "hello";
-                        }));
-                assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
-                future.get();
-                assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
-            } catch (ExecutionException e) {
-                throw e.getCause();
-            } finally {
-                executor.shutdownNow();
-            }
+        final ExecutorService executor = Executors.newSingleThreadExecutor();
+        try (LoggingContext ctx = LoggingContext.create()) {
+            MDC.put("mdc", value2);
+
+            final Future<?> future = executor.submit(
+                    ctx.wrapInCopy((Callable<String>) () -> {
+                        assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
+                        MDC.put("mdc", UUID.randomUUID().toString());
+                        return "hello";
+                    }));
+            assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
+            future.get();
+            assertThat(MDC.get("mdc"), CoreMatchers.is(value2));
+        } catch (ExecutionException e) {
+            throw e.getCause();
+        } finally {
+            executor.shutdownNow();
         }
     }