From 6e784e4ca3a5ae9c5dc421fcd01a417af5bf5ace Mon Sep 17 00:00:00 2001 From: Davide Angelocola Date: Sun, 29 Aug 2021 12:12:34 +0200 Subject: [PATCH] minor code cleanups - more private final fields - avoiding C-style array declarations - few typos, notably JPlarformLogger -> JPlatformLogger Signed-off-by: Davide Angelocola --- .../logging/impl/SLF4JLocationAwareLog.java | 2 +- .../org/apache/commons/logging/impl/SLF4JLog.java | 2 +- .../commons/logging/impl/SLF4JLogFactory.java | 2 +- .../java/org/slf4j/bridge/SLF4JBridgeHandler.java | 4 ++-- .../src/main/java/org/apache/log4j/Category.java | 4 ++-- .../java/org/apache/log4j/Log4jLoggerFactory.java | 2 +- .../src/main/java/org/slf4j/LoggerFactory.java | 2 +- .../java/org/slf4j/helpers/BasicMDCAdapter.java | 2 +- .../main/java/org/slf4j/helpers/BasicMarker.java | 8 ++++---- .../java/org/slf4j/helpers/FormattingTuple.java | 6 +++--- .../slf4j/helpers/NOP_FallbackServiceProvider.java | 6 +++--- .../java/org/slf4j/helpers/SubstituteLogger.java | 2 +- .../slf4j/helpers/SubstituteServiceProvider.java | 6 +++--- .../java/org/slf4j/spi/CallerBoundaryAware.java | 6 ++++-- .../java/org/slf4j/spi/SLF4JServiceProvider.java | 3 ++- .../test/java/org/slf4j/LoggerAccessingThread.java | 2 +- .../slf4j/helpers/SubstituteLoggerFactoryTest.java | 2 +- .../org/slf4j/instrumentation/LogTransformer.java | 10 +++++----- .../org/slf4j/profiler/SortAndPruneComposites.java | 2 +- .../logging/SLF4JPlarformLoggerFactory.java | 14 +++++++------- ...larformLogger.java => SLF4JPlatformLogger.java} | 6 +++--- .../platform/logging/SLF4JSystemLoggerFinder.java | 2 +- .../java/org/slf4j/jul/JDK14LoggerAdapter.java | 2 +- .../org/slf4j/issue/LoggerSerializationTest.java | 2 +- .../test/java/org/slf4j/log4j12/MDCFriendTest.java | 2 +- .../org/slf4j/migrator/internal/MigratorFrame.java | 4 ++-- .../java/org/slf4j/migrator/line/JCLRuleSet.java | 2 +- .../java/org/slf4j/migrator/line/JULRuleSet.java | 2 +- .../java/org/slf4j/migrator/line/Log4jRuleSet.java | 2 +- .../migrator/line/MultiGroupConversionRule.java | 4 ++-- .../org/slf4j/migrator/helper/RandomHelper.java | 2 +- .../org/slf4j/migrator/line/TrivialMatcher.java | 2 +- .../java/org/slf4j/nop/NOPServiceProvider.java | 6 +++--- .../slf4j/nop/MultithreadedInitializationTest.java | 2 +- .../main/java/org/slf4j/simple/SimpleLogger.java | 2 +- .../slf4j/simple/SimpleLoggerConfiguration.java | 2 +- .../MultithereadedExecutionTest.java | 6 +++--- slf4j-site/src/site/pages/news.html | 6 +++--- 38 files changed, 73 insertions(+), 70 deletions(-) rename slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/{SLF4JPlarformLogger.java => SLF4JPlatformLogger.java} (96%) diff --git a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java index 7c6dba575..755c2f597 100644 --- a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java +++ b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLocationAwareLog.java @@ -43,7 +43,7 @@ public class SLF4JLocationAwareLog implements Log, Serializable { // in both Log4jLogger and Jdk14Logger classes in the original JCL, the // logger instance is transient - private transient LocationAwareLogger logger; + private final transient LocationAwareLogger logger; private static final String FQCN = SLF4JLocationAwareLog.class.getName(); diff --git a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLog.java b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLog.java index f986f4728..2e796c2bb 100644 --- a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLog.java +++ b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4JLog.java @@ -42,7 +42,7 @@ public class SLF4JLog implements Log, Serializable { // in both Log4jLogger and Jdk14Logger classes in the original JCL, the // logger instance is transient - private transient Logger logger; + private final transient Logger logger; public SLF4JLog(Logger logger) { this.logger = logger; 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 0c9bbc5ae..a9eabc305 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 @@ -110,7 +110,7 @@ public String[] getAttributeNames() { while (keys.hasMoreElements()) { names.add((String) keys.nextElement()); } - String results[] = new String[names.size()]; + String[] results = new String[names.size()]; for (int i = 0; i < results.length; i++) { results[i] = (String) names.get(i); } 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 0e587632f..1b92fa5bc 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 @@ -174,8 +174,8 @@ public static boolean isInstalled() { public static void removeHandlersForRootLogger() { java.util.logging.Logger rootLogger = getRootLogger(); java.util.logging.Handler[] handlers = rootLogger.getHandlers(); - for (int i = 0; i < handlers.length; i++) { - rootLogger.removeHandler(handlers[i]); + for (Handler handler : handlers) { + rootLogger.removeHandler(handler); } } diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java index 3e41517eb..ee4d78935 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java @@ -45,12 +45,12 @@ public class Category { private static final String CATEGORY_FQCN = Category.class.getName(); - private String name; + private final String name; protected org.slf4j.Logger slf4jLogger; private org.slf4j.spi.LocationAwareLogger locationAwareLogger; - private static Marker FATAL_MARKER = MarkerFactory.getMarker("FATAL"); + private static final Marker FATAL_MARKER = MarkerFactory.getMarker("FATAL"); Category(String name) { this.name = name; 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 54d865c67..eea3c97d7 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 @@ class Log4jLoggerFactory { // String, Logger - private static ConcurrentMap log4jLoggers = new ConcurrentHashMap<>(); + private static final ConcurrentMap log4jLoggers = new ConcurrentHashMap<>(); public static Logger getLogger(String name) { org.apache.log4j.Logger instance = log4jLoggers.get(name); diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java index faced5c5c..2c6ac97f4 100755 --- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java @@ -182,7 +182,7 @@ private static void reportIgnoredStaticLoggerBinders(Set staticLoggerBinder // We need to use the name of the StaticLoggerBinder class, but we can't // reference the class itself. - private static String STATIC_LOGGER_BINDER_PATH = "org/slf4j/impl/StaticLoggerBinder.class"; + private static final String STATIC_LOGGER_BINDER_PATH = "org/slf4j/impl/StaticLoggerBinder.class"; static Set findPossibleStaticLoggerBinderPathSet() { // use Set instead of list in order to deal with bug #138 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 d9cad2f5b..7afb88503 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java @@ -43,7 +43,7 @@ */ public class BasicMDCAdapter implements MDCAdapter { - private InheritableThreadLocal> inheritableThreadLocal = new InheritableThreadLocal>() { + private final InheritableThreadLocal> inheritableThreadLocal = new InheritableThreadLocal>() { @Override protected Map childValue(Map parentValue) { if (parentValue == null) { 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 610614b0d..9e3a6aee8 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 final List referenceList = new CopyOnWriteArrayList<>(); BasicMarker(String name) { if (name == null) { @@ -128,9 +128,9 @@ public boolean contains(String name) { return false; } - private static String OPEN = "[ "; - private static String CLOSE = " ]"; - private static String SEP = ", "; + private static final String OPEN = "[ "; + private static final String CLOSE = " ]"; + private static final String SEP = ", "; public boolean equals(Object obj) { if (this == obj) diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/FormattingTuple.java b/slf4j-api/src/main/java/org/slf4j/helpers/FormattingTuple.java index 6792b1138..a416e1d47 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/FormattingTuple.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/FormattingTuple.java @@ -33,9 +33,9 @@ public class FormattingTuple { static public FormattingTuple NULL = new FormattingTuple(null); - private String message; - private Throwable throwable; - private Object[] argArray; + private final String message; + private final Throwable throwable; + private final Object[] argArray; public FormattingTuple(String message) { this(message, null, null); diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/NOP_FallbackServiceProvider.java b/slf4j-api/src/main/java/org/slf4j/helpers/NOP_FallbackServiceProvider.java index 8258202db..87d287a67 100755 --- a/slf4j-api/src/main/java/org/slf4j/helpers/NOP_FallbackServiceProvider.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/NOP_FallbackServiceProvider.java @@ -14,9 +14,9 @@ public class NOP_FallbackServiceProvider implements SLF4JServiceProvider { // to avoid constant folding by the compiler, this field must *not* be final public static String REQUESTED_API_VERSION = "2.0.99"; // !final - private ILoggerFactory loggerFactory = new NOPLoggerFactory(); - private IMarkerFactory markerFactory = new BasicMarkerFactory(); - private MDCAdapter mdcAdapter = new NOPMDCAdapter(); + private final ILoggerFactory loggerFactory = new NOPLoggerFactory(); + private final IMarkerFactory markerFactory = new BasicMarkerFactory(); + private final MDCAdapter mdcAdapter = new NOPMDCAdapter(); @Override diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLogger.java b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLogger.java index 65fb97d36..bf34c7e26 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLogger.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteLogger.java @@ -53,7 +53,7 @@ public class SubstituteLogger implements Logger { private Boolean delegateEventAware; private Method logMethodCache; private EventRecodingLogger eventRecodingLogger; - private Queue eventQueue; + private final Queue eventQueue; public final boolean createdPostInitialization; diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteServiceProvider.java b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteServiceProvider.java index 20f7fbc9e..2c59530d5 100755 --- a/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteServiceProvider.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/SubstituteServiceProvider.java @@ -6,9 +6,9 @@ import org.slf4j.spi.SLF4JServiceProvider; public class SubstituteServiceProvider implements SLF4JServiceProvider { - private SubstituteLoggerFactory loggerFactory = new SubstituteLoggerFactory(); - private IMarkerFactory markerFactory = new BasicMarkerFactory(); - private MDCAdapter mdcAdapter = new BasicMDCAdapter(); + private final SubstituteLoggerFactory loggerFactory = new SubstituteLoggerFactory(); + private final IMarkerFactory markerFactory = new BasicMarkerFactory(); + private final MDCAdapter mdcAdapter = new BasicMDCAdapter(); @Override public ILoggerFactory getLoggerFactory() { diff --git a/slf4j-api/src/main/java/org/slf4j/spi/CallerBoundaryAware.java b/slf4j-api/src/main/java/org/slf4j/spi/CallerBoundaryAware.java index b427c9208..e1a2de95b 100644 --- a/slf4j-api/src/main/java/org/slf4j/spi/CallerBoundaryAware.java +++ b/slf4j-api/src/main/java/org/slf4j/spi/CallerBoundaryAware.java @@ -1,10 +1,12 @@ package org.slf4j.spi; +import org.slf4j.event.LoggingEvent; + /** * Additional interface to {@link LoggingEventBuilder} and - * {@link qorg.slf4j.event.LoggingEvent LoggingEvent}. + * {@link org.slf4j.event.LoggingEvent LoggingEvent}. * - * Implementations of {@link LoggingEventBuilder} and {@link LoggingEvent} may optionally + * Implementations of {@link LoggingEventBuilder} and {@link LoggingEvent} may optionally * implement {@link CallerBoundaryAware} in order to support caller info extraction. * * This interface is intended for use by logging backends or logging bridges. diff --git a/slf4j-api/src/main/java/org/slf4j/spi/SLF4JServiceProvider.java b/slf4j-api/src/main/java/org/slf4j/spi/SLF4JServiceProvider.java index bce20f28b..cfa8d08a6 100755 --- a/slf4j-api/src/main/java/org/slf4j/spi/SLF4JServiceProvider.java +++ b/slf4j-api/src/main/java/org/slf4j/spi/SLF4JServiceProvider.java @@ -3,6 +3,7 @@ import org.slf4j.ILoggerFactory; import org.slf4j.IMarkerFactory; import org.slf4j.LoggerFactory; +import org.slf4j.MDC; /** * This interface based on {@link java.util.ServiceLoader} paradigm. @@ -31,7 +32,7 @@ public interface SLF4JServiceProvider { public IMarkerFactory getMarkerFactory(); /** - * Return the instnace of {@link MDCAdapter} that + * Return the instance of {@link MDCAdapter} that * {@link MDC} should bind to. * * @return instance of {@link MDCAdapter} diff --git a/slf4j-api/src/test/java/org/slf4j/LoggerAccessingThread.java b/slf4j-api/src/test/java/org/slf4j/LoggerAccessingThread.java index 171b137e2..30ab57059 100755 --- a/slf4j-api/src/test/java/org/slf4j/LoggerAccessingThread.java +++ b/slf4j-api/src/test/java/org/slf4j/LoggerAccessingThread.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicLong; public class LoggerAccessingThread extends Thread { - private static int LOOP_LEN = 32; + private static final int LOOP_LEN = 32; final CyclicBarrier barrier; final int count; 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 048406424..a836f86b9 100755 --- a/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java +++ b/slf4j-api/src/test/java/org/slf4j/helpers/SubstituteLoggerFactoryTest.java @@ -36,7 +36,7 @@ import java.util.Set; public class SubstituteLoggerFactoryTest { - private SubstituteLoggerFactory factory = new SubstituteLoggerFactory(); + private final SubstituteLoggerFactory factory = new SubstituteLoggerFactory(); @Test public void testFactory() { 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 4a76e5760..1ea44794e 100644 --- a/slf4j-ext/src/main/java/org/slf4j/instrumentation/LogTransformer.java +++ b/slf4j-ext/src/main/java/org/slf4j/instrumentation/LogTransformer.java @@ -135,8 +135,8 @@ public Builder level(String level) { } } - private String level; - private String levelEnabled; + private final String level; + private final String levelEnabled; private LogTransformer(Builder builder) { String s = "WARNING: javassist not available on classpath for javaagent, log statements will not be added"; @@ -156,10 +156,10 @@ private LogTransformer(Builder builder) { this.levelEnabled = "is" + builder.level.substring(0, 1).toUpperCase() + builder.level.substring(1) + "Enabled"; } - private boolean addEntryExit; + private final boolean addEntryExit; // private boolean addVariableAssignment; - private boolean verbose; - private String[] ignore; + private final boolean verbose; + private final String[] ignore; public byte[] transform(ClassLoader loader, String className, Class clazz, ProtectionDomain domain, byte[] bytes) { 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 d92f6432e..b6e150881 100644 --- a/slf4j-ext/src/test/java/org/slf4j/profiler/SortAndPruneComposites.java +++ b/slf4j-ext/src/test/java/org/slf4j/profiler/SortAndPruneComposites.java @@ -50,7 +50,7 @@ public int[] sortAndPruneComposites() { int[] sortedArray = sort(); // start a new stopwatch called PRUNE_COMPOSITES sortProfiler.start("PRUNE_COMPOSITES"); - int result[] = pruneComposites(sortedArray); + int[] result = pruneComposites(sortedArray); return result; } diff --git a/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JPlarformLoggerFactory.java b/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JPlarformLoggerFactory.java index 8eabb7c31..4ad907a1e 100644 --- a/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JPlarformLoggerFactory.java +++ b/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JPlarformLoggerFactory.java @@ -31,28 +31,28 @@ import org.slf4j.LoggerFactory; /** - * Manages instances of {@link SLF4JPlarformLogger}. + * Manages instances of {@link SLF4JPlatformLogger}. * * @since 1.3.0 * @author Ceki * */ public class SLF4JPlarformLoggerFactory { - ConcurrentMap loggerMap = new ConcurrentHashMap<>(); + ConcurrentMap loggerMap = new ConcurrentHashMap<>(); /** - * Return an appropriate {@link SLF4JPlarformLogger} instance by name. + * Return an appropriate {@link SLF4JPlatformLogger} instance by name. */ - public SLF4JPlarformLogger getLogger(String loggerName) { + public SLF4JPlatformLogger getLogger(String loggerName) { - SLF4JPlarformLogger spla = loggerMap.get(loggerName); + SLF4JPlatformLogger spla = loggerMap.get(loggerName); if (spla != null) { return spla; } else { Logger slf4jLogger = LoggerFactory.getLogger(loggerName); - SLF4JPlarformLogger newInstance = new SLF4JPlarformLogger(slf4jLogger); - SLF4JPlarformLogger oldInstance = loggerMap.putIfAbsent(loggerName, newInstance); + SLF4JPlatformLogger newInstance = new SLF4JPlatformLogger(slf4jLogger); + SLF4JPlatformLogger oldInstance = loggerMap.putIfAbsent(loggerName, newInstance); return oldInstance == null ? newInstance : oldInstance; } } 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/SLF4JPlatformLogger.java similarity index 96% rename from slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JPlarformLogger.java rename to slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JPlatformLogger.java index e6169afa8..b79a85177 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/SLF4JPlatformLogger.java @@ -37,13 +37,13 @@ * Adapts {@link Logger} to {@link System.Logger}. * @since 2.0.0 */ -class SLF4JPlarformLogger implements System.Logger { +class SLF4JPlatformLogger implements System.Logger { - static private String PRESUMED_CALLER_BOUNDARY = System.Logger.class.getName(); + static private final String PRESUMED_CALLER_BOUNDARY = System.Logger.class.getName(); private final Logger slf4jLogger; - public SLF4JPlarformLogger(Logger logger) { + public SLF4JPlatformLogger(Logger logger) { this.slf4jLogger = requireNonNull(logger); } diff --git a/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JSystemLoggerFinder.java b/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JSystemLoggerFinder.java index 9bf57fbb3..4333dac9e 100644 --- a/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JSystemLoggerFinder.java +++ b/slf4j-jdk-platform-logging/src/main/java/org/slf4j/jdk/platform/logging/SLF4JSystemLoggerFinder.java @@ -52,7 +52,7 @@ public System.Logger getLogger(String name, Module module) { // is updated to forward a module, we should do that here. // // [1] https://openjdk.java.net/jeps/264 - SLF4JPlarformLogger adapter = platformLoggerFactory.getLogger(name); + SLF4JPlatformLogger adapter = platformLoggerFactory.getLogger(name); return adapter; } diff --git a/slf4j-jdk14/src/main/java/org/slf4j/jul/JDK14LoggerAdapter.java b/slf4j-jdk14/src/main/java/org/slf4j/jul/JDK14LoggerAdapter.java index 45965b147..dbc52da52 100755 --- a/slf4j-jdk14/src/main/java/org/slf4j/jul/JDK14LoggerAdapter.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/jul/JDK14LoggerAdapter.java @@ -216,7 +216,7 @@ final private void fillCallerData(String callerFQCN, LogRecord record) { static String SUBSTITUE = SubstituteLogger.class.getName(); static String FLUENT = DefaultLoggingEventBuilder.class.getName(); - static String BARRIER_CLASSES[] = new String[] { SUPER_OF_SUPER, SUPER, SELF, SUBSTITUE, FLUENT }; + static String[] BARRIER_CLASSES = new String[] { SUPER_OF_SUPER, SUPER, SELF, SUBSTITUE, FLUENT }; private boolean barrierMatch(String callerFQCN, String candidateClassName) { if (candidateClassName.equals(callerFQCN)) diff --git a/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java b/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java index a324f2034..a8139d856 100644 --- a/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java +++ b/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java @@ -47,7 +47,7 @@ public class LoggerSerializationTest { static class LoggerHolder implements Serializable { private static final long serialVersionUID = 1L; - private Logger log = LoggerFactory.getLogger(LoggerHolder.class); + private final Logger log = LoggerFactory.getLogger(LoggerHolder.class); public String toString() { return "log=" + getLog(); diff --git a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/MDCFriendTest.java b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/MDCFriendTest.java index 74c40b27c..fa64b65dc 100755 --- a/slf4j-log4j12/src/test/java/org/slf4j/log4j12/MDCFriendTest.java +++ b/slf4j-log4j12/src/test/java/org/slf4j/log4j12/MDCFriendTest.java @@ -11,7 +11,7 @@ public class MDCFriendTest { - private static Random random = new Random(); + private static final Random random = new Random(); int diff = random.nextInt(1024 * 8); @Test 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 63f804b10..aa7c46d6c 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 @@ -58,8 +58,8 @@ public class MigratorFrame extends JFrame implements ActionListener { static final int X_SIZE = 700; static final int Y_SIZE = 400; - private SpringLayout layoutManager = new SpringLayout(); - private SpringLayoutHelper slh = new SpringLayoutHelper(layoutManager, BASIC_PADDING); + private final SpringLayout layoutManager = new SpringLayout(); + private final SpringLayoutHelper slh = new SpringLayoutHelper(layoutManager, BASIC_PADDING); private JLabel migrationLabel; 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 23aafb316..8367d5081 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 @@ -36,7 +36,7 @@ */ public class JCLRuleSet implements RuleSet { - private ArrayList conversionRuleList; + private final ArrayList conversionRuleList; public JCLRuleSet() { // matching : import org.apache.commons.logging.LogFactory; 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 e4e91f9f0..da5f3378b 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 @@ -36,7 +36,7 @@ */ public class JULRuleSet implements RuleSet { - private ArrayList conversionRuleList; + private final ArrayList conversionRuleList; public JULRuleSet() { 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 6fd02b378..e07aa73a0 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 @@ -30,7 +30,7 @@ public class Log4jRuleSet implements RuleSet { - private ArrayList conversionRuleList; + private final ArrayList conversionRuleList; public Log4jRuleSet() { diff --git a/slf4j-migrator/src/main/java/org/slf4j/migrator/line/MultiGroupConversionRule.java b/slf4j-migrator/src/main/java/org/slf4j/migrator/line/MultiGroupConversionRule.java index ce1ee5207..f07694067 100644 --- a/slf4j-migrator/src/main/java/org/slf4j/migrator/line/MultiGroupConversionRule.java +++ b/slf4j-migrator/src/main/java/org/slf4j/migrator/line/MultiGroupConversionRule.java @@ -40,8 +40,8 @@ public class MultiGroupConversionRule implements ConversionRule { // our conversion reg-expressions final private static int MAX_GROUPS = 10; - private Pattern pattern; - private String[] replacementTable = new String[MAX_GROUPS]; + private final Pattern pattern; + private final String[] replacementTable = new String[MAX_GROUPS]; public MultiGroupConversionRule(Pattern pattern) { this.pattern = pattern; diff --git a/slf4j-migrator/src/test/java/org/slf4j/migrator/helper/RandomHelper.java b/slf4j-migrator/src/test/java/org/slf4j/migrator/helper/RandomHelper.java index 1928daaa8..f0e304ca7 100644 --- a/slf4j-migrator/src/test/java/org/slf4j/migrator/helper/RandomHelper.java +++ b/slf4j-migrator/src/test/java/org/slf4j/migrator/helper/RandomHelper.java @@ -28,7 +28,7 @@ public class RandomHelper { - private Random random = new Random(100); + private final Random random = new Random(100); final char folderSeparator; RandomHelper(char folderSeparator) { 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 adefdd350..c9b0fa71b 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 @@ -35,7 +35,7 @@ class TrivialMatcher implements RuleSet { - private ArrayList conversionRuleList; + private final ArrayList conversionRuleList; public TrivialMatcher() { // simple rule no capturing group is defined, we use default capturing group which is group zero diff --git a/slf4j-nop/src/main/java/org/slf4j/nop/NOPServiceProvider.java b/slf4j-nop/src/main/java/org/slf4j/nop/NOPServiceProvider.java index d97456414..515cf23b2 100755 --- a/slf4j-nop/src/main/java/org/slf4j/nop/NOPServiceProvider.java +++ b/slf4j-nop/src/main/java/org/slf4j/nop/NOPServiceProvider.java @@ -17,9 +17,9 @@ public class NOPServiceProvider implements SLF4JServiceProvider { // to avoid constant folding by the compiler, this field must *not* be final public static String REQUESTED_API_VERSION = "2.0.99"; // !final - private ILoggerFactory loggerFactory = new NOPLoggerFactory(); - private IMarkerFactory markerFactory = new BasicMarkerFactory(); - private MDCAdapter mdcAdapter = new NOPMDCAdapter(); + private final ILoggerFactory loggerFactory = new NOPLoggerFactory(); + private final IMarkerFactory markerFactory = new BasicMarkerFactory(); + private final MDCAdapter mdcAdapter = new NOPMDCAdapter(); public ILoggerFactory getLoggerFactory() { return loggerFactory; 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 48ac05620..9cd0bc0c5 100755 --- a/slf4j-nop/src/test/java/org/slf4j/nop/MultithreadedInitializationTest.java +++ b/slf4j-nop/src/test/java/org/slf4j/nop/MultithreadedInitializationTest.java @@ -45,7 +45,7 @@ public class MultithreadedInitializationTest { final static int THREAD_COUNT = 4 + Runtime.getRuntime().availableProcessors() * 2; - private static AtomicLong EVENT_COUNT = new AtomicLong(0); + private static final AtomicLong EVENT_COUNT = new AtomicLong(0); final CyclicBarrier barrier = new CyclicBarrier(THREAD_COUNT + 1); 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 26e4598aa..823dbde7b 100644 --- a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java @@ -147,7 +147,7 @@ public class SimpleLogger extends LegacyAbstractLogger { private static final long serialVersionUID = -632788891211436180L; - private static long START_TIME = System.currentTimeMillis(); + private static final long START_TIME = System.currentTimeMillis(); protected static final int LOG_LEVEL_TRACE = LocationAwareLogger.TRACE_INT; protected static final int LOG_LEVEL_DEBUG = LocationAwareLogger.DEBUG_INT; 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 b707aa002..3a03b8f37 100755 --- a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java +++ b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java @@ -54,7 +54,7 @@ public class SimpleLoggerConfiguration { private static final boolean LEVEL_IN_BRACKETS_DEFAULT = false; boolean levelInBrackets = LEVEL_IN_BRACKETS_DEFAULT; - private static String LOG_FILE_DEFAULT = "System.err"; + private static final String LOG_FILE_DEFAULT = "System.err"; private String logFile = LOG_FILE_DEFAULT; OutputChoice outputChoice = null; diff --git a/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java b/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java index 1b584273f..f40468ab7 100755 --- a/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java +++ b/slf4j-simple/src/test/java/org/slf4j/simple/multiThreadedExecution/MultithereadedExecutionTest.java @@ -39,10 +39,10 @@ */ public class MultithereadedExecutionTest { - private static int THREAD_COUNT = 2; - private Thread[] threads = new Thread[THREAD_COUNT]; + private static final int THREAD_COUNT = 2; + private final Thread[] threads = new Thread[THREAD_COUNT]; - private static long TEST_DURATION_IN_MILLIS = 100; + private static final long TEST_DURATION_IN_MILLIS = 100; private final PrintStream oldOut = System.out; StateCheckingPrintStream scps = new StateCheckingPrintStream(oldOut); diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index f6f3127fd..85acd3dd1 100755 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -339,10 +339,10 @@

2019 - Release of SLF4J 1.8.0-beta5

February 19th, 2019 - Release of SLF4J 1.8.0-beta4

-

In the 1.8.x series, SLF4J has been +

In the 1.8.x series, SLF4J has been modularized per JPMS/Jigsaw - specificaton. The resulting internal changes are detailed in the FAQ page.

@@ -353,7 +353,7 @@

February 19th, 2019 - Release of SLF4J 1.8.0-beta4

In the 1.8.x series, SLF4J has been modularized per JPMS/Jigsaw - specificaton. The resulting internal changes are detailed in the FAQ page. Moreover, SLF4J now requires Java 6 or later as slf4j-api now relies on