[logging-log4j2] branch master updated: Java 8 cleanups

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/master by this push:
     new 98de189  Java 8 cleanups
98de189 is described below

commit 98de1894bfa24915101562231c9f7477676c4965
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Mon May 31 14:06:58 2021 -0500

    Java 8 cleanups
---
 .../src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java | 7 +++----
 .../src/main/java/org/apache/logging/log4j/core/LoggerContext.java | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java
index 821f7a2..139e33b 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java
@@ -22,7 +22,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 import org.apache.logging.log4j.message.MessageFactory;
 
@@ -63,7 +62,7 @@ public class LoggerRegistry<T extends ExtendedLogger> {
 
         @Override
         public void putIfAbsent(final Map<String, T> innerMap, final String name, final T logger) {
-            ((ConcurrentMap<String, T>) innerMap).putIfAbsent(name, logger);
+            innerMap.putIfAbsent(name, logger);
         }
     }
 
@@ -89,7 +88,7 @@ public class LoggerRegistry<T extends ExtendedLogger> {
     }
 
     public LoggerRegistry() {
-        this(new ConcurrentMapFactory<T>());
+        this(new ConcurrentMapFactory<>());
     }
 
     public LoggerRegistry(final MapFactory<T> factory) {
@@ -126,7 +125,7 @@ public class LoggerRegistry<T extends ExtendedLogger> {
     }
 
     public Collection<T> getLoggers() {
-        return getLoggers(new ArrayList<T>());
+        return getLoggers(new ArrayList<>());
     }
 
     public Collection<T> getLoggers(final Collection<T> destination) {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
index 2923758..b2ff3aa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
@@ -27,7 +27,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -388,7 +387,7 @@ public class LoggerContext extends AbstractLifeCycle
             final Configuration prev = configuration;
             configuration = NULL_CONFIGURATION;
             updateLoggers();
-            ((LifeCycle) prev).stop(timeout, timeUnit);
+            prev.stop(timeout, timeUnit);
             externalMap.clear();
             LogManager.getFactory().removeContext(this);
         } finally {
@@ -772,7 +771,7 @@ public class LoggerContext extends AbstractLifeCycle
         return new Logger(ctx, name, messageFactory);
     }
 
-    private class ThreadContextDataTask implements Runnable {
+    private static class ThreadContextDataTask implements Runnable {
 
         @Override
         public void run() {