http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java index beba5d3..86cce8d 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java @@ -35,7 +35,7 @@ public class AbstractFilterableTest { @Test public void testAddSimpleFilter() throws Exception { - Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null); filterable.addFilter(filter); assertSame(filter, filterable.getFilter()); @@ -43,7 +43,7 @@ public class AbstractFilterableTest { @Test public void testAddMultipleSimpleFilters() throws Exception { - Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null); filterable.addFilter(filter); assertSame(filter, filterable.getFilter()); @@ -56,7 +56,7 @@ public class AbstractFilterableTest { @Test public void testAddMultipleEqualSimpleFilter() throws Exception { - Filter filter = new EqualFilter("test"); + final Filter filter = new EqualFilter("test"); filterable.addFilter(filter); assertSame(filter, filterable.getFilter()); @@ -69,9 +69,9 @@ public class AbstractFilterableTest { @Test public void testAddCompositeFilter() throws Exception { - Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2}); + final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2}); filterable.addFilter(compositeFilter); assertSame(compositeFilter, filterable.getFilter()); @@ -79,10 +79,10 @@ public class AbstractFilterableTest { @Test public void testAddMultipleCompositeFilters() throws Exception { - Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter filter3 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2, filter3}); + final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter3 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2, filter3}); filterable.addFilter(compositeFilter); assertSame(compositeFilter, filterable.getFilter()); @@ -95,10 +95,10 @@ public class AbstractFilterableTest { @Test public void testAddSimpleFilterAndCompositeFilter() throws Exception { - Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter notInCompositeFilterFilter = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); + final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter notInCompositeFilterFilter = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); filterable.addFilter(notInCompositeFilterFilter); assertSame(notInCompositeFilterFilter, filterable.getFilter()); @@ -111,10 +111,10 @@ public class AbstractFilterableTest { @Test public void testAddCompositeFilterAndSimpleFilter() throws Exception { - Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter notInCompositeFilterFilter = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); + final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter notInCompositeFilterFilter = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); filterable.addFilter(compositeFilter); assertSame(compositeFilter, filterable.getFilter()); @@ -127,7 +127,7 @@ public class AbstractFilterableTest { @Test public void testRemoveSimpleFilterFromSimpleFilter() throws Exception { - Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null); filterable.addFilter(filter); filterable.removeFilter(filter); @@ -136,8 +136,8 @@ public class AbstractFilterableTest { @Test public void testRemoveSimpleEqualFilterFromSimpleFilter() throws Exception { - Filter filterOriginal = new EqualFilter("test"); - Filter filterCopy = new EqualFilter("test"); + final Filter filterOriginal = new EqualFilter("test"); + final Filter filterCopy = new EqualFilter("test"); filterable.addFilter(filterOriginal); filterable.removeFilter(filterCopy); @@ -146,8 +146,8 @@ public class AbstractFilterableTest { @Test public void testRemoveSimpleEqualFilterFromTwoSimpleFilters() throws Exception { - Filter filterOriginal = new EqualFilter("test"); - Filter filterCopy = new EqualFilter("test"); + final Filter filterOriginal = new EqualFilter("test"); + final Filter filterCopy = new EqualFilter("test"); filterable.addFilter(filterOriginal); filterable.addFilter(filterOriginal); @@ -159,8 +159,8 @@ public class AbstractFilterableTest { @Test public void testRemoveSimpleEqualFilterFromMultipleSimpleFilters() throws Exception { - Filter filterOriginal = new EqualFilter("test"); - Filter filterCopy = new EqualFilter("test"); + final Filter filterOriginal = new EqualFilter("test"); + final Filter filterCopy = new EqualFilter("test"); filterable.addFilter(filterOriginal); filterable.addFilter(filterOriginal); @@ -176,7 +176,7 @@ public class AbstractFilterableTest { @Test public void testRemoveNullFromSingleSimpleFilter() throws Exception { - Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null); filterable.addFilter(filter); filterable.removeFilter(null); @@ -186,8 +186,8 @@ public class AbstractFilterableTest { @Test public void testRemoveNonExistingFilterFromSingleSimpleFilter() throws Exception { - Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter newFilter = ThresholdFilter.createFilter(Level.WARN, null, null); + final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter newFilter = ThresholdFilter.createFilter(Level.WARN, null, null); filterable.addFilter(filter); filterable.removeFilter(newFilter); @@ -196,9 +196,9 @@ public class AbstractFilterableTest { @Test public void testRemoveSimpleFilterFromCompositeFilter() { - Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); + final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); filterable.addFilter(compositeFilter); @@ -211,10 +211,10 @@ public class AbstractFilterableTest { @Test public void testRemoveSimpleFilterFromCompositeAndSimpleFilter() { - Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); - Filter anotherFilter = ThresholdFilter.createFilter(Level.WARN, null, null); + final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); + final Filter anotherFilter = ThresholdFilter.createFilter(Level.WARN, null, null); filterable.addFilter(compositeFilter); @@ -228,9 +228,9 @@ public class AbstractFilterableTest { @Test public void testRemoveCompositeFilterFromCompositeFilter() { - Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); + final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); filterable.addFilter(compositeFilter); filterable.removeFilter(compositeFilter); @@ -239,10 +239,10 @@ public class AbstractFilterableTest { @Test public void testRemoveFiltersFromComposite() { - Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); - Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); - Filter anotherFilter = ThresholdFilter.createFilter(Level.WARN, null, null); + final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null); + final Filter compositeFilter = CompositeFilter.createFilters(new Filter[]{filter1, filter2}); + final Filter anotherFilter = ThresholdFilter.createFilter(Level.WARN, null, null); filterable.addFilter(compositeFilter); filterable.addFilter(anotherFilter); @@ -266,7 +266,7 @@ public class AbstractFilterableTest { if (this == o) return true; if (!(o instanceof EqualFilter)) return false; - EqualFilter that = (EqualFilter) o; + final EqualFilter that = (EqualFilter) o; if (key != null ? !key.equals(that.key) : that.key != null) return false;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractScriptFilterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractScriptFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractScriptFilterTest.java index a2e949c..53f9cd7 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractScriptFilterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractScriptFilterTest.java @@ -37,7 +37,7 @@ public abstract class AbstractScriptFilterTest { @Test public void testGroovyFilter() throws Exception { - Logger logger = LogManager.getLogger("TestGroovyFilter"); + final Logger logger = LogManager.getLogger("TestGroovyFilter"); logger.traceEntry(); logger.info("This should not be logged"); ThreadContext.put("UserId", "JohnDoe"); @@ -45,7 +45,7 @@ public abstract class AbstractScriptFilterTest { ThreadContext.clearMap(); final ListAppender app = getContext().getListAppender("List"); try { - List<String> messages = app.getMessages(); + final List<String> messages = app.getMessages(); assertNotNull("No Messages", messages); assertTrue("Incorrect number of messages. Expected 2, Actual " + messages.size(), messages.size() == 2); } finally { @@ -55,14 +55,14 @@ public abstract class AbstractScriptFilterTest { @Test public void testJavascriptFilter() throws Exception { - Logger logger = LogManager.getLogger("TestJavaScriptFilter"); + final Logger logger = LogManager.getLogger("TestJavaScriptFilter"); logger.traceEntry(); logger.info("This should not be logged"); ThreadContext.put("UserId", "JohnDoe"); logger.info("This should be logged"); ThreadContext.clearMap(); final ListAppender app = getContext().getListAppender("List"); - List<String> messages = app.getMessages(); + final List<String> messages = app.getMessages(); try { assertNotNull("No Messages", messages); assertTrue("Incorrect number of messages. Expected 2, Actual " + messages.size(), messages.size() == 2); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventNanoTimeTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventNanoTimeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventNanoTimeTest.java index b4d37dd..93d60c4 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventNanoTimeTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventNanoTimeTest.java @@ -80,7 +80,7 @@ public class Log4jLogEventNanoTimeTest { final String[] line1Parts = line1.split(" AND "); assertEquals("Use actual System.nanoTime()", line1Parts[2]); assertEquals(line1Parts[0], line1Parts[1]); - long loggedNanoTime = Long.parseLong(line1Parts[0]); + final long loggedNanoTime = Long.parseLong(line1Parts[0]); assertTrue("used system nano time", loggedNanoTime - before < TimeUnit.SECONDS.toNanos(1)); final String[] line2Parts = line2.split(" AND "); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java index f5f2e87..d57a058 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java @@ -279,7 +279,7 @@ public class Log4jLogEventTest { assertSame(exception, event.getThrown()); assertEquals(987654321L, event.getTimeMillis()); - LogEvent event2 = new Log4jLogEvent.Builder(event).build(); + final LogEvent event2 = new Log4jLogEvent.Builder(event).build(); assertEquals("copy constructor builder", event2, event); assertEquals("same hashCode", event2.hashCode(), event.hashCode()); } @@ -327,7 +327,7 @@ public class Log4jLogEventTest { assertSame(exception, event.getThrown()); assertEquals(987654321L, event.getTimeMillis()); - LogEvent e2 = new Log4jLogEvent.Builder(event).build(); + final LogEvent e2 = new Log4jLogEvent.Builder(event).build(); assertSame(contextMap, e2.getContextMap()); assertSame(contextStack, e2.getContextStack()); assertEquals(true, e2.isEndOfBatch()); @@ -345,9 +345,9 @@ public class Log4jLogEventTest { // use reflection to get value of source field in log event copy: // invoking the getSource() method would initialize the field - Field fieldSource = Log4jLogEvent.class.getDeclaredField("source"); + final Field fieldSource = Log4jLogEvent.class.getDeclaredField("source"); fieldSource.setAccessible(true); - Object value = fieldSource.get(e2); + final Object value = fieldSource.get(e2); assertNull("source in copy", value); } @@ -437,7 +437,7 @@ public class Log4jLogEventTest { try { // TODO null logger name throws NPE in equals. Use Objects.requireNonNull in constructor? different("null name", builder(event).setLoggerName(null), event); fail("Expected NullPointerException"); - } catch (NullPointerException ok) { + } catch (final NullPointerException ok) { } different("different marker", builder(event).setMarker(MarkerManager.getMarker("different")), event); @@ -447,7 +447,7 @@ public class Log4jLogEventTest { try { // TODO null message throws NPE in equals(). Use Objects.requireNonNull in constructor? different("null message", builder(event).setMessage(null), event); fail("Expected NullPointerException"); - } catch (NullPointerException ok) { + } catch (final NullPointerException ok) { } different("different nanoTime", builder(event).setNanoTime(135), event); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java index fa3a055..3980a54 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java @@ -45,7 +45,7 @@ public class MutableLogEventTest { private static final ThreadContext.ContextStack STACK = new MutableThreadContextStack(Arrays.asList("abc", "xyz")); private static Map<String,String> createContextMap() { - Map<String,String> result = new HashMap<>(); + final Map<String,String> result = new HashMap<>(); result.put("a", "1"); result.put("b", "2"); return result; @@ -54,7 +54,7 @@ public class MutableLogEventTest { @Test public void testInitFromCopiesAllFields() { // private ThrowableProxy thrownProxy; - Log4jLogEvent source = Log4jLogEvent.newBuilder() // + final Log4jLogEvent source = Log4jLogEvent.newBuilder() // .setContextMap(CONTEXTMAP) // .setContextStack(STACK) // .setEndOfBatch(true) // @@ -70,7 +70,7 @@ public class MutableLogEventTest { .setThrown(new RuntimeException("run")) // .setTimeMillis(987654321) .build(); - MutableLogEvent mutable = new MutableLogEvent(); + final MutableLogEvent mutable = new MutableLogEvent(); mutable.initFrom(source); assertEquals("contextMap", CONTEXTMAP, mutable.getContextMap()); assertEquals("stack", STACK, mutable.getContextStack()); @@ -93,7 +93,7 @@ public class MutableLogEventTest { @Test public void testClear() { - MutableLogEvent mutable = new MutableLogEvent(); + final MutableLogEvent mutable = new MutableLogEvent(); assertNull("context map", mutable.getContextMap()); assertNull("context stack", mutable.getContextStack()); assertFalse("end of batch", mutable.isEndOfBatch()); @@ -175,7 +175,7 @@ public class MutableLogEventTest { @Test public void testJavaIoSerializable() throws Exception { - MutableLogEvent evt = new MutableLogEvent(); + final MutableLogEvent evt = new MutableLogEvent(); evt.setContextMap(CONTEXTMAP); evt.setContextStack(STACK); evt.setEndOfBatch(true); @@ -218,7 +218,7 @@ public class MutableLogEventTest { @Test public void testJavaIoSerializableWithThrown() throws Exception { final Error thrown = new InternalError("test error"); - MutableLogEvent evt = new MutableLogEvent(); + final MutableLogEvent evt = new MutableLogEvent(); evt.setContextMap(CONTEXTMAP); evt.setContextStack(STACK); evt.setEndOfBatch(true); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java index 2d297f4..78c83ac 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java @@ -32,20 +32,20 @@ public class ReusableLogEventFactoryTest { @Test public void testCreateEventReturnsSameInstance() throws Exception { final ReusableLogEventFactory factory = new ReusableLogEventFactory(); - LogEvent event1 = callCreateEvent(factory, "a", Level.DEBUG, new SimpleMessage("abc"), null); - LogEvent event2 = callCreateEvent(factory, "b", Level.INFO, new SimpleMessage("xyz"), null); + final LogEvent event1 = callCreateEvent(factory, "a", Level.DEBUG, new SimpleMessage("abc"), null); + final LogEvent event2 = callCreateEvent(factory, "b", Level.INFO, new SimpleMessage("xyz"), null); assertSame(event1, event2); } @Test public void testCreateEventOverwritesFields() throws Exception { final ReusableLogEventFactory factory = new ReusableLogEventFactory(); - LogEvent event1 = callCreateEvent(factory, "a", Level.DEBUG, new SimpleMessage("abc"), null); + final LogEvent event1 = callCreateEvent(factory, "a", Level.DEBUG, new SimpleMessage("abc"), null); assertEquals("logger", "a", event1.getLoggerName()); assertEquals("level", Level.DEBUG, event1.getLevel()); assertEquals("msg", new SimpleMessage("abc"), event1.getMessage()); - LogEvent event2 = callCreateEvent(factory, "b", Level.INFO, new SimpleMessage("xyz"), null); + final LogEvent event2 = callCreateEvent(factory, "b", Level.INFO, new SimpleMessage("xyz"), null); assertSame(event1, event2); assertEquals("logger", "b", event1.getLoggerName()); @@ -66,12 +66,12 @@ public class ReusableLogEventFactoryTest { final ReusableLogEventFactory factory = new ReusableLogEventFactory(); final LogEvent[] event1 = new LogEvent[1]; final LogEvent[] event2 = new LogEvent[1]; - Thread t1 = new Thread("THREAD 1") { + final Thread t1 = new Thread("THREAD 1") { public void run() { event1[0] = callCreateEvent(factory, "a", Level.DEBUG, new SimpleMessage("abc"), null); } }; - Thread t2 = new Thread("Thread 2") { + final Thread t2 = new Thread("Thread 2") { public void run() { event2[0] = callCreateEvent(factory, "b", Level.INFO, new SimpleMessage("xyz"), null); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutAllAsyncTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutAllAsyncTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutAllAsyncTest.java index 0ef2e1d..d90f75b 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutAllAsyncTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutAllAsyncTest.java @@ -51,19 +51,19 @@ public class CsvParameterLayoutAllAsyncTest { @Test public void testLayoutDefaultNormal() throws Exception { - Logger root = (Logger) LogManager.getRootLogger(); + final Logger root = (Logger) LogManager.getRootLogger(); CsvParameterLayoutTest.testLayoutNormalApi(root, CsvParameterLayout.createDefaultLayout(), false); } @Test public void testLayoutDefaultObjectArrayMessage() throws Exception { - Logger root = (Logger) LogManager.getRootLogger(); + final Logger root = (Logger) LogManager.getRootLogger(); CsvParameterLayoutTest.testLayoutNormalApi(root, CsvParameterLayout.createDefaultLayout(), true); } @Test public void testLayoutTab() throws Exception { - Logger root = (Logger) LogManager.getRootLogger(); + final Logger root = (Logger) LogManager.getRootLogger(); CsvParameterLayoutTest.testLayoutNormalApi(root, CsvParameterLayout.createLayout(CSVFormat.TDF), true); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutTest.java index f1826a2..280cb80 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutTest.java @@ -143,19 +143,19 @@ public class CsvParameterLayoutTest { @Test public void testLayoutDefaultNormal() throws Exception { - Logger root = this.init.getRootLogger(); + final Logger root = this.init.getRootLogger(); testLayoutNormalApi(root, CsvParameterLayout.createDefaultLayout(), false); } @Test public void testLayoutDefaultObjectArrayMessage() throws Exception { - Logger root = this.init.getRootLogger(); + final Logger root = this.init.getRootLogger(); testLayoutNormalApi(root, CsvParameterLayout.createDefaultLayout(), true); } @Test public void testLayoutTab() throws Exception { - Logger root = this.init.getRootLogger(); + final Logger root = this.init.getRootLogger(); testLayoutNormalApi(root, CsvParameterLayout.createLayout(CSVFormat.TDF), true); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java index 7e7c9a9..8bcdd14 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java @@ -176,7 +176,7 @@ public class GelfLayoutTest { final String uncompressedString = new String(uncompressed, layout.getCharset()); final String uncompressedString2 = new String(uncompressed2, layout.getCharset()); //@formatter:off - String expected = "{" + + final String expected = "{" + "\"version\": \"1.1\"," + "\"host\": \"" + HOSTNAME + "\"," + "\"timestamp\": " + GelfLayout.formatTimestamp(events.get(2).getTimeMillis()) + "," + http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutMainMapLookupTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutMainMapLookupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutMainMapLookupTest.java index 08386ba..a2881df 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutMainMapLookupTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutMainMapLookupTest.java @@ -1,64 +1,64 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. - */ - -package org.apache.logging.log4j.core.layout; - -import java.util.List; - -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.appender.FileAppender; -import org.apache.logging.log4j.core.lookup.MainMapLookup; -import org.apache.logging.log4j.junit.LoggerContextRule; -import org.apache.logging.log4j.test.appender.ListAppender; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; - -/** - * Tests LOG4j2-962. - */ -public class PatternLayoutMainMapLookupTest { - - static { - // Must be set before Log4j writes the header to the appenders. - MainMapLookup.setMainArguments("value0", "value1", "value2"); - } - - @ClassRule - public static LoggerContextRule context = new LoggerContextRule("log4j2-962.xml"); - - @Test - public void testFileName() { - FileAppender fileApp = (FileAppender) context.getRequiredAppender("File"); - final String name = fileApp.getFileName(); - Assert.assertEquals("target/value0.log", name); - } - - @Test - public void testHeader() { - ListAppender listApp = context.getListAppender("List"); - Logger logger = context.getLogger(this.getClass().getName()); - logger.info("Hello World"); - final List<String> messages = listApp.getMessages(); - Assert.assertFalse(messages.isEmpty()); - final String messagesStr = messages.toString(); - Assert.assertEquals(messagesStr, "Header: value0", messages.get(0)); - listApp.stop(); - Assert.assertEquals(messagesStr, "Footer: value1", messages.get(2)); - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ + +package org.apache.logging.log4j.core.layout; + +import java.util.List; + +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.appender.FileAppender; +import org.apache.logging.log4j.core.lookup.MainMapLookup; +import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.test.appender.ListAppender; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Test; + +/** + * Tests LOG4j2-962. + */ +public class PatternLayoutMainMapLookupTest { + + static { + // Must be set before Log4j writes the header to the appenders. + MainMapLookup.setMainArguments("value0", "value1", "value2"); + } + + @ClassRule + public static LoggerContextRule context = new LoggerContextRule("log4j2-962.xml"); + + @Test + public void testFileName() { + final FileAppender fileApp = (FileAppender) context.getRequiredAppender("File"); + final String name = fileApp.getFileName(); + Assert.assertEquals("target/value0.log", name); + } + + @Test + public void testHeader() { + final ListAppender listApp = context.getListAppender("List"); + final Logger logger = context.getLogger(this.getClass().getName()); + logger.info("Hello World"); + final List<String> messages = listApp.getMessages(); + Assert.assertFalse(messages.isEmpty()); + final String messagesStr = messages.toString(); + Assert.assertEquals(messagesStr, "Header: value0", messages.get(0)); + listApp.stop(); + Assert.assertEquals(messagesStr, "Footer: value1", messages.get(2)); + } + +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java index 5b51e96..07bde21 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java @@ -227,9 +227,9 @@ public class PatternLayoutTest { @Test public void testPatternSelector() throws Exception { - PatternMatch[] patterns = new PatternMatch[1]; + final PatternMatch[] patterns = new PatternMatch[1]; patterns[0] = new PatternMatch("FLOW", "%d %-5p [%t]: ====== %C{1}.%M:%L %m ======%n"); - PatternSelector selector = MarkerPatternSelector.createSelector(patterns, "%d %-5p [%t]: %m%n", true, true, ctx.getConfiguration()); + final PatternSelector selector = MarkerPatternSelector.createSelector(patterns, "%d %-5p [%t]: %m%n", true, true, ctx.getConfiguration()); final PatternLayout layout = PatternLayout.newBuilder().withPatternSelector(selector) .withConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() // @@ -499,7 +499,7 @@ public class PatternLayoutTest { .setLevel(Level.INFO) .setMessage(new SimpleMessage("Hello, world 1!")).build(); final String result1 = layout.toSerializable(event1); - String name = this.getClass().getName().substring(this.getClass().getName().indexOf(".") + 1); + final String name = this.getClass().getName().substring(this.getClass().getName().indexOf(".") + 1); assertEquals(name + " Hello, world 1!", new String(result1)); } { @@ -553,7 +553,7 @@ public class PatternLayoutTest { .setSource(new StackTraceElement(this.getClass().getName(), "testCallersFqcnTruncationByDroppingPartsFromFront", this.getClass().getCanonicalName() + ".java", 546)) .build(); final String result1 = layout.toSerializable(event1); - String name = this.getClass().getName().substring(this.getClass().getName().indexOf(".") + 1); + final String name = this.getClass().getName().substring(this.getClass().getName().indexOf(".") + 1); assertEquals(name + " Hello, world 1!", new String(result1)); } { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java index 82f710f..152c605 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java @@ -39,9 +39,9 @@ public class PatternSelectorTest { @Test public void testPatternSelector() throws Exception { - PatternMatch[] patterns = new PatternMatch[1]; + final PatternMatch[] patterns = new PatternMatch[1]; patterns[0] = new PatternMatch("FLOW", "%d %-5p [%t]: ====== %C{1}.%M:%L %m ======%n"); - PatternSelector selector = MarkerPatternSelector.createSelector(patterns, "%d %-5p [%t]: %m%n", true, true, ctx.getConfiguration()); + final PatternSelector selector = MarkerPatternSelector.createSelector(patterns, "%d %-5p [%t]: %m%n", true, true, ctx.getConfiguration()); final PatternLayout layout = PatternLayout.newBuilder().withPatternSelector(selector) .withConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() // http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/StringBuilderEncoderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/StringBuilderEncoderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/StringBuilderEncoderTest.java index 40c9db8..972d30b 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/StringBuilderEncoderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/StringBuilderEncoderTest.java @@ -61,7 +61,7 @@ public class StringBuilderEncoderTest { assertEquals("char at " + i, (byte) text.charAt(i), destination.drained.get(i)); } for (int i = destination.buffer.capacity(); i < text.length(); i++) { - int bufIx = i - destination.buffer.capacity(); + final int bufIx = i - destination.buffer.capacity(); assertEquals("char at " + i, (byte) text.charAt(i), destination.buffer.get(bufIx)); } } @@ -90,7 +90,7 @@ public class StringBuilderEncoderTest { assertEquals("char at " + i, (byte) text.charAt(i), destination.drained.get(i)); } for (int i = 3 * destination.buffer.capacity(); i < text.length(); i++) { - int bufIx = i - 3 * destination.buffer.capacity(); + final int bufIx = i - 3 * destination.buffer.capacity(); assertEquals("char at " + i, (byte) text.charAt(i), destination.buffer.get(bufIx)); } } @@ -260,7 +260,7 @@ public class StringBuilderEncoderTest { final int DESTINATION_SIZE = 1024 * 1024; final SpyByteBufferDestination destination = new SpyByteBufferDestination(256 * 1024, DESTINATION_SIZE); - int max = DESTINATION_SIZE / text.length(); + final int max = DESTINATION_SIZE / text.length(); for (int i = 0; i < max; i++) { helper.encode(text, destination); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java index 718aa57..3e7ecad 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java @@ -24,7 +24,9 @@ import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.net.Protocol; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Ignore; +@Ignore public class UdpSerializedSocketServerTest extends AbstractSocketServerTest { private static UdpSocketServer<ObjectInputStream> server; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java index e830604..80e9bd5 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java @@ -46,7 +46,7 @@ public class SslConfigurationTest { Assert.assertNotNull(clientSocket); clientSocket.close(); } - } catch (UnknownHostException offline) { + } catch (final UnknownHostException offline) { // this exception is thrown on Windows when offline } } @@ -65,7 +65,7 @@ public class SslConfigurationTest { // Expected, do nothing. } } - } catch (UnknownHostException offline) { + } catch (final UnknownHostException offline) { // this exception is thrown on Windows when offline } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverterTest.java index 642ed16..ec5106f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverterTest.java @@ -79,7 +79,7 @@ public class EqualsReplacementConverterTest { @Test public void testParseSubstitutionWithoutPattern() { - String substitution = "test"; + final String substitution = "test"; testParseSubstitution(substitution, substitution); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java index 69e0ec3..92f62d4 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java @@ -305,10 +305,10 @@ public class PatternParserTest { @Test public void testNanoPatternShortChangesConfigurationNanoClock() { - Configuration config = new NullConfiguration(); + final Configuration config = new NullConfiguration(); assertTrue(config.getNanoClock() instanceof DummyNanoClock); - PatternParser pp = new PatternParser(config, KEY, null); + final PatternParser pp = new PatternParser(config, KEY, null); assertTrue(config.getNanoClock() instanceof DummyNanoClock); pp.parse("%m"); @@ -320,10 +320,10 @@ public class PatternParserTest { @Test public void testNanoPatternLongChangesNanoClockFactoryMode() { - Configuration config = new NullConfiguration(); + final Configuration config = new NullConfiguration(); assertTrue(config.getNanoClock() instanceof DummyNanoClock); - PatternParser pp = new PatternParser(config, KEY, null); + final PatternParser pp = new PatternParser(config, KEY, null); assertTrue(config.getNanoClock() instanceof DummyNanoClock); pp.parse("%m"); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CronExpressionTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CronExpressionTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CronExpressionTest.java index d76ef4e..db586b7 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CronExpressionTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CronExpressionTest.java @@ -31,37 +31,37 @@ public class CronExpressionTest { @Test public void testDayOfMonth() throws Exception { - CronExpression parser = new CronExpression("0 */15,12 7-11,13-17 * * ?"); - Date date = new GregorianCalendar(2015, 11, 2).getTime(); - Date fireDate = parser.getNextValidTimeAfter(date); - Date expected = new GregorianCalendar(2015, 11, 2, 7, 0, 0).getTime(); + final CronExpression parser = new CronExpression("0 */15,12 7-11,13-17 * * ?"); + final Date date = new GregorianCalendar(2015, 11, 2).getTime(); + final Date fireDate = parser.getNextValidTimeAfter(date); + final Date expected = new GregorianCalendar(2015, 11, 2, 7, 0, 0).getTime(); assertEquals("Dates not equal.", expected, fireDate); } @Test public void testDayOfWeek() throws Exception { - CronExpression parser = new CronExpression("0 */15,12 7-11,13-17 ? * Fri"); - Date date = new GregorianCalendar(2015, 11, 2).getTime(); - Date fireDate = parser.getNextValidTimeAfter(date); - Date expected = new GregorianCalendar(2015, 11, 4, 7, 0, 0).getTime(); + final CronExpression parser = new CronExpression("0 */15,12 7-11,13-17 ? * Fri"); + final Date date = new GregorianCalendar(2015, 11, 2).getTime(); + final Date fireDate = parser.getNextValidTimeAfter(date); + final Date expected = new GregorianCalendar(2015, 11, 4, 7, 0, 0).getTime(); assertEquals("Dates not equal.", expected, fireDate); } @Test public void testNextMonth() throws Exception { - CronExpression parser = new CronExpression("0 */15,12 7-11,13-17 1 * ?"); - Date date = new GregorianCalendar(2015, 11, 2).getTime(); - Date fireDate = parser.getNextValidTimeAfter(date); - Date expected = new GregorianCalendar(2016, 0, 1, 7, 0, 0).getTime(); + final CronExpression parser = new CronExpression("0 */15,12 7-11,13-17 1 * ?"); + final Date date = new GregorianCalendar(2015, 11, 2).getTime(); + final Date fireDate = parser.getNextValidTimeAfter(date); + final Date expected = new GregorianCalendar(2016, 0, 1, 7, 0, 0).getTime(); assertEquals("Dates not equal.", expected, fireDate); } @Test public void testLastDayOfMonth() throws Exception { - CronExpression parser = new CronExpression("0 */15,12 7-11,13-17 L * ?"); - Date date = new GregorianCalendar(2015, 10, 2).getTime(); - Date fireDate = parser.getNextValidTimeAfter(date); - Date expected = new GregorianCalendar(2015, 10, 30, 7, 0, 0).getTime(); + final CronExpression parser = new CronExpression("0 */15,12 7-11,13-17 L * ?"); + final Date date = new GregorianCalendar(2015, 10, 2).getTime(); + final Date fireDate = parser.getNextValidTimeAfter(date); + final Date expected = new GregorianCalendar(2015, 10, 30, 7, 0, 0).getTime(); assertEquals("Dates not equal.", expected, fireDate); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/util/WatchManagerTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/WatchManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/WatchManagerTest.java index 8b98134..89d4f68 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/WatchManagerTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/WatchManagerTest.java @@ -48,26 +48,26 @@ public class WatchManagerTest { @Test public void testWatchManager() throws Exception { Assume.assumeFalse(IS_WINDOWS); - ConfigurationScheduler scheduler = new ConfigurationScheduler(); + final ConfigurationScheduler scheduler = new ConfigurationScheduler(); scheduler.incrementScheduledItems(); - WatchManager watchManager = new WatchManager(scheduler); + final WatchManager watchManager = new WatchManager(scheduler); watchManager.setIntervalSeconds(1); scheduler.start(); watchManager.start(); try { - File sourceFile = new File(originalFile); - FileOutputStream targetStream = new FileOutputStream(testFile); - File updateFile = new File(newFile); + final File sourceFile = new File(originalFile); + final FileOutputStream targetStream = new FileOutputStream(testFile); + final File updateFile = new File(newFile); Path source = Paths.get(sourceFile.toURI()); Files.copy(source, targetStream); - File targetFile = new File(testFile); - BlockingQueue<File> queue = new LinkedBlockingQueue<>(); + final File targetFile = new File(testFile); + final BlockingQueue<File> queue = new LinkedBlockingQueue<>(); watchManager.watchFile(targetFile, new TestWatcher(queue)); Thread.sleep(1000); source = Paths.get(updateFile.toURI()); Files.copy(source, Paths.get(targetFile.toURI()), StandardCopyOption.REPLACE_EXISTING); Thread.sleep(1000); - File f = queue.poll(1, TimeUnit.SECONDS); + final File f = queue.poll(1, TimeUnit.SECONDS); assertNotNull("File change not detected", f); } finally { watchManager.stop(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java index 00615b8..afbccff 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java @@ -51,13 +51,13 @@ public class CleanFiles extends ExternalResource { if (file.exists()) { try { FileSystems.getDefault().provider().delete(file.toPath()); - } catch (IOException e) { + } catch (final IOException e) { fail(e.toString()); } } try { Thread.sleep(200); - } catch (InterruptedException ignored) { + } catch (final InterruptedException ignored) { } } } @@ -70,7 +70,7 @@ public class CleanFiles extends ExternalResource { @Override public String toString() { - StringBuilder builder = new StringBuilder(); + final StringBuilder builder = new StringBuilder(); builder.append("CleanFiles ["); builder.append(files); builder.append("]"); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java index 8c15ef2..c2836a2 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java @@ -217,7 +217,7 @@ public class LoggerContextRule implements TestRule { @Override public String toString() { - StringBuilder builder = new StringBuilder(); + final StringBuilder builder = new StringBuilder(); builder.append("LoggerContextRule [configLocation="); builder.append(configLocation); builder.append(", contextSelectorClass="); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/message/MutableLogEventWithReusableParamMsgTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/message/MutableLogEventWithReusableParamMsgTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/message/MutableLogEventWithReusableParamMsgTest.java index 6e50c01..3cf523e 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/message/MutableLogEventWithReusableParamMsgTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/message/MutableLogEventWithReusableParamMsgTest.java @@ -26,8 +26,8 @@ import org.junit.Test; public class MutableLogEventWithReusableParamMsgTest { @Test public void testInteractionWithReusableParameterizedMessage() { - MutableLogEvent evt = new MutableLogEvent(); - ReusableParameterizedMessage msg = new ReusableParameterizedMessage(); + final MutableLogEvent evt = new MutableLogEvent(); + final ReusableParameterizedMessage msg = new ReusableParameterizedMessage(); msg.set("Hello {} {} {}", 1, 2, 3); evt.setMessage(msg); evt.clear(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/BlockingAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/BlockingAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/BlockingAppender.java index 1564317..4d3c7d8 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/BlockingAppender.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/BlockingAppender.java @@ -42,7 +42,7 @@ public class BlockingAppender extends AbstractAppender { while (running) { try { Thread.sleep(10L); - } catch (InterruptedException e) { + } catch (final InterruptedException e) { Thread.currentThread().interrupt(); // set interrupt status } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/EncodingListAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/EncodingListAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/EncodingListAppender.java index 1174174..74f8a21 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/EncodingListAppender.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/EncodingListAppender.java @@ -60,18 +60,18 @@ public class EncodingListAppender extends ListAppender { if (layout == null) { events.add(event); } else if (layout instanceof SerializedLayout) { - Destination content = new Destination(); + final Destination content = new Destination(); content.byteBuffer.put(layout.getHeader()); layout.encode(event, content); content.getByteBuffer().flip(); - byte[] record = new byte[content.getByteBuffer().remaining()]; + final byte[] record = new byte[content.getByteBuffer().remaining()]; content.getByteBuffer().get(record); data.add(record); } else { - Destination content = new Destination(); + final Destination content = new Destination(); layout.encode(event, content); content.getByteBuffer().flip(); - byte[] record = new byte[content.getByteBuffer().remaining()]; + final byte[] record = new byte[content.getByteBuffer().remaining()]; content.getByteBuffer().get(record); write(record); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java index 6bfd168..a6704d7 100644 --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java @@ -280,7 +280,7 @@ public class FlumeAppenderTest { avroLogger.info("Test message 2"); avroAppender.stop(); for (int i = 0; i < 3; ++i) { - Event event = channel.take(); + final Event event = channel.take(); Assert.assertNotNull("No event for item " + i, event); Assert.assertTrue("Channel contained event, but not expected message. Received : " + getBody(event), getBody(event).endsWith("Test message " + i)); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java ---------------------------------------------------------------------- diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java index be9d9f4..142a73a 100644 --- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java +++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java @@ -155,7 +155,7 @@ public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection> { return null; } } else if (Strings.isNotEmpty(databaseName)) { - List<MongoCredential> credentials = new ArrayList<>(); + final List<MongoCredential> credentials = new ArrayList<>(); description = "database=" + databaseName; if (Strings.isNotEmpty(userName) && Strings.isNotEmpty(password)) { description += ", username=" + userName + ", passwordHash=" @@ -195,7 +195,7 @@ public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection> { return null; } - WriteConcern writeConcern = toWriteConcern(writeConcernConstant, writeConcernConstantClassName); + final WriteConcern writeConcern = toWriteConcern(writeConcernConstant, writeConcernConstantClassName); return new MongoDbProvider(database, writeConcern, collectionName, description); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/message/ParameterFormatterBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/message/ParameterFormatterBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/message/ParameterFormatterBenchmark.java index 49bc9ea..a2a24e9 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/message/ParameterFormatterBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/message/ParameterFormatterBenchmark.java @@ -57,10 +57,10 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency3ParamsV3(final ThreadState state) { state.buffer.setLength(0); - String STR = "p1={}, p2={}, p3={}"; - int length = STR.length(); + final String STR = "p1={}, p2={}, p3={}"; + final int length = STR.length(); STR.getChars(0, length, state.copy, 0); - int count = ParameterFormatter.countArgumentPlaceholders3(state.copy, length, state.indices); + final int count = ParameterFormatter.countArgumentPlaceholders3(state.copy, length, state.indices); ParameterFormatter.formatMessage3(state.buffer, state.copy, length, ARGS, count, state.indices); return state.buffer.length(); } @@ -70,10 +70,10 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency5ParamsV3(final ThreadState state) { state.buffer.setLength(0); - String STR = "p1={}, p2={}, p3={}, p4={}, p5={}"; - int length = STR.length(); + final String STR = "p1={}, p2={}, p3={}, p4={}, p5={}"; + final int length = STR.length(); STR.getChars(0, length, state.copy, 0); - int count = ParameterFormatter.countArgumentPlaceholders3(state.copy, length, state.indices); + final int count = ParameterFormatter.countArgumentPlaceholders3(state.copy, length, state.indices); ParameterFormatter.formatMessage3(state.buffer, state.copy, length, ARGS, count, state.indices); return state.buffer.length(); } @@ -83,10 +83,10 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency7ParamsV3(final ThreadState state) { state.buffer.setLength(0); - String STR = "p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}"; - int length = STR.length(); + final String STR = "p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}"; + final int length = STR.length(); STR.getChars(0, length, state.copy, 0); - int count = ParameterFormatter.countArgumentPlaceholders3(state.copy, length, state.indices); + final int count = ParameterFormatter.countArgumentPlaceholders3(state.copy, length, state.indices); ParameterFormatter.formatMessage3(state.buffer, state.copy, length, ARGS, count, state.indices); return state.buffer.length(); } @@ -96,10 +96,10 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency9ParamsV3(final ThreadState state) { state.buffer.setLength(0); - String STR = "p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}, p8={}, p9={}"; - int length = STR.length(); + final String STR = "p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}, p8={}, p9={}"; + final int length = STR.length(); STR.getChars(0, length, state.copy, 0); - int count = ParameterFormatter.countArgumentPlaceholders3(state.copy, length, state.indices); + final int count = ParameterFormatter.countArgumentPlaceholders3(state.copy, length, state.indices); ParameterFormatter.formatMessage3(state.buffer, state.copy, length, ARGS, count, state.indices); return state.buffer.length(); } @@ -109,7 +109,7 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency3ParamsV2(final ThreadState state) { state.buffer.setLength(0); - int count = ParameterFormatter.countArgumentPlaceholders2("p1={}, p2={}, p3={}", state.indices); + final int count = ParameterFormatter.countArgumentPlaceholders2("p1={}, p2={}, p3={}", state.indices); ParameterFormatter.formatMessage2(state.buffer, "p1={}, p2={}, p3={}", ARGS, count, state.indices); return state.buffer.length(); } @@ -119,7 +119,7 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency5ParamsV2(final ThreadState state) { state.buffer.setLength(0); - int count = ParameterFormatter.countArgumentPlaceholders2("p1={}, p2={}, p3={}, p4={}, p5={}", state.indices); + final int count = ParameterFormatter.countArgumentPlaceholders2("p1={}, p2={}, p3={}, p4={}, p5={}", state.indices); ParameterFormatter.formatMessage2(state.buffer, "p1={}, p2={}, p3={}, p4={}, p5={}", ARGS, count, state.indices); return state.buffer.length(); } @@ -129,7 +129,7 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency7ParamsV2(final ThreadState state) { state.buffer.setLength(0); - int count = ParameterFormatter.countArgumentPlaceholders2("p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}", state.indices); + final int count = ParameterFormatter.countArgumentPlaceholders2("p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}", state.indices); ParameterFormatter.formatMessage2(state.buffer, "p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}", ARGS, count, state.indices); return state.buffer.length(); } @@ -139,7 +139,7 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency9ParamsV2(final ThreadState state) { state.buffer.setLength(0); - int count = ParameterFormatter.countArgumentPlaceholders2("p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}, p8={}, p9={}", state.indices); + final int count = ParameterFormatter.countArgumentPlaceholders2("p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}, p8={}, p9={}", state.indices); ParameterFormatter.formatMessage2(state.buffer, "p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}, p8={}, p9={}", ARGS, count, state.indices); return state.buffer.length(); } @@ -149,7 +149,7 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency3Params(final ThreadState state) { state.buffer.setLength(0); - int count = ParameterFormatter.countArgumentPlaceholders("p1={}, p2={}, p3={}"); + final int count = ParameterFormatter.countArgumentPlaceholders("p1={}, p2={}, p3={}"); ParameterFormatter.formatMessage(state.buffer, "p1={}, p2={}, p3={}", ARGS, count); return state.buffer.length(); } @@ -159,7 +159,7 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency5Params(final ThreadState state) { state.buffer.setLength(0); - int count = ParameterFormatter.countArgumentPlaceholders("p1={}, p2={}, p3={}, p4={}, p5={}"); + final int count = ParameterFormatter.countArgumentPlaceholders("p1={}, p2={}, p3={}, p4={}, p5={}"); ParameterFormatter.formatMessage(state.buffer, "p1={}, p2={}, p3={}, p4={}, p5={}", ARGS, count); return state.buffer.length(); } @@ -169,7 +169,7 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency7Params(final ThreadState state) { state.buffer.setLength(0); - int count = ParameterFormatter.countArgumentPlaceholders("p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}"); + final int count = ParameterFormatter.countArgumentPlaceholders("p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}"); ParameterFormatter.formatMessage(state.buffer, "p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}", ARGS, count); return state.buffer.length(); } @@ -179,7 +179,7 @@ public class ParameterFormatterBenchmark { @OutputTimeUnit(TimeUnit.NANOSECONDS) public int latency9Params(final ThreadState state) { state.buffer.setLength(0); - int count = ParameterFormatter.countArgumentPlaceholders("p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}, p8={}, p9={}"); + final int count = ParameterFormatter.countArgumentPlaceholders("p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}, p8={}, p9={}"); ParameterFormatter.formatMessage(state.buffer, "p1={}, p2={}, p3={}, p4={}, p5={}, p6={}, p7={}, p8={}, p9={}", ARGS, count); return state.buffer.length(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java index ed6bb68..540c264 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java @@ -85,7 +85,7 @@ public class AbstractStringLayoutStringEncodingBenchmark { utf8EncodeLayout = new EncodeLayout(Charset.forName("UTF-8")); utf16EncodeLayout = new EncodeLayout(Charset.forName("UTF-16")); - StringBuilder msg = new StringBuilder(); + final StringBuilder msg = new StringBuilder(); msg.append(MESSAGE); logEvent = createLogEvent(new SimpleMessage(msg)); @@ -93,7 +93,7 @@ public class AbstractStringLayoutStringEncodingBenchmark { destination = new Destination(); } - private static LogEvent createLogEvent(Message message) { + private static LogEvent createLogEvent(final Message message) { final Marker marker = null; final String fqcn = "com.mycom.myproject.mypackage.MyClass"; final org.apache.logging.log4j.Level level = org.apache.logging.log4j.Level.DEBUG; @@ -186,13 +186,13 @@ public class AbstractStringLayoutStringEncodingBenchmark { utf16EncodeLayout.encode(logEvent, destination); } - private static long consume(byte[] bytes) { + private static long consume(final byte[] bytes) { long checksum = 0; - for (byte b : bytes) checksum += b; + for (final byte b : bytes) checksum += b; return checksum; } - private static long consume(byte[] bytes, int offset, int length) { + private static long consume(final byte[] bytes, final int offset, final int length) { long checksum = 0; for (int i = offset; i < length; i++) { checksum += bytes[i]; @@ -201,43 +201,43 @@ public class AbstractStringLayoutStringEncodingBenchmark { } private static class GetBytesLayout extends AbstractStringLayout { - public GetBytesLayout(Charset charset) { + public GetBytesLayout(final Charset charset) { super(charset); } @Override - public String toSerializable(LogEvent event) { + public String toSerializable(final LogEvent event) { return null; } @Override - public byte[] toByteArray(LogEvent event) { - StringBuilder sb = getStringBuilder(); + public byte[] toByteArray(final LogEvent event) { + final StringBuilder sb = getStringBuilder(); ((StringBuilderFormattable) event.getMessage()).formatTo(sb); return getBytes(sb.toString()); } } private static class EncodeLayout extends AbstractStringLayout { - public EncodeLayout(Charset charset) { + public EncodeLayout(final Charset charset) { super(charset); } @Override - public String toSerializable(LogEvent event) { + public String toSerializable(final LogEvent event) { return null; } @Override - public byte[] toByteArray(LogEvent event) { + public byte[] toByteArray(final LogEvent event) { return null; } @Override - public void encode(LogEvent event, ByteBufferDestination destination) { - StringBuilder sb = getStringBuilder(); + public void encode(final LogEvent event, final ByteBufferDestination destination) { + final StringBuilder sb = getStringBuilder(); ((StringBuilderFormattable) event.getMessage()).formatTo(sb); - Encoder<StringBuilder> helper = getStringBuilderEncoder(); + final Encoder<StringBuilder> helper = getStringBuilderEncoder(); helper.encode(sb, destination); } } @@ -251,7 +251,7 @@ public class AbstractStringLayoutStringEncodingBenchmark { } @Override - public ByteBuffer drain(ByteBuffer buf) { + public ByteBuffer drain(final ByteBuffer buf) { buf.flip(); consume(buf.array(), buf.position(), buf.limit()); buf.clear(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/CollectionsBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/CollectionsBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/CollectionsBenchmark.java index ea40dac..9caa5f2 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/CollectionsBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/CollectionsBenchmark.java @@ -65,7 +65,7 @@ public class CollectionsBenchmark { @Benchmark public long iterMap1Element() { long total = 0; - for (Long value : map1.values()) { + for (final Long value : map1.values()) { total += value; } return total; @@ -74,7 +74,7 @@ public class CollectionsBenchmark { @Benchmark public long iterArraySet1Element() { long total = 0; - for (Long value : arraySet1) { + for (final Long value : arraySet1) { total += value; } return total; @@ -83,7 +83,7 @@ public class CollectionsBenchmark { @Benchmark public long iterArrayList1Element() { long total = 0; - for (Long value : arrayList1) { + for (final Long value : arrayList1) { total += value; } return total; @@ -92,7 +92,7 @@ public class CollectionsBenchmark { @Benchmark public long iterMap3Elements() { long total = 0; - for (Long value : map3.values()) { + for (final Long value : map3.values()) { total += value; } return total; @@ -101,7 +101,7 @@ public class CollectionsBenchmark { @Benchmark public long iterArraySet3Element() { long total = 0; - for (Long value : arraySet3) { + for (final Long value : arraySet3) { total += value; } return total; @@ -110,7 +110,7 @@ public class CollectionsBenchmark { @Benchmark public long iterArrayList3Element() { long total = 0; - for (Long value : arrayList3) { + for (final Long value : arrayList3) { total += value; } return total; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java index daccb12..cab0163 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java @@ -84,15 +84,15 @@ public class FileAppenderBenchmark { } private void deleteLogFiles() { - File logbackFile = new File("target/testlogback.log"); + final File logbackFile = new File("target/testlogback.log"); logbackFile.delete(); - File log4jFile = new File ("target/testlog4j.log"); + final File log4jFile = new File ("target/testlog4j.log"); log4jFile.delete(); - File log4jRandomFile = new File ("target/testRandomlog4j2.log"); + final File log4jRandomFile = new File ("target/testRandomlog4j2.log"); log4jRandomFile.delete(); - File log4j2File = new File ("target/testlog4j2.log"); + final File log4j2File = new File ("target/testlog4j2.log"); log4j2File.delete(); - File julFile = new File("target/testJulLog.log"); + final File julFile = new File("target/testJulLog.log"); julFile.delete(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java index c0602c3..ebffcc8 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java @@ -83,15 +83,15 @@ public class FileAppenderParamsBenchmark { } private void deleteLogFiles() { - File logbackFile = new File("target/testlogback.log"); + final File logbackFile = new File("target/testlogback.log"); logbackFile.delete(); - File log4jFile = new File ("target/testlog4j.log"); + final File log4jFile = new File ("target/testlog4j.log"); log4jFile.delete(); - File log4jRandomFile = new File ("target/testRandomlog4j2.log"); + final File log4jRandomFile = new File ("target/testRandomlog4j2.log"); log4jRandomFile.delete(); - File log4j2File = new File ("target/testlog4j2.log"); + final File log4j2File = new File ("target/testlog4j2.log"); log4j2File.delete(); - File julFile = new File("target/testJulLog.log"); + final File julFile = new File("target/testJulLog.log"); julFile.delete(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java index 0527709..bb8cd16 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java @@ -120,11 +120,11 @@ public class Log4j2AppenderComparisonBenchmark { } private void deleteLogFiles() { - File log4j2File = new File ("target/testlog4j2.log"); + final File log4j2File = new File ("target/testlog4j2.log"); log4j2File.delete(); - File log4jRandomFile = new File ("target/testRandomlog4j2.log"); + final File log4jRandomFile = new File ("target/testRandomlog4j2.log"); log4jRandomFile.delete(); - File mmapFile = new File ("target/MemoryMappedFileAppenderTest.log"); + final File mmapFile = new File ("target/MemoryMappedFileAppenderTest.log"); mmapFile.delete(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java index 0321b04..bf64b19 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java @@ -72,7 +72,7 @@ public class LoggerConfigBenchmark { } @Override - public void append(LogEvent event) { + public void append(final LogEvent event) { count.incrementAndGet(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java index bdf1378..b91203f 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java @@ -67,7 +67,7 @@ public class MemoryHandlerJULLocationBenchmark { @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.SECONDS) public void throughputSimple() { - LogRecord logRecord = new LogRecord(java.util.logging.Level.INFO, BenchmarkMessageParams.TEST); + final LogRecord logRecord = new LogRecord(java.util.logging.Level.INFO, BenchmarkMessageParams.TEST); logRecord.getSourceClassName(); // force location logger.log(logRecord); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageBenchmark.java index 463ba92..962a1e3 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageBenchmark.java @@ -68,7 +68,7 @@ public class ParameterizedMessageBenchmark { @Benchmark @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) - public int refactoredFormatTo(ThreadState state) { + public int refactoredFormatTo(final ThreadState state) { state.buffer.setLength(0); new ParameterizedMessage("pattern {} with {} two parameters and some text", ARGS). formatTo(state.buffer);
