Use final. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2693d253 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2693d253 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2693d253
Branch: refs/heads/master Commit: 2693d2531e5868f3dee866ab3c5527a3cd3fc777 Parents: d7a9ff7 Author: ggregory <ggreg...@apache.org> Authored: Fri Jun 3 10:02:48 2016 -0700 Committer: ggregory <ggreg...@apache.org> Committed: Fri Jun 3 10:02:48 2016 -0700 ---------------------------------------------------------------------- .../logging/log4j/CloseableThreadContext.java | 2 +- .../java/org/apache/logging/log4j/LogManager.java | 18 +++++++++--------- .../logging/log4j/simple/SimpleLoggerContext.java | 4 ++-- .../apache/logging/log4j/spi/LoggerRegistry.java | 2 +- .../org/apache/logging/log4j/spi/Provider.java | 4 ++-- .../apache/logging/log4j/status/StatusData.java | 2 +- .../apache/logging/log4j/status/StatusLogger.java | 2 +- .../org/apache/logging/log4j/util/LambdaUtil.java | 2 +- .../java/org/apache/logging/log4j/util/Unbox.java | 16 ++++++++-------- .../apache/logging/log4j/AbstractLoggerTest.java | 4 ++-- .../org/apache/logging/log4j/LogManagerTest.java | 2 +- .../java/org/apache/logging/log4j/LoggerTest.java | 16 ++++++++-------- .../apache/logging/log4j/TestLoggerContext.java | 4 ++-- .../org/apache/logging/log4j/util/UnboxTest.java | 6 +++--- 14 files changed, 42 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java b/log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java index b9a9cf0..e9317cf 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java @@ -143,7 +143,7 @@ public class CloseableThreadContext { } private void closeMap() { - for (Iterator<Map.Entry<String, String>> it = originalValues.entrySet().iterator(); it.hasNext(); ) { + for (final Iterator<Map.Entry<String, String>> it = originalValues.entrySet().iterator(); it.hasNext(); ) { final Map.Entry<String, String> entry = it.next(); final String key = entry.getKey(); final String originalValue = entry.getValue(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java index 9b651d6..a891103 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java @@ -153,7 +153,7 @@ public class LogManager { public static LoggerContext getContext() { try { return factory.getContext(FQCN, null, null, true); - } catch (IllegalStateException ex) { + } catch (final IllegalStateException ex) { LOGGER.warn(ex.getMessage() + " Using SimpleLogger"); return new SimpleLoggerContextFactory().getContext(FQCN, null, null, true); } @@ -172,7 +172,7 @@ public class LogManager { // TODO: would it be a terrible idea to try and find the caller ClassLoader here? try { return factory.getContext(FQCN, null, null, currentContext, null, null); - } catch (IllegalStateException ex) { + } catch (final IllegalStateException ex) { LOGGER.warn(ex.getMessage() + " Using SimpleLogger"); return new SimpleLoggerContextFactory().getContext(FQCN, null, null, currentContext, null, null); } @@ -192,7 +192,7 @@ public class LogManager { public static LoggerContext getContext(final ClassLoader loader, final boolean currentContext) { try { return factory.getContext(FQCN, loader, null, currentContext); - } catch (IllegalStateException ex) { + } catch (final IllegalStateException ex) { LOGGER.warn(ex.getMessage() + " Using SimpleLogger"); return new SimpleLoggerContextFactory().getContext(FQCN, loader, null, currentContext); } @@ -214,7 +214,7 @@ public class LogManager { final Object externalContext) { try { return factory.getContext(FQCN, loader, externalContext, currentContext); - } catch (IllegalStateException ex) { + } catch (final IllegalStateException ex) { LOGGER.warn(ex.getMessage() + " Using SimpleLogger"); return new SimpleLoggerContextFactory().getContext(FQCN, loader, externalContext, currentContext); } @@ -236,7 +236,7 @@ public class LogManager { final URI configLocation) { try { return factory.getContext(FQCN, loader, null, currentContext, configLocation, null); - } catch (IllegalStateException ex) { + } catch (final IllegalStateException ex) { LOGGER.warn(ex.getMessage() + " Using SimpleLogger"); return new SimpleLoggerContextFactory().getContext(FQCN, loader, null, currentContext, configLocation, null); @@ -260,7 +260,7 @@ public class LogManager { final Object externalContext, final URI configLocation) { try { return factory.getContext(FQCN, loader, externalContext, currentContext, configLocation, null); - } catch (IllegalStateException ex) { + } catch (final IllegalStateException ex) { LOGGER.warn(ex.getMessage() + " Using SimpleLogger"); return new SimpleLoggerContextFactory().getContext(FQCN, loader, externalContext, currentContext, configLocation, null); @@ -285,7 +285,7 @@ public class LogManager { final Object externalContext, final URI configLocation, final String name) { try { return factory.getContext(FQCN, loader, externalContext, currentContext, configLocation, name); - } catch (IllegalStateException ex) { + } catch (final IllegalStateException ex) { LOGGER.warn(ex.getMessage() + " Using SimpleLogger"); return new SimpleLoggerContextFactory().getContext(FQCN, loader, externalContext, currentContext, configLocation, name); @@ -305,7 +305,7 @@ public class LogManager { protected static LoggerContext getContext(final String fqcn, final boolean currentContext) { try { return factory.getContext(fqcn, null, null, currentContext); - } catch (IllegalStateException ex) { + } catch (final IllegalStateException ex) { LOGGER.warn(ex.getMessage() + " Using SimpleLogger"); return new SimpleLoggerContextFactory().getContext(fqcn, null, null, currentContext); } @@ -327,7 +327,7 @@ public class LogManager { final boolean currentContext) { try { return factory.getContext(fqcn, loader, null, currentContext); - } catch (IllegalStateException ex) { + } catch (final IllegalStateException ex) { LOGGER.warn(ex.getMessage() + " Using SimpleLogger"); return new SimpleLoggerContextFactory().getContext(fqcn, loader, null, currentContext); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java index 4f71a10..3fe637f 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java @@ -117,12 +117,12 @@ public class SimpleLoggerContext implements LoggerContext { } @Override - public boolean hasLogger(String name, MessageFactory messageFactory) { + public boolean hasLogger(final String name, final MessageFactory messageFactory) { return false; } @Override - public boolean hasLogger(String name, Class<? extends MessageFactory> messageFactoryClass) { + public boolean hasLogger(final String name, final Class<? extends MessageFactory> messageFactoryClass) { return false; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java index dbc8c0b..821f7a2 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java @@ -130,7 +130,7 @@ public class LoggerRegistry<T extends ExtendedLogger> { } public Collection<T> getLoggers(final Collection<T> destination) { - for (Map<String, T> inner : map.values()) { + for (final Map<String, T> inner : map.values()) { destination.addAll(inner.values()); } return destination; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java index 837f501..357e3c6 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java @@ -88,7 +88,7 @@ public class Provider { if (className == null) { return null; } - ClassLoader loader = classLoader.get(); + final ClassLoader loader = classLoader.get(); if (loader == null) { return null; } @@ -121,7 +121,7 @@ public class Provider { if (threadContextMap == null) { return null; } - ClassLoader loader = classLoader.get(); + final ClassLoader loader = classLoader.get(); if (loader == null) { return null; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java index 65d24c8..463d9d0 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java @@ -51,7 +51,7 @@ public class StatusData implements Serializable { * @param threadName The thread name */ public StatusData(final StackTraceElement caller, final Level level, final Message msg, final Throwable t, - String threadName) { + final String threadName) { this.timestamp = System.currentTimeMillis(); this.caller = caller; this.level = level; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java index 902b444..bf8fd52 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java @@ -80,7 +80,7 @@ public final class StatusLogger extends AbstractLogger { private int listenersLevel; - private StatusLogger(String name, MessageFactory messageFactory) { + private StatusLogger(final String name, final MessageFactory messageFactory) { super(name, messageFactory); this.logger = new SimpleLogger("StatusLogger", Level.ERROR, false, true, false, false, Strings.EMPTY, messageFactory, PROPS, System.err); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java index 33b0d2a..a9f1684 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java @@ -84,7 +84,7 @@ public final class LambdaUtil { * @return the Message resulting from evaluating the lambda expression or the Message created by the factory for * supplied values that are not of type Message */ - public static Message getMessage(Supplier<?> supplier, MessageFactory messageFactory) { + public static Message getMessage(final Supplier<?> supplier, final MessageFactory messageFactory) { if (supplier == null) { return null; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java index 41e403b..ff09b4b 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java @@ -69,7 +69,7 @@ public class Unbox { * @return a {@code StringBuilder} containing the text representation of the specified primitive value */ @PerformanceSensitive("allocation") - public static StringBuilder box(float value) { + public static StringBuilder box(final float value) { return getSB().append(value); } @@ -81,7 +81,7 @@ public class Unbox { * @return a {@code StringBuilder} containing the text representation of the specified primitive value */ @PerformanceSensitive("allocation") - public static StringBuilder box(double value) { + public static StringBuilder box(final double value) { return getSB().append(value); } @@ -93,7 +93,7 @@ public class Unbox { * @return a {@code StringBuilder} containing the text representation of the specified primitive value */ @PerformanceSensitive("allocation") - public static StringBuilder box(short value) { + public static StringBuilder box(final short value) { return getSB().append(value); } @@ -105,7 +105,7 @@ public class Unbox { * @return a {@code StringBuilder} containing the text representation of the specified primitive value */ @PerformanceSensitive("allocation") - public static StringBuilder box(int value) { + public static StringBuilder box(final int value) { return getSB().append(value); } @@ -117,7 +117,7 @@ public class Unbox { * @return a {@code StringBuilder} containing the text representation of the specified primitive value */ @PerformanceSensitive("allocation") - public static StringBuilder box(char value) { + public static StringBuilder box(final char value) { return getSB().append(value); } @@ -129,7 +129,7 @@ public class Unbox { * @return a {@code StringBuilder} containing the text representation of the specified primitive value */ @PerformanceSensitive("allocation") - public static StringBuilder box(long value) { + public static StringBuilder box(final long value) { return getSB().append(value); } @@ -141,7 +141,7 @@ public class Unbox { * @return a {@code StringBuilder} containing the text representation of the specified primitive value */ @PerformanceSensitive("allocation") - public static StringBuilder box(byte value) { + public static StringBuilder box(final byte value) { return getSB().append(value); } @@ -153,7 +153,7 @@ public class Unbox { * @return a {@code StringBuilder} containing the text representation of the specified primitive value */ @PerformanceSensitive("allocation") - public static StringBuilder box(boolean value) { + public static StringBuilder box(final boolean value) { return getSB().append(value); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java index d973610..348cda1 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java @@ -42,10 +42,10 @@ public class AbstractLoggerTest extends AbstractLogger { // TODO add proper tests for ReusableMessage @Before public void before() throws Exception { - Field field = AbstractLogger.class.getDeclaredField("messageFactory"); + final Field field = AbstractLogger.class.getDeclaredField("messageFactory"); field.setAccessible(true); // make non-private - Field modifierField = Field.class.getDeclaredField("modifiers"); + final Field modifierField = Field.class.getDeclaredField("modifiers"); modifierField.setAccessible(true); modifierField.setInt(field, field.getModifiers() &~ Modifier.FINAL); // make non-private http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/test/java/org/apache/logging/log4j/LogManagerTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LogManagerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LogManagerTest.java index 596a9f2..0bf0a0e 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/LogManagerTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/LogManagerTest.java @@ -57,7 +57,7 @@ public class LogManagerTest { @Test public void testShutdown() { - LoggerContext loggerContext = LogManager.getContext(false); + final LoggerContext loggerContext = LogManager.getContext(false); LogManager.shutdown(loggerContext); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java index c4238fa..b01cc17 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java @@ -105,7 +105,7 @@ public class LoggerTest { @Test public void flowTracingString_ObjectArray2() { - EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", 1, 2); + final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", 1, 2); logger.traceExit(msg, 3); assertEquals(2, results.size()); assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); @@ -116,7 +116,7 @@ public class LoggerTest { @Test public void flowTracingVoidReturn() { - EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", 1, 2); + final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", 1, 2); logger.traceExit(msg); assertEquals(2, results.size()); assertThat("Incorrect Entry", results.get(0), startsWith("ENTER[ FLOW ] TRACE Enter")); @@ -145,7 +145,7 @@ public class LoggerTest { @Test public void flowTracingString_SupplierOfObjectMessages() { - EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", new Supplier<Message>() { + final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", new Supplier<Message>() { @Override public Message get() { return new ObjectMessage(1); @@ -166,7 +166,7 @@ public class LoggerTest { @Test public void flowTracingString_SupplierOfStrings() { - EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", new Supplier<String>() { + final EntryMessage msg = logger.traceEntry("doFoo(a={}, b={})", new Supplier<String>() { @Override public String get() { return "1"; @@ -254,7 +254,7 @@ public class LoggerTest { assertEquals(String.format(" DEBUG %,d", Integer.MAX_VALUE), testLogger.getEntries().get(0)); } - private static void assertMessageFactoryInstanceOf(MessageFactory factory, Class cls) { + private static void assertMessageFactoryInstanceOf(MessageFactory factory, final Class cls) { if (factory instanceof MessageFactory2Adapter) { factory = ((MessageFactory2Adapter) factory).getOriginal(); } @@ -546,7 +546,7 @@ public class LoggerTest { int status; String message; - public Response(int status, String message) { + public Response(final int status, final String message) { this.status = status; this.message = message; } @@ -555,7 +555,7 @@ public class LoggerTest { return status; } - public void setStatus(int status) { + public void setStatus(final int status) { this.status = status; } @@ -563,7 +563,7 @@ public class LoggerTest { return message; } - public void setMessage(String message) { + public void setMessage(final String message) { this.message = message; } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java b/log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java index b0a5a82..7ca2fd6 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java @@ -56,12 +56,12 @@ public class TestLoggerContext implements LoggerContext { } @Override - public boolean hasLogger(String name, MessageFactory messageFactory) { + public boolean hasLogger(final String name, final MessageFactory messageFactory) { return false; } @Override - public boolean hasLogger(String name, Class<? extends MessageFactory> messageFactoryClass) { + public boolean hasLogger(final String name, final Class<? extends MessageFactory> messageFactoryClass) { return false; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2693d253/log4j-api/src/test/java/org/apache/logging/log4j/util/UnboxTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/UnboxTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/UnboxTest.java index e0b2766..784fbe8 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/UnboxTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/UnboxTest.java @@ -26,7 +26,7 @@ public class UnboxTest { @Test public void testBoxHas16Slots() throws Exception { - StringBuilder[] probe = new StringBuilder[16 * 3]; + final StringBuilder[] probe = new StringBuilder[16 * 3]; for (int i = 0; i <= probe.length - 8; ) { probe[i++] = Unbox.box(true); probe[i++] = Unbox.box('c'); @@ -118,7 +118,7 @@ public class UnboxTest { public void testBoxIsThreadLocal() throws Exception { final StringBuilder[] probe = new StringBuilder[16 * 3]; populate(0, probe); - Thread t1 = new Thread() { + final Thread t1 = new Thread() { @Override public void run() { populate(16, probe); @@ -126,7 +126,7 @@ public class UnboxTest { }; t1.start(); t1.join(); - Thread t2 = new Thread() { + final Thread t2 = new Thread() { @Override public void run() { populate(16, probe);
