Repository: logging-log4j2 Updated Branches: refs/heads/master d73d2a189 -> 7b54d3061
Add final modifier to local variables. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7b54d306 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7b54d306 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7b54d306 Branch: refs/heads/master Commit: 7b54d3061c35eea5ffe46afcc2b7fb7ab64603f4 Parents: d73d2a1 Author: Gary Gregory <ggreg...@apache.org> Authored: Mon Sep 19 22:24:24 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Mon Sep 19 22:24:24 2016 -0700 ---------------------------------------------------------------------- .../log4j/spi/DefaultThreadContextMap.java | 4 ++-- .../logging/log4j/util/ArrayContextData.java | 6 +++--- .../message/ReusableMessageFactoryTest.java | 4 ++-- .../log4j/util/ArrayContextDataTest.java | 10 +++++----- .../logging/log4j/core/impl/Log4jLogEvent.java | 6 +++--- .../core/impl/ThreadContextDataInjector.java | 2 +- .../core/jackson/ContextDataDeserializer.java | 2 +- .../log4j/core/net/TcpSocketManager.java | 2 +- .../appender/ScriptAppenderSelectorTest.java | 2 +- .../routing/DefaultRouteScriptAppenderTest.java | 2 +- .../routing/RoutesScriptAppenderTest.java | 2 +- ...ggerAllThreadContextImplementationsTest.java | 2 +- ...nfigAllThreadContextImplementationsTest.java | 2 +- .../log4j/core/filter/AbstractFilterTest.java | 10 +++++----- .../impl/NestedLoggingFromToStringTest.java | 20 ++++++++++---------- .../jmh/ArrayContextDataVsHashMapBenchmark.java | 6 +++--- .../log4j/perf/jmh/ThreadContextBenchmark.java | 6 +++--- .../log4j/perf/nogc/OpenHashMapContextData.java | 4 ++-- 18 files changed, 46 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java index c326389..1c01c0b 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java @@ -131,7 +131,7 @@ public class DefaultThreadContextMap implements ThreadContextMap2, ContextData { if (map == null) { return; } - for (Map.Entry<String, String> entry : map.entrySet()) { + for (final Map.Entry<String, String> entry : map.entrySet()) { action.accept(entry.getKey(), (V) entry.getValue()); } } @@ -142,7 +142,7 @@ public class DefaultThreadContextMap implements ThreadContextMap2, ContextData { if (map == null) { return; } - for (Map.Entry<String, String> entry : map.entrySet()) { + for (final Map.Entry<String, String> entry : map.entrySet()) { action.accept(entry.getKey(), (V) entry.getValue(), state); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java index cd88e47..41edc96 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java @@ -344,7 +344,7 @@ public class ArrayContextData implements MutableContextData { if (!(obj instanceof ArrayContextData)) { return false; } - ArrayContextData other = (ArrayContextData) obj; + final ArrayContextData other = (ArrayContextData) obj; if (this.size() != other.size()) { return false; } @@ -452,13 +452,13 @@ public class ArrayContextData implements MutableContextData { values = EMPTY; // Read in number of buckets - int capacity = s.readInt(); + final int capacity = s.readInt(); if (capacity < 0) { throw new InvalidObjectException("Illegal capacity: " + capacity); } // Read number of mappings - int mappings = s.readInt(); + final int mappings = s.readInt(); if (mappings < 0) { throw new InvalidObjectException("Illegal mappings count: " + mappings); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableMessageFactoryTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableMessageFactoryTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableMessageFactoryTest.java index 6c62503..7942e5f 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableMessageFactoryTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableMessageFactoryTest.java @@ -52,12 +52,12 @@ public class ReusableMessageFactoryTest { private void assertReusableParameterizeMessage(final Message message, final String txt, final Object[] params) { assertTrue(message instanceof ReusableParameterizedMessage); - ReusableParameterizedMessage msg = (ReusableParameterizedMessage) message; + final ReusableParameterizedMessage msg = (ReusableParameterizedMessage) message; assertTrue("reserved", msg.reserved); assertEquals(txt, msg.getFormat()); assertEquals("count", msg.getParameterCount(), params.length); - Object[] messageParams = msg.getParameters(); + final Object[] messageParams = msg.getParameters(); for (int i = 0; i < params.length; i++) { assertEquals(messageParams[i], params[i]); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-api/src/test/java/org/apache/logging/log4j/util/ArrayContextDataTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/ArrayContextDataTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/ArrayContextDataTest.java index adbabb8..bff68b5 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/ArrayContextDataTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/ArrayContextDataTest.java @@ -442,7 +442,7 @@ public class ArrayContextDataTest { original.putValue("d", "dvalue"); assertEquals(5, original.size()); - HashMap<String, String> expected = new HashMap<>(); + final HashMap<String, String> expected = new HashMap<>(); expected.put("a", "avalue"); expected.put("B", "Bvalue"); expected.put("3", "3value"); @@ -501,9 +501,9 @@ public class ArrayContextDataTest { assertNull(original.getValueAt(0)); // ensure slots in the values array are nulled out - Field f = ArrayContextData.class.getDeclaredField("values"); + final Field f = ArrayContextData.class.getDeclaredField("values"); f.setAccessible(true); - Object[] values = (Object[]) f.get(original); + final Object[] values = (Object[]) f.get(original); for (int i = 0; i < values.length; i++) { assertNull(values[i]); } @@ -592,9 +592,9 @@ public class ArrayContextDataTest { assertEquals(0, original.size()); // ensure slots in the values array are nulled out - Field f = ArrayContextData.class.getDeclaredField("values"); + final Field f = ArrayContextData.class.getDeclaredField("values"); f.setAccessible(true); - Object[] values = (Object[]) f.get(original); + final Object[] values = (Object[]) f.get(original); for (int i = 0; i < values.length; i++) { assertNull(values[i]); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java index 7b7f038..af18b64 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java @@ -194,7 +194,7 @@ public class Log4jLogEvent implements LogEvent { public Builder setContextMap(final Map<String, String> contextMap) { contextData = ContextDataFactory.createContextData(); // replace with new instance if (contextMap != null) { - for (Map.Entry<String, String> entry : contextMap.entrySet()) { + for (final Map.Entry<String, String> entry : contextMap.entrySet()) { contextData.putValue(entry.getKey(), entry.getValue()); } } @@ -428,7 +428,7 @@ public class Log4jLogEvent implements LogEvent { private static MutableContextData createContextData(final Map<String, String> contextMap) { final MutableContextData result = ContextDataFactory.createContextData(); if (contextMap != null) { - for (Map.Entry<String, String> entry : contextMap.entrySet()) { + for (final Map.Entry<String, String> entry : contextMap.entrySet()) { result.putValue(entry.getKey(), entry.getValue()); } } @@ -915,7 +915,7 @@ public class Log4jLogEvent implements LogEvent { } private static MutableContextData memento(final ContextData data) { - MutableContextData result = ContextDataFactory.createContextData(); + final MutableContextData result = ContextDataFactory.createContextData(); result.putAll(data); return result; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java index 2bfa69c..e57a807 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java @@ -90,7 +90,7 @@ public class ThreadContextDataInjector { */ private static void copyThreadContextMap(final Map<String, String> map, final MutableContextData result) { if (map != null) { - for (Map.Entry<String, String> entry : map.entrySet()) { + for (final Map.Entry<String, String> entry : map.entrySet()) { result.putValue(entry.getKey(), entry.getValue()); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataDeserializer.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataDeserializer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataDeserializer.java index c3dc827..fadd5d4 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataDeserializer.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataDeserializer.java @@ -54,7 +54,7 @@ public class ContextDataDeserializer extends StdDeserializer<MutableContextData> final MutableContextData contextData = ContextDataFactory.createContextData(); // Iterate over object fields: while (jp.nextToken() != JsonToken.END_OBJECT) { - String fieldName = jp.getCurrentName(); + final String fieldName = jp.getCurrentName(); // move to value jp.nextToken(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java index 444c250..891f5ac 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java @@ -147,7 +147,7 @@ public class TcpSocketManager extends AbstractSocketManager { @Override protected synchronized boolean closeOutputStream() { - boolean closed = super.closeOutputStream(); + final boolean closed = super.closeOutputStream(); if (reconnector != null) { reconnector.shutdown(); reconnector.interrupt(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelectorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelectorTest.java index 2e80467..549dea5 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelectorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelectorTest.java @@ -60,7 +60,7 @@ public class ScriptAppenderSelectorTest { } private void logAndCheck() { - Marker marker = MarkerManager.getMarker("HEXDUMP"); + final Marker marker = MarkerManager.getMarker("HEXDUMP"); final Logger logger = loggerContextRule.getLogger(ScriptAppenderSelectorTest.class); logger.error("Hello"); final ListAppender listAppender = getListAppender(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java index b77d12f..b112fb7 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java @@ -89,7 +89,7 @@ public class DefaultRouteScriptAppenderTest { } private void logAndCheck() { - Marker marker = MarkerManager.getMarker("HEXDUMP"); + final Marker marker = MarkerManager.getMarker("HEXDUMP"); final Logger logger = loggerContextRule.getLogger(DefaultRouteScriptAppenderTest.class); logger.error("Hello"); final ListAppender listAppender = getListAppender(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutesScriptAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutesScriptAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutesScriptAppenderTest.java index 7e40234..a9cc947 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutesScriptAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutesScriptAppenderTest.java @@ -91,7 +91,7 @@ public class RoutesScriptAppenderTest { } private void logAndCheck() { - Marker marker = MarkerManager.getMarker("HEXDUMP"); + final Marker marker = MarkerManager.getMarker("HEXDUMP"); final Logger logger = loggerContextRule.getLogger(RoutesScriptAppenderTest.class); logger.error("Hello"); final ListAppender listAppender = getListAppender(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerAllThreadContextImplementationsTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerAllThreadContextImplementationsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerAllThreadContextImplementationsTest.java index 6e42149..3dcd534 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerAllThreadContextImplementationsTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerAllThreadContextImplementationsTest.java @@ -178,7 +178,7 @@ public class AsyncLoggerAllThreadContextImplementationsTest { try (final BufferedReader reader = new BufferedReader(new FileReader(file))) { String expect = null; for (int i = 0; i < LINE_COUNT; i++) { - String line = reader.readLine(); + final String line = reader.readLine(); if ((i & 1) == 1) { expect = "INFO c.f.Bar mapvalue [stackvalue] {KEY=mapvalue, configProp=configValue, configProp2=configValue2, count=" + i + "} " + contextDesc + " i=" + i; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAllThreadContextImplementationsTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAllThreadContextImplementationsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAllThreadContextImplementationsTest.java index a79e8a3..1f08d0a 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAllThreadContextImplementationsTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAllThreadContextImplementationsTest.java @@ -149,7 +149,7 @@ public class AsyncLoggerConfigAllThreadContextImplementationsTest { try (final BufferedReader reader = new BufferedReader(new FileReader(file))) { String expect = null; for (int i = 0; i < LINE_COUNT; i++) { - String line = reader.readLine(); + final String line = reader.readLine(); if ((i & 1) == 1) { expect = "INFO c.f.Bar mapvalue [stackvalue] {KEY=mapvalue, configProp=configValue, configProp2=configValue2, count=" + i + "} " + contextDesc + " i=" + i; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterTest.java index bdfba2d..077e2b1 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterTest.java @@ -33,8 +33,8 @@ public class AbstractFilterTest { @Test public void testUnrolledBackwardsCompatible() { - ConcreteFilter filter = new ConcreteFilter(); - Filter.Result expected = Filter.Result.DENY; + final ConcreteFilter filter = new ConcreteFilter(); + final Filter.Result expected = Filter.Result.DENY; verifyMethodsWithUnrolledVarargs(filter, Filter.Result.DENY); filter.testResult = Filter.Result.ACCEPT; @@ -42,9 +42,9 @@ public class AbstractFilterTest { } private void verifyMethodsWithUnrolledVarargs(final ConcreteFilter filter, final Filter.Result expected) { - Logger logger = null; - Level level = null; - Marker marker = null; + final Logger logger = null; + final Level level = null; + final Marker marker = null; assertEquals(expected, filter.filter(logger, level, marker, "", 1)); assertEquals(expected, filter.filter(logger, level, marker, "", 1, 2)); assertEquals(expected, filter.filter(logger, level, marker, "", 1, 2, 3)); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java index 8aa57b0..fbd9dce 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java @@ -92,24 +92,24 @@ public class NestedLoggingFromToStringTest { @Test public void testNestedLoggingInLastArgument() { - ParameterizedLoggingThing it = new ParameterizedLoggingThing(); + final ParameterizedLoggingThing it = new ParameterizedLoggingThing(); logger.info("main: argCount={} it={}", "2", it); final List<String> list = listAppender.getMessages(); - String expect1 = "DEBUG org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest$ParameterizedLoggingThing getX: values x=3 y=4 z=5"; - String expect2 = "INFO org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest main: argCount=2 it=[ParameterizedLoggingThing x=3 y=4 z=5]"; + final String expect1 = "DEBUG org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest$ParameterizedLoggingThing getX: values x=3 y=4 z=5"; + final String expect2 = "INFO org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest main: argCount=2 it=[ParameterizedLoggingThing x=3 y=4 z=5]"; assertEquals(expect1, list.get(0)); assertEquals(expect2, list.get(1)); } @Test public void testNestedLoggingInFirstArgument() { - ParameterizedLoggingThing it = new ParameterizedLoggingThing(); + final ParameterizedLoggingThing it = new ParameterizedLoggingThing(); logger.info("next: it={} some{} other{}", it, "AA", "BB"); final List<String> list = listAppender.getMessages(); - String expect1 = "DEBUG org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest$ParameterizedLoggingThing getX: values x=3 y=4 z=5"; - String expect2 = "INFO org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest next: it=[ParameterizedLoggingThing x=3 y=4 z=5] someAA otherBB"; + final String expect1 = "DEBUG org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest$ParameterizedLoggingThing getX: values x=3 y=4 z=5"; + final String expect2 = "INFO org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest next: it=[ParameterizedLoggingThing x=3 y=4 z=5] someAA otherBB"; assertEquals(expect1, list.get(0)); assertEquals(expect2, list.get(1)); } @@ -119,10 +119,10 @@ public class NestedLoggingFromToStringTest { logger.info(new ObjectLoggingThing1()); final List<String> list = listAppender.getMessages(); - String expect1 = "DEBUG org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest$ParameterizedLoggingThing getX: values x=3 y=4 z=5"; - String expect2 = "TRACE org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest$ObjectLoggingThing2 [ParameterizedLoggingThing x=3 y=4 z=5]"; - String expect3 = "TRACE org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest$ObjectLoggingThing1 [ObjectLoggingThing2 x=123]"; - String expect4 = "INFO org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest [ObjectLoggingThing1 y=999]"; + final String expect1 = "DEBUG org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest$ParameterizedLoggingThing getX: values x=3 y=4 z=5"; + final String expect2 = "TRACE org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest$ObjectLoggingThing2 [ParameterizedLoggingThing x=3 y=4 z=5]"; + final String expect3 = "TRACE org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest$ObjectLoggingThing1 [ObjectLoggingThing2 x=123]"; + final String expect4 = "INFO org.apache.logging.log4j.core.impl.NestedLoggingFromToStringTest [ObjectLoggingThing1 y=999]"; assertEquals(expect1, list.get(0)); assertEquals(expect2, list.get(1)); assertEquals(expect3, list.get(2)); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ArrayContextDataVsHashMapBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ArrayContextDataVsHashMapBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ArrayContextDataVsHashMapBenchmark.java index b32b44e..63f43f2 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ArrayContextDataVsHashMapBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ArrayContextDataVsHashMapBenchmark.java @@ -86,9 +86,9 @@ public class ArrayContextDataVsHashMapBenchmark { map = new HashMap<>(); keys = new String[count]; - Random r = new Random(); + final Random r = new Random(); for (int j = 0; j < keys.length; j++) { - char[] str = new char[length]; + final char[] str = new char[length]; for (int i = 0; i < str.length; i++) { str[i] = (char) r.nextInt(); } @@ -198,7 +198,7 @@ public class ArrayContextDataVsHashMapBenchmark { public int iterateMap() { final int[] result = {0}; - for (Map.Entry<String, Object> entry : populatedMap.entrySet()) { + for (final Map.Entry<String, Object> entry : populatedMap.entrySet()) { result[0] += entry.getKey().hashCode() + entry.getValue().hashCode(); } return result[0]; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java index 3f1ecbf..f2a950d 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java @@ -115,9 +115,9 @@ public class ThreadContextBenchmark { keys = new String[count]; values = new String[count]; - Random r = new Random(); + final Random r = new Random(); for (int j = 0; j < keys.length; j++) { - char[] str = new char[KEY_LENGTH]; + final char[] str = new char[KEY_LENGTH]; for (int i = 0; i < str.length; i++) { str[i] = (char) r.nextInt(); } @@ -127,7 +127,7 @@ public class ThreadContextBenchmark { final int PROPERTIES_COUNT = 5; // count propertyList = new ArrayList<>(PROPERTIES_COUNT); for (int j = 0; j < PROPERTIES_COUNT; j++) { - char[] str = new char[KEY_LENGTH]; + final char[] str = new char[KEY_LENGTH]; for (int i = 0; i < str.length; i++) { str[i] = (char) r.nextInt(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b54d306/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashMapContextData.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashMapContextData.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashMapContextData.java index 510ad96..a6a0c9e 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashMapContextData.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashMapContextData.java @@ -503,7 +503,7 @@ public class OpenHashMapContextData<K, V> implements MutableContextData, ThreadC // The resulting map will be tentatively sized for size() + m.size() elements tryCapacity(size() + map.size()); } - for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) { + for (final Map.Entry<? extends K, ? extends V> entry : map.entrySet()) { putObjectValue(entry.getKey(), entry.getValue()); } } @@ -656,7 +656,7 @@ public class OpenHashMapContextData<K, V> implements MutableContextData, ThreadC } try { rehash(l); - } catch (OutOfMemoryError cantDoIt) { // unusual to catch OOME but in this case appropriate + } catch (final OutOfMemoryError cantDoIt) { // unusual to catch OOME but in this case appropriate return false; } return true;
