From c7d79d86a935de93a9f5b20c4e2547bc495b524a Mon Sep 17 00:00:00 2001 From: Davide Angelocola Date: Wed, 25 Aug 2021 19:45:19 +0200 Subject: [PATCH] upgrading code to Java 8 - for each - diamond operator - some typos Signed-off-by: Davide Angelocola --- .../java/org/slf4j/StringPrintStream.java | 2 +- .../java/org/slf4j/issues/Issue324Test.java | 2 +- .../test_osgi/CheckingBundleListener.java | 10 +++---- .../java/org/slf4j/test_osgi/FelixHost.java | 2 +- .../test_osgi/FrameworkErrorListener.java | 8 +++--- .../commons/logging/impl/SLF4JLogFactory.java | 4 +-- .../commons/logging/impl/SimpleLog.java | 14 +++++----- .../org/slf4j/bridge/SLF4JBridgeHandler.java | 12 ++++----- .../java/org/slf4j/bridge/ListAppender.java | 2 +- .../bridge/SLF4JBridgeHandlerPerfTest.java | 8 +++--- .../slf4j/bridge/SLF4JBridgeHandlerTest.java | 18 ++++++------- .../org/apache/log4j/Log4jLoggerFactory.java | 2 +- .../src/test/java/org/dummy/ListHandler.java | 2 +- slf4j-api/src/main/java/org/slf4j/Logger.java | 4 +-- .../main/java/org/slf4j/LoggerFactory.java | 7 +++-- .../src/main/java/org/slf4j/event/Level.java | 4 +-- .../org/slf4j/helpers/BasicMDCAdapter.java | 11 ++++---- .../java/org/slf4j/helpers/BasicMarker.java | 2 +- .../org/slf4j/helpers/BasicMarkerFactory.java | 2 +- .../org/slf4j/helpers/MessageFormatter.java | 4 +-- .../helpers/SubstituteLoggerFactory.java | 8 +++--- .../slf4j/basicTests/DoubleCheckedInt.java | 4 +-- .../org/slf4j/helpers/MDCAdapterTestBase.java | 27 +++++++------------ .../org/slf4j/helpers/StringPrintStream.java | 2 +- .../helpers/SubstitutableLoggerTest.java | 8 +++--- .../helpers/SubstituteLoggerFactoryTest.java | 8 +++--- .../org/slf4j/rule/RunInNewThreadRule.java | 2 +- .../slf4j/rule/RunInNewThreadStatement.java | 2 +- .../MultithreadedInitializationTest.java | 2 +- .../java/org/slf4j/agent/AgentPremain.java | 11 +++----- .../slf4j/instrumentation/LogTransformer.java | 10 +++---- .../slf4j/instrumentation/ToStringHelper.java | 4 +-- .../java/org/slf4j/profiler/Profiler.java | 4 +-- .../org/slf4j/profiler/ProfilerRegistry.java | 4 +-- .../java/org/slf4j/dummyExt/ListAppender.java | 2 +- .../java/org/slf4j/dummyExt/XLoggerTest.java | 24 ++++++++--------- .../profiler/SortAndPruneComposites.java | 2 +- .../platform/logging/SLF4JPlarformLogger.java | 2 +- .../platform/logging/StringPrintStream.java | 2 +- .../org/slf4j/jul/JDK14LoggerFactory.java | 2 +- .../slf4j/jul/JDK14AdapterLoggerNameTest.java | 6 ++--- .../JDK14MultithreadedInitializationTest.java | 4 +-- .../test/java/org/slf4j/jul/ListHandler.java | 2 +- .../org/slf4j/log4j12/Log4jLoggerFactory.java | 2 +- .../org/slf4j/log4j12/Log4jMDCAdapter.java | 4 +-- .../org/slf4j/log4j12/InvocationTest.java | 2 +- .../java/org/slf4j/log4j12/ListAppender.java | 2 +- .../testHarness/RecursiveAppender.java | 2 +- .../java/org/slf4j/migrator/FileSelector.java | 6 ++--- .../slf4j/migrator/InplaceFileConverter.java | 4 +-- .../main/java/org/slf4j/migrator/Main.java | 10 +++---- .../org/slf4j/migrator/ProjectConverter.java | 25 +++++++---------- .../migrator/internal/MigratorFrame.java | 2 +- .../org/slf4j/migrator/line/EmptyRuleSet.java | 2 +- .../org/slf4j/migrator/line/JCLRuleSet.java | 2 +- .../org/slf4j/migrator/line/JULRuleSet.java | 2 +- .../org/slf4j/migrator/line/Log4jRuleSet.java | 2 +- .../slf4j/migrator/line/TrivialMatcher.java | 2 +- .../nop/MultithreadedInitializationTest.java | 2 +- .../java/org/slf4j/simple/SimpleLogger.java | 2 +- .../simple/SimpleLoggerConfiguration.java | 14 +++++----- .../org/slf4j/simple/SimpleLoggerFactory.java | 2 +- slf4j-site/src/site/pages/css/site.css | 2 +- 63 files changed, 163 insertions(+), 190 deletions(-) diff --git a/integration/src/test/java/org/slf4j/StringPrintStream.java b/integration/src/test/java/org/slf4j/StringPrintStream.java index 200b745f..a26cb391 100644 --- a/integration/src/test/java/org/slf4j/StringPrintStream.java +++ b/integration/src/test/java/org/slf4j/StringPrintStream.java @@ -32,7 +32,7 @@ public class StringPrintStream extends PrintStream { public static final String LINE_SEP = System.getProperty("line.separator"); PrintStream other; - List stringList = new ArrayList(); + List stringList = new ArrayList<>(); public StringPrintStream(PrintStream ps) { super(ps); diff --git a/integration/src/test/java/org/slf4j/issues/Issue324Test.java b/integration/src/test/java/org/slf4j/issues/Issue324Test.java index a7c2d7ee..9d3cf208 100644 --- a/integration/src/test/java/org/slf4j/issues/Issue324Test.java +++ b/integration/src/test/java/org/slf4j/issues/Issue324Test.java @@ -7,7 +7,7 @@ import junit.framework.TestCase; public class Issue324Test extends TestCase { - public void testLoggerCreationInPresenseOfSecurityManager() { + public void testLoggerCreationInPresenceOfSecurityManager() { String currentDir = System.getProperty("user.dir"); System.out.println("currentDir:" + currentDir); Logger logger = LoggerFactory.getLogger(Issue324Test.class); diff --git a/integration/src/test/java/org/slf4j/test_osgi/CheckingBundleListener.java b/integration/src/test/java/org/slf4j/test_osgi/CheckingBundleListener.java index ef4a0349..bdbfdee8 100644 --- a/integration/src/test/java/org/slf4j/test_osgi/CheckingBundleListener.java +++ b/integration/src/test/java/org/slf4j/test_osgi/CheckingBundleListener.java @@ -33,7 +33,7 @@ import org.osgi.framework.BundleListener; public class CheckingBundleListener implements BundleListener { - List eventList = new ArrayList(); + List eventList = new ArrayList<>(); public void bundleChanged(BundleEvent be) { eventList.add(be); @@ -45,16 +45,14 @@ public class CheckingBundleListener implements BundleListener { } public void dumpAll() { - for (int i = 0; i < eventList.size(); i++) { - BundleEvent fe = (BundleEvent) eventList.get(i); + for (BundleEvent fe : eventList) { dump(fe); } } boolean exists(String bundleName) { - for (int i = 0; i < eventList.size(); i++) { - BundleEvent fe = (BundleEvent) eventList.get(i); - Bundle b = fe.getBundle(); + for (BundleEvent bundleEvent : eventList) { + Bundle b = bundleEvent.getBundle(); System.out.println("===[" + b + "]"); if (bundleName.equals(b.getSymbolicName())) { return true; diff --git a/integration/src/test/java/org/slf4j/test_osgi/FelixHost.java b/integration/src/test/java/org/slf4j/test_osgi/FelixHost.java index c2a655d7..10997055 100644 --- a/integration/src/test/java/org/slf4j/test_osgi/FelixHost.java +++ b/integration/src/test/java/org/slf4j/test_osgi/FelixHost.java @@ -75,7 +75,7 @@ public class FelixHost { try { // Create host activator; - List list = new ArrayList(); + List list = new ArrayList<>(); // list.add(new HostActivator()); configMap.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, "org.xml.sax, org.xml.sax.helpers, javax.xml.parsers, javax.naming"); diff --git a/integration/src/test/java/org/slf4j/test_osgi/FrameworkErrorListener.java b/integration/src/test/java/org/slf4j/test_osgi/FrameworkErrorListener.java index 2f9458d8..bdb13a7f 100644 --- a/integration/src/test/java/org/slf4j/test_osgi/FrameworkErrorListener.java +++ b/integration/src/test/java/org/slf4j/test_osgi/FrameworkErrorListener.java @@ -32,8 +32,9 @@ import org.osgi.framework.FrameworkListener; public class FrameworkErrorListener implements FrameworkListener { - public List errorList = new ArrayList(); + public List errorList = new ArrayList<>(); + @Override public void frameworkEvent(FrameworkEvent fe) { if (fe.getType() == FrameworkEvent.ERROR) { errorList.add(fe); @@ -54,9 +55,8 @@ public class FrameworkErrorListener implements FrameworkListener { } public void dumpAll() { - for (int i = 0; i < errorList.size(); i++) { - FrameworkEvent fe = (FrameworkEvent) errorList.get(i); - dump(fe); + for (FrameworkEvent frameworkEvent : errorList) { + dump(frameworkEvent); } } } diff --git a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java index ec8aa6ce..0c9bbc5a 100644 --- a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java +++ b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLogFactory.java @@ -64,7 +64,7 @@ public class SLF4JLogFactory extends LogFactory { * Public no-arguments constructor required by the lookup mechanism. */ public SLF4JLogFactory() { - loggerMap = new ConcurrentHashMap(); + loggerMap = new ConcurrentHashMap<>(); } // ----------------------------------------------------- Manifest Constants @@ -105,7 +105,7 @@ public class SLF4JLogFactory extends LogFactory { @SuppressWarnings("unchecked") public String[] getAttributeNames() { - List names = new ArrayList(); + List names = new ArrayList<>(); Enumeration keys = attributes.keys(); while (keys.hasMoreElements()) { names.add((String) keys.nextElement()); diff --git a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java index 536245d9..e8223af6 100644 --- a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java +++ b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java @@ -673,15 +673,13 @@ public class SimpleLog implements Log, Serializable { } private static InputStream getResourceAsStream(final String name) { - return AccessController.doPrivileged(new PrivilegedAction() { - public InputStream run() { - ClassLoader threadCL = getContextClassLoader(); + return AccessController.doPrivileged((PrivilegedAction) () -> { + ClassLoader threadCL = getContextClassLoader(); - if (threadCL != null) { - return threadCL.getResourceAsStream(name); - } else { - return ClassLoader.getSystemResourceAsStream(name); - } + if (threadCL != null) { + return threadCL.getResourceAsStream(name); + } else { + return ClassLoader.getSystemResourceAsStream(name); } }); } diff --git a/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java b/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java index eed8f25e..0e587632 100755 --- a/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java +++ b/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java @@ -143,9 +143,9 @@ public class SLF4JBridgeHandler extends Handler { public static void uninstall() throws SecurityException { java.util.logging.Logger rootLogger = getRootLogger(); Handler[] handlers = rootLogger.getHandlers(); - for (int i = 0; i < handlers.length; i++) { - if (handlers[i] instanceof SLF4JBridgeHandler) { - rootLogger.removeHandler(handlers[i]); + for (Handler handler : handlers) { + if (handler instanceof SLF4JBridgeHandler) { + rootLogger.removeHandler(handler); } } } @@ -153,14 +153,14 @@ public class SLF4JBridgeHandler extends Handler { /** * Returns true if SLF4JBridgeHandler has been previously installed, returns false otherwise. * - * @return true if SLF4JBridgeHandler is already installed, false other wise + * @return true if SLF4JBridgeHandler is already installed, false otherwise * */ public static boolean isInstalled() { java.util.logging.Logger rootLogger = getRootLogger(); Handler[] handlers = rootLogger.getHandlers(); - for (int i = 0; i < handlers.length; i++) { - if (handlers[i] instanceof SLF4JBridgeHandler) { + for (Handler handler : handlers) { + if (handler instanceof SLF4JBridgeHandler) { return true; } } diff --git a/jul-to-slf4j/src/test/java/org/slf4j/bridge/ListAppender.java b/jul-to-slf4j/src/test/java/org/slf4j/bridge/ListAppender.java index e5fb5f3b..41cc5d81 100644 --- a/jul-to-slf4j/src/test/java/org/slf4j/bridge/ListAppender.java +++ b/jul-to-slf4j/src/test/java/org/slf4j/bridge/ListAppender.java @@ -32,7 +32,7 @@ import org.apache.log4j.spi.LoggingEvent; public class ListAppender extends AppenderSkeleton { - public List list = new ArrayList(); + public List list = new ArrayList<>(); public boolean extractLocationInfo = false; diff --git a/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java b/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java index 604ec1d1..2860aa70 100644 --- a/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java +++ b/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java @@ -56,8 +56,8 @@ public class SLF4JBridgeHandlerPerfTest { fileAppender = new FileAppender(new PatternLayout("%r [%t] %p %c %x - %m%n"), "target/test-output/toto.log"); existingHandlers = julRootLogger.getHandlers(); - for (int i = 0; i < existingHandlers.length; i++) { - julRootLogger.removeHandler(existingHandlers[i]); + for (Handler existingHandler : existingHandlers) { + julRootLogger.removeHandler(existingHandler); } log4jRoot = org.apache.log4j.Logger.getRootLogger(); log4jRoot.addAppender(fileAppender); @@ -68,8 +68,8 @@ public class SLF4JBridgeHandlerPerfTest { SLF4JBridgeHandler.uninstall(); fileAppender.close(); log4jRoot.getLoggerRepository().resetConfiguration(); - for (int i = 0; i < existingHandlers.length; i++) { - julRootLogger.addHandler(existingHandlers[i]); + for (Handler existingHandler : existingHandlers) { + julRootLogger.addHandler(existingHandler); } } diff --git a/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java b/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java index 19d714c6..3b05bab1 100755 --- a/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java +++ b/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java @@ -115,7 +115,7 @@ public class SLF4JBridgeHandlerTest { julResourceBundleLogger.info(msg); assertEquals(1, listAppender.list.size()); - LoggingEvent le = (LoggingEvent) listAppender.list.get(0); + LoggingEvent le = listAppender.list.get(0); assertEquals(LOGGER_NAME, le.getLoggerName()); assertEquals(expectedMsg, le.getMessage()); } @@ -149,19 +149,19 @@ public class SLF4JBridgeHandlerTest { LoggingEvent le = null; - le = (LoggingEvent) listAppender.list.get(0); + le = listAppender.list.get(0); assertEquals("foo", le.getLoggerName()); assertEquals(expectedMsg1, le.getMessage()); - le = (LoggingEvent) listAppender.list.get(1); + le = listAppender.list.get(1); assertEquals("foo", le.getLoggerName()); assertEquals(expectedMsg2, le.getMessage()); - le = (LoggingEvent) listAppender.list.get(2); + le = listAppender.list.get(2); assertEquals("foo", le.getLoggerName()); assertEquals(expectedMsg3, le.getMessage()); - le = (LoggingEvent) listAppender.list.get(3); + le = listAppender.list.get(3); assertEquals("yay", le.getLoggerName()); assertEquals(expectedMsg3, le.getMessage()); } @@ -173,7 +173,7 @@ public class SLF4JBridgeHandlerTest { julLogger.logp(Level.INFO, "SLF4JBridgeHandlerTest", "testLogWithPlaceholderNoParameters", msg, new Object[0]); assertEquals(1, listAppender.list.size()); - LoggingEvent le = (LoggingEvent) listAppender.list.get(0); + LoggingEvent le = listAppender.list.get(0); assertEquals(LOGGER_NAME, le.getLoggerName()); assertEquals(msg, le.getMessage()); } @@ -187,7 +187,7 @@ public class SLF4JBridgeHandlerTest { julLogger.log(Level.INFO, msg, "ignored parameter due to IllegalArgumentException"); assertEquals(1, listAppender.list.size()); - LoggingEvent le = (LoggingEvent) listAppender.list.get(0); + LoggingEvent le = listAppender.list.get(0); assertEquals(msg, le.getMessage()); } @@ -197,12 +197,12 @@ public class SLF4JBridgeHandlerTest { String msg = null; julLogger.log(Level.INFO, msg); assertEquals(1, listAppender.list.size()); - LoggingEvent le = (LoggingEvent) listAppender.list.get(0); + LoggingEvent le = listAppender.list.get(0); assertEquals("", le.getMessage()); } void assertLevel(int index, org.apache.log4j.Level expectedLevel) { - LoggingEvent le = (LoggingEvent) listAppender.list.get(index); + LoggingEvent le = listAppender.list.get(index); assertEquals(expectedLevel, le.getLevel()); } } diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java index 30b35221..54d865c6 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java @@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentMap; class Log4jLoggerFactory { // String, Logger - private static ConcurrentMap log4jLoggers = new ConcurrentHashMap(); + private static ConcurrentMap log4jLoggers = new ConcurrentHashMap<>(); public static Logger getLogger(String name) { org.apache.log4j.Logger instance = log4jLoggers.get(name); diff --git a/log4j-over-slf4j/src/test/java/org/dummy/ListHandler.java b/log4j-over-slf4j/src/test/java/org/dummy/ListHandler.java index c29ebfa1..2a237239 100644 --- a/log4j-over-slf4j/src/test/java/org/dummy/ListHandler.java +++ b/log4j-over-slf4j/src/test/java/org/dummy/ListHandler.java @@ -31,7 +31,7 @@ import java.util.logging.LogRecord; public class ListHandler extends Handler { - List list = new ArrayList(); + List list = new ArrayList<>(); public void close() throws SecurityException { diff --git a/slf4j-api/src/main/java/org/slf4j/Logger.java b/slf4j-api/src/main/java/org/slf4j/Logger.java index 5509465f..15eae258 100644 --- a/slf4j-api/src/main/java/org/slf4j/Logger.java +++ b/slf4j-api/src/main/java/org/slf4j/Logger.java @@ -61,7 +61,7 @@ import org.slf4j.spi.NOPLoggingEventBuilder; * oldT = t; * t = temperature; * logger.debug("Temperature set to {}. Old temperature was {}.", t, oldT); - * if(temperature.intValue() > 50) { + * if (temperature.intValue() > 50) { * logger.info("Temperature has risen above 50 degrees."); * } * } @@ -106,7 +106,7 @@ public interface Logger { * @since 2.0 */ default public LoggingEventBuilder makeLoggingEventBuilder(Level level) { - if(isEnabledForLevel(level)) { + if (isEnabledForLevel(level)) { return new DefaultLoggingEventBuilder(this, level); } else { return NOPLoggingEventBuilder.singleton(); diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java index d96146e8..faced5c5 100755 --- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java @@ -36,7 +36,6 @@ import java.util.Set; import java.util.concurrent.LinkedBlockingQueue; import org.slf4j.event.SubstituteLoggingEvent; -import org.slf4j.helpers.NOPLoggerFactory; import org.slf4j.helpers.NOP_FallbackServiceProvider; import org.slf4j.helpers.SubstituteServiceProvider; import org.slf4j.helpers.SubstituteLogger; @@ -101,7 +100,7 @@ public final class LoggerFactory { private static List findServiceProviders() { ServiceLoader serviceLoader = ServiceLoader.load(SLF4JServiceProvider.class); - List providerList = new ArrayList(); + List providerList = new ArrayList<>(); for (SLF4JServiceProvider provider : serviceLoader) { providerList.add(provider); } @@ -189,7 +188,7 @@ public final class LoggerFactory { // use Set instead of list in order to deal with bug #138 // LinkedHashSet appropriate here because it preserves insertion order // during iteration - Set staticLoggerBinderPathSet = new LinkedHashSet(); + Set staticLoggerBinderPathSet = new LinkedHashSet<>(); try { ClassLoader loggerFactoryClassLoader = LoggerFactory.class.getClassLoader(); Enumeration paths; @@ -236,7 +235,7 @@ public final class LoggerFactory { final int queueSize = queue.size(); int count = 0; final int maxDrain = 128; - List eventList = new ArrayList(maxDrain); + List eventList = new ArrayList<>(maxDrain); while (true) { int numDrained = queue.drainTo(eventList, maxDrain); if (numDrained == 0) diff --git a/slf4j-api/src/main/java/org/slf4j/event/Level.java b/slf4j-api/src/main/java/org/slf4j/event/Level.java index d8634287..a288b06b 100755 --- a/slf4j-api/src/main/java/org/slf4j/event/Level.java +++ b/slf4j-api/src/main/java/org/slf4j/event/Level.java @@ -17,8 +17,8 @@ public enum Level { ERROR(ERROR_INT, "ERROR"), WARN(WARN_INT, "WARN"), INFO(INFO_INT, "INFO"), DEBUG(DEBUG_INT, "DEBUG"), TRACE(TRACE_INT, "TRACE"); - private int levelInt; - private String levelStr; + private final int levelInt; + private final String levelStr; Level(int i, String s) { levelInt = i; diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java index 5e1ce694..d9cad2f5 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java @@ -27,7 +27,6 @@ package org.slf4j.helpers; import org.slf4j.spi.MDCAdapter; import java.util.*; -import java.util.Map; /** * Basic MDC implementation, which can be used with logging systems that lack @@ -50,7 +49,7 @@ public class BasicMDCAdapter implements MDCAdapter { if (parentValue == null) { return null; } - return new HashMap(parentValue); + return new HashMap<>(parentValue); } }; @@ -72,7 +71,7 @@ public class BasicMDCAdapter implements MDCAdapter { } Map map = inheritableThreadLocal.get(); if (map == null) { - map = new HashMap(); + map = new HashMap<>(); inheritableThreadLocal.set(map); } map.put(key, val); @@ -134,7 +133,7 @@ public class BasicMDCAdapter implements MDCAdapter { public Map getCopyOfContextMap() { Map oldMap = inheritableThreadLocal.get(); if (oldMap != null) { - return new HashMap(oldMap); + return new HashMap<>(oldMap); } else { return null; } @@ -142,8 +141,8 @@ public class BasicMDCAdapter implements MDCAdapter { public void setContextMap(Map contextMap) { Map copy = null; - if(contextMap != null) { - copy = new HashMap(contextMap); + if (contextMap != null) { + copy = new HashMap<>(contextMap); } inheritableThreadLocal.set(copy); } diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java index 73a2f4d7..610614b0 100755 --- a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java @@ -40,7 +40,7 @@ public class BasicMarker implements Marker { private static final long serialVersionUID = -2849567615646933777L; private final String name; - private List referenceList = new CopyOnWriteArrayList(); + private List referenceList = new CopyOnWriteArrayList<>(); BasicMarker(String name) { if (name == null) { diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarkerFactory.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarkerFactory.java index 5139bb66..06b0ec58 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarkerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarkerFactory.java @@ -41,7 +41,7 @@ import org.slf4j.Marker; */ public class BasicMarkerFactory implements IMarkerFactory { - private final ConcurrentMap markerMap = new ConcurrentHashMap(); + private final ConcurrentMap markerMap = new ConcurrentHashMap<>(); /** * Regular users should not create diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java index 69c972b8..ad7779ee 100755 --- a/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java @@ -216,13 +216,13 @@ final public class MessageFormatter { // itself escaped: "abc x:\\{}" // we have to consume one backward slash sbuf.append(messagePattern, i, j - 1); - deeplyAppendParameter(sbuf, argArray[L], new HashMap()); + deeplyAppendParameter(sbuf, argArray[L], new HashMap<>()); i = j + 2; } } else { // normal case sbuf.append(messagePattern, i, j); - deeplyAppendParameter(sbuf, argArray[L], new HashMap()); + deeplyAppendParameter(sbuf, argArray[L], new HashMap<>()); i = j + 2; } } diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java index 886c8197..8a9d5dd3 100755 --- a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLoggerFactory.java @@ -44,9 +44,9 @@ public class SubstituteLoggerFactory implements ILoggerFactory { volatile boolean postInitialization = false; - final Map loggers = new ConcurrentHashMap(); + final Map loggers = new ConcurrentHashMap<>(); - final LinkedBlockingQueue eventQueue = new LinkedBlockingQueue(); + final LinkedBlockingQueue eventQueue = new LinkedBlockingQueue<>(); synchronized public Logger getLogger(String name) { SubstituteLogger logger = loggers.get(name); @@ -58,11 +58,11 @@ public class SubstituteLoggerFactory implements ILoggerFactory { } public List getLoggerNames() { - return new ArrayList(loggers.keySet()); + return new ArrayList<>(loggers.keySet()); } public List getLoggers() { - return new ArrayList(loggers.values()); + return new ArrayList<>(loggers.values()); } public LinkedBlockingQueue getEventQueue() { diff --git a/slf4j-api/src/test/java/org/slf4j/basicTests/DoubleCheckedInt.java b/slf4j-api/src/test/java/org/slf4j/basicTests/DoubleCheckedInt.java index 6ce24df6..42a39e64 100755 --- a/slf4j-api/src/test/java/org/slf4j/basicTests/DoubleCheckedInt.java +++ b/slf4j-api/src/test/java/org/slf4j/basicTests/DoubleCheckedInt.java @@ -114,8 +114,8 @@ public class DoubleCheckedInt { private static int[] getStateCount(StateAccessingThread[] threads) { int[] valCount = new int[NUMBER_OF_STATES]; - for (int i = 0; i < threads.length; i++) { - int val = threads[i].state; + for (StateAccessingThread thread : threads) { + int val = thread.state; valCount[val] = valCount[val] + 1; } return valCount; diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/MDCAdapterTestBase.java b/slf4j-api/src/test/java/org/slf4j/helpers/MDCAdapterTestBase.java index fe6b7169..cd97b1c3 100644 --- a/slf4j-api/src/test/java/org/slf4j/helpers/MDCAdapterTestBase.java +++ b/slf4j-api/src/test/java/org/slf4j/helpers/MDCAdapterTestBase.java @@ -83,22 +83,16 @@ public class MDCAdapterTestBase { @Test public void testMDCInheritsValuesFromParentThread() throws Exception { mdc.put("parentKey", "parentValue"); - runAndWait(new Runnable() { - public void run() { - mdc.put("childKey", "childValue"); - assertEquals("parentValue", mdc.get("parentKey")); - } + runAndWait(() -> { + mdc.put("childKey", "childValue"); + assertEquals("parentValue", mdc.get("parentKey")); }); } @Test public void testMDCDoesntGetValuesFromChildThread() throws Exception { mdc.put("parentKey", "parentValue"); - runAndWait(new Runnable() { - public void run() { - mdc.put("childKey", "childValue"); - } - }); + runAndWait(() -> mdc.put("childKey", "childValue")); assertEquals("parentValue", mdc.get("parentKey")); assertNull(mdc.get("childKey")); } @@ -112,17 +106,15 @@ public class MDCAdapterTestBase { @Test public void testMDCChildThreadCanOverwriteParentThread() throws Exception { mdc.put("sharedKey", "parentValue"); - runAndWait(new Runnable() { - public void run() { - assertEquals("parentValue", mdc.get("sharedKey")); - mdc.put("sharedKey", "childValue"); - assertEquals("childValue", mdc.get("sharedKey")); - } + runAndWait(() -> { + assertEquals("parentValue", mdc.get("sharedKey")); + mdc.put("sharedKey", "childValue"); + assertEquals("childValue", mdc.get("sharedKey")); }); assertEquals("parentValue", mdc.get("sharedKey")); } - private void runAndWait(Runnable runnable) throws Exception { + private void runAndWait(Runnable runnable) { RecordingExceptionHandler handler = new RecordingExceptionHandler(); Thread thread = new Thread(runnable); thread.setUncaughtExceptionHandler(handler); @@ -139,6 +131,7 @@ public class MDCAdapterTestBase { private static class RecordingExceptionHandler implements UncaughtExceptionHandler { private Throwable exception; + @Override public void uncaughtException(Thread t, Throwable e) { exception = e; } diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/StringPrintStream.java b/slf4j-api/src/test/java/org/slf4j/helpers/StringPrintStream.java index 3a1cc234..e230967e 100755 --- a/slf4j-api/src/test/java/org/slf4j/helpers/StringPrintStream.java +++ b/slf4j-api/src/test/java/org/slf4j/helpers/StringPrintStream.java @@ -44,7 +44,7 @@ public class StringPrintStream extends PrintStream { PrintStream other; boolean duplicate = false; - public List stringList = Collections.synchronizedList(new ArrayList()); + public List stringList = Collections.synchronizedList(new ArrayList<>()); public StringPrintStream(PrintStream ps, boolean duplicate) { super(ps); diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/SubstitutableLoggerTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/SubstitutableLoggerTest.java index 71b8a241..af869f5a 100644 --- a/slf4j-api/src/test/java/org/slf4j/helpers/SubstitutableLoggerTest.java +++ b/slf4j-api/src/test/java/org/slf4j/helpers/SubstitutableLoggerTest.java @@ -50,8 +50,8 @@ public class SubstitutableLoggerTest { // WARNING: if you need to add an excluded method to have tests pass, ask yourself whether you // forgot to implement the said method with delegation in SubstituteLogger. You probably did. - private static final Set EXCLUDED_METHODS = new HashSet( - Arrays.asList("getName")); + private static final Set EXCLUDED_METHODS = new HashSet<>( + Arrays.asList("getName")); /** @@ -85,7 +85,7 @@ public class SubstitutableLoggerTest { } private static Set determineMethodSignatures(Class loggerClass) { - Set methodSignatures = new HashSet(); + Set methodSignatures = new HashSet<>(); // Note: Class.getDeclaredMethods() does not include inherited methods for (Method m : loggerClass.getDeclaredMethods()) { if (!EXCLUDED_METHODS.contains(m.getName())) { @@ -98,7 +98,7 @@ public class SubstitutableLoggerTest { // implements InvocationHandler private class LoggerInvocationHandler implements InvocationHandler { - private final Set invokedMethodSignatures = new HashSet(); + private final Set invokedMethodSignatures = new HashSet<>(); public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { invokedMethodSignatures.add(method.toString()); diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java index 9820f8b7..04840642 100755 --- a/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java +++ b/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java @@ -52,8 +52,8 @@ public class SubstituteLoggerFactoryTest { factory.getLogger("foo1"); factory.getLogger("foo2"); - Set expectedNames = new HashSet(Arrays.asList("foo1", "foo2")); - Set actualNames = new HashSet(factory.getLoggerNames()); + Set expectedNames = new HashSet<>(Arrays.asList("foo1", "foo2")); + Set actualNames = new HashSet<>(factory.getLoggerNames()); assertEquals(expectedNames, actualNames); } @@ -63,9 +63,9 @@ public class SubstituteLoggerFactoryTest { factory.getLogger("foo1"); factory.getLogger("foo2"); - Set expectedNames = new HashSet(Arrays.asList("foo1", "foo2")); + Set expectedNames = new HashSet<>(Arrays.asList("foo1", "foo2")); - Set actualNames = new HashSet(); + Set actualNames = new HashSet<>(); for (SubstituteLogger slog : factory.getLoggers()) { actualNames.add(slog.getName()); } diff --git a/slf4j-api/src/test/java/org/slf4j/rule/RunInNewThreadRule.java b/slf4j-api/src/test/java/org/slf4j/rule/RunInNewThreadRule.java index ab35ecc8..3945144f 100755 --- a/slf4j-api/src/test/java/org/slf4j/rule/RunInNewThreadRule.java +++ b/slf4j-api/src/test/java/org/slf4j/rule/RunInNewThreadRule.java @@ -41,7 +41,7 @@ public class RunInNewThreadRule implements TestRule { public Statement apply(Statement base, Description description) { RunInNewThread desiredAnnotaton = description.getAnnotation(RunInNewThread.class); - if(desiredAnnotaton == null) { + if (desiredAnnotaton == null) { System.out.println("test "+ description.getMethodName() +" not annotated"); return base; } else { diff --git a/slf4j-api/src/test/java/org/slf4j/rule/RunInNewThreadStatement.java b/slf4j-api/src/test/java/org/slf4j/rule/RunInNewThreadStatement.java index e990be37..2b8869e5 100755 --- a/slf4j-api/src/test/java/org/slf4j/rule/RunInNewThreadStatement.java +++ b/slf4j-api/src/test/java/org/slf4j/rule/RunInNewThreadStatement.java @@ -50,7 +50,7 @@ public class RunInNewThreadStatement extends Statement implements Runnable { System.out.println("Timeout is "+timeout); thread.join(timeout); - if(throwable != null) { + if (throwable != null) { throw throwable; } } diff --git a/slf4j-api/src/test/java/org/slf4j/testHarness/MultithreadedInitializationTest.java b/slf4j-api/src/test/java/org/slf4j/testHarness/MultithreadedInitializationTest.java index 0db3c23b..5e024f8a 100644 --- a/slf4j-api/src/test/java/org/slf4j/testHarness/MultithreadedInitializationTest.java +++ b/slf4j-api/src/test/java/org/slf4j/testHarness/MultithreadedInitializationTest.java @@ -20,7 +20,7 @@ import org.slf4j.helpers.SubstituteLogger; abstract public class MultithreadedInitializationTest { final protected static int THREAD_COUNT = 4 + Runtime.getRuntime().availableProcessors() * 2; - private final List createdLoggers = Collections.synchronizedList(new ArrayList()); + private final List createdLoggers = Collections.synchronizedList(new ArrayList<>()); final protected AtomicLong eventCount = new AtomicLong(0); final private CyclicBarrier barrier = new CyclicBarrier(THREAD_COUNT + 1); diff --git a/slf4j-ext/src/main/java/org/slf4j/agent/AgentPremain.java b/slf4j-ext/src/main/java/org/slf4j/agent/AgentPremain.java index 127b5250..7db5cb7d 100644 --- a/slf4j-ext/src/main/java/org/slf4j/agent/AgentPremain.java +++ b/slf4j-ext/src/main/java/org/slf4j/agent/AgentPremain.java @@ -114,13 +114,10 @@ public class AgentPremain { System.err.println("Start at " + new Date()); - Thread hook = new Thread() { - @Override - public void run() { - long timePassed = System.currentTimeMillis() - start; - System.err.println("Stop at " + new Date() + ", execution time = " + timePassed + " ms"); - } - }; + Thread hook = new Thread(() -> { + long timePassed = System.currentTimeMillis() - start; + System.err.println("Stop at " + new Date() + ", execution time = " + timePassed + " ms"); + }); Runtime.getRuntime().addShutdownHook(hook); } } diff --git a/slf4j-ext/src/main/java/org/slf4j/instrumentation/LogTransformer.java b/slf4j-ext/src/main/java/org/slf4j/instrumentation/LogTransformer.java index c353903c..4a76e576 100644 --- a/slf4j-ext/src/main/java/org/slf4j/instrumentation/LogTransformer.java +++ b/slf4j-ext/src/main/java/org/slf4j/instrumentation/LogTransformer.java @@ -187,8 +187,8 @@ public class LogTransformer implements ClassFileTransformer { private byte[] transform0(String className, Class clazz, ProtectionDomain domain, byte[] bytes) { try { - for (int i = 0; i < ignore.length; i++) { - if (className.startsWith(ignore[i])) { + for (String s : ignore) { + if (className.startsWith(s)) { return bytes; } } @@ -263,9 +263,9 @@ public class LogTransformer implements ClassFileTransformer { // instrumented too. CtBehavior[] methods = cl.getDeclaredBehaviors(); - for (int i = 0; i < methods.length; i++) { - if (methods[i].isEmpty() == false) { - doMethod(methods[i]); + for (CtBehavior method : methods) { + if (method.isEmpty() == false) { + doMethod(method); } } b = cl.toBytecode(); diff --git a/slf4j-ext/src/main/java/org/slf4j/instrumentation/ToStringHelper.java b/slf4j-ext/src/main/java/org/slf4j/instrumentation/ToStringHelper.java index c0fa2f61..f479dab6 100644 --- a/slf4j-ext/src/main/java/org/slf4j/instrumentation/ToStringHelper.java +++ b/slf4j-ext/src/main/java/org/slf4j/instrumentation/ToStringHelper.java @@ -53,10 +53,10 @@ public class ToStringHelper { * is needed, but unfortunately the runtime library does not contain a * WeakHashSet class, so the behavior is emulated with a WeakHashmap with * the class as the key, and a Long containing the value of - * System.currentTimeMilis when an instance of the class failed to render. + * System.currentTimeMillis when an instance of the class failed to render. */ - final static Map, Object> unrenderableClasses = new WeakHashMap, Object>(); + final static Map, Object> unrenderableClasses = new WeakHashMap<>(); /** * Returns o.toString() unless it throws an exception (which causes it to be diff --git a/slf4j-ext/src/main/java/org/slf4j/profiler/Profiler.java b/slf4j-ext/src/main/java/org/slf4j/profiler/Profiler.java index fc9afd9d..a0ecf43b 100644 --- a/slf4j-ext/src/main/java/org/slf4j/profiler/Profiler.java +++ b/slf4j-ext/src/main/java/org/slf4j/profiler/Profiler.java @@ -57,7 +57,7 @@ public class Profiler implements TimeInstrument { final String name; final StopWatch globalStopWatch; - List childTimeInstrumentList = new ArrayList(); + List childTimeInstrumentList = new ArrayList<>(); // optional field ProfilerRegistry profilerRegistry; @@ -209,7 +209,7 @@ public class Profiler implements TimeInstrument { * @since 1.5.9 */ public List getCopyOfChildTimeInstruments() { - List copy = new ArrayList(childTimeInstrumentList); + List copy = new ArrayList<>(childTimeInstrumentList); return copy; } diff --git a/slf4j-ext/src/main/java/org/slf4j/profiler/ProfilerRegistry.java b/slf4j-ext/src/main/java/org/slf4j/profiler/ProfilerRegistry.java index 61fda75e..264ca493 100644 --- a/slf4j-ext/src/main/java/org/slf4j/profiler/ProfilerRegistry.java +++ b/slf4j-ext/src/main/java/org/slf4j/profiler/ProfilerRegistry.java @@ -34,9 +34,9 @@ import java.util.Map; */ public class ProfilerRegistry { - private static final InheritableThreadLocal inheritableThreadLocal = new InheritableThreadLocal(); + private static final InheritableThreadLocal inheritableThreadLocal = new InheritableThreadLocal<>(); - Map profilerMap = new HashMap(); + Map profilerMap = new HashMap<>(); public void put(Profiler profiler) { put(profiler.getName(), profiler); diff --git a/slf4j-ext/src/test/java/org/slf4j/dummyExt/ListAppender.java b/slf4j-ext/src/test/java/org/slf4j/dummyExt/ListAppender.java index bb7f2f2b..16194f77 100644 --- a/slf4j-ext/src/test/java/org/slf4j/dummyExt/ListAppender.java +++ b/slf4j-ext/src/test/java/org/slf4j/dummyExt/ListAppender.java @@ -32,7 +32,7 @@ import org.apache.log4j.spi.LoggingEvent; public class ListAppender extends AppenderSkeleton { - public List list = new ArrayList(); + public final List list = new ArrayList<>(); public boolean extractLocationInfo = false; diff --git a/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java b/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java index b3af39cc..16c1bc40 100644 --- a/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java +++ b/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java @@ -79,9 +79,9 @@ public class XLoggerTest { logger.entry("a", "b", "c", "d", "e", "f"); assertEquals(6, listAppender.list.size()); - verify((LoggingEvent) listAppender.list.get(0), "entry"); - verify((LoggingEvent) listAppender.list.get(1), "entry with (1)"); - verify((LoggingEvent) listAppender.list.get(2), "entry with (test)"); + verify(listAppender.list.get(0), "entry"); + verify(listAppender.list.get(1), "entry with (1)"); + verify(listAppender.list.get(2), "entry with (test)"); } @Test @@ -92,9 +92,9 @@ public class XLoggerTest { assertEquals(Boolean.FALSE, logger.exit(false)); assertEquals(3, listAppender.list.size()); - verify((LoggingEvent) listAppender.list.get(0), "exit"); - verify((LoggingEvent) listAppender.list.get(1), "exit with (0)"); - verify((LoggingEvent) listAppender.list.get(2), "exit with (false)"); + verify(listAppender.list.get(0), "exit"); + verify(listAppender.list.get(1), "exit with (0)"); + verify(listAppender.list.get(2), "exit with (false)"); } @Test @@ -104,8 +104,8 @@ public class XLoggerTest { assertEquals(t, logger.throwing(t)); assertEquals(t, logger.throwing(XLogger.Level.DEBUG, t)); assertEquals(2, listAppender.list.size()); - verifyWithException((LoggingEvent) listAppender.list.get(0), "throwing", t); - LoggingEvent event = (LoggingEvent) listAppender.list.get(1); + verifyWithException(listAppender.list.get(0), "throwing", t); + LoggingEvent event = listAppender.list.get(1); verifyWithLevelAndException(event, XLogger.Level.DEBUG, "throwing", t); } @@ -122,8 +122,8 @@ public class XLoggerTest { logger.catching(ex); logger.catching(XLogger.Level.DEBUG, ex); } - verifyWithException((LoggingEvent) listAppender.list.get(0), "catching", t); - verifyWithLevelAndException((LoggingEvent) listAppender.list.get(1), XLogger.Level.DEBUG, "catching", t); + verifyWithException(listAppender.list.get(0), "catching", t); + verifyWithLevelAndException(listAppender.list.get(1), XLogger.Level.DEBUG, "catching", t); } // See http://jira.qos.ch/browse/SLF4J-105 @@ -156,10 +156,10 @@ public class XLoggerTest { public void testNoDoubleSubstitution_Bug421() { XLogger logger = XLoggerFactory.getXLogger("UnitTest"); logger.error("{},{}", "foo", "[{}]"); - verify((LoggingEvent) listAppender.list.get(0), "foo,[{}]"); + verify(listAppender.list.get(0), "foo,[{}]"); logger.error("{},{}", "[{}]", "foo"); - verify((LoggingEvent) listAppender.list.get(1), "[{}],foo"); + verify(listAppender.list.get(1), "[{}],foo"); } diff --git a/slf4j-ext/src/test/java/org/slf4j/profiler/SortAndPruneComposites.java b/slf4j-ext/src/test/java/org/slf4j/profiler/SortAndPruneComposites.java index 867bb60f..d92f6432 100644 --- a/slf4j-ext/src/test/java/org/slf4j/profiler/SortAndPruneComposites.java +++ b/slf4j-ext/src/test/java/org/slf4j/profiler/SortAndPruneComposites.java @@ -63,7 +63,7 @@ public class SortAndPruneComposites { } int[] pruneComposites(int[] sortedArray) { - ArrayList primesArray = new ArrayList(); + ArrayList primesArray = new ArrayList<>(); for (int i = 0; i < originalArrrayLength; i++) { int n = sortedArray[i]; if (isPrime(n)) { diff --git a/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JPlarformLogger.java b/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JPlarformLogger.java index e82776bf..e6169afa 100644 --- a/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JPlarformLogger.java +++ b/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JPlarformLogger.java @@ -144,7 +144,7 @@ class SLF4JPlarformLogger implements System.Logger { // The JDK uses a different formatting convention. We must invoke it now. message = String.format(message, params); } - if(leb instanceof CallerBoundaryAware) { + if (leb instanceof CallerBoundaryAware) { CallerBoundaryAware cba = (CallerBoundaryAware) leb; cba.setCallerBoundary(PRESUMED_CALLER_BOUNDARY); } diff --git a/slf4j-jdk-platform-logging/src/test/java/org/slf4j/jdk/platform/logging/StringPrintStream.java b/slf4j-jdk-platform-logging/src/test/java/org/slf4j/jdk/platform/logging/StringPrintStream.java index 56d42c8f..821e9b89 100644 --- a/slf4j-jdk-platform-logging/src/test/java/org/slf4j/jdk/platform/logging/StringPrintStream.java +++ b/slf4j-jdk-platform-logging/src/test/java/org/slf4j/jdk/platform/logging/StringPrintStream.java @@ -35,7 +35,7 @@ public class StringPrintStream extends PrintStream { PrintStream other; boolean duplicate = false; - public List stringList = Collections.synchronizedList(new ArrayList()); + public List stringList = Collections.synchronizedList(new ArrayList<>()); public StringPrintStream(PrintStream ps, boolean duplicate) { super(ps); diff --git a/slf4j-jdk14/src/main/java/org/slf4j/jul/JDK14LoggerFactory.java b/slf4j-jdk14/src/main/java/org/slf4j/jul/JDK14LoggerFactory.java index 8155526d..38dc0987 100644 --- a/slf4j-jdk14/src/main/java/org/slf4j/jul/JDK14LoggerFactory.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/jul/JDK14LoggerFactory.java @@ -42,7 +42,7 @@ public class JDK14LoggerFactory implements ILoggerFactory { ConcurrentMap loggerMap; public JDK14LoggerFactory() { - loggerMap = new ConcurrentHashMap(); + loggerMap = new ConcurrentHashMap<>(); // ensure jul initialization. see SLF4J-359 // note that call to java.util.logging.LogManager.getLogManager() fails on the Google App Engine platform. See // SLF4J-363 diff --git a/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14AdapterLoggerNameTest.java b/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14AdapterLoggerNameTest.java index dc2e2a89..8b263c58 100644 --- a/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14AdapterLoggerNameTest.java +++ b/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14AdapterLoggerNameTest.java @@ -77,8 +77,8 @@ public class JDK14AdapterLoggerNameTest { private void removeHandlers(Logger logger) { logger.setUseParentHandlers(false); Handler[] handlers = logger.getHandlers(); - for (int i = 0; i < handlers.length; i++) { - logger.removeHandler(handlers[i]); + for (Handler handler : handlers) { + logger.removeHandler(handler); } } @@ -87,7 +87,7 @@ public class JDK14AdapterLoggerNameTest { assertNotNull("missing logger name", mockHandler.record.getLoggerName()); } - private class MockHandler extends java.util.logging.Handler { + private static class MockHandler extends java.util.logging.Handler { public LogRecord record; public void close() throws SecurityException { diff --git a/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14MultithreadedInitializationTest.java b/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14MultithreadedInitializationTest.java index 18e3a08c..3211f901 100644 --- a/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14MultithreadedInitializationTest.java +++ b/slf4j-jdk14/src/test/java/org/slf4j/jul/JDK14MultithreadedInitializationTest.java @@ -47,8 +47,8 @@ public class JDK14MultithreadedInitializationTest extends MultithreadedInitializ private void removeAllHandlers(java.util.logging.Logger logger) { Handler[] handlers = logger.getHandlers(); - for (int i = 0; i < handlers.length; i++) { - logger.removeHandler(handlers[i]); + for (Handler handler : handlers) { + logger.removeHandler(handler); } } diff --git a/slf4j-jdk14/src/test/java/org/slf4j/jul/ListHandler.java b/slf4j-jdk14/src/test/java/org/slf4j/jul/ListHandler.java index a24c787c..d1ac5f49 100755 --- a/slf4j-jdk14/src/test/java/org/slf4j/jul/ListHandler.java +++ b/slf4j-jdk14/src/test/java/org/slf4j/jul/ListHandler.java @@ -6,7 +6,7 @@ import java.util.logging.LogRecord; public class ListHandler extends java.util.logging.Handler { - public List recordList = new ArrayList(); + public List recordList = new ArrayList<>(); @Override public void publish(LogRecord record) { diff --git a/slf4j-log4j12/src/main/java/org/slf4j/log4j12/Log4jLoggerFactory.java b/slf4j-log4j12/src/main/java/org/slf4j/log4j12/Log4jLoggerFactory.java index 746d9522..934a5b90 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/log4j12/Log4jLoggerFactory.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/log4j12/Log4jLoggerFactory.java @@ -61,7 +61,7 @@ public class Log4jLoggerFactory implements ILoggerFactory { ConcurrentMap loggerMap; public Log4jLoggerFactory() { - loggerMap = new ConcurrentHashMap(); + loggerMap = new ConcurrentHashMap<>(); // force log4j to initialize org.apache.log4j.LogManager.getRootLogger(); } diff --git a/slf4j-log4j12/src/main/java/org/slf4j/log4j12/Log4jMDCAdapter.java b/slf4j-log4j12/src/main/java/org/slf4j/log4j12/Log4jMDCAdapter.java index 9b8bd9b4..e4c9b79d 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/log4j12/Log4jMDCAdapter.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/log4j12/Log4jMDCAdapter.java @@ -90,8 +90,8 @@ public class Log4jMDCAdapter implements MDCAdapter { Map old = org.apache.log4j.MDC.getContext(); // we must cater for the case where the contextMap argument is null - if(contextMap == null) { - if(old != null) { + if (contextMap == null) { + if (old != null) { old.clear(); } return; diff --git a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/InvocationTest.java b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/InvocationTest.java index f5073381..0fb068e4 100644 --- a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/InvocationTest.java +++ b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/InvocationTest.java @@ -176,7 +176,7 @@ public class InvocationTest { @Test public void testMDCContextMapValues() { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("ka", "va"); map.put("kb", "vb"); diff --git a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/ListAppender.java b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/ListAppender.java index cdd5486d..bfd32822 100644 --- a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/ListAppender.java +++ b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/ListAppender.java @@ -32,7 +32,7 @@ import org.apache.log4j.spi.LoggingEvent; public class ListAppender extends AppenderSkeleton { - public List list = new ArrayList(); + public List list = new ArrayList<>(); public boolean extractLocationInfo = false; diff --git a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/testHarness/RecursiveAppender.java b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/testHarness/RecursiveAppender.java index 2595142a..bce057ea 100644 --- a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/testHarness/RecursiveAppender.java +++ b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/testHarness/RecursiveAppender.java @@ -39,7 +39,7 @@ public class RecursiveAppender extends AppenderSkeleton { int activationDelay = 0; String loggerName = "org.slf4j.impl.RecursiveAppender" + diff; - public List events = new ArrayList(); + public List events = new ArrayList<>(); public RecursiveAppender() { System.out.println("XXXXXXX entering RecursiveAppender constructor"); diff --git a/slf4j-migrator/src/main/java/org/slf4j/migrator/FileSelector.java b/slf4j-migrator/src/main/java/org/slf4j/migrator/FileSelector.java index 71af29bd..0e8d13c8 100644 --- a/slf4j-migrator/src/main/java/org/slf4j/migrator/FileSelector.java +++ b/slf4j-migrator/src/main/java/org/slf4j/migrator/FileSelector.java @@ -32,7 +32,7 @@ import org.slf4j.migrator.internal.ProgressListener; public class FileSelector { - private List javaFileList = new ArrayList(); + private final List javaFileList = new ArrayList<>(); ProgressListener pl; @@ -54,8 +54,8 @@ public class FileSelector { pl.onDirectory(file); File[] files = file.listFiles(); if (files != null) { - for (int i = 0; i < files.length; i++) { - selectFiles(files[i]); + for (File value : files) { + selectFiles(value); } } } else { diff --git a/slf4j-migrator/src/main/java/org/slf4j/migrator/InplaceFileConverter.java b/slf4j-migrator/src/main/java/org/slf4j/migrator/InplaceFileConverter.java index d4bf3e63..cecb1be8 100644 --- a/slf4j-migrator/src/main/java/org/slf4j/migrator/InplaceFileConverter.java +++ b/slf4j-migrator/src/main/java/org/slf4j/migrator/InplaceFileConverter.java @@ -102,8 +102,8 @@ public class InplaceFileConverter { } private void writeReplacement(OutputStream os, String[] replacement) throws IOException { - for (int i = 0; i < replacement.length; i++) { - os.write(replacement[i].getBytes()); + for (String s : replacement) { + os.write(s.getBytes()); os.write(lineTerminator.getBytes()); } } diff --git a/slf4j-migrator/src/main/java/org/slf4j/migrator/Main.java b/slf4j-migrator/src/main/java/org/slf4j/migrator/Main.java index 5a94a41d..bbb1b9cc 100644 --- a/slf4j-migrator/src/main/java/org/slf4j/migrator/Main.java +++ b/slf4j-migrator/src/main/java/org/slf4j/migrator/Main.java @@ -38,12 +38,10 @@ public class Main { public static void main(String[] args) { System.out.println("Starting SLF4J Migrator"); - SwingUtilities.invokeLater(new Runnable() { - public void run() { - MigratorFrame inst = new MigratorFrame(); - inst.setLocationRelativeTo(null); - inst.setVisible(true); - } + SwingUtilities.invokeLater(() -> { + MigratorFrame inst = new MigratorFrame(); + inst.setLocationRelativeTo(null); + inst.setVisible(true); }); } diff --git a/slf4j-migrator/src/main/java/org/slf4j/migrator/ProjectConverter.java b/slf4j-migrator/src/main/java/org/slf4j/migrator/ProjectConverter.java index a553fe39..f7947577 100644 --- a/slf4j-migrator/src/main/java/org/slf4j/migrator/ProjectConverter.java +++ b/slf4j-migrator/src/main/java/org/slf4j/migrator/ProjectConverter.java @@ -27,7 +27,6 @@ package org.slf4j.migrator; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import javax.swing.SwingUtilities; @@ -38,18 +37,16 @@ import org.slf4j.migrator.line.RuleSet; public class ProjectConverter { - private RuleSet ruleSet; + private final RuleSet ruleSet; private List exception; ProgressListener progressListener; - public static void main(String[] args) throws IOException { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - MigratorFrame inst = new MigratorFrame(); - inst.setLocationRelativeTo(null); - inst.setVisible(true); - } + public static void main(String[] args) { + SwingUtilities.invokeLater(() -> { + MigratorFrame inst = new MigratorFrame(); + inst.setLocationRelativeTo(null); + inst.setVisible(true); }); } @@ -83,9 +80,7 @@ public class ProjectConverter { */ private void scanFileList(List lstFiles) { progressListener.onFileScanBegin(); - Iterator itFile = lstFiles.iterator(); - while (itFile.hasNext()) { - File currentFile = itFile.next(); + for (File currentFile : lstFiles) { progressListener.onFileScan(currentFile); scanFile(currentFile); } @@ -108,16 +103,14 @@ public class ProjectConverter { public void addException(ConversionException exc) { if (exception == null) { - exception = new ArrayList(); + exception = new ArrayList<>(); } exception.add(exc); } public void printException() { if (exception != null) { - Iterator iterator = exception.iterator(); - while (iterator.hasNext()) { - ConversionException exc = (ConversionException) iterator.next(); + for (ConversionException exc : exception) { exc.print(); } exception = null; diff --git a/slf4j-migrator/src/main/java/org/slf4j/migrator/internal/MigratorFrame.java b/slf4j-migrator/src/main/java/org/slf4j/migrator/internal/MigratorFrame.java index 2fd4bb8a..63f804b1 100644 --- a/slf4j-migrator/src/main/java/org/slf4j/migrator/internal/MigratorFrame.java +++ b/slf4j-migrator/src/main/java/org/slf4j/migrator/internal/MigratorFrame.java @@ -313,7 +313,7 @@ public class MigratorFrame extends JFrame implements ActionListener { List doSanityAnalysis() { - List errorList = new ArrayList(); + List errorList = new ArrayList<>(); if (!radioJCL.isSelected() && !radioLog4j.isSelected() && !radioJUL.isSelected()) { errorList.add("Please select the migration type: JCL, log4j, or JUL to SLF4J."); } diff --git a/slf4j-migrator/src/main/java/org/slf4j/migrator/line/EmptyRuleSet.java b/slf4j-migrator/src/main/java/org/slf4j/migrator/line/EmptyRuleSet.java index a0393265..3533d0e3 100644 --- a/slf4j-migrator/src/main/java/org/slf4j/migrator/line/EmptyRuleSet.java +++ b/slf4j-migrator/src/main/java/org/slf4j/migrator/line/EmptyRuleSet.java @@ -30,7 +30,7 @@ import java.util.List; public class EmptyRuleSet implements RuleSet { - List list = new ArrayList(); + List list = new ArrayList<>(); public Iterator iterator() { return list.iterator(); diff --git a/slf4j-migrator/src/main/java/org/slf4j/migrator/line/JCLRuleSet.java b/slf4j-migrator/src/main/java/org/slf4j/migrator/line/JCLRuleSet.java index f463e46d..23aafb31 100644 --- a/slf4j-migrator/src/main/java/org/slf4j/migrator/line/JCLRuleSet.java +++ b/slf4j-migrator/src/main/java/org/slf4j/migrator/line/JCLRuleSet.java @@ -54,7 +54,7 @@ public class JCLRuleSet implements RuleSet { SingleConversionRule cr5 = new SingleConversionRule(Pattern.compile("LogFactory.getLog\\("), "LoggerFactory.getLogger("); - conversionRuleList = new ArrayList(); + conversionRuleList = new ArrayList<>(); conversionRuleList.add(cr0); conversionRuleList.add(cr1); conversionRuleList.add(cr2); diff --git a/slf4j-migrator/src/main/java/org/slf4j/migrator/line/JULRuleSet.java b/slf4j-migrator/src/main/java/org/slf4j/migrator/line/JULRuleSet.java index b296b70a..e4e91f9f 100644 --- a/slf4j-migrator/src/main/java/org/slf4j/migrator/line/JULRuleSet.java +++ b/slf4j-migrator/src/main/java/org/slf4j/migrator/line/JULRuleSet.java @@ -55,7 +55,7 @@ public class JULRuleSet implements RuleSet { SingleConversionRule crWarning = new SingleConversionRule(Pattern.compile("\\.warning\\("), ".warn("); SingleConversionRule crSevere = new SingleConversionRule(Pattern.compile("\\.severe\\("), ".error("); - conversionRuleList = new ArrayList(); + conversionRuleList = new ArrayList<>(); conversionRuleList.add(crImport0); conversionRuleList.add(crImport1); conversionRuleList.add(crImport2); diff --git a/slf4j-migrator/src/main/java/org/slf4j/migrator/line/Log4jRuleSet.java b/slf4j-migrator/src/main/java/org/slf4j/migrator/line/Log4jRuleSet.java index c760496c..6fd02b37 100755 --- a/slf4j-migrator/src/main/java/org/slf4j/migrator/line/Log4jRuleSet.java +++ b/slf4j-migrator/src/main/java/org/slf4j/migrator/line/Log4jRuleSet.java @@ -57,7 +57,7 @@ public class Log4jRuleSet implements RuleSet { SingleConversionRule variable1 = new SingleConversionRule(Pattern.compile("(^Category\\b)"), "Logger"); - conversionRuleList = new ArrayList(); + conversionRuleList = new ArrayList<>(); conversionRuleList.add(crImport0); conversionRuleList.add(catImport); conversionRuleList.add(crImport1); diff --git a/slf4j-migrator/src/test/java/org/slf4j/migrator/line/TrivialMatcher.java b/slf4j-migrator/src/test/java/org/slf4j/migrator/line/TrivialMatcher.java index d392769b..adefdd35 100644 --- a/slf4j-migrator/src/test/java/org/slf4j/migrator/line/TrivialMatcher.java +++ b/slf4j-migrator/src/test/java/org/slf4j/migrator/line/TrivialMatcher.java @@ -51,7 +51,7 @@ class TrivialMatcher implements RuleSet { cr1.addReplacement(3, ""); // no replacement for the third group it will remains the same - conversionRuleList = new ArrayList(); + conversionRuleList = new ArrayList<>(); conversionRuleList.add(cr); conversionRuleList.add(cr1); } diff --git a/slf4j-nop/src/test/java/org/slf4j/nop/MultithreadedInitializationTest.java b/slf4j-nop/src/test/java/org/slf4j/nop/MultithreadedInitializationTest.java index 95b60819..48ac0562 100755 --- a/slf4j-nop/src/test/java/org/slf4j/nop/MultithreadedInitializationTest.java +++ b/slf4j-nop/src/test/java/org/slf4j/nop/MultithreadedInitializationTest.java @@ -124,7 +124,7 @@ public class MultithreadedInitializationTest { public static final String LINE_SEP = System.getProperty("line.separator"); PrintStream other; - List stringList = new ArrayList(); + List stringList = new ArrayList<>(); public StringPrintStream(PrintStream ps) { super(ps); diff --git a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java index 5183971d..26e4598a 100644 --- a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java @@ -359,7 +359,7 @@ public class SimpleLogger extends LegacyAbstractLogger { List markers = null; if (marker != null) { - markers = new ArrayList(); + markers = new ArrayList<>(); markers.add(marker); } diff --git a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java index 5e332074..b707aa00 100755 --- a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java +++ b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java @@ -97,14 +97,12 @@ public class SimpleLoggerConfiguration { private void loadProperties() { // Add props from the resource simplelogger.properties - InputStream in = AccessController.doPrivileged(new PrivilegedAction() { - public InputStream run() { - ClassLoader threadCL = Thread.currentThread().getContextClassLoader(); - if (threadCL != null) { - return threadCL.getResourceAsStream(CONFIGURATION_FILE); - } else { - return ClassLoader.getSystemResourceAsStream(CONFIGURATION_FILE); - } + InputStream in = AccessController.doPrivileged((PrivilegedAction) () -> { + ClassLoader threadCL = Thread.currentThread().getContextClassLoader(); + if (threadCL != null) { + return threadCL.getResourceAsStream(CONFIGURATION_FILE); + } else { + return ClassLoader.getSystemResourceAsStream(CONFIGURATION_FILE); } }); if (null != in) { diff --git a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerFactory.java b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerFactory.java index 38129ec1..8b45447c 100644 --- a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerFactory.java +++ b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerFactory.java @@ -41,7 +41,7 @@ public class SimpleLoggerFactory implements ILoggerFactory { ConcurrentMap loggerMap; public SimpleLoggerFactory() { - loggerMap = new ConcurrentHashMap(); + loggerMap = new ConcurrentHashMap<>(); SimpleLogger.lazyInit(); } diff --git a/slf4j-site/src/site/pages/css/site.css b/slf4j-site/src/site/pages/css/site.css index a896562a..65aa8d5e 100755 --- a/slf4j-site/src/site/pages/css/site.css +++ b/slf4j-site/src/site/pages/css/site.css @@ -445,7 +445,7 @@ dt:hover .anchor { padding-top: 3px; padding-right: 16px; float: left; - height: 18px;div + height: 18px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); white-space: nowrap; background-color: white;