You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/10/30 16:53:28 UTC
[01/13] logging-log4j2 git commit: Use final.
Repository: logging-log4j2
Updated Branches:
refs/heads/release-2.x 1f4c79624 -> 4a4b60abb
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessagePatternConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessagePatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessagePatternConverterTest.java
index cd85071..577d26a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessagePatternConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessagePatternConverterTest.java
@@ -149,13 +149,13 @@ public class MessagePatternConverterTest {
@Test
public void testMapMessageFormatJson() throws Exception {
final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, new String[]{"json"});
- Message msg = new StringMapMessage()
+ final Message msg = new StringMapMessage()
.with("key", "val");
- LogEvent event = Log4jLogEvent.newBuilder() //
+ final LogEvent event = Log4jLogEvent.newBuilder() //
.setLoggerName("MyLogger") //
.setLevel(Level.DEBUG) //
.setMessage(msg).build();
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
converter.format(event, sb);
assertEquals("Unexpected result", "{\"key\":\"val\"}", sb.toString());
}
@@ -163,13 +163,13 @@ public class MessagePatternConverterTest {
@Test
public void testMapMessageFormatXml() throws Exception {
final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, new String[]{"xml"});
- Message msg = new StringMapMessage()
+ final Message msg = new StringMapMessage()
.with("key", "val");
- LogEvent event = Log4jLogEvent.newBuilder() //
+ final LogEvent event = Log4jLogEvent.newBuilder() //
.setLoggerName("MyLogger") //
.setLevel(Level.DEBUG) //
.setMessage(msg).build();
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
converter.format(event, sb);
assertEquals("Unexpected result", "<Map>\n <Entry key=\"key\">val</Entry>\n</Map>", sb.toString());
}
@@ -177,13 +177,13 @@ public class MessagePatternConverterTest {
@Test
public void testMapMessageFormatDefault() throws Exception {
final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, null);
- Message msg = new StringMapMessage()
+ final Message msg = new StringMapMessage()
.with("key", "val");
- LogEvent event = Log4jLogEvent.newBuilder() //
+ final LogEvent event = Log4jLogEvent.newBuilder() //
.setLoggerName("MyLogger") //
.setLevel(Level.DEBUG) //
.setMessage(msg).build();
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
converter.format(event, sb);
assertEquals("Unexpected result", "key=\"val\"", sb.toString());
}
@@ -191,13 +191,13 @@ public class MessagePatternConverterTest {
@Test
public void testStructuredDataFormatFull() throws Exception {
final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, new String[]{"FULL"});
- Message msg = new StructuredDataMessage("id", "message", "type")
+ final Message msg = new StructuredDataMessage("id", "message", "type")
.with("key", "val");
- LogEvent event = Log4jLogEvent.newBuilder() //
+ final LogEvent event = Log4jLogEvent.newBuilder() //
.setLoggerName("MyLogger") //
.setLevel(Level.DEBUG) //
.setMessage(msg).build();
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
converter.format(event, sb);
assertEquals("Unexpected result", "type [id key=\"val\"] message", sb.toString());
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/time/MutableInstantTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/MutableInstantTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/MutableInstantTest.java
index 63d3138..6bebbd1 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/MutableInstantTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/MutableInstantTest.java
@@ -26,7 +26,7 @@ public class MutableInstantTest {
@Test
public void testGetEpochSecond() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
assertEquals("initial", 0, instant.getEpochSecond());
instant.initFromEpochSecond(123, 456);
@@ -35,7 +35,7 @@ public class MutableInstantTest {
instant.initFromEpochMilli(123456, 789012);
assertEquals("returns converted value when initialized from milllis", 123, instant.getEpochSecond());
- MutableInstant other = new MutableInstant();
+ final MutableInstant other = new MutableInstant();
other.initFromEpochSecond(788, 456);
instant.initFrom(other);
@@ -44,7 +44,7 @@ public class MutableInstantTest {
@Test
public void testGetNanoOfSecond() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
assertEquals("initial", 0, instant.getNanoOfSecond());
instant.initFromEpochSecond(123, 456);
@@ -53,7 +53,7 @@ public class MutableInstantTest {
instant.initFromEpochMilli(123456, 789012);
assertEquals("returns converted value when initialized from milllis", 456789012, instant.getNanoOfSecond());
- MutableInstant other = new MutableInstant();
+ final MutableInstant other = new MutableInstant();
other.initFromEpochSecond(788, 456);
instant.initFrom(other);
@@ -62,7 +62,7 @@ public class MutableInstantTest {
@Test
public void testGetEpochMillisecond() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
assertEquals("initial", 0, instant.getEpochMillisecond());
instant.initFromEpochMilli(123, 456);
@@ -71,7 +71,7 @@ public class MutableInstantTest {
instant.initFromEpochSecond(123, 456789012);
assertEquals("returns converted value when initialized from seconds", 123456, instant.getEpochMillisecond());
- MutableInstant other = new MutableInstant();
+ final MutableInstant other = new MutableInstant();
other.initFromEpochMilli(788, 456);
instant.initFrom(other);
@@ -80,7 +80,7 @@ public class MutableInstantTest {
@Test
public void getGetNanoOfMillisecond() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
assertEquals("initial", 0, instant.getNanoOfMillisecond());
instant.initFromEpochMilli(123, 456);
@@ -89,7 +89,7 @@ public class MutableInstantTest {
instant.initFromEpochSecond(123, 456789012);
assertEquals("returns converted value when initialized from milllis", 789012, instant.getNanoOfMillisecond());
- MutableInstant other = new MutableInstant();
+ final MutableInstant other = new MutableInstant();
other.initFromEpochMilli(788, 456);
instant.initFrom(other);
@@ -103,12 +103,12 @@ public class MutableInstantTest {
@Test
public void testInitFromInstantCopiesValues() {
- MutableInstant other = new MutableInstant();
+ final MutableInstant other = new MutableInstant();
other.initFromEpochSecond(788, 456);
assertEquals("epochSec", 788, other.getEpochSecond());
assertEquals("NanosOfSec", 456, other.getNanoOfSecond());
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFrom(other);
assertEquals("epochSec", 788, instant.getEpochSecond());
@@ -117,7 +117,7 @@ public class MutableInstantTest {
@Test
public void testInitFromEpochMillis() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFromEpochMilli(123456, 789012);
assertEquals("epochSec", 123, instant.getEpochSecond());
assertEquals("NanoOfSec", 456789012, instant.getNanoOfSecond());
@@ -127,26 +127,26 @@ public class MutableInstantTest {
@Test(expected = IllegalArgumentException.class)
public void testInitFromEpochMillisRejectsNegativeNanoOfMilli() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFromEpochMilli(123456, -1);
}
@Test(expected = IllegalArgumentException.class)
public void testInitFromEpochMillisRejectsTooLargeNanoOfMilli() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFromEpochMilli(123456, 1000_000);
}
@Test
public void testInitFromEpochMillisAcceptsTooMaxNanoOfMilli() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFromEpochMilli(123456, 999_999);
assertEquals("NanoOfMilli", 999_999, instant.getNanoOfMillisecond());
}
@Test
public void testInitFromEpochSecond() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFromEpochSecond(123, 456789012);
assertEquals("epochSec", 123, instant.getEpochSecond());
assertEquals("NanoOfSec", 456789012, instant.getNanoOfSecond());
@@ -156,26 +156,26 @@ public class MutableInstantTest {
@Test(expected = IllegalArgumentException.class)
public void testInitFromEpochSecondRejectsNegativeNanoOfMilli() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFromEpochSecond(123456, -1);
}
@Test(expected = IllegalArgumentException.class)
public void testInitFromEpochSecondRejectsTooLargeNanoOfMilli() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFromEpochSecond(123456, 1000_000_000);
}
@Test
public void testInitFromEpochSecondAcceptsTooMaxNanoOfMilli() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFromEpochSecond(123456, 999_999_999);
assertEquals("NanoOfSec", 999_999_999, instant.getNanoOfSecond());
}
@Test
public void testInstantToMillisAndNanos() {
- long[] values = new long[2];
+ final long[] values = new long[2];
MutableInstant.instantToMillisAndNanos(123456, 999_999_999, values);
assertEquals(123456_999, values[0]);
assertEquals(999_999, values[1]);
@@ -183,9 +183,9 @@ public class MutableInstantTest {
@Test
public void testInitFromClock() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
- PreciseClock clock = new FixedPreciseClock(123456, 789012);
+ final PreciseClock clock = new FixedPreciseClock(123456, 789012);
instant.initFrom(clock);
assertEquals(123456, instant.getEpochMillisecond());
@@ -196,10 +196,10 @@ public class MutableInstantTest {
@Test
public void testEquals() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFromEpochSecond(123, 456789012);
- MutableInstant instant2 = new MutableInstant();
+ final MutableInstant instant2 = new MutableInstant();
instant2.initFromEpochMilli(123456, 789012);
assertEquals(instant, instant2);
@@ -207,10 +207,10 @@ public class MutableInstantTest {
@Test
public void testHashCode() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFromEpochSecond(123, 456789012);
- MutableInstant instant2 = new MutableInstant();
+ final MutableInstant instant2 = new MutableInstant();
instant2.initFromEpochMilli(123456, 789012);
assertEquals(instant.hashCode(), instant2.hashCode());
@@ -222,7 +222,7 @@ public class MutableInstantTest {
@Test
public void testToString() {
- MutableInstant instant = new MutableInstant();
+ final MutableInstant instant = new MutableInstant();
instant.initFromEpochSecond(123, 456789012);
assertEquals("MutableInstant[epochSecond=123, nano=456789012]", instant.toString());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/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 1371ed2..2d3688d 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
@@ -53,8 +53,8 @@ public class MutableLogEventWithReusableParamMsgTest {
evt.setMessage(msg);
evt.clear();
- Message mementoMessage = evt.memento();
- Message mementoMessageSecondInvocation = evt.memento();
+ final Message mementoMessage = evt.memento();
+ final Message mementoMessageSecondInvocation = evt.memento();
// MutableLogEvent.memento should be cached
assertThat(mementoMessage, sameInstance(mementoMessageSecondInvocation));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
index d4c5219..79afa21 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
@@ -75,7 +75,7 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF
private FlumeAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
final boolean ignoreExceptions, final String includes, final String excludes, final String required,
final String mdcPrefix, final String eventPrefix, final boolean compress, final FlumeEventFactory factory,
- final AbstractFlumeManager manager, Property[] properties) {
+ final AbstractFlumeManager manager, final Property[] properties) {
super(name, filter, layout, ignoreExceptions, properties);
this.manager = manager;
this.mdcIncludes = includes;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSource.java b/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSource.java
index f1ede24..3fbb0da 100644
--- a/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSource.java
+++ b/log4j-jdbc-dbcp2/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSource.java
@@ -168,7 +168,7 @@ public final class PoolingDriverConnectionSource extends AbstractDriverManagerCo
}
@Override
- public boolean stop(long timeout, TimeUnit timeUnit) {
+ public boolean stop(final long timeout, final TimeUnit timeUnit) {
try {
final PoolingDriver driver = getPoolingDriver();
if (driver != null) {
@@ -176,7 +176,7 @@ public final class PoolingDriverConnectionSource extends AbstractDriverManagerCo
driver.closePool(poolName);
}
return true;
- } catch (Exception e) {
+ } catch (final Exception e) {
getLogger().error("Exception stopping connection source for '{}' → '{}'", getConnectionString(),
getActualConnectionString(), e);
return false;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/InstantAttributeConverter.java
----------------------------------------------------------------------
diff --git a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/InstantAttributeConverter.java b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/InstantAttributeConverter.java
index 9e0120e..fde75af 100644
--- a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/InstantAttributeConverter.java
+++ b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/InstantAttributeConverter.java
@@ -46,11 +46,11 @@ public class InstantAttributeConverter implements AttributeConverter<Instant, St
return null;
}
- int pos = s.indexOf(",");
- long epochSecond = Long.parseLong(s.substring(0, pos));
- int nanos = Integer.parseInt(s.substring(pos + 1, s.length()));
+ final int pos = s.indexOf(",");
+ final long epochSecond = Long.parseLong(s.substring(0, pos));
+ final int nanos = Integer.parseInt(s.substring(pos + 1, s.length()));
- MutableInstant result = new MutableInstant();
+ final MutableInstant result = new MutableInstant();
result.initFromEpochSecond(epochSecond, nanos);
return result;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
index 6ff3c14..6d90b3c 100644
--- a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
+++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
@@ -64,7 +64,7 @@ public abstract class AbstractJpaAppenderTest {
public void tearDown() throws SQLException {
final LoggerContext context = LoggerContext.getContext(false);
try {
- String appenderName = "databaseAppender";
+ final String appenderName = "databaseAppender";
final Appender appender = context.getConfiguration().getAppender(appenderName);
assertNotNull("The appender '" + appenderName + "' should not be null.", appender);
assertTrue("The appender should be a JpaAppender.", appender instanceof JpaAppender);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java
----------------------------------------------------------------------
diff --git a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java
index 465fa3f..595c361 100644
--- a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java
+++ b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java
@@ -164,7 +164,7 @@ public class MongoDbTestRule implements TestRule {
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("MongoDbTestRule [starter=");
builder.append(starter);
builder.append(", portSystemPropertyName=");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
----------------------------------------------------------------------
diff --git a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
index 96a903b..2f3ea1a 100644
--- a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
+++ b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
@@ -172,7 +172,7 @@ public class MongoDbTestRule implements TestRule {
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("MongoDbTestRule [starter=");
builder.append(starter);
builder.append(", portSystemPropertyName=");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java
index 7bf5ba9..b9b8a7f 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderThrowableBenchmark.java
@@ -116,21 +116,21 @@ public class FileAppenderThrowableBenchmark {
new Class<?>[]{Class.forName(FileAppenderThrowableBenchmark.class.getName() + "$TestIface" + (i % 31))},
new InvocationHandler() {
@Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
try {
return method.invoke(delegate, args);
- } catch (InvocationTargetException e) {
+ } catch (final InvocationTargetException e) {
throw e.getCause();
}
}
});
}
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
throw new IllegalStateException("Failed to create stack", e);
}
try {
helper.action();
- } catch (IllegalStateException e) {
+ } catch (final IllegalStateException e) {
return e;
}
throw new IllegalStateException("Failed to create throwable");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java
index 865f925..774a5a5 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringBuilderEscapeBenchmark.java
@@ -68,8 +68,8 @@ public class StringBuilderEscapeBenchmark {
return state.buffer.length();
}
- private static String repeat(String str, int times) {
- StringBuilder sb = new StringBuilder(str.length() * times);
+ private static String repeat(final String str, final int times) {
+ final StringBuilder sb = new StringBuilder(str.length() * times);
for (int i = 0; i < times; i++) {
sb.append(str);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
----------------------------------------------------------------------
diff --git a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
index fcf1d66..e7865a8 100644
--- a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
+++ b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java
@@ -32,7 +32,7 @@ public class Log4jLoggerFactory extends AbstractLoggerAdapter<Logger> implements
private static final String PACKAGE = "org.slf4j";
private final Log4jMarkerFactory markerFactory;
- public Log4jLoggerFactory(Log4jMarkerFactory markerFactory) {
+ public Log4jLoggerFactory(final Log4jMarkerFactory markerFactory) {
this.markerFactory = markerFactory;
}
[09/13] logging-log4j2 git commit: Checkstyle: Remove trailing white
spaces on all lines.
Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java
index 0fca21e..cf49a53 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java
@@ -55,17 +55,17 @@ public final class Generate {
@Override
String imports() {
//@formatter:off
- return ""
- + "import java.io.Serializable;%n"
- + "import org.apache.logging.log4j.Level;%n"
- + "import org.apache.logging.log4j.LogManager;%n"
- + "import org.apache.logging.log4j.Logger;%n"
- + "import org.apache.logging.log4j.Marker;%n"
- + "import org.apache.logging.log4j.message.Message;%n"
- + "import org.apache.logging.log4j.message.MessageFactory;%n"
- + "import org.apache.logging.log4j.spi.AbstractLogger;%n"
- + "import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;%n"
- + "import org.apache.logging.log4j.util.MessageSupplier;%n"
+ return ""
+ + "import java.io.Serializable;%n"
+ + "import org.apache.logging.log4j.Level;%n"
+ + "import org.apache.logging.log4j.LogManager;%n"
+ + "import org.apache.logging.log4j.Logger;%n"
+ + "import org.apache.logging.log4j.Marker;%n"
+ + "import org.apache.logging.log4j.message.Message;%n"
+ + "import org.apache.logging.log4j.message.MessageFactory;%n"
+ + "import org.apache.logging.log4j.spi.AbstractLogger;%n"
+ + "import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;%n"
+ + "import org.apache.logging.log4j.util.MessageSupplier;%n"
+ "import org.apache.logging.log4j.util.Supplier;%n"
+ "%n";
//@formatter:on
@@ -74,15 +74,15 @@ public final class Generate {
@Override
String declaration() {
//@formatter:off
- return ""
- + "/**%n"
- + " * Custom Logger interface with convenience methods for%n"
- + " * %s%n"
- + " * <p>Compatible with Log4j 2.6 or higher.</p>%n"
- + " */%n"
- + "public final class %s implements Serializable {%n"
- + " private static final long serialVersionUID = " + System.nanoTime() + "L;%n"
- + " private final ExtendedLoggerWrapper logger;%n"
+ return ""
+ + "/**%n"
+ + " * Custom Logger interface with convenience methods for%n"
+ + " * %s%n"
+ + " * <p>Compatible with Log4j 2.6 or higher.</p>%n"
+ + " */%n"
+ + "public final class %s implements Serializable {%n"
+ + " private static final long serialVersionUID = " + System.nanoTime() + "L;%n"
+ + " private final ExtendedLoggerWrapper logger;%n"
+ "%n";
//@formatter:on
}
@@ -90,11 +90,11 @@ public final class Generate {
@Override
String constructor() {
//@formatter:off
- return ""
- + "%n"
- + " private %s(final Logger logger) {%n"
+ return ""
+ + "%n"
+ + " private %s(final Logger logger) {%n"
+ " this.logger = new ExtendedLoggerWrapper((AbstractLogger) logger, logger.getName(), "
- + "logger.getMessageFactory());%n"
+ + "logger.getMessageFactory());%n"
+ " }%n";
//@formatter:on
}
@@ -108,16 +108,16 @@ public final class Generate {
@Override
String imports() {
//@formatter:off
- return ""
- + "import org.apache.logging.log4j.Level;%n"
- + "import org.apache.logging.log4j.LogManager;%n"
- + "import org.apache.logging.log4j.Logger;%n"
- + "import org.apache.logging.log4j.Marker;%n"
- + "import org.apache.logging.log4j.message.Message;%n"
- + "import org.apache.logging.log4j.message.MessageFactory;%n"
- + "import org.apache.logging.log4j.spi.AbstractLogger;%n"
- + "import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;%n"
- + "import org.apache.logging.log4j.util.MessageSupplier;%n"
+ return ""
+ + "import org.apache.logging.log4j.Level;%n"
+ + "import org.apache.logging.log4j.LogManager;%n"
+ + "import org.apache.logging.log4j.Logger;%n"
+ + "import org.apache.logging.log4j.Marker;%n"
+ + "import org.apache.logging.log4j.message.Message;%n"
+ + "import org.apache.logging.log4j.message.MessageFactory;%n"
+ + "import org.apache.logging.log4j.spi.AbstractLogger;%n"
+ + "import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;%n"
+ + "import org.apache.logging.log4j.util.MessageSupplier;%n"
+ "import org.apache.logging.log4j.util.Supplier;%n"
+ "%n";
//@formatter:on
@@ -126,15 +126,15 @@ public final class Generate {
@Override
String declaration() {
//@formatter:off
- return ""
- + "/**%n"
- + " * Extended Logger interface with convenience methods for%n"
- + " * %s%n"
- + " * <p>Compatible with Log4j 2.6 or higher.</p>%n"
- + " */%n"
- + "public final class %s extends ExtendedLoggerWrapper {%n"
- + " private static final long serialVersionUID = " + System.nanoTime() + "L;%n"
- + " private final ExtendedLoggerWrapper logger;%n"
+ return ""
+ + "/**%n"
+ + " * Extended Logger interface with convenience methods for%n"
+ + " * %s%n"
+ + " * <p>Compatible with Log4j 2.6 or higher.</p>%n"
+ + " */%n"
+ + "public final class %s extends ExtendedLoggerWrapper {%n"
+ + " private static final long serialVersionUID = " + System.nanoTime() + "L;%n"
+ + " private final ExtendedLoggerWrapper logger;%n"
+ "%n";
//@formatter:on
}
@@ -142,11 +142,11 @@ public final class Generate {
@Override
String constructor() {
//@formatter:off
- return ""
- + "%n"
- + " private %s(final Logger logger) {%n"
- + " super((AbstractLogger) logger, logger.getName(), logger.getMessageFactory());%n"
- + " this.logger = this;%n"
+ return ""
+ + "%n"
+ + " private %s(final Logger logger) {%n"
+ + " super((AbstractLogger) logger, logger.getName(), logger.getMessageFactory());%n"
+ + " this.logger = this;%n"
+ " }%n";
//@formatter:on
}
@@ -165,826 +165,826 @@ public final class Generate {
abstract Class<?> generator();
}
- static final String FQCN_FIELD = ""
+ static final String FQCN_FIELD = ""
+ " private static final String FQCN = %s.class.getName();%n";
- static final String LEVEL_FIELD = ""
+ static final String LEVEL_FIELD = ""
+ " private static final Level %s = Level.forName(\"%s\", %d);%n";
- static final String FACTORY_METHODS = ""
+ static final String FACTORY_METHODS = ""
//@formatter:off
- + "%n"
- + " /**%n"
- + " * Returns a custom Logger with the name of the calling class.%n"
- + " * %n"
- + " * @return The custom Logger for the calling class.%n"
- + " */%n"
- + " public static CLASSNAME create() {%n"
- + " final Logger wrapped = LogManager.getLogger();%n"
- + " return new CLASSNAME(wrapped);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Returns a custom Logger using the fully qualified name of the Class as%n"
- + " * the Logger name.%n"
- + " * %n"
- + " * @param loggerName The Class whose name should be used as the Logger name.%n"
- + " * If null it will default to the calling class.%n"
- + " * @return The custom Logger.%n"
- + " */%n"
- + " public static CLASSNAME create(final Class<?> loggerName) {%n"
- + " final Logger wrapped = LogManager.getLogger(loggerName);%n"
- + " return new CLASSNAME(wrapped);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Returns a custom Logger using the fully qualified name of the Class as%n"
- + " * the Logger name.%n"
- + " * %n"
- + " * @param loggerName The Class whose name should be used as the Logger name.%n"
- + " * If null it will default to the calling class.%n"
- + " * @param messageFactory The message factory is used only when creating a%n"
- + " * logger, subsequent use does not change the logger but will log%n"
- + " * a warning if mismatched.%n"
- + " * @return The custom Logger.%n"
- + " */%n"
- + " public static CLASSNAME create(final Class<?> loggerName, final MessageFactory"
- + " messageFactory) {%n"
- + " final Logger wrapped = LogManager.getLogger(loggerName, messageFactory);%n"
- + " return new CLASSNAME(wrapped);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Returns a custom Logger using the fully qualified class name of the value%n"
- + " * as the Logger name.%n"
- + " * %n"
- + " * @param value The value whose class name should be used as the Logger%n"
- + " * name. If null the name of the calling class will be used as%n"
- + " * the logger name.%n"
- + " * @return The custom Logger.%n"
- + " */%n"
- + " public static CLASSNAME create(final Object value) {%n"
- + " final Logger wrapped = LogManager.getLogger(value);%n"
- + " return new CLASSNAME(wrapped);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Returns a custom Logger using the fully qualified class name of the value%n"
- + " * as the Logger name.%n"
- + " * %n"
- + " * @param value The value whose class name should be used as the Logger%n"
- + " * name. If null the name of the calling class will be used as%n"
- + " * the logger name.%n"
- + " * @param messageFactory The message factory is used only when creating a%n"
- + " * logger, subsequent use does not change the logger but will log%n"
- + " * a warning if mismatched.%n"
- + " * @return The custom Logger.%n"
- + " */%n"
- + " public static CLASSNAME create(final Object value, final MessageFactory messageFactory) {%n"
- + " final Logger wrapped = LogManager.getLogger(value, messageFactory);%n"
- + " return new CLASSNAME(wrapped);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Returns a custom Logger with the specified name.%n"
- + " * %n"
- + " * @param name The logger name. If null the name of the calling class will%n"
- + " * be used.%n"
- + " * @return The custom Logger.%n"
- + " */%n"
- + " public static CLASSNAME create(final String name) {%n"
- + " final Logger wrapped = LogManager.getLogger(name);%n"
- + " return new CLASSNAME(wrapped);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Returns a custom Logger with the specified name.%n"
- + " * %n"
- + " * @param name The logger name. If null the name of the calling class will%n"
- + " * be used.%n"
- + " * @param messageFactory The message factory is used only when creating a%n"
- + " * logger, subsequent use does not change the logger but will log%n"
- + " * a warning if mismatched.%n"
- + " * @return The custom Logger.%n"
- + " */%n"
- + " public static CLASSNAME create(final String name, final MessageFactory messageFactory) {%n"
- + " final Logger wrapped = LogManager.getLogger(name, messageFactory);%n"
- + " return new CLASSNAME(wrapped);%n"
+ + "%n"
+ + " /**%n"
+ + " * Returns a custom Logger with the name of the calling class.%n"
+ + " * %n"
+ + " * @return The custom Logger for the calling class.%n"
+ + " */%n"
+ + " public static CLASSNAME create() {%n"
+ + " final Logger wrapped = LogManager.getLogger();%n"
+ + " return new CLASSNAME(wrapped);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Returns a custom Logger using the fully qualified name of the Class as%n"
+ + " * the Logger name.%n"
+ + " * %n"
+ + " * @param loggerName The Class whose name should be used as the Logger name.%n"
+ + " * If null it will default to the calling class.%n"
+ + " * @return The custom Logger.%n"
+ + " */%n"
+ + " public static CLASSNAME create(final Class<?> loggerName) {%n"
+ + " final Logger wrapped = LogManager.getLogger(loggerName);%n"
+ + " return new CLASSNAME(wrapped);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Returns a custom Logger using the fully qualified name of the Class as%n"
+ + " * the Logger name.%n"
+ + " * %n"
+ + " * @param loggerName The Class whose name should be used as the Logger name.%n"
+ + " * If null it will default to the calling class.%n"
+ + " * @param messageFactory The message factory is used only when creating a%n"
+ + " * logger, subsequent use does not change the logger but will log%n"
+ + " * a warning if mismatched.%n"
+ + " * @return The custom Logger.%n"
+ + " */%n"
+ + " public static CLASSNAME create(final Class<?> loggerName, final MessageFactory"
+ + " messageFactory) {%n"
+ + " final Logger wrapped = LogManager.getLogger(loggerName, messageFactory);%n"
+ + " return new CLASSNAME(wrapped);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Returns a custom Logger using the fully qualified class name of the value%n"
+ + " * as the Logger name.%n"
+ + " * %n"
+ + " * @param value The value whose class name should be used as the Logger%n"
+ + " * name. If null the name of the calling class will be used as%n"
+ + " * the logger name.%n"
+ + " * @return The custom Logger.%n"
+ + " */%n"
+ + " public static CLASSNAME create(final Object value) {%n"
+ + " final Logger wrapped = LogManager.getLogger(value);%n"
+ + " return new CLASSNAME(wrapped);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Returns a custom Logger using the fully qualified class name of the value%n"
+ + " * as the Logger name.%n"
+ + " * %n"
+ + " * @param value The value whose class name should be used as the Logger%n"
+ + " * name. If null the name of the calling class will be used as%n"
+ + " * the logger name.%n"
+ + " * @param messageFactory The message factory is used only when creating a%n"
+ + " * logger, subsequent use does not change the logger but will log%n"
+ + " * a warning if mismatched.%n"
+ + " * @return The custom Logger.%n"
+ + " */%n"
+ + " public static CLASSNAME create(final Object value, final MessageFactory messageFactory) {%n"
+ + " final Logger wrapped = LogManager.getLogger(value, messageFactory);%n"
+ + " return new CLASSNAME(wrapped);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Returns a custom Logger with the specified name.%n"
+ + " * %n"
+ + " * @param name The logger name. If null the name of the calling class will%n"
+ + " * be used.%n"
+ + " * @return The custom Logger.%n"
+ + " */%n"
+ + " public static CLASSNAME create(final String name) {%n"
+ + " final Logger wrapped = LogManager.getLogger(name);%n"
+ + " return new CLASSNAME(wrapped);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Returns a custom Logger with the specified name.%n"
+ + " * %n"
+ + " * @param name The logger name. If null the name of the calling class will%n"
+ + " * be used.%n"
+ + " * @param messageFactory The message factory is used only when creating a%n"
+ + " * logger, subsequent use does not change the logger but will log%n"
+ + " * a warning if mismatched.%n"
+ + " * @return The custom Logger.%n"
+ + " */%n"
+ + " public static CLASSNAME create(final String name, final MessageFactory messageFactory) {%n"
+ + " final Logger wrapped = LogManager.getLogger(name, messageFactory);%n"
+ + " return new CLASSNAME(wrapped);%n"
+ " }%n";
//@formatter:on
- static final String METHODS = ""
+ static final String METHODS = ""
//@formatter:off
- + "%n"
- + " /**%n"
- + " * Logs a message with the specific Marker at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param msg the message string to be logged%n"
- + " */%n"
- + " public void methodName(final Marker marker, final Message msg) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, msg, (Throwable) null);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with the specific Marker at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param msg the message string to be logged%n"
- + " * @param t A Throwable or null.%n"
- + " */%n"
- + " public void methodName(final Marker marker, final Message msg, final Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, msg, t);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message object with the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message object to log.%n"
- + " */%n"
- + " public void methodName(final Marker marker, final Object message) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, (Throwable) null);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message CharSequence with the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message CharSequence to log.%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final CharSequence message) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, (Throwable) null);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
- + " * the {@link Throwable} {@code t} passed as parameter.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log.%n"
- + " * @param t the exception to log, including its stack trace.%n"
- + " */%n"
- + " public void methodName(final Marker marker, final Object message, final Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, t);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
- + " * the {@link Throwable} {@code t} passed as parameter.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the CharSequence to log.%n"
- + " * @param t the exception to log, including its stack trace.%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final CharSequence message, final Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, t);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message object with the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message object to log.%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, (Throwable) null);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param params parameters to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Object... params) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, params);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Object p0) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Object p0, "
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with the specific Marker at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param msg the message string to be logged%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final Message msg) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, msg, (Throwable) null);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with the specific Marker at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param msg the message string to be logged%n"
+ + " * @param t A Throwable or null.%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final Message msg, final Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, msg, t);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message object with the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message object to log.%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final Object message) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, (Throwable) null);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message CharSequence with the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message CharSequence to log.%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final CharSequence message) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, (Throwable) null);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
+ + " * the {@link Throwable} {@code t} passed as parameter.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log.%n"
+ + " * @param t the exception to log, including its stack trace.%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final Object message, final Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, t);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
+ + " * the {@link Throwable} {@code t} passed as parameter.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the CharSequence to log.%n"
+ + " * @param t the exception to log, including its stack trace.%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final CharSequence message, final Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, t);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message object with the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message object to log.%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, (Throwable) null);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param params parameters to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Object... params) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, params);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Object p0) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Object p0, "
+ + "final Object p1) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Object p0, "
+ + "final Object p1, final Object p2) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @param p5 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4, final Object p5) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4, p5);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @param p5 parameter to the message.%n"
+ + " * @param p6 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4, final Object p5, final Object p6) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4, p5, p6);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @param p5 parameter to the message.%n"
+ + " * @param p6 parameter to the message.%n"
+ + " * @param p7 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
+ + " final Object p7) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @param p5 parameter to the message.%n"
+ + " * @param p6 parameter to the message.%n"
+ + " * @param p7 parameter to the message.%n"
+ + " * @param p8 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
+ + " final Object p7, final Object p8) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, "
+ + "p8);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @param p5 parameter to the message.%n"
+ + " * @param p6 parameter to the message.%n"
+ + " * @param p7 parameter to the message.%n"
+ + " * @param p8 parameter to the message.%n"
+ + " * @param p9 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
+ + " final Object p7, final Object p8, final Object p9) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, "
+ + "p8, p9);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
+ + " * the {@link Throwable} {@code t} passed as parameter.%n"
+ + " * %n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param message the message to log.%n"
+ + " * @param t the exception to log, including its stack trace.%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, t);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs the specified Message at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param msg the message string to be logged%n"
+ + " */%n"
+ + " public void methodName(final Message msg) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, msg, (Throwable) null);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs the specified Message at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param msg the message string to be logged%n"
+ + " * @param t A Throwable or null.%n"
+ + " */%n"
+ + " public void methodName(final Message msg, final Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, msg, t);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message object with the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message object to log.%n"
+ + " */%n"
+ + " public void methodName(final Object message) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, (Throwable) null);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
+ + " * the {@link Throwable} {@code t} passed as parameter.%n"
+ + " * %n"
+ + " * @param message the message to log.%n"
+ + " * @param t the exception to log, including its stack trace.%n"
+ + " */%n"
+ + " public void methodName(final Object message, final Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, t);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message CharSequence with the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message CharSequence to log.%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final CharSequence message) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, (Throwable) null);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a CharSequence at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
+ + " * the {@link Throwable} {@code t} passed as parameter.%n"
+ + " * %n"
+ + " * @param message the CharSequence to log.%n"
+ + " * @param t the exception to log, including its stack trace.%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final CharSequence message, final Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, t);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message object with the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message object to log.%n"
+ + " */%n"
+ + " public void methodName(final String message) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, (Throwable) null);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param params parameters to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " */%n"
+ + " public void methodName(final String message, final Object... params) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, params);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final String message, final Object p0) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final String message, final Object p0, "
+ "final Object p1) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Object p0, "
- + "final Object p1, final Object p2) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @param p5 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4, final Object p5) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4, p5);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @param p5 parameter to the message.%n"
- + " * @param p6 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4, final Object p5, final Object p6) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4, p5, p6);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @param p5 parameter to the message.%n"
- + " * @param p6 parameter to the message.%n"
- + " * @param p7 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
- + " final Object p7) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @param p5 parameter to the message.%n"
- + " * @param p6 parameter to the message.%n"
- + " * @param p7 parameter to the message.%n"
- + " * @param p8 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
- + " final Object p7, final Object p8) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, "
- + "p8);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @param p5 parameter to the message.%n"
- + " * @param p6 parameter to the message.%n"
- + " * @param p7 parameter to the message.%n"
- + " * @param p8 parameter to the message.%n"
- + " * @param p9 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
- + " final Object p7, final Object p8, final Object p9) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, "
- + "p8, p9);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
- + " * the {@link Throwable} {@code t} passed as parameter.%n"
- + " * %n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param message the message to log.%n"
- + " * @param t the exception to log, including its stack trace.%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, t);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs the specified Message at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param msg the message string to be logged%n"
- + " */%n"
- + " public void methodName(final Message msg) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, msg, (Throwable) null);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs the specified Message at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param msg the message string to be logged%n"
- + " * @param t A Throwable or null.%n"
- + " */%n"
- + " public void methodName(final Message msg, final Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, msg, t);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message object with the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message object to log.%n"
- + " */%n"
- + " public void methodName(final Object message) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, (Throwable) null);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
- + " * the {@link Throwable} {@code t} passed as parameter.%n"
- + " * %n"
- + " * @param message the message to log.%n"
- + " * @param t the exception to log, including its stack trace.%n"
- + " */%n"
- + " public void methodName(final Object message, final Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, t);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message CharSequence with the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message CharSequence to log.%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final CharSequence message) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, (Throwable) null);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a CharSequence at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
- + " * the {@link Throwable} {@code t} passed as parameter.%n"
- + " * %n"
- + " * @param message the CharSequence to log.%n"
- + " * @param t the exception to log, including its stack trace.%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final CharSequence message, final Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, t);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message object with the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message object to log.%n"
- + " */%n"
- + " public void methodName(final String message) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, (Throwable) null);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final String message, final Object p0, "
+ + "final Object p1, final Object p2) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @param p5 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4, final Object p5) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4, p5);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @param p5 parameter to the message.%n"
+ + " * @param p6 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4, final Object p5, final Object p6) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4, p5, p6);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @param p5 parameter to the message.%n"
+ + " * @param p6 parameter to the message.%n"
+ + " * @param p7 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
+ + " final Object p7) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4, p5, p6, p7);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param params parameters to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " */%n"
- + " public void methodName(final String message, final Object... params) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, params);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final String message, final Object p0) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final String message, final Object p0, "
- + "final Object p1) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final String message, final Object p0, "
- + "final Object p1, final Object p2) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @param p5 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4, final Object p5) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4, p5);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @param p5 parameter to the message.%n"
- + " * @param p6 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4, final Object p5, final Object p6) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4, p5, p6);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @param p5 parameter to the message.%n"
- + " * @param p6 parameter to the message.%n"
- + " * @param p7 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
- + " final Object p7) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4, p5, p6, p7);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @param p5 parameter to the message.%n"
- + " * @param p6 parameter to the message.%n"
- + " * @param p7 parameter to the message.%n"
- + " * @param p8 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
- + " final Object p7, final Object p8) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4, p5, p6, p7, "
- + "p8);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
- + " * %n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param p0 parameter to the message.%n"
- + " * @param p1 parameter to the message.%n"
- + " * @param p2 parameter to the message.%n"
- + " * @param p3 parameter to the message.%n"
- + " * @param p4 parameter to the message.%n"
- + " * @param p5 parameter to the message.%n"
- + " * @param p6 parameter to the message.%n"
- + " * @param p7 parameter to the message.%n"
- + " * @param p8 parameter to the message.%n"
- + " * @param p9 parameter to the message.%n"
- + " * @see #getMessageFactory()%n"
- + " * @since Log4j-2.6%n"
- + " */%n"
- + " public void methodName(final String message, final Object p0, "
- + "final Object p1, final Object p2,%n"
- + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
- + " final Object p7, final Object p8, final Object p9) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4, p5, p6, p7, "
- + "p8, p9);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
- + " * the {@link Throwable} {@code t} passed as parameter.%n"
- + " * %n"
- + " * @param message the message to log.%n"
- + " * @param t the exception to log, including its stack trace.%n"
- + " */%n"
- + " public void methodName(final String message, final Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, t);%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @param p5 parameter to the message.%n"
+ + " * @param p6 parameter to the message.%n"
+ + " * @param p7 parameter to the message.%n"
+ + " * @param p8 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
+ + " final Object p7, final Object p8) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4, p5, p6, p7, "
+ + "p8);%n"
+ " }%n"
- + "%n"
- + " /**%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters at the {@code CUSTOM_LEVEL} level.%n"
+ + " * %n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param p0 parameter to the message.%n"
+ + " * @param p1 parameter to the message.%n"
+ + " * @param p2 parameter to the message.%n"
+ + " * @param p3 parameter to the message.%n"
+ + " * @param p4 parameter to the message.%n"
+ + " * @param p5 parameter to the message.%n"
+ + " * @param p6 parameter to the message.%n"
+ + " * @param p7 parameter to the message.%n"
+ + " * @param p8 parameter to the message.%n"
+ + " * @param p9 parameter to the message.%n"
+ + " * @see #getMessageFactory()%n"
+ + " * @since Log4j-2.6%n"
+ + " */%n"
+ + " public void methodName(final String message, final Object p0, "
+ + "final Object p1, final Object p2,%n"
+ + " final Object p3, final Object p4, final Object p5, final Object p6,%n"
+ + " final Object p7, final Object p8, final Object p9) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, p0, p1, p2, p3, p4, p5, p6, p7, "
+ + "p8, p9);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message at the {@code CUSTOM_LEVEL} level including the stack trace of%n"
+ + " * the {@link Throwable} {@code t} passed as parameter.%n"
+ + " * %n"
+ + " * @param message the message to log.%n"
+ + " * @param t the exception to log, including its stack trace.%n"
+ + " */%n"
+ + " public void methodName(final String message, final Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, t);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ " * Logs a message which is only to be constructed if the logging level is the {@code CUSTOM_LEVEL}"
- + "level.%n"
- + " *%n"
- + " * @param msgSupplier A function, which when called, produces the desired log message;%n"
- + " * the format depends on the message factory.%n"
- + " * @since Log4j-2.4%n"
- + " */%n"
- + " public void methodName(final Supplier<?> msgSupplier) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, msgSupplier, (Throwable) null);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message (only to be constructed if the logging level is the {@code CUSTOM_LEVEL}%n"
+ + "level.%n"
+ + " *%n"
+ + " * @param msgSupplier A function, which when called, produces the desired log message;%n"
+ + " * the format depends on the message factory.%n"
+ + " * @since Log4j-2.4%n"
+ + " */%n"
+ + " public void methodName(final Supplier<?> msgSupplier) {%n"
+ + " logger.logIfEnabled(FQCN, CUS
<TRUNCATED>
[06/13] logging-log4j2 git commit: Checkstyle: Remove trailing white
spaces on all lines.
Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/GenerateCustomLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/GenerateCustomLoggerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/GenerateCustomLoggerTest.java
index 0642253..15f43d0 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/GenerateCustomLoggerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/GenerateCustomLoggerTest.java
@@ -47,7 +47,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
public class GenerateCustomLoggerTest {
-
+
@BeforeClass
public static void beforeClass() {
System.setProperty("log4j2.loggerContextFactory", "org.apache.logging.log4j.TestLoggerContextFactory");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/GenerateExtendedLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/GenerateExtendedLoggerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/GenerateExtendedLoggerTest.java
index 914ada8..b97ef91 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/GenerateExtendedLoggerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/GenerateExtendedLoggerTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
public class GenerateExtendedLoggerTest {
-
+
@BeforeClass
public static void beforeClass() {
System.setProperty("log4j2.loggerContextFactory", "org.apache.logging.log4j.TestLoggerContextFactory");
@@ -142,7 +142,7 @@ public class GenerateExtendedLoggerTest {
final Method method = cls.getDeclaredMethod(name, String.class);
method.invoke(extendedLogger, "This is message " + n++);
}
-
+
// This logger extends o.a.l.log4j.spi.ExtendedLogger,
// so all the standard logging methods can be used as well
final ExtendedLogger logger = (ExtendedLogger) extendedLogger;
@@ -158,7 +158,7 @@ public class GenerateExtendedLoggerTest {
for (int i = 0; i < lines.size() - 6; i++) {
assertEquals(" " + levels.get(i).name + " This is message " + i, lines.get(i));
}
-
+
// test that the standard logging methods still work
int i = lines.size() - 6;
assertEquals(" TRACE trace message", lines.get(i++));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParserSDFTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParserSDFTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParserSDFTest.java
index 247dad8..55102a2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParserSDFTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParserSDFTest.java
@@ -36,8 +36,8 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
/**
- * Compare FastDateParser with SimpleDateFormat
- *
+ * Compare FastDateParser with SimpleDateFormat
+ *
* Copied from Apache Commons Lang 3 on 2016-11-16.
*/
@RunWith(Parameterized.class)
@@ -186,9 +186,9 @@ public class FastDateParserSDFTest {
fdfE = e.getClass();
}
if (valid) {
- assertEquals(locale.toString()+" "+formattedDate +"\n",expectedTime, actualTime);
+ assertEquals(locale.toString()+" "+formattedDate +"\n",expectedTime, actualTime);
} else {
- assertEquals(locale.toString()+" "+formattedDate + " expected same Exception ", sdfE, fdfE);
+ assertEquals(locale.toString()+" "+formattedDate + " expected same Exception ", sdfE, fdfE);
}
}
private void checkParsePosition(final String formattedDate) {
@@ -205,12 +205,12 @@ public class FastDateParserSDFTest {
final int length = formattedDate.length();
if (endIndex != length) {
// Error in test data
- throw new RuntimeException("Test data error: expected SDF parse to consume entire string; endindex " + endIndex + " != " + length);
+ throw new RuntimeException("Test data error: expected SDF parse to consume entire string; endindex " + endIndex + " != " + length);
}
} else {
final int errorIndex = sdfP.getErrorIndex();
if (errorIndex == -1) {
- throw new RuntimeException("Test data error: expected SDF parse to fail, but got " + expectedTime);
+ throw new RuntimeException("Test data error: expected SDF parse to fail, but got " + expectedTime);
}
}
@@ -227,6 +227,6 @@ public class FastDateParserSDFTest {
assertNotEquals("Test data error: expected FDF parse to fail, but got " + actualTime, -1, fdferrorIndex);
assertTrue("FDF error index ("+ fdferrorIndex + ") should approxiamate SDF index (" + sdferrorIndex + ")",
sdferrorIndex - fdferrorIndex <= 4);
- }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParserTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParserTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParserTest.java
index 546780b..00588df 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParserTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParserTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
/**
* Unit tests {@link org.apache.commons.lang3.time.FastDateParser}.
- *
+ *
* Copied from Apache Commons Lang 3 on 2016-11-16.
*/
public class FastDateParserTest {
@@ -343,7 +343,7 @@ public class FastDateParserTest {
}
}
}
-
+
@Test
public void testJpLocales() {
@@ -421,7 +421,7 @@ public class FastDateParserTest {
testSdfAndFdp("''yyyyMMdd'A''B'HHmmssSSS''", "'20030210A'B153320989'", false); // OK
testSdfAndFdp("''''yyyyMMdd'A''B'HHmmssSSS''", "''20030210A'B153320989'", false); // OK
testSdfAndFdp("'$\\Ed'" ,"$\\Ed", false); // OK
-
+
// quoted charaters are case sensitive
testSdfAndFdp("'QED'", "QED", false);
testSdfAndFdp("'QED'", "qed", true);
@@ -429,7 +429,7 @@ public class FastDateParserTest {
testSdfAndFdp("yyyy-MM-dd 'QED'", "2003-02-10 QED", false);
testSdfAndFdp("yyyy-MM-dd 'QED'", "2003-02-10 qed", true);
}
-
+
@Test
public void testLANG_832() throws Exception {
testSdfAndFdp("'d'd" ,"d3", false); // OK
@@ -593,19 +593,19 @@ public class FastDateParserTest {
final DateParser parser= getInstance(yMdHmsSZ, REYKJAVIK);
assertEquals(REYKJAVIK, parser.getTimeZone());
}
-
+
@Test
public void testLang996() throws ParseException {
final Calendar expected = Calendar.getInstance(NEW_YORK, Locale.US);
expected.clear();
expected.set(2014, Calendar.MAY, 14);
- final DateParser fdp = getInstance("ddMMMyyyy", NEW_YORK, Locale.US);
+ final DateParser fdp = getInstance("ddMMMyyyy", NEW_YORK, Locale.US);
assertEquals(expected.getTime(), fdp.parse("14may2014"));
assertEquals(expected.getTime(), fdp.parse("14MAY2014"));
assertEquals(expected.getTime(), fdp.parse("14May2014"));
}
-
+
@Test(expected = IllegalArgumentException.class)
public void test1806Argument() {
getInstance("XXXX");
@@ -624,8 +624,8 @@ public class FastDateParserTest {
}
private static enum Expected1806 {
- India(INDIA, "+05", "+0530", "+05:30", true),
- Greenwich(GMT, "Z", "Z", "Z", false),
+ India(INDIA, "+05", "+0530", "+05:30", true),
+ Greenwich(GMT, "Z", "Z", "Z", false),
NewYork(NEW_YORK, "-05", "-0500", "-05:00", false);
private Expected1806(final TimeZone zone, final String one, final String two, final String three, final boolean hasHalfHourOffset) {
@@ -642,17 +642,17 @@ public class FastDateParserTest {
final String three;
final long offset;
}
-
+
@Test
public void test1806() throws ParseException {
final String formatStub = "yyyy-MM-dd'T'HH:mm:ss.SSS";
final String dateStub = "2001-02-04T12:08:56.235";
-
+
for (final Expected1806 trial : Expected1806.values()) {
final Calendar cal = initializeCalendar(trial.zone);
final String message = trial.zone.getDisplayName()+";";
-
+
DateParser parser = getInstance(formatStub+"X", trial.zone);
assertEquals(message+trial.one, cal.getTime().getTime(), parser.parse(dateStub+trial.one).getTime()-trial.offset);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParser_MoreOrLessTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParser_MoreOrLessTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParser_MoreOrLessTest.java
index 0caa8be..e95631a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParser_MoreOrLessTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/datetime/FastDateParser_MoreOrLessTest.java
@@ -31,15 +31,15 @@ import org.junit.Test;
public class FastDateParser_MoreOrLessTest {
private static final TimeZone NEW_YORK = TimeZone.getTimeZone("America/New_York");
-
+
@Test
public void testInputHasPrecedingCharacters() {
final FastDateParser parser = new FastDateParser("MM/dd", TimeZone.getDefault(), Locale.getDefault());
final ParsePosition parsePosition = new ParsePosition(0);
final Date date = parser.parse("A 3/23/61", parsePosition);
Assert.assertNull(date);
- Assert.assertEquals(0, parsePosition.getIndex());
- Assert.assertEquals(0, parsePosition.getErrorIndex());
+ Assert.assertEquals(0, parsePosition.getIndex());
+ Assert.assertEquals(0, parsePosition.getErrorIndex());
}
@Test
@@ -54,7 +54,7 @@ public class FastDateParser_MoreOrLessTest {
calendar.setTime(date);
Assert.assertEquals(1961, calendar.get(Calendar.YEAR));
Assert.assertEquals(2, calendar.get(Calendar.MONTH));
- Assert.assertEquals(23, calendar.get(Calendar.DATE));
+ Assert.assertEquals(23, calendar.get(Calendar.DATE));
}
@Test
@@ -67,9 +67,9 @@ public class FastDateParser_MoreOrLessTest {
final Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
Assert.assertEquals(2, calendar.get(Calendar.MONTH));
- Assert.assertEquals(23, calendar.get(Calendar.DATE));
+ Assert.assertEquals(23, calendar.get(Calendar.DATE));
}
-
+
@Test
public void testInputHasWrongCharacters() {
final FastDateParser parser = new FastDateParser("MM-dd-yyy", TimeZone.getDefault(), Locale.getDefault());
@@ -77,7 +77,7 @@ public class FastDateParser_MoreOrLessTest {
Assert.assertNull(parser.parse("03/23/1961", parsePosition));
Assert.assertEquals(2, parsePosition.getErrorIndex());
}
-
+
@Test
public void testInputHasLessCharacters() {
final FastDateParser parser = new FastDateParser("MM/dd/yyy", TimeZone.getDefault(), Locale.getDefault());
@@ -85,21 +85,21 @@ public class FastDateParser_MoreOrLessTest {
Assert.assertNull(parser.parse("03/23", parsePosition));
Assert.assertEquals(5, parsePosition.getErrorIndex());
}
-
+
@Test
public void testInputHasWrongTimeZone() {
final FastDateParser parser = new FastDateParser("mm:ss z", NEW_YORK, Locale.US);
-
+
final String input = "11:23 Pacific Standard Time";
final ParsePosition parsePosition = new ParsePosition(0);
Assert.assertNotNull(parser.parse(input, parsePosition));
Assert.assertEquals(input.length(), parsePosition.getIndex());
-
+
parsePosition.setIndex(0);
Assert.assertNull(parser.parse( "11:23 Pacific Standard ", parsePosition));
Assert.assertEquals(6, parsePosition.getErrorIndex());
}
-
+
@Test
public void testInputHasWrongDay() {
final FastDateParser parser = new FastDateParser("EEEE, MM/dd/yyy", NEW_YORK, Locale.US);
@@ -107,7 +107,7 @@ public class FastDateParser_MoreOrLessTest {
final ParsePosition parsePosition = new ParsePosition(0);
Assert.assertNotNull(parser.parse(input, parsePosition));
Assert.assertEquals(input.length(), parsePosition.getIndex());
-
+
parsePosition.setIndex(0);
Assert.assertNull(parser.parse( "Thorsday, 03/23/61", parsePosition));
Assert.assertEquals(0, parsePosition.getErrorIndex());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 65458ba..36d4b63 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
@@ -26,7 +26,7 @@ import java.nio.file.Path;
* <p>
* For example:
* </p>
- *
+ *
* <pre>
* @Rule
* public CleanFiles files = new CleanFiles("path/to/file.txt");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 2d591d3..09ce947 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
@@ -48,7 +48,7 @@ public class LoggerContextRule implements TestRule, LoggerContextAccessor {
public static LoggerContextRule createShutdownTimeoutLoggerContextRule(final String config) {
return new LoggerContextRule(config, 10, TimeUnit.SECONDS);
}
-
+
private static final String SYS_PROP_KEY_CLASS_NAME = "org.apache.logging.log4j.junit.LoggerContextRule#ClassName";
private static final String SYS_PROP_KEY_DISPLAY_NAME = "org.apache.logging.log4j.junit.LoggerContextRule#DisplayName";
private final String configLocation;
@@ -278,7 +278,7 @@ public class LoggerContextRule implements TestRule, LoggerContextAccessor {
public void reconfigure() {
loggerContext.reconfigure();
}
-
+
@Override
public String toString() {
final StringBuilder builder = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/test/RuleChainFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/RuleChainFactory.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/RuleChainFactory.java
index 30629b2..6c3c435 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/RuleChainFactory.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/RuleChainFactory.java
@@ -27,7 +27,7 @@ public class RuleChainFactory {
/**
* Creates a {@link RuleChain} where the rules are evaluated in the order you pass in.
- *
+ *
* @param testRules
* test rules to evaluate
* @return a new rule chain.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEventFactory.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEventFactory.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEventFactory.java
index a95fd6b..7a79f35 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEventFactory.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEventFactory.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.LogEvent;
* Factory to create Flume events.
*/
public interface FlumeEventFactory {
-
+
/**
* Creates a Flume event.
* @param event The Log4j LogEvent.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
index d559904..a32dedd 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
@@ -278,7 +278,7 @@ public class FlumePersistentAppenderTest {
fields[i]);
}
}
-
+
@Test
public void testRFC5424Layout() throws IOException {
@@ -346,7 +346,7 @@ public class FlumePersistentAppenderTest {
}
}
}
-
+
@Test
public void testLogInterrupted() {
final ExecutorService executor = Executors.newSingleThreadExecutor();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/ByteStreamLogger.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/ByteStreamLogger.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/ByteStreamLogger.java
index 114f35a..e53e038 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/ByteStreamLogger.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/ByteStreamLogger.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
/**
- *
+ *
* @since 2.1
*/
public class ByteStreamLogger {
@@ -114,7 +114,7 @@ public class ByteStreamLogger {
this.logger.logIfEnabled(fqcn, this.level, this.marker, this.msg.toString());
this.msg.setLength(0);
}
-
+
private void logEnd(final String fqcn) {
if (this.msg.length() > 0) {
log(fqcn);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/CharStreamLogger.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/CharStreamLogger.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/CharStreamLogger.java
index 8bd5d24..a904480 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/CharStreamLogger.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/CharStreamLogger.java
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
/**
- *
+ *
* @since 2.1
*/
public class CharStreamLogger {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerBufferedInputStream.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerBufferedInputStream.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerBufferedInputStream.java
index 54d9796..f7a7e55 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerBufferedInputStream.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerBufferedInputStream.java
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
/**
- *
+ *
* @since 2.1
*/
public class LoggerBufferedInputStream extends BufferedInputStream {
@@ -48,17 +48,17 @@ public class LoggerBufferedInputStream extends BufferedInputStream {
public void close() throws IOException {
super.close();
}
-
+
@Override
public synchronized int read() throws IOException {
return super.read();
}
-
+
@Override
public int read(final byte[] b) throws IOException {
return super.read(b, 0, b.length);
}
-
+
@Override
public synchronized int read(final byte[] b, final int off, final int len) throws IOException {
return super.read(b, off, len);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerBufferedReader.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerBufferedReader.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerBufferedReader.java
index 584e61a..e63f612 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerBufferedReader.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerBufferedReader.java
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
/**
- *
+ *
* @since 2.1
*/
public class LoggerBufferedReader extends BufferedReader {
@@ -42,27 +42,27 @@ public class LoggerBufferedReader extends BufferedReader {
final Level level, final Marker marker) {
super(new LoggerReader(reader, logger, fqcn == null ? FQCN : fqcn, level, marker), size);
}
-
+
@Override
public void close() throws IOException {
super.close();
}
-
+
@Override
public int read() throws IOException {
return super.read();
}
-
+
@Override
public int read(final char[] cbuf) throws IOException {
return super.read(cbuf, 0, cbuf.length);
}
-
+
@Override
public int read(final char[] cbuf, final int off, final int len) throws IOException {
return super.read(cbuf, off, len);
}
-
+
@Override
public int read(final CharBuffer target) throws IOException {
final int len = target.remaining();
@@ -73,7 +73,7 @@ public class LoggerBufferedReader extends BufferedReader {
}
return charsRead;
}
-
+
@Override
public String readLine() throws IOException {
return super.readLine();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerFilterOutputStream.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerFilterOutputStream.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerFilterOutputStream.java
index b608502..d3d476b 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerFilterOutputStream.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerFilterOutputStream.java
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.spi.ExtendedLogger;
* that follows the {@link java.io.OutputStream} methods in spirit, but doesn't require output to any external stream.
* This class should <em>not</em> be used as a stream for an underlying logger unless it's being used as a bridge.
* Otherwise, infinite loops may occur!
- *
+ *
* @since 2.1
*/
public class LoggerFilterOutputStream extends FilterOutputStream {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerFilterWriter.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerFilterWriter.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerFilterWriter.java
index 4b0991f..d2da1ce 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerFilterWriter.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerFilterWriter.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.spi.ExtendedLogger;
/**
* Logs each line written to a pre-defined level. Can also be configured with a Marker. This class provides an interface
* that follows the {@link java.io.Writer} methods in spirit, but doesn't require output to any external out.
- *
+ *
* @since 2.1
*/
public class LoggerFilterWriter extends FilterWriter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerInputStream.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerInputStream.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerInputStream.java
index 5366f19..ee77251 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerInputStream.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerInputStream.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.spi.ExtendedLogger;
/**
* Logs each line read to a pre-defined level. Can also be configured with a Marker.
- *
+ *
* @since 2.1
*/
public class LoggerInputStream extends FilterInputStream {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerOutputStream.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerOutputStream.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerOutputStream.java
index b8ea392..1267966 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerOutputStream.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerOutputStream.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.spi.ExtendedLogger;
* that follows the {@link java.io.OutputStream} methods in spirit, but doesn't require output to any external stream.
* This class should <em>not</em> be used as a stream for an underlying logger unless it's being used as a bridge.
* Otherwise, infinite loops may occur!
- *
+ *
* @since 2.1
*/
public class LoggerOutputStream extends OutputStream {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerPrintStream.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerPrintStream.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerPrintStream.java
index 30bac34..5aa1e82 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerPrintStream.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerPrintStream.java
@@ -33,7 +33,7 @@ import org.apache.logging.log4j.spi.ExtendedLogger;
* that follows the {@link java.io.PrintStream} methods in spirit, but doesn't require output to any external stream.
* This class should <em>not</em> be used as a stream for an underlying logger unless it's being used as a bridge.
* Otherwise, infinite loops may occur!
- *
+ *
* @since 2.1
*/
public class LoggerPrintStream extends PrintStream {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerReader.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerReader.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerReader.java
index 265e8e7..6fb9579 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerReader.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerReader.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.spi.ExtendedLogger;
/**
* Logs each line read to a pre-defined level. Can also be configured with a Marker.
- *
+ *
* @since 2.1
*/
public class LoggerReader extends FilterReader {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerWriter.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerWriter.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerWriter.java
index 8fba24c..235d4eb 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerWriter.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/LoggerWriter.java
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.spi.ExtendedLogger;
/**
* Logs each line written to a pre-defined level. Can also be configured with a Marker. This class provides an interface
* that follows the {@link java.io.Writer} methods in spirit, but doesn't require output to any external writer.
- *
+ *
* @since 2.1
*/
public class LoggerWriter extends Writer {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractLoggerOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractLoggerOutputStreamTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractLoggerOutputStreamTest.java
index 188b422..9f83788 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractLoggerOutputStreamTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractLoggerOutputStreamTest.java
@@ -28,7 +28,7 @@ import static org.mockito.BDDMockito.then;
import static org.mockito.Mockito.mock;
public abstract class AbstractLoggerOutputStreamTest extends AbstractStreamTest {
-
+
protected OutputStream out;
protected ByteArrayOutputStream wrapped;
protected abstract ByteArrayOutputStream createOutputStream();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractStreamTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractStreamTest.java
index d73fd02..a24e0f9 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractStreamTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/AbstractStreamTest.java
@@ -1,59 +1,59 @@
-/*
- * 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.io;
-
-import java.util.List;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.junit.LoggerContextRule;
-import org.apache.logging.log4j.spi.ExtendedLogger;
-import org.junit.Before;
-import org.junit.ClassRule;
-
-import static org.hamcrest.core.StringStartsWith.startsWith;
-import static org.junit.Assert.*;
-
-public abstract class AbstractStreamTest {
-
- protected static ExtendedLogger getExtendedLogger() {
- return ctx.getLogger("UnitTestLogger");
- }
-
- protected final static String NEWLINE = System.lineSeparator();
- protected final static Level LEVEL = Level.ERROR;
- protected final static String FIRST = "first";
-
- protected final static String LAST = "last";
-
- @ClassRule
- public static LoggerContextRule ctx = new LoggerContextRule("log4j2-streams-unit-test.xml");
-
- protected void assertMessages(final String... messages) {
- final List<String> actualMsgs = ctx.getListAppender("UnitTest").getMessages();
- assertEquals("Unexpected number of results.", messages.length, actualMsgs.size());
- for (int i = 0; i < messages.length; i++) {
- final String start = LEVEL.name() + ' ' + messages[i];
- assertThat(actualMsgs.get(i), startsWith(start));
- }
- }
-
- @Before
- public void clearAppender() {
- ctx.getListAppender("UnitTest").clear();
- }
-}
+/*
+ * 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.io;
+
+import java.util.List;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.apache.logging.log4j.spi.ExtendedLogger;
+import org.junit.Before;
+import org.junit.ClassRule;
+
+import static org.hamcrest.core.StringStartsWith.startsWith;
+import static org.junit.Assert.*;
+
+public abstract class AbstractStreamTest {
+
+ protected static ExtendedLogger getExtendedLogger() {
+ return ctx.getLogger("UnitTestLogger");
+ }
+
+ protected final static String NEWLINE = System.lineSeparator();
+ protected final static Level LEVEL = Level.ERROR;
+ protected final static String FIRST = "first";
+
+ protected final static String LAST = "last";
+
+ @ClassRule
+ public static LoggerContextRule ctx = new LoggerContextRule("log4j2-streams-unit-test.xml");
+
+ protected void assertMessages(final String... messages) {
+ final List<String> actualMsgs = ctx.getListAppender("UnitTest").getMessages();
+ assertEquals("Unexpected number of results.", messages.length, actualMsgs.size());
+ for (int i = 0; i < messages.length; i++) {
+ final String start = LEVEL.name() + ' ' + messages[i];
+ assertThat(actualMsgs.get(i), startsWith(start));
+ }
+ }
+
+ @Before
+ public void clearAppender() {
+ ctx.getListAppender("UnitTest").clear();
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/IoBuilderCallerInfoTesting.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/IoBuilderCallerInfoTesting.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/IoBuilderCallerInfoTesting.java
index d81e173..e255542 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/IoBuilderCallerInfoTesting.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/IoBuilderCallerInfoTesting.java
@@ -1,55 +1,55 @@
-/*
- * 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.io;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.Logger;
-import org.apache.logging.log4j.junit.LoggerContextRule;
-import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.Before;
-import org.junit.ClassRule;
-
-import static org.junit.Assert.*;
-
-public class IoBuilderCallerInfoTesting {
-
- protected static Logger getExtendedLogger() {
- return ctx.getLogger("ClassAndMethodLogger");
- }
-
- protected static Logger getLogger() {
- return getExtendedLogger();
- }
-
- protected final static Level LEVEL = Level.WARN;
-
- @ClassRule
- public static LoggerContextRule ctx = new LoggerContextRule("log4j2-streams-calling-info.xml");
-
- public void assertMessages(final String msg, final int size, final String methodName) {
- final ListAppender appender = ctx.getListAppender("ClassAndMethod");
- assertEquals(msg + ".size", size, appender.getMessages().size());
- for (final String message : appender.getMessages()) {
- assertEquals(msg + " has incorrect caller info", this.getClass().getName() + '.' + methodName, message);
- }
- }
-
- @Before
- public void clearAppender() {
- ctx.getListAppender("ClassAndMethod").clear();
- }
-}
+/*
+ * 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.io;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.apache.logging.log4j.test.appender.ListAppender;
+import org.junit.Before;
+import org.junit.ClassRule;
+
+import static org.junit.Assert.*;
+
+public class IoBuilderCallerInfoTesting {
+
+ protected static Logger getExtendedLogger() {
+ return ctx.getLogger("ClassAndMethodLogger");
+ }
+
+ protected static Logger getLogger() {
+ return getExtendedLogger();
+ }
+
+ protected final static Level LEVEL = Level.WARN;
+
+ @ClassRule
+ public static LoggerContextRule ctx = new LoggerContextRule("log4j2-streams-calling-info.xml");
+
+ public void assertMessages(final String msg, final int size, final String methodName) {
+ final ListAppender appender = ctx.getListAppender("ClassAndMethod");
+ assertEquals(msg + ".size", size, appender.getMessages().size());
+ for (final String message : appender.getMessages()) {
+ assertEquals(msg + " has incorrect caller info", this.getClass().getName() + '.' + methodName, message);
+ }
+ }
+
+ @Before
+ public void clearAppender() {
+ ctx.getListAppender("ClassAndMethod").clear();
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerBufferedInputStreamCallerInfoTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerBufferedInputStreamCallerInfoTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerBufferedInputStreamCallerInfoTest.java
index 5975407..e00bb1b 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerBufferedInputStreamCallerInfoTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerBufferedInputStreamCallerInfoTest.java
@@ -34,7 +34,7 @@ public class LoggerBufferedInputStreamCallerInfoTest extends IoBuilderCallerInfo
this.logIn.close();
assertMessages("after close", 4, "close");
}
-
+
@Test
public void read() throws Exception {
this.logIn.read();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerBufferedReaderCallerInfoTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerBufferedReaderCallerInfoTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerBufferedReaderCallerInfoTest.java
index 6f83dbb..4f07e56 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerBufferedReaderCallerInfoTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerBufferedReaderCallerInfoTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
public class LoggerBufferedReaderCallerInfoTest extends IoBuilderCallerInfoTesting {
BufferedReader logReader;
-
+
@Test
public void close() throws Exception {
this.logReader.readLine();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerInputStreamCallerInfoTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerInputStreamCallerInfoTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerInputStreamCallerInfoTest.java
index 36f70f3..d6b4efc 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerInputStreamCallerInfoTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerInputStreamCallerInfoTest.java
@@ -45,7 +45,7 @@ public class LoggerInputStreamCallerInfoTest extends IoBuilderCallerInfoTesting
this.logIn.close();
assertMessages("after close size", 4, "read");
}
-
+
@Before
public void setupStreams() {
final InputStream srcInputStream = new ByteArrayInputStream("a\nb\nc\nd".getBytes());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerInputStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerInputStreamTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerInputStreamTest.java
index 9242eef..65bc2db 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerInputStreamTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerInputStreamTest.java
@@ -45,7 +45,7 @@ public class LoggerInputStreamTest extends AbstractStreamTest {
this.read = new ByteArrayOutputStream();
this.in = createInputStream();
}
-
+
@Test
public void testClose_HasRemainingData() throws IOException {
final byte[] bytes = new byte[1024];
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerOutputStreamCallerInfoTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerOutputStreamCallerInfoTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerOutputStreamCallerInfoTest.java
index 1b5eb85..66002ca 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerOutputStreamCallerInfoTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerOutputStreamCallerInfoTest.java
@@ -25,19 +25,19 @@ import org.junit.Test;
public class LoggerOutputStreamCallerInfoTest extends IoBuilderCallerInfoTesting {
private OutputStream logOut;
-
+
@Before
public void setupStreams() {
this.logOut = IoBuilder.forLogger(getExtendedLogger()).setLevel(Level.WARN).buildOutputStream();
}
-
+
@Test
public void write() throws Exception {
this.logOut.write('a');
assertMessages("before write int", 0, "write");
this.logOut.write('\n');
assertMessages("after write int", 1, "write");
-
+
this.logOut.write("b\n".getBytes());
assertMessages("after write byte array", 2, "write");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintStreamCallerInfoTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintStreamCallerInfoTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintStreamCallerInfoTest.java
index 723336f..e79ddaf 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintStreamCallerInfoTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintStreamCallerInfoTest.java
@@ -34,7 +34,7 @@ public class LoggerPrintStreamCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.close();
assertMessages("after close size", 2, "close");
}
-
+
@Test
public void print_boolean() throws Exception {
this.logOut.print(true);
@@ -42,7 +42,7 @@ public class LoggerPrintStreamCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println(true);
assertMessages("println", 1, "print_boolean");
}
-
+
@Test
public void print_char() throws Exception {
this.logOut.print('a');
@@ -50,7 +50,7 @@ public class LoggerPrintStreamCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println('b');
assertMessages("println", 1, "print_char");
}
-
+
@Test
public void print_chararray() throws Exception {
this.logOut.print("a".toCharArray());
@@ -58,7 +58,7 @@ public class LoggerPrintStreamCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println("b".toCharArray());
assertMessages("println", 1, "print_chararray");
}
-
+
@Test
public void print_double() throws Exception {
this.logOut.print(1D);
@@ -66,7 +66,7 @@ public class LoggerPrintStreamCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println(2D);
assertMessages("println", 1, "print_double");
}
-
+
@Test
public void print_float() throws Exception {
this.logOut.print(1f);
@@ -74,7 +74,7 @@ public class LoggerPrintStreamCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println(2f);
assertMessages("println", 1, "print_float");
}
-
+
@Test
public void print_int() throws Exception {
this.logOut.print(1);
@@ -82,7 +82,7 @@ public class LoggerPrintStreamCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println(2);
assertMessages("println", 1, "print_int");
}
-
+
@Test
public void print_long() throws Exception {
this.logOut.print(1L);
@@ -90,7 +90,7 @@ public class LoggerPrintStreamCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println(2L);
assertMessages("println", 1, "print_long");
}
-
+
@Test
public void print_object() throws Exception {
this.logOut.print((Object) 'a');
@@ -98,19 +98,19 @@ public class LoggerPrintStreamCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println((Object) 'b');
assertMessages("println", 1, "print_object");
}
-
+
@Test
public void print_printf() throws Exception {
this.logOut.printf("a\n");
assertMessages("println", 1, "print_printf");
}
-
+
@Test
public void print_printf_locale() throws Exception {
this.logOut.printf(Locale.getDefault(), "a\n");
assertMessages("println", 1, "print_printf_locale");
}
-
+
@Test
public void print_string() throws Exception {
this.logOut.print("a");
@@ -118,26 +118,26 @@ public class LoggerPrintStreamCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println("b");
assertMessages("println", 1, "print_string");
}
-
+
@Before
public void setupStreams() {
this.logOut = IoBuilder.forLogger(getLogger())
.setLevel(Level.WARN)
.buildPrintStream();
}
-
+
@Test
public void write_bytes() throws Exception {
this.logOut.write("b\n".getBytes());
assertMessages("write", 1, "write_bytes");
}
-
+
@Test
public void write_bytes_offset() throws Exception {
this.logOut.write("c\n".getBytes(), 0, 2);
assertMessages("write", 1, "write_bytes_offset");
}
-
+
@Test
public void write_int() throws Exception {
this.logOut.write('a');
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterCallerInfoTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterCallerInfoTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterCallerInfoTest.java
index ca6ce01..52c87c8 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterCallerInfoTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterCallerInfoTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
public class LoggerPrintWriterCallerInfoTest extends IoBuilderCallerInfoTesting {
private PrintWriter logOut;
-
+
@Test
public void close() throws Exception {
this.logOut.print("a\nb");
@@ -34,7 +34,7 @@ public class LoggerPrintWriterCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.close();
assertMessages("after close size", 2, "close");
}
-
+
@Test
public void print_boolean() throws Exception {
this.logOut.print(true);
@@ -42,7 +42,7 @@ public class LoggerPrintWriterCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println(true);
assertMessages("println", 1, "print_boolean");
}
-
+
@Test
public void print_char() throws Exception {
this.logOut.print('a');
@@ -50,7 +50,7 @@ public class LoggerPrintWriterCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println('b');
assertMessages("println", 1, "print_char");
}
-
+
@Test
public void print_chararray() throws Exception {
this.logOut.print("a".toCharArray());
@@ -58,7 +58,7 @@ public class LoggerPrintWriterCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println("b".toCharArray());
assertMessages("println", 1, "print_chararray");
}
-
+
@Test
public void print_double() throws Exception {
this.logOut.print(1D);
@@ -66,7 +66,7 @@ public class LoggerPrintWriterCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println(2D);
assertMessages("println", 1, "print_double");
}
-
+
@Test
public void print_float() throws Exception {
this.logOut.print(1f);
@@ -74,7 +74,7 @@ public class LoggerPrintWriterCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println(2f);
assertMessages("println", 1, "print_float");
}
-
+
@Test
public void print_int() throws Exception {
this.logOut.print(1);
@@ -82,7 +82,7 @@ public class LoggerPrintWriterCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println(2);
assertMessages("println", 1, "print_int");
}
-
+
@Test
public void print_long() throws Exception {
this.logOut.print(1L);
@@ -90,7 +90,7 @@ public class LoggerPrintWriterCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println(2L);
assertMessages("println", 1, "print_long");
}
-
+
@Test
public void print_object() throws Exception {
this.logOut.print((Object) 'a');
@@ -98,19 +98,19 @@ public class LoggerPrintWriterCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println((Object) 'b');
assertMessages("println", 1, "print_object");
}
-
+
@Test
public void print_printf() throws Exception {
this.logOut.printf("a\n");
assertMessages("println", 1, "print_printf");
}
-
+
@Test
public void print_printf_locale() throws Exception {
this.logOut.printf(Locale.getDefault(), "a\n");
assertMessages("println", 1, "print_printf_locale");
}
-
+
@Test
public void print_string() throws Exception {
this.logOut.print("a");
@@ -118,26 +118,26 @@ public class LoggerPrintWriterCallerInfoTest extends IoBuilderCallerInfoTesting
this.logOut.println("b");
assertMessages("println", 1, "print_string");
}
-
+
@Before
public void setupStreams() {
this.logOut = IoBuilder.forLogger(getLogger())
.setLevel(Level.WARN)
.buildPrintWriter();
}
-
+
@Test
public void write_bytes() throws Exception {
this.logOut.write("b\n".toCharArray());
assertMessages("write", 1, "write_bytes");
}
-
+
@Test
public void write_bytes_offset() throws Exception {
this.logOut.write("c\n".toCharArray(), 0, 2);
assertMessages("write", 1, "write_bytes_offset");
}
-
+
@Test
public void write_int() throws Exception {
this.logOut.write('a');
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterJdbcH2Test.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterJdbcH2Test.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterJdbcH2Test.java
index 712ec62..dad446d 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterJdbcH2Test.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterJdbcH2Test.java
@@ -1,96 +1,96 @@
-/*
- * 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.io;
-
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.junit.LoggerContextRule;
-import org.apache.logging.log4j.test.appender.ListAppender;
-import org.apache.logging.log4j.util.Strings;
-import org.h2.jdbcx.JdbcDataSource;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class LoggerPrintWriterJdbcH2Test {
-
- @ClassRule
- public static LoggerContextRule context = new LoggerContextRule("log4j2-jdbc-driver-manager.xml");
-
- private static final String H2_URL = "jdbc:h2:mem:Log4j";
-
- private static final String PASSWORD = Strings.EMPTY;
-
- private static final String USER_ID = "sa";
-
- private ListAppender listAppender;
-
- private PrintWriter createLoggerPrintWriter() {
- return IoBuilder.forLogger(context.getLogger()).setLevel(Level.ALL).buildPrintWriter();
- }
-
- private ListAppender getListAppender() {
- return listAppender;
- }
-
- protected Connection newConnection() throws SQLException {
- return DriverManager.getConnection(H2_URL, USER_ID, PASSWORD);
- }
-
- private void setListAppender(final ListAppender listAppender) {
- this.listAppender = listAppender;
- }
-
- @Before
- public void setUp() throws Exception {
- this.setListAppender(context.getListAppender("List").clear());
- Assert.assertEquals(0, this.getListAppender().getMessages().size());
- }
-
- @Test
- @Ignore("DataSource#setLogWriter() has no effect in H2, it uses its own internal logging and an SLF4J bridge.")
- public void testDataSource_setLogWriter() throws SQLException {
- final JdbcDataSource dataSource = new JdbcDataSource();
- dataSource.setUrl(H2_URL);
- dataSource.setUser(USER_ID);
- dataSource.setPassword(PASSWORD);
- dataSource.setLogWriter(createLoggerPrintWriter());
- // dataSource.setLogWriter(new PrintWriter(new OutputStreamWriter(System.out)));
- try (final Connection conn = dataSource.getConnection()) {
- conn.prepareCall("select 1");
- }
- Assert.assertTrue(this.getListAppender().getMessages().size() > 0);
- }
-
- @Test
- public void testDriverManager_setLogWriter() throws SQLException {
- DriverManager.setLogWriter(createLoggerPrintWriter());
- // DriverManager.setLogWriter(new PrintWriter(new OutputStreamWriter(System.out)));
- try (final Connection conn = this.newConnection()) {
- conn.rollback();
- } finally {
- DriverManager.setLogWriter(null);
- }
- Assert.assertTrue(this.getListAppender().getMessages().size() > 0);
- }
-}
+/*
+ * 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.io;
+
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.apache.logging.log4j.test.appender.ListAppender;
+import org.apache.logging.log4j.util.Strings;
+import org.h2.jdbcx.JdbcDataSource;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class LoggerPrintWriterJdbcH2Test {
+
+ @ClassRule
+ public static LoggerContextRule context = new LoggerContextRule("log4j2-jdbc-driver-manager.xml");
+
+ private static final String H2_URL = "jdbc:h2:mem:Log4j";
+
+ private static final String PASSWORD = Strings.EMPTY;
+
+ private static final String USER_ID = "sa";
+
+ private ListAppender listAppender;
+
+ private PrintWriter createLoggerPrintWriter() {
+ return IoBuilder.forLogger(context.getLogger()).setLevel(Level.ALL).buildPrintWriter();
+ }
+
+ private ListAppender getListAppender() {
+ return listAppender;
+ }
+
+ protected Connection newConnection() throws SQLException {
+ return DriverManager.getConnection(H2_URL, USER_ID, PASSWORD);
+ }
+
+ private void setListAppender(final ListAppender listAppender) {
+ this.listAppender = listAppender;
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ this.setListAppender(context.getListAppender("List").clear());
+ Assert.assertEquals(0, this.getListAppender().getMessages().size());
+ }
+
+ @Test
+ @Ignore("DataSource#setLogWriter() has no effect in H2, it uses its own internal logging and an SLF4J bridge.")
+ public void testDataSource_setLogWriter() throws SQLException {
+ final JdbcDataSource dataSource = new JdbcDataSource();
+ dataSource.setUrl(H2_URL);
+ dataSource.setUser(USER_ID);
+ dataSource.setPassword(PASSWORD);
+ dataSource.setLogWriter(createLoggerPrintWriter());
+ // dataSource.setLogWriter(new PrintWriter(new OutputStreamWriter(System.out)));
+ try (final Connection conn = dataSource.getConnection()) {
+ conn.prepareCall("select 1");
+ }
+ Assert.assertTrue(this.getListAppender().getMessages().size() > 0);
+ }
+
+ @Test
+ public void testDriverManager_setLogWriter() throws SQLException {
+ DriverManager.setLogWriter(createLoggerPrintWriter());
+ // DriverManager.setLogWriter(new PrintWriter(new OutputStreamWriter(System.out)));
+ try (final Connection conn = this.newConnection()) {
+ conn.rollback();
+ } finally {
+ DriverManager.setLogWriter(null);
+ }
+ Assert.assertTrue(this.getListAppender().getMessages().size() > 0);
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterTest.java
index 032e004..37618ac 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerPrintWriterTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
public class LoggerPrintWriterTest extends AbstractLoggerWriterTest {
- private PrintWriter print;
+ private PrintWriter print;
@Override
protected StringWriter createWriter() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerReaderCallerInfoTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerReaderCallerInfoTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerReaderCallerInfoTest.java
index ae009b2..41393e5 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerReaderCallerInfoTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerReaderCallerInfoTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
public class LoggerReaderCallerInfoTest extends IoBuilderCallerInfoTesting {
Reader logReader;
-
+
@Test
public void read() throws Exception {
this.logReader.read();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerReaderTest.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerReaderTest.java b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerReaderTest.java
index b6383e2..fa48a31 100644
--- a/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerReaderTest.java
+++ b/log4j-iostreams/src/test/java/org/apache/logging/log4j/io/LoggerReaderTest.java
@@ -39,7 +39,7 @@ public class LoggerReaderTest extends AbstractStreamTest {
.setLevel(LEVEL)
.buildReader();
}
-
+
@Before
public void createStream() {
this.wrapped = new StringReader(FIRST + "\r\n" + LAST);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java
----------------------------------------------------------------------
diff --git a/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java b/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java
index 1fb51aa..1e644d5 100644
--- a/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java
+++ b/log4j-jcl/src/main/java/org/apache/logging/log4j/jcl/Log4jLog.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.spi.ExtendedLogger;
*
*/
public class Log4jLog implements Log, Serializable {
-
+
private static final long serialVersionUID = 1L;
private static final String FQCN = Log4jLog.class.getName();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
index b2d36a8..081f760 100644
--- a/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
+++ b/log4j-jpa/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
@@ -89,7 +89,7 @@ public final class JpaDatabaseManager extends AbstractDatabaseManager {
protected void writeInternal(final LogEvent event) {
writeInternal(event, null);
}
-
+
@Override
protected void writeInternal(final LogEvent event, final Serializable serializable) {
if (!this.isRunning() || this.entityManagerFactory == null || this.entityManager == null
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverterTest.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverterTest.java
index 0fae006..165f87f 100644
--- a/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverterTest.java
+++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverterTest.java
@@ -36,7 +36,7 @@ public class ContextStackJsonAttributeConverterTest {
private ContextStackJsonAttributeConverter converter;
@Rule
- public final ThreadContextStackRule threadContextRule = new ThreadContextStackRule();
+ public final ThreadContextStackRule threadContextRule = new ThreadContextStackRule();
@Before
public void setUp() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Constants.java
----------------------------------------------------------------------
diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Constants.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Constants.java
index bc86410..90e0730 100644
--- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Constants.java
+++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Constants.java
@@ -29,7 +29,7 @@ public final class Constants {
* {@code log4j-core}.
*/
public static final String LOGGER_ADAPTOR_PROPERTY = "log4j.jul.LoggerAdapter";
-
+
/**
* The Log4j property to set to a custom implementation of {@link org.apache.logging.log4j.jul.LevelConverter}. The specified class must have
* a default constructor.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
----------------------------------------------------------------------
diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
index adaf4eb..ea04fee 100644
--- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
+++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
@@ -34,7 +34,7 @@ import org.apache.logging.log4j.Level;
* <p>
* Since 2.4, supports custom JUL levels by mapping them to their closest mapped neighbour.
* </p>
- *
+ *
* @since 2.1
*/
public class DefaultLevelConverter implements LevelConverter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java
----------------------------------------------------------------------
diff --git a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java
index 18f3bf0..03f3cff 100644
--- a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java
+++ b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
/**
* Tests {@link DefaultLevelConverter} for custom JUL levels.
- *
+ *
* @since 2.4
*/
public class DefaultLevelConverterCustomJulLevelsTest {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java
----------------------------------------------------------------------
diff --git a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java
index 595c361..68416c2 100644
--- a/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java
+++ b/log4j-mongodb2/src/test/java/org/apache/logging/log4j/mongodb2/MongoDbTestRule.java
@@ -43,7 +43,7 @@ import de.flapdoodle.embed.process.runtime.Network;
/**
* A JUnit test rule to manage a MongoDB embedded instance.
- *
+ *
* TODO Move this class to Apache Commons Testing.
*/
public class MongoDbTestRule implements TestRule {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
----------------------------------------------------------------------
diff --git a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
index 2f3ea1a..b6a7097 100644
--- a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
+++ b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
@@ -43,7 +43,7 @@ import de.flapdoodle.embed.process.runtime.Network;
/**
* A JUnit test rule to manage a MongoDB embedded instance.
- *
+ *
* TODO Move this class to Apache Commons Testing.
*/
public class MongoDbTestRule implements TestRule {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java
----------------------------------------------------------------------
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java
index f22c4a1..39fecb7 100644
--- a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java
+++ b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java
@@ -44,7 +44,7 @@ public abstract class AbstractLoadBundleTest {
private final BundleTestInfo bundleTestInfo;
private Path here;
-
+
@Rule
public OsgiRule osgi = new OsgiRule(getFactory());
/**
@@ -61,7 +61,7 @@ public abstract class AbstractLoadBundleTest {
@Before
public void before() throws BundleException {
bundleContext = osgi.getFramework().getBundleContext();
-
+
here = Paths.get(".").toAbsolutePath().normalize();
}
@@ -75,7 +75,7 @@ public abstract class AbstractLoadBundleTest {
final Path corePath = here.resolveSibling("log4j-core").resolve("target").resolve("log4j-core-" + bundleTestInfo.getVersion() + ".jar");
return bundleContext.installBundle(corePath.toUri().toString());
}
-
+
private Bundle getDummyBundle() throws BundleException {
final Path dumyPath = here.resolveSibling("log4j-samples").resolve("log4j-samples-configuration").resolve("target").resolve("log4j-samples-configuration-" + bundleTestInfo.getVersion() + ".jar");
return bundleContext.installBundle(dumyPath.toUri().toString());
@@ -86,9 +86,9 @@ public abstract class AbstractLoadBundleTest {
return bundleContext.installBundle(apiPath.toUri().toString());
}
-
+
protected abstract FrameworkFactory getFactory();
-
+
private void log(final Bundle dummy) throws ReflectiveOperationException {
// use reflection to log in the context of the dummy bundle
@@ -131,7 +131,7 @@ public abstract class AbstractLoadBundleTest {
private void start(final Bundle api, final Bundle core, final Bundle dummy) throws BundleException {
api.start();
core.start();
- dummy.start();
+ dummy.start();
}
private void stop(final Bundle api, final Bundle core, final Bundle dummy) throws BundleException {
@@ -139,7 +139,7 @@ public abstract class AbstractLoadBundleTest {
core.stop();
api.stop();
}
-
+
private void uninstall(final Bundle api, final Bundle core, final Bundle dummy) throws BundleException {
dummy.uninstall();
core.uninstall();
@@ -154,37 +154,37 @@ public abstract class AbstractLoadBundleTest {
final Bundle api = getApiBundle();
final Bundle core = getCoreBundle();
-
+
Assert.assertEquals("api is not in INSTALLED state", Bundle.INSTALLED, api.getState());
Assert.assertEquals("core is not in INSTALLED state", Bundle.INSTALLED, core.getState());
api.start();
core.start();
-
- Assert.assertEquals("api is not in ACTIVE state", Bundle.ACTIVE, api.getState());
- Assert.assertEquals("core is not in ACTIVE state", Bundle.ACTIVE, core.getState());
-
+
+ Assert.assertEquals("api is not in ACTIVE state", Bundle.ACTIVE, api.getState());
+ Assert.assertEquals("core is not in ACTIVE state", Bundle.ACTIVE, core.getState());
+
core.stop();
api.stop();
-
+
Assert.assertEquals("api is not in RESOLVED state", Bundle.RESOLVED, api.getState());
Assert.assertEquals("core is not in RESOLVED state", Bundle.RESOLVED, core.getState());
-
+
api.start();
core.start();
-
- Assert.assertEquals("api is not in ACTIVE state", Bundle.ACTIVE, api.getState());
- Assert.assertEquals("core is not in ACTIVE state", Bundle.ACTIVE, core.getState());
-
+
+ Assert.assertEquals("api is not in ACTIVE state", Bundle.ACTIVE, api.getState());
+ Assert.assertEquals("core is not in ACTIVE state", Bundle.ACTIVE, core.getState());
+
core.stop();
api.stop();
-
+
Assert.assertEquals("api is not in RESOLVED state", Bundle.RESOLVED, api.getState());
Assert.assertEquals("core is not in RESOLVED state", Bundle.RESOLVED, core.getState());
-
+
core.uninstall();
api.uninstall();
-
+
Assert.assertEquals("api is not in UNINSTALLED state", Bundle.UNINSTALLED, api.getState());
Assert.assertEquals("core is not in UNINSTALLED state", Bundle.UNINSTALLED, core.getState());
}
@@ -223,7 +223,7 @@ public abstract class AbstractLoadBundleTest {
core.stop();
api.stop();
-
+
core.uninstall();
api.uninstall();
}
@@ -291,7 +291,7 @@ public abstract class AbstractLoadBundleTest {
/**
- * Tests the loading of the 1.2 Compatibility API bundle, its classes should be loadable from the Core bundle,
+ * Tests the loading of the 1.2 Compatibility API bundle, its classes should be loadable from the Core bundle,
* and the class loader should be the same between a class from core and a class from compat
*/
@Test
@@ -303,7 +303,7 @@ public abstract class AbstractLoadBundleTest {
api.start();
core.start();
-
+
final Class<?> coreClassFromCore = core.loadClass("org.apache.logging.log4j.core.Core");
final Class<?> levelClassFrom12API = core.loadClass("org.apache.log4j.Level");
final Class<?> levelClassFromAPI = core.loadClass("org.apache.logging.log4j.Level");
@@ -313,7 +313,7 @@ public abstract class AbstractLoadBundleTest {
core.stop();
api.stop();
-
+
uninstall(api, core, compat);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
----------------------------------------------------------------------
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
index 6832157..eef72e1 100644
--- a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
+++ b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
@@ -58,7 +58,7 @@ public class OsgiRule extends ExternalResource {
configMap.put("felix.log.level", "4");
configMap.put("eclipse.log.level", "ALL");
// Hack to get the build working on Windows. Could try newer versions of Felix.
- configMap.put("felix.cache.locking", "false");
+ configMap.put("felix.cache.locking", "false");
// Delegates loading of endorsed libraries to JVM classloader
// config.put("org.osgi.framework.bootdelegation", "javax.*,org.w3c.*,org.xml.*");
framework = factory.newFramework(configMap);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 0d36c21..df5d494 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
@@ -164,7 +164,7 @@ public class LoggerConfigBenchmark {
processLogEvent(event);
}
}
-
+
volatile LoggerConfigBenchmark loggerConfig = this;
/**
@@ -186,7 +186,7 @@ public class LoggerConfigBenchmark {
/**
* Determine if the LogEvent should be processed or ignored.
- *
+ *
* @param event The LogEvent.
* @return true if the LogEvent should be processed.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java
index beb1456..9e5a3e4 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java
@@ -177,7 +177,7 @@ public class ThreadLocalVsPoolBenchmark {
}
/**
- *
+ *
*/
abstract class ObjectPool<T> {
private final Deque<T> pool = new ConcurrentLinkedDeque<>();
@@ -195,7 +195,7 @@ abstract class ObjectPool<T> {
}
/**
- *
+ *
*/
class StringBuilderPool extends ObjectPool<StringBuilder> {
private final int initialSize;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
index 885c357..c28d398 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
@@ -67,7 +67,7 @@ public class ThreadsafeDateFormatBenchmark {
private final FastDateFormat fastDateFormat = FastDateFormat.getInstance("HH:mm:ss.SSS");
private final FixedDateFormat fixedDateFormat = FixedDateFormat.createIfSupported("HH:mm:ss.SSS");
private final FormatterFixedReuseBuffer formatFixedReuseBuffer = new FormatterFixedReuseBuffer();
-
+
private class CachedTimeFastFormat {
private final long timestamp;
private final String formatted;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebLifeCycle.java
----------------------------------------------------------------------
diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebLifeCycle.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebLifeCycle.java
index 05ccbfa..e8cba90 100644
--- a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebLifeCycle.java
+++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebLifeCycle.java
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.LifeCycle;
* access to them.
*/
interface Log4jWebLifeCycle extends Log4jWebSupport, LifeCycle {
-
+
/**
* Starts up Log4j in the web application. Calls {@link #setLoggerContext()} after initialization is complete.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java
----------------------------------------------------------------------
diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java
index ddbc799..b3c47e2 100644
--- a/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java
+++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java
@@ -67,7 +67,7 @@ public class ServletAppender extends AbstractAppender {
/**
* Logs with {@link ServletContext#log(String, Throwable)} if true and with {@link ServletContext#log(String)} if false.
- *
+ *
* @return whether to log a Throwable with the servlet context.
*/
public boolean isLogThrowables() {
@@ -82,7 +82,7 @@ public class ServletAppender extends AbstractAppender {
}
}
-
+
@PluginBuilderFactory
public static <B extends Builder<B>> B newBuilder() {
return new Builder<B>().asBuilder();
@@ -90,7 +90,7 @@ public class ServletAppender extends AbstractAppender {
private final ServletContext servletContext;
private final boolean logThrowables;
-
+
private ServletAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
final ServletContext servletContext, final boolean ignoreExceptions, final boolean logThrowables) {
super(name, filter, layout, ignoreExceptions, Property.EMPTY_ARRAY);
[05/13] logging-log4j2 git commit: Use final.
Posted by gg...@apache.org.
Use final.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/de97a11d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/de97a11d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/de97a11d
Branch: refs/heads/release-2.x
Commit: de97a11d871eaa659dbb72ba020ccbc4daeb49bf
Parents: 1f4c796
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Oct 30 10:49:49 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Oct 30 10:49:49 2018 -0600
----------------------------------------------------------------------
.../java/org/apache/log4j/AppenderSkeleton.java | 26 +-
.../java/org/apache/log4j/ConsoleAppender.java | 2 +-
.../java/org/apache/log4j/SimpleLayout.java | 2 +-
.../config/Log4j1ConfigurationFactoryTest.java | 2 +-
.../org/apache/logging/log4j/LogManager.java | 4 +-
.../logging/log4j/message/MapMessage.java | 6 +-
.../log4j/message/ReusableObjectMessage.java | 4 +-
.../message/ReusableParameterizedMessage.java | 4 +-
.../log4j/message/ReusableSimpleMessage.java | 2 +-
.../StructuredDataCollectionMessage.java | 30 +-
.../log4j/message/StructuredDataMessage.java | 6 +-
.../logging/log4j/spi/AbstractLogger.java | 2 +-
.../CopyOnWriteSortedArrayThreadContextMap.java | 2 +-
.../log4j/spi/DefaultThreadContextMap.java | 2 +
.../org/apache/logging/log4j/spi/Provider.java | 4 +-
.../log4j/util/FilteredObjectInputStream.java | 4 +-
.../apache/logging/log4j/util/LoaderUtil.java | 10 +-
.../logging/log4j/util/ProcessIdUtil.java | 12 +-
.../logging/log4j/util/PropertiesUtil.java | 4 +-
.../log4j/util/PropertyFilePropertySource.java | 2 +-
.../logging/log4j/util/PropertySource.java | 2 +-
.../apache/logging/log4j/util/ProviderUtil.java | 4 +-
.../log4j/util/SortedArrayStringMap.java | 14 +-
.../logging/log4j/util/StringBuilders.java | 6 +-
.../logging/log4j/AbstractLoggerTest.java | 10 +-
.../org/apache/logging/log4j/LoggerTest.java | 2 +-
.../logging/log4j/message/MapMessageTest.java | 2 +-
.../ReusableParameterizedMessageTest.java | 4 +-
.../logging/log4j/util/CharsetForNameMain.java | 6 +-
.../log4j/util/Log4jCharsetsPropertiesTest.java | 8 +-
.../logging/log4j/util/ProcessIdUtilTest.java | 2 +-
.../logging/log4j/util/PropertiesUtilTest.java | 8 +-
.../log4j/util/PropertySourceTokenizerTest.java | 2 +-
.../logging/log4j/util/ProviderUtilTest.java | 6 +-
.../log4j/util/SortedArrayStringMapTest.java | 2 +-
.../logging/log4j/util/StringBuildersTest.java | 18 +-
.../log4j/util/SystemPropertiesMain.java | 7 +-
.../SystemPropertiesPropertySourceTest.java | 4 +-
.../core/appender/AbstractWriterAppender.java | 2 +-
.../log4j/core/appender/ConsoleAppender.java | 6 +-
.../log4j/core/appender/FailoverAppender.java | 2 +-
.../log4j/core/appender/FileAppender.java | 2 +-
.../core/appender/OutputStreamAppender.java | 2 +-
.../log4j/core/appender/SyslogAppender.java | 2 +-
.../log4j/core/appender/WriterAppender.java | 4 +-
.../AbstractDriverManagerConnectionSource.java | 2 +-
.../db/jdbc/DriverManagerConnectionSource.java | 2 +-
.../appender/db/jdbc/JdbcDatabaseManager.java | 6 +-
.../log4j/core/appender/mom/JmsAppender.java | 2 +-
.../core/appender/nosql/NoSqlAppender.java | 6 +-
.../rolling/DefaultRolloverStrategy.java | 2 +-
.../rolling/RollingRandomAccessFileManager.java | 6 +-
.../log4j/core/async/AsyncLoggerConfig.java | 2 +-
.../log4j/core/async/RingBufferLogEvent.java | 4 +-
.../logging/log4j/core/config/LoggerConfig.java | 8 +-
.../impl/DefaultConfigurationBuilder.java | 12 +-
.../log4j/core/filter/AbstractFilterable.java | 2 +-
.../log4j/core/impl/ContextDataFactory.java | 2 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 4 +-
.../logging/log4j/core/impl/MementoMessage.java | 4 +-
.../log4j/core/impl/MutableLogEvent.java | 4 +-
.../core/impl/ReusableLogEventFactory.java | 2 +-
.../logging/log4j/core/impl/ThrowableProxy.java | 2 +-
.../log4j/core/impl/ThrowableProxyRenderer.java | 16 +-
.../core/layout/AbstractJacksonLayout.java | 14 +-
.../logging/log4j/core/layout/JsonLayout.java | 2 +-
.../log4j/core/layout/PatternLayout.java | 6 +-
.../log4j/core/layout/Rfc5424Layout.java | 2 +-
.../log4j/core/net/SslSocketManager.java | 6 +-
.../log4j/core/net/TcpSocketManager.java | 6 +-
.../net/ssl/AbstractKeyStoreConfiguration.java | 2 +-
.../net/ssl/EnvironmentPasswordProvider.java | 2 +-
.../core/net/ssl/FilePasswordProvider.java | 8 +-
.../core/net/ssl/KeyStoreConfiguration.java | 6 +-
.../net/ssl/StoreConfigurationException.java | 2 +-
.../core/net/ssl/TrustStoreConfiguration.java | 4 +-
.../core/pattern/DatePatternConverter.java | 4 +-
.../log4j/core/pattern/HighlightConverter.java | 2 +-
.../log4j/core/pattern/PatternParser.java | 2 +-
.../core/pattern/ProcessIdPatternConverter.java | 2 +-
.../logging/log4j/core/time/MutableInstant.java | 8 +-
.../log4j/core/tools/picocli/CommandLine.java | 1167 +++++++++---------
.../logging/log4j/core/util/ClockFactory.java | 8 +-
.../apache/logging/log4j/core/util/Loader.java | 10 +-
.../core/util/datetime/FixedDateFormat.java | 4 +-
.../core/EventParameterMemoryLeakTest.java | 8 +-
.../log4j/core/GarbageCollectionHelper.java | 4 +-
...sableParameterizedMessageMemoryLeakTest.java | 8 +-
.../log4j/core/TestPatternConverters.java | 2 +-
.../appender/ConsoleAppenderBuilderTest.java | 2 +-
.../log4j/core/appender/HangingAppender.java | 2 +-
.../appender/JsonCompleteFileAppenderTest.java | 6 +-
.../core/appender/SmtpAppenderAsyncTest.java | 4 +-
.../log4j/core/appender/SocketAppenderTest.java | 4 +-
.../appender/XmlCompleteFileAppenderTest.java | 8 +-
.../core/appender/XmlFileAppenderTest.java | 4 +-
.../db/AbstractDatabaseManagerTest.java | 2 +-
.../jdbc/DriverManagerConnectionSourceTest.java | 6 +-
.../JdbcAppenderMapMessageDataSourceTest.java | 2 +-
.../JdbcAppenderStringSubstitutionTest.java | 6 +-
.../kafka/KafkaAppenderCloseTimeoutTest.java | 6 +-
.../appender/mom/kafka/KafkaAppenderTest.java | 10 +-
...gAppenderDirectWriteWithReconfigureTest.java | 2 +-
.../core/async/AsyncLoggerConfigTest3.java | 2 +-
.../AsyncLoggerConfigWithAsyncEnabledTest.java | 4 +-
.../AsyncLoggerCustomSelectorLocationTest.java | 6 +-
.../log4j/core/async/BlockingAppender.java | 2 +-
.../log4j/core/async/QueueFullAbstractTest.java | 32 +-
...syncLoggerConfigLoggingFromToStringTest.java | 4 +-
.../core/async/RingBufferLogEventTest.java | 10 +-
.../log4j/core/async/perftest/Histogram.java | 10 +-
.../core/config/CompositeConfigurationTest.java | 2 +-
.../log4j/core/config/JiraLog4j2_2134Test.java | 30 +-
.../core/config/NestedLoggerConfigTest.java | 12 +-
.../log4j/core/impl/FactoryTestStringMap.java | 6 +-
.../log4j/core/impl/MutableLogEventTest.java | 16 +-
.../NestedLoggingFromThrowableMessageTest.java | 10 +-
.../impl/ThreadContextDataInjectorTest.java | 10 +-
.../log4j/core/layout/JsonLayoutTest.java | 10 +-
.../log4j/core/layout/Log4j2_2195_Test.java | 12 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 6 +-
.../log4j/core/layout/SerializedLayoutTest.java | 2 +-
.../core/net/mock/MockTcpSyslogServer.java | 4 +-
.../core/net/mock/MockTlsSyslogServer.java | 2 +-
.../core/net/mock/MockUdpSyslogServer.java | 2 +-
.../core/net/ssl/FilePasswordProviderTest.java | 2 +-
.../net/ssl/MemoryPasswordProviderTest.java | 8 +-
.../core/pattern/DatePatternConverterTest.java | 12 +-
.../core/pattern/HighlightConverterTest.java | 4 +-
.../pattern/MessagePatternConverterTest.java | 24 +-
.../log4j/core/time/MutableInstantTest.java | 52 +-
...MutableLogEventWithReusableParamMsgTest.java | 4 +-
.../log4j/flume/appender/FlumeAppender.java | 2 +-
.../db/jdbc/PoolingDriverConnectionSource.java | 4 +-
.../converter/InstantAttributeConverter.java | 8 +-
.../db/jpa/AbstractJpaAppenderTest.java | 2 +-
.../logging/log4j/mongodb2/MongoDbTestRule.java | 2 +-
.../logging/log4j/mongodb3/MongoDbTestRule.java | 2 +-
.../jmh/FileAppenderThrowableBenchmark.java | 8 +-
.../perf/jmh/StringBuilderEscapeBenchmark.java | 4 +-
.../logging/slf4j/Log4jLoggerFactory.java | 2 +-
141 files changed, 1018 insertions(+), 1014 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java b/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java
index a4c5231..78417cf 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java
@@ -56,7 +56,7 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler {
}
@Override
- public void addFilter(Filter newFilter) {
+ public void addFilter(final Filter newFilter) {
if(headFilter == null) {
headFilter = tailFilter = newFilter;
} else {
@@ -104,7 +104,7 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler {
return threshold;
}
- public boolean isAsSevereAsThreshold(Priority priority) {
+ public boolean isAsSevereAsThreshold(final Priority priority) {
return ((threshold == null) || priority.isGreaterOrEqual(threshold));
}
@@ -113,7 +113,7 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler {
* @param event The LoggingEvent.
*/
@Override
- public void doAppend(LoggingEvent event) {
+ public void doAppend(final LoggingEvent event) {
}
/**
@@ -122,54 +122,54 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler {
* @since 0.9.0
*/
@Override
- public synchronized void setErrorHandler(ErrorHandler eh) {
+ public synchronized void setErrorHandler(final ErrorHandler eh) {
if (eh != null) {
this.errorHandler = eh;
}
}
@Override
- public void setLayout(Layout layout) {
+ public void setLayout(final Layout layout) {
this.layout = layout;
}
@Override
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
- public void setThreshold(Priority threshold) {
+ public void setThreshold(final Priority threshold) {
this.threshold = threshold;
}
public static class NoOpErrorHandler implements ErrorHandler {
@Override
- public void setLogger(Logger logger) {
+ public void setLogger(final Logger logger) {
}
@Override
- public void error(String message, Exception e, int errorCode) {
+ public void error(final String message, final Exception e, final int errorCode) {
}
@Override
- public void error(String message) {
+ public void error(final String message) {
}
@Override
- public void error(String message, Exception e, int errorCode, LoggingEvent event) {
+ public void error(final String message, final Exception e, final int errorCode, final LoggingEvent event) {
}
@Override
- public void setAppender(Appender appender) {
+ public void setAppender(final Appender appender) {
}
@Override
- public void setBackupAppender(Appender appender) {
+ public void setBackupAppender(final Appender appender) {
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-1.2-api/src/main/java/org/apache/log4j/ConsoleAppender.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/ConsoleAppender.java b/log4j-1.2-api/src/main/java/org/apache/log4j/ConsoleAppender.java
index 0e841c5..605fac7 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/ConsoleAppender.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/ConsoleAppender.java
@@ -45,7 +45,7 @@ public class ConsoleAppender extends AppenderSkeleton
* {@inheritDoc}
*/
@Override
- protected void append(LoggingEvent theEvent)
+ protected void append(final LoggingEvent theEvent)
{
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-1.2-api/src/main/java/org/apache/log4j/SimpleLayout.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/SimpleLayout.java b/log4j-1.2-api/src/main/java/org/apache/log4j/SimpleLayout.java
index 3b2374c..c77b9be 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/SimpleLayout.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/SimpleLayout.java
@@ -29,7 +29,7 @@ public class SimpleLayout extends Layout
* {@inheritDoc}
*/
@Override
- public String format(LoggingEvent theEvent)
+ public String format(final LoggingEvent theEvent)
{
return Strings.EMPTY;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
index 8d3e4e2..ebe3e54 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
@@ -174,7 +174,7 @@ public class Log4j1ConfigurationFactoryTest {
} finally {
try {
Files.deleteIfExists(tempFilePath);
- } catch (FileSystemException e) {
+ } catch (final FileSystemException e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
index ecff443..f2fdc72 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
@@ -349,7 +349,7 @@ public class LogManager {
* @return a LoggerContext.
*/
protected static LoggerContext getContext(final String fqcn, final ClassLoader loader,
- final boolean currentContext, URI configLocation, String name) {
+ final boolean currentContext, final URI configLocation, final String name) {
try {
return factory.getContext(fqcn, loader, null, currentContext, configLocation, name);
} catch (final IllegalStateException ex) {
@@ -406,7 +406,7 @@ public class LogManager {
}
private static String toLoggerName(final Class<?> cls) {
- String canonicalName = cls.getCanonicalName();
+ final String canonicalName = cls.getCanonicalName();
return canonicalName != null ? canonicalName : cls.getName();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
index 38319d2..de20739 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
@@ -212,7 +212,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
* @return The value of the element or null if the key is not present.
*/
public String get(final String key) {
- Object result = data.getValue(key);
+ final Object result = data.getValue(key);
return ParameterFormatter.deepToString(result);
}
@@ -343,7 +343,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
sb.append(" <Entry key=\"")
.append(data.getKeyAt(i))
.append("\">");
- int size = sb.length();
+ final int size = sb.length();
ParameterFormatter.recursiveDeepToString(data.getValueAt(i), sb, null);
StringBuilders.escapeXml(sb, size);
sb.append("</Entry>\n");
@@ -453,7 +453,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
}
@Override
- public void formatTo(String[] formats, StringBuilder buffer) {
+ public void formatTo(final String[] formats, final StringBuilder buffer) {
format(getFormat(formats), buffer);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
index 76917f3..9144223 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
@@ -104,7 +104,7 @@ public class ReusableObjectMessage implements ReusableMessage, ParameterVisitabl
// go ahead and allocate the memory now;
// this saves an allocation in the future when this buffer is re-used
if (emptyReplacement.length == 0) {
- Object[] params = new Object[10]; // Default reusable parameter buffer size
+ final Object[] params = new Object[10]; // Default reusable parameter buffer size
params[0] = obj;
return params;
}
@@ -122,7 +122,7 @@ public class ReusableObjectMessage implements ReusableMessage, ParameterVisitabl
}
@Override
- public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
+ public <S> void forEachParameter(final ParameterConsumer<S> action, final S state) {
action.accept(obj, 0, state);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
index c0f5884..c206ab1 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
@@ -109,8 +109,8 @@ public class ReusableParameterizedMessage implements ReusableMessage, ParameterV
}
@Override
- public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
- Object[] parameters = getParams();
+ public <S> void forEachParameter(final ParameterConsumer<S> action, final S state) {
+ final Object[] parameters = getParams();
for (short i = 0; i < argCount; i++) {
action.accept(parameters[i], i, state);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
index 2a186be..de0b975 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
@@ -81,7 +81,7 @@ public class ReusableSimpleMessage implements ReusableMessage, CharSequence, Par
}
@Override
- public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
+ public <S> void forEachParameter(final ParameterConsumer<S> action, final S state) {
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
index e58aed3..89ebd92 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
@@ -29,9 +29,9 @@ public class StructuredDataCollectionMessage implements StringBuilderFormattable
MessageCollectionMessage<StructuredDataMessage> {
private static final long serialVersionUID = 5725337076388822924L;
- private List<StructuredDataMessage> structuredDataMessageList;
+ private final List<StructuredDataMessage> structuredDataMessageList;
- public StructuredDataCollectionMessage(List<StructuredDataMessage> messages) {
+ public StructuredDataCollectionMessage(final List<StructuredDataMessage> messages) {
this.structuredDataMessageList = messages;
}
@@ -42,15 +42,15 @@ public class StructuredDataCollectionMessage implements StringBuilderFormattable
@Override
public String getFormattedMessage() {
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
formatTo(sb);
return sb.toString();
}
@Override
public String getFormat() {
- StringBuilder sb = new StringBuilder();
- for (StructuredDataMessage msg : structuredDataMessageList) {
+ final StringBuilder sb = new StringBuilder();
+ for (final StructuredDataMessage msg : structuredDataMessageList) {
if (msg.getFormat() != null) {
if (sb.length() > 0) {
sb.append(", ");
@@ -62,27 +62,27 @@ public class StructuredDataCollectionMessage implements StringBuilderFormattable
}
@Override
- public void formatTo(StringBuilder buffer) {
- for (StructuredDataMessage msg : structuredDataMessageList) {
+ public void formatTo(final StringBuilder buffer) {
+ for (final StructuredDataMessage msg : structuredDataMessageList) {
msg.formatTo(buffer);
}
}
@Override
public Object[] getParameters() {
- List<Object[]> objectList = new ArrayList<>();
+ final List<Object[]> objectList = new ArrayList<>();
int count = 0;
- for (StructuredDataMessage msg : structuredDataMessageList) {
- Object[] objects = msg.getParameters();
+ for (final StructuredDataMessage msg : structuredDataMessageList) {
+ final Object[] objects = msg.getParameters();
if (objects != null) {
objectList.add(objects);
count += objects.length;
}
}
- Object[] objects = new Object[count];
+ final Object[] objects = new Object[count];
int index = 0;
- for (Object[] objs : objectList) {
- for (Object obj : objs) {
+ for (final Object[] objs : objectList) {
+ for (final Object obj : objs) {
objects[index++] = obj;
}
}
@@ -91,8 +91,8 @@ public class StructuredDataCollectionMessage implements StringBuilderFormattable
@Override
public Throwable getThrowable() {
- for (StructuredDataMessage msg : structuredDataMessageList) {
- Throwable t = msg.getThrowable();
+ for (final StructuredDataMessage msg : structuredDataMessageList) {
+ final Throwable t = msg.getThrowable();
if (t != null) {
return t;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
index 32fa2a5..0ecf77d 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
@@ -253,7 +253,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str
}
@Override
- public void formatTo(String[] formats, StringBuilder buffer) {
+ public void formatTo(final String[] formats, final StringBuilder buffer) {
asString(getFormat(formats), null, buffer);
}
@@ -355,7 +355,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str
}
}
- private void asXml(StructuredDataId structuredDataId, StringBuilder sb) {
+ private void asXml(final StructuredDataId structuredDataId, final StringBuilder sb) {
sb.append("<StructuredData>\n");
sb.append("<type>").append(type).append("</type>\n");
sb.append("<id>").append(structuredDataId).append("</id>\n");
@@ -386,7 +386,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str
return asString(getFormat(formats), null);
}
- private Format getFormat(String[] formats) {
+ private Format getFormat(final String[] formats) {
if (formats != null && formats.length > 0) {
for (int i = 0; i < formats.length; i++) {
final String format = formats[i];
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index 5b6ac1a..0c77b86 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -2141,7 +2141,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
getRecursionDepthHolder()[0]++;
}
private static void decrementRecursionDepth() {
- int[] depth = getRecursionDepthHolder();
+ final int[] depth = getRecursionDepthHolder();
depth[0]--;
if (depth[0] < 0) {
throw new IllegalStateException("Recursion depth became negative: " + depth[0]);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
index 862246e..97fb7b9 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
@@ -88,7 +88,7 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap
if (parentValue == null) {
return null;
}
- StringMap stringMap = createStringMap(parentValue);
+ final StringMap stringMap = createStringMap(parentValue);
stringMap.freeze();
return stringMap;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/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 1e69a83..24e1b44 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
@@ -154,6 +154,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString
for (final Map.Entry<String, String> entry : map.entrySet()) {
//BiConsumer should be able to handle values of any type V. In our case the values are of type String.
@SuppressWarnings("unchecked")
+ final
V value = (V) entry.getValue();
action.accept(entry.getKey(), value);
}
@@ -168,6 +169,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString
for (final Map.Entry<String, String> entry : map.entrySet()) {
//TriConsumer should be able to handle values of any type V. In our case the values are of type String.
@SuppressWarnings("unchecked")
+ final
V value = (V) entry.getValue();
action.accept(entry.getKey(), value, state);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
index 5808cf8..591c4c2 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
@@ -220,7 +220,7 @@ public class Provider {
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -228,7 +228,7 @@ public class Provider {
return false;
}
- Provider provider = (Provider) o;
+ final Provider provider = (Provider) o;
if (priority != null ? !priority.equals(provider.priority) : provider.priority != null) {
return false;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
index df97fd2..48080a7 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
@@ -56,7 +56,7 @@ public class FilteredObjectInputStream extends ObjectInputStream {
this.allowedClasses = new HashSet<>();
}
- public FilteredObjectInputStream(InputStream in) throws IOException {
+ public FilteredObjectInputStream(final InputStream in) throws IOException {
super(in);
this.allowedClasses = new HashSet<>();
}
@@ -77,7 +77,7 @@ public class FilteredObjectInputStream extends ObjectInputStream {
@Override
protected Class<?> resolveClass(final ObjectStreamClass desc) throws IOException, ClassNotFoundException {
- String name = desc.getName();
+ final String name = desc.getName();
if (!(isAllowedByDefault(name) || allowedClasses.contains(name))) {
throw new InvalidObjectException("Class is not allowed for deserialization: " + name);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index bbf3cc7..567b3ae 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -106,14 +106,14 @@ public final class LoaderUtil {
}
public static ClassLoader[] getClassLoaders() {
- List<ClassLoader> classLoaders = new ArrayList<>();
- ClassLoader tcl = getThreadContextClassLoader();
+ final List<ClassLoader> classLoaders = new ArrayList<>();
+ final ClassLoader tcl = getThreadContextClassLoader();
classLoaders.add(tcl);
// Some implementations may use null to represent the bootstrap class loader.
- ClassLoader current = LoaderUtil.class.getClassLoader();
+ final ClassLoader current = LoaderUtil.class.getClassLoader();
if (current != null && current != tcl) {
classLoaders.add(current);
- ClassLoader parent = current.getParent();
+ final ClassLoader parent = current.getParent();
while (parent != null && !classLoaders.contains(parent)) {
classLoaders.add(parent);
}
@@ -123,7 +123,7 @@ public final class LoaderUtil {
classLoaders.add(parent);
parent = parent.getParent();
}
- ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
+ final ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
if (!classLoaders.contains(systemClassLoader)) {
classLoaders.add(systemClassLoader);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java
index 685aabe..18d1834 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java
@@ -30,13 +30,13 @@ public class ProcessIdUtil {
public static String getProcessId() {
try {
// LOG4J2-2126 use reflection to improve compatibility with Android Platform which does not support JMX extensions
- Class<?> managementFactoryClass = Class.forName("java.lang.management.ManagementFactory");
- Method getRuntimeMXBean = managementFactoryClass.getDeclaredMethod("getRuntimeMXBean");
- Class<?> runtimeMXBeanClass = Class.forName("java.lang.management.RuntimeMXBean");
- Method getName = runtimeMXBeanClass.getDeclaredMethod("getName");
+ final Class<?> managementFactoryClass = Class.forName("java.lang.management.ManagementFactory");
+ final Method getRuntimeMXBean = managementFactoryClass.getDeclaredMethod("getRuntimeMXBean");
+ final Class<?> runtimeMXBeanClass = Class.forName("java.lang.management.RuntimeMXBean");
+ final Method getName = runtimeMXBeanClass.getDeclaredMethod("getName");
- Object runtimeMXBean = getRuntimeMXBean.invoke(null);
- String name = (String) getName.invoke(runtimeMXBean);
+ final Object runtimeMXBean = getRuntimeMXBean.invoke(null);
+ final String name = (String) getName.invoke(runtimeMXBean);
//String name = ManagementFactory.getRuntimeMXBean().getName(); //JMX not allowed on Android
return name.split("@")[0]; // likely works on most platforms
} catch (final Exception ex) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
index 2a9ff7f..334fd7b 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
@@ -178,9 +178,9 @@ public final class PropertiesUtil {
if (Charset.isSupported(charsetName)) {
return Charset.forName(charsetName);
}
- ResourceBundle bundle = getCharsetsResourceBundle();
+ final ResourceBundle bundle = getCharsetsResourceBundle();
if (bundle.containsKey(name)) {
- String mapped = bundle.getString(name);
+ final String mapped = bundle.getString(name);
if (Charset.isSupported(mapped)) {
return Charset.forName(mapped);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java
index 3adbb24..c4cf359 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java
@@ -37,7 +37,7 @@ public class PropertyFilePropertySource extends PropertiesPropertySource {
for (final URL url : LoaderUtil.findResources(fileName)) {
try (final InputStream in = url.openStream()) {
props.load(in);
- } catch (IOException e) {
+ } catch (final IOException e) {
LowLevelLogUtil.logException("Unable to read " + url, e);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java
index 75399d9..aba2ccf 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java
@@ -93,7 +93,7 @@ public interface PropertySource {
if (CACHE.containsKey(value)) {
return CACHE.get(value);
}
- List<CharSequence> tokens = new ArrayList<>();
+ final List<CharSequence> tokens = new ArrayList<>();
final Matcher matcher = PROPERTY_TOKENIZER.matcher(value);
while (matcher.find()) {
tokens.add(matcher.group(1).toLowerCase());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
index d19cdd9..8ae4462 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
@@ -63,10 +63,10 @@ public final class ProviderUtil {
private static volatile ProviderUtil instance;
private ProviderUtil() {
- for (ClassLoader classLoader : LoaderUtil.getClassLoaders()) {
+ for (final ClassLoader classLoader : LoaderUtil.getClassLoaders()) {
try {
loadProviders(classLoader);
- } catch (Throwable ex) {
+ } catch (final Throwable ex) {
LOGGER.debug("Unable to retrieve provider from ClassLoader {}", classLoader, ex);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
index 6d3eadb..ffd9745 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
@@ -96,7 +96,7 @@ public class SortedArrayStringMap implements IndexedStringMap {
Method[] methods = ObjectInputStream.class.getMethods();
Method setMethod = null;
Method getMethod = null;
- for (Method method : methods) {
+ for (final Method method : methods) {
if (method.getName().equals("setObjectInputFilter")) {
setMethod = method;
} else if (method.getName().equals("getObjectInputFilter")) {
@@ -106,16 +106,16 @@ public class SortedArrayStringMap implements IndexedStringMap {
Method newMethod = null;
try {
if (setMethod != null) {
- Class<?> clazz = Class.forName("org.apache.logging.log4j.util.internal.DefaultObjectInputFilter");
+ final Class<?> clazz = Class.forName("org.apache.logging.log4j.util.internal.DefaultObjectInputFilter");
methods = clazz.getMethods();
- for (Method method : methods) {
+ for (final Method method : methods) {
if (method.getName().equals("newInstance") && Modifier.isStatic(method.getModifiers())) {
newMethod = method;
break;
}
}
}
- } catch (ClassNotFoundException ex) {
+ } catch (final ClassNotFoundException ex) {
// Ignore the exception
}
newObjectInputFilter = newMethod;
@@ -549,7 +549,7 @@ public class SortedArrayStringMap implements IndexedStringMap {
}
}
- private static Object unmarshall(final byte[] data, ObjectInputStream inputStream)
+ private static Object unmarshall(final byte[] data, final ObjectInputStream inputStream)
throws IOException, ClassNotFoundException {
final ByteArrayInputStream bin = new ByteArrayInputStream(data);
Collection<String> allowedClasses = null;
@@ -559,8 +559,8 @@ public class SortedArrayStringMap implements IndexedStringMap {
ois = new FilteredObjectInputStream(bin, allowedClasses);
} else {
try {
- Object obj = getObjectInputFilter.invoke(inputStream);
- Object filter = newObjectInputFilter.invoke(null, obj);
+ final Object obj = getObjectInputFilter.invoke(inputStream);
+ final Object filter = newObjectInputFilter.invoke(null, obj);
ois = new ObjectInputStream(bin);
setObjectInputFilter.invoke(ois, filter);
} catch (IllegalAccessException | InvocationTargetException ex) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java
index 48fa98f..a45fa5a 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java
@@ -189,7 +189,7 @@ public final class StringBuilders {
}
}
- int lastChar = toAppendTo.length() - 1;
+ final int lastChar = toAppendTo.length() - 1;
toAppendTo.setLength(toAppendTo.length() + escapeCount);
int lastPos = toAppendTo.length() - 1;
@@ -238,7 +238,7 @@ public final class StringBuilders {
}
}
- private static int escapeAndDecrement(StringBuilder toAppendTo, int lastPos, char c) {
+ private static int escapeAndDecrement(final StringBuilder toAppendTo, int lastPos, final char c) {
toAppendTo.setCharAt(lastPos--, c);
toAppendTo.setCharAt(lastPos--, '\\');
return lastPos;
@@ -262,7 +262,7 @@ public final class StringBuilders {
}
}
- int lastChar = toAppendTo.length() - 1;
+ final int lastChar = toAppendTo.length() - 1;
toAppendTo.setLength(toAppendTo.length() + escapeCount);
int lastPos = toAppendTo.length() - 1;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
index a152aad..f7d7855 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
@@ -922,8 +922,8 @@ public class AbstractLoggerTest {
throw new IllegalStateException("Oops!");
}
}, "Message Format"));
- List<StatusData> statusDatalist = StatusLogger.getLogger().getStatusData();
- StatusData mostRecent = statusDatalist.get(statusDatalist.size() - 1);
+ final List<StatusData> statusDatalist = StatusLogger.getLogger().getStatusData();
+ final StatusData mostRecent = statusDatalist.get(statusDatalist.size() - 1);
assertEquals(Level.WARN, mostRecent.getLevel());
assertThat(mostRecent.getFormattedStatus(), containsString(
"org.apache.logging.log4j.spi.AbstractLogger caught " +
@@ -939,8 +939,8 @@ public class AbstractLoggerTest {
throw new IllegalStateException("Oops!");
}
}, null /* format */));
- List<StatusData> statusDatalist = StatusLogger.getLogger().getStatusData();
- StatusData mostRecent = statusDatalist.get(statusDatalist.size() - 1);
+ final List<StatusData> statusDatalist = StatusLogger.getLogger().getStatusData();
+ final StatusData mostRecent = statusDatalist.get(statusDatalist.size() - 1);
assertEquals(Level.WARN, mostRecent.getLevel());
assertThat(mostRecent.getFormattedStatus(), containsString(
"org.apache.logging.log4j.spi.AbstractLogger caught " +
@@ -950,7 +950,7 @@ public class AbstractLoggerTest {
private static final class TestMessage implements Message {
private final FormattedMessageSupplier formattedMessageSupplier;
private final String format;
- TestMessage(FormattedMessageSupplier formattedMessageSupplier, String format) {
+ TestMessage(final FormattedMessageSupplier formattedMessageSupplier, final String format) {
this.formattedMessageSupplier = formattedMessageSupplier;
this.format = format;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
index 2321c64..c9a284f 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
@@ -538,7 +538,7 @@ public class LoggerTest {
ThreadContext.put("TestYear", Integer.valueOf(2010).toString());
logger.debug("Debug message");
- String testYear = ThreadContext.get("TestYear");
+ final String testYear = ThreadContext.get("TestYear");
assertNotNull("Test Year is null", testYear);
assertEquals("Incorrect test year: " + testYear, "2010", testYear);
ThreadContext.clearMap();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java
index 44a15aa..d6c5cf7 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java
@@ -231,7 +231,7 @@ public class MapMessageTest {
}
@Override
- public void formatTo(StringBuilder buffer) {
+ public void formatTo(final StringBuilder buffer) {
buffer.append("formatTo");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
index d16beb3..93fe061 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
@@ -154,13 +154,13 @@ public class ReusableParameterizedMessageTest {
final ReusableParameterizedMessage msg = new ReusableParameterizedMessage();
final Throwable EXCEPTION1 = new IllegalAccessError("#1");
msg.set(testMsg, "msg", EXCEPTION1);
- List<Object> expected = new LinkedList<>();
+ final List<Object> expected = new LinkedList<>();
expected.add("msg");
expected.add(EXCEPTION1);
final List<Object> actual = new LinkedList<>();
msg.forEachParameter(new ParameterConsumer<Void>() {
@Override
- public void accept(Object parameter, int parameterIndex, Void state) {
+ public void accept(final Object parameter, final int parameterIndex, final Void state) {
actual.add(parameter);
}
}, null);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/util/CharsetForNameMain.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/CharsetForNameMain.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/CharsetForNameMain.java
index b82e135..64caaf3 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/CharsetForNameMain.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/CharsetForNameMain.java
@@ -24,11 +24,11 @@ public class CharsetForNameMain {
/**
* Checks that the given Charset names can be loaded.
*/
- public static void main(String[] args) {
- for (String value : args) {
+ public static void main(final String[] args) {
+ for (final String value : args) {
final String charsetName = value.trim();
if (Charset.isSupported(charsetName)) {
- Charset cs = Charset.forName(charsetName);
+ final Charset cs = Charset.forName(charsetName);
System.out.println(String.format("%s -> %s aliases: %s", charsetName, cs.name(), cs.aliases()));
} else {
System.err.println("Not supported:" + charsetName);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
index ff8fd5f..916521b 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
@@ -31,13 +31,13 @@ public class Log4jCharsetsPropertiesTest {
*/
@Test
public void testLoadAll() {
- ResourceBundle resourceBundle = PropertiesUtil.getCharsetsResourceBundle();
- Enumeration<String> keys = resourceBundle.getKeys();
+ final ResourceBundle resourceBundle = PropertiesUtil.getCharsetsResourceBundle();
+ final Enumeration<String> keys = resourceBundle.getKeys();
while (keys.hasMoreElements()) {
- String key = keys.nextElement();
+ final String key = keys.nextElement();
Assert.assertFalse(String.format("The Charset %s is available and should not be mapped", key),
Charset.isSupported(key));
- String value = resourceBundle.getString(key);
+ final String value = resourceBundle.getString(key);
Assert.assertTrue(String.format("The Charset %s is is not available and is mapped from %s", value, key),
Charset.isSupported(value));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/util/ProcessIdUtilTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/ProcessIdUtilTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/ProcessIdUtilTest.java
index 13aaf9c..423532d 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/ProcessIdUtilTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/ProcessIdUtilTest.java
@@ -24,7 +24,7 @@ public class ProcessIdUtilTest {
@Test
public void processIdTest() throws Exception {
- String processId = ProcessIdUtil.getProcessId();
+ final String processId = ProcessIdUtil.getProcessId();
assertFalse("ProcessId is default", processId.equals(ProcessIdUtil.DEFAULT_PROCESSID));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
index 49b62de..3ac9c92 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
@@ -83,21 +83,21 @@ public class PropertiesUtilTest {
@Test
public void testGetMappedProperty_sun_stdout_encoding() {
final PropertiesUtil pu = new PropertiesUtil(System.getProperties());
- Charset expected = System.console() == null ? Charset.defaultCharset() : StandardCharsets.UTF_8;
+ final Charset expected = System.console() == null ? Charset.defaultCharset() : StandardCharsets.UTF_8;
assertEquals(expected, pu.getCharsetProperty("sun.stdout.encoding"));
}
@Test
public void testGetMappedProperty_sun_stderr_encoding() {
final PropertiesUtil pu = new PropertiesUtil(System.getProperties());
- Charset expected = System.console() == null ? Charset.defaultCharset() : StandardCharsets.UTF_8;
+ final Charset expected = System.console() == null ? Charset.defaultCharset() : StandardCharsets.UTF_8;
assertEquals(expected, pu.getCharsetProperty("sun.err.encoding"));
}
@Test
public void testNonStringSystemProperties() {
- Object key1 = "1";
- Object key2 = new Object();
+ final Object key1 = "1";
+ final Object key2 = new Object();
System.getProperties().put(key1, new Object());
System.getProperties().put(key2, "value-2");
try {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertySourceTokenizerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertySourceTokenizerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertySourceTokenizerTest.java
index dd1d49c..38afa0f 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertySourceTokenizerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertySourceTokenizerTest.java
@@ -60,7 +60,7 @@ public class PropertySourceTokenizerTest {
@Test
public void testTokenize() throws Exception {
- List<CharSequence> tokens = PropertySource.Util.tokenize(value);
+ final List<CharSequence> tokens = PropertySource.Util.tokenize(value);
assertEquals(expectedTokens, tokens);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java
index ce4236a..6c03f81 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java
@@ -31,9 +31,9 @@ public class ProviderUtilTest {
@Test
public void complexTest() throws Exception {
- File file = new File("target/classes");
- ClassLoader classLoader = new URLClassLoader(new URL[] {file.toURI().toURL()});
- Worker worker = new Worker();
+ final File file = new File("target/classes");
+ final ClassLoader classLoader = new URLClassLoader(new URL[] {file.toURI().toURL()});
+ final Worker worker = new Worker();
worker.setContextClassLoader(classLoader);
worker.start();
worker.join();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
index 3d9ce3e..54e5ccb 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
@@ -48,7 +48,7 @@ public class SortedArrayStringMapTest {
}
public void testConstructorAllowsZeroCapacity() throws Exception {
- SortedArrayStringMap sortedArrayStringMap = new SortedArrayStringMap(0);
+ final SortedArrayStringMap sortedArrayStringMap = new SortedArrayStringMap(0);
assertEquals(0, sortedArrayStringMap.size());
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java
index 6feecbb..6fa7a6f 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java
@@ -49,8 +49,8 @@ public class StringBuildersTest {
@Test
public void escapeJsonCharactersCorrectly() {
- String jsonValueNotEscaped = "{\"field\n1\":\"value_1\"}";
- String jsonValueEscaped = "{\\\"field\\n1\\\":\\\"value_1\\\"}";
+ final String jsonValueNotEscaped = "{\"field\n1\":\"value_1\"}";
+ final String jsonValueEscaped = "{\\\"field\\n1\\\":\\\"value_1\\\"}";
StringBuilder sb = new StringBuilder();
sb.append(jsonValueNotEscaped);
@@ -59,7 +59,7 @@ public class StringBuildersTest {
assertEquals(jsonValueEscaped, sb.toString());
sb = new StringBuilder();
- String jsonValuePartiallyEscaped = "{\"field\n1\":\\\"value_1\\\"}";
+ final String jsonValuePartiallyEscaped = "{\"field\n1\":\\\"value_1\\\"}";
sb.append(jsonValueNotEscaped);
assertEquals(jsonValueNotEscaped, sb.toString());
StringBuilders.escapeJson(sb, 10);
@@ -68,10 +68,10 @@ public class StringBuildersTest {
@Test
public void escapeJsonCharactersISOControl() {
- String jsonValueNotEscaped = "{\"field\n1\":\"value" + (char) 0x8F + "_1\"}";
- String jsonValueEscaped = "{\\\"field\\n1\\\":\\\"value\\u008F_1\\\"}";
+ final String jsonValueNotEscaped = "{\"field\n1\":\"value" + (char) 0x8F + "_1\"}";
+ final String jsonValueEscaped = "{\\\"field\\n1\\\":\\\"value\\u008F_1\\\"}";
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
sb.append(jsonValueNotEscaped);
assertEquals(jsonValueNotEscaped, sb.toString());
StringBuilders.escapeJson(sb, 0);
@@ -80,10 +80,10 @@ public class StringBuildersTest {
@Test
public void escapeXMLCharactersCorrectly() {
- String xmlValueNotEscaped = "<\"Salt&Peppa'\">";
- String xmlValueEscaped = "<"Salt&Peppa'">";
+ final String xmlValueNotEscaped = "<\"Salt&Peppa'\">";
+ final String xmlValueEscaped = "<"Salt&Peppa'">";
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
sb.append(xmlValueNotEscaped);
assertEquals(xmlValueNotEscaped, sb.toString());
StringBuilders.escapeXml(sb, 0);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesMain.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesMain.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesMain.java
index 19b4981..6f1f7a1 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesMain.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesMain.java
@@ -32,15 +32,16 @@ public class SystemPropertiesMain {
* @param args
* unused
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
@SuppressWarnings("unchecked")
+ final
Enumeration<String> keyEnum = (Enumeration<String>) System.getProperties().propertyNames();
- List<String> list = new ArrayList<>();
+ final List<String> list = new ArrayList<>();
while (keyEnum.hasMoreElements()) {
list.add(keyEnum.nextElement());
}
Collections.sort(list);
- for (String key : list) {
+ for (final String key : list) {
System.out.println(key + " = " + System.getProperty(key));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
index e492e4a..eb5032d 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceTest.java
@@ -44,9 +44,9 @@ public class SystemPropertiesPropertySourceTest {
*/
@Test
public void testMultiThreadedAccess() throws InterruptedException, ExecutionException {
- ExecutorService threadPool = Executors.newSingleThreadExecutor();
+ final ExecutorService threadPool = Executors.newSingleThreadExecutor();
try {
- Future<?> future = threadPool.submit(new Runnable() {
+ final Future<?> future = threadPool.submit(new Runnable() {
@Override
public void run() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
index f94ef59..21f2082 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
@@ -60,7 +60,7 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
* The OutputStreamManager.
*/
protected AbstractWriterAppender(final String name, final StringLayout layout, final Filter filter,
- final boolean ignoreExceptions, final boolean immediateFlush, Property[] properties, final M manager) {
+ final boolean ignoreExceptions, final boolean immediateFlush, final Property[] properties, final M manager) {
super(name, filter, layout, ignoreExceptions, properties);
this.manager = manager;
this.immediateFlush = immediateFlush;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
index 7a9864f..540c39d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
@@ -84,7 +84,7 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
public abstract Charset getDefaultCharset();
- protected Charset getCharset(final String property, Charset defaultCharset) {
+ protected Charset getCharset(final String property, final Charset defaultCharset) {
return new PropertiesUtil(PropertiesUtil.getSystemProperties()).getCharsetProperty(property, defaultCharset);
}
@@ -92,7 +92,7 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
private ConsoleAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
final OutputStreamManager manager, final boolean ignoreExceptions, final Target target,
- Property[] properties) {
+ final Property[] properties) {
super(name, layout, filter, ignoreExceptions, true, properties, manager);
this.target = target;
}
@@ -275,7 +275,7 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
return outputStream;
}
- private static String clean(String string) {
+ private static String clean(final String string) {
return string.replace(Chars.NUL, Chars.SPACE);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
index 3032e30..14ee729 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
@@ -64,7 +64,7 @@ public final class FailoverAppender extends AbstractAppender {
private FailoverAppender(final String name, final Filter filter, final String primary, final String[] failovers,
final int intervalMillis, final Configuration config, final boolean ignoreExceptions,
- Property[] properties) {
+ final Property[] properties) {
super(name, filter, null, ignoreExceptions, properties);
this.primaryRef = primary;
this.failovers = failovers;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
index 7dd239b..7140d7d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
@@ -254,7 +254,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
private FileAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
final FileManager manager, final String filename, final boolean ignoreExceptions,
- final boolean immediateFlush, final Advertiser advertiser, Property[] properties) {
+ final boolean immediateFlush, final Advertiser advertiser, final Property[] properties) {
super(name, layout, filter, ignoreExceptions, immediateFlush, properties, manager);
if (advertiser != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
index 3c84938..7e7fdcb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
@@ -50,7 +50,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
private boolean follow = false;
- private boolean ignoreExceptions = true;
+ private final boolean ignoreExceptions = true;
private OutputStream target;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
index 87ec9f8..95af878 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
@@ -306,7 +306,7 @@ public class SyslogAppender extends SocketAppender {
protected SyslogAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
final boolean ignoreExceptions, final boolean immediateFlush,
- final AbstractSocketManager manager, final Advertiser advertiser, Property[] properties) {
+ final AbstractSocketManager manager, final Advertiser advertiser, final Property[] properties) {
super(name, layout, filter, manager, ignoreExceptions, immediateFlush, advertiser, properties);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
index a5683eb..59fb176 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
@@ -50,8 +50,8 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
@Override
public WriterAppender build() {
- StringLayout layout = (StringLayout) getLayout();
- StringLayout actualLayout = layout != null ? layout : PatternLayout.createDefaultLayout();
+ final StringLayout layout = (StringLayout) getLayout();
+ final StringLayout actualLayout = layout != null ? layout : PatternLayout.createDefaultLayout();
return new WriterAppender(getName(), actualLayout, getFilter(), getManager(target, follow, actualLayout),
isIgnoreExceptions(), getPropertyArray());
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
index 06e5cce..0a67d69 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
@@ -127,7 +127,7 @@ public class AbstractDriverManagerConnectionSource extends AbstractConnectionSou
private final char[] userName;
public AbstractDriverManagerConnectionSource(final String driverClassName, final String connectionString,
- String actualConnectionString, final char[] userName, final char[] password, final Property[] properties) {
+ final String actualConnectionString, final char[] userName, final char[] password, final Property[] properties) {
super();
this.driverClassName = driverClassName;
this.connectionString = connectionString;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java
index e390c5e..2f1b390 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java
@@ -57,7 +57,7 @@ public class DriverManagerConnectionSource extends AbstractDriverManagerConnecti
}
public DriverManagerConnectionSource(final String driverClassName, final String connectionString,
- String actualConnectionString, final char[] userName, final char[] password, final Property[] properties) {
+ final String actualConnectionString, final char[] userName, final char[] password, final Property[] properties) {
super(driverClassName, connectionString, actualConnectionString, userName, password, properties);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
index a026a3b..deebeb7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
@@ -237,7 +237,7 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
if (this.connection != null && !this.connection.isClosed()) {
if (this.isBatchSupported) {
logger().debug("Executing batch PreparedStatement {}", this.statement);
- int[] result = this.statement.executeBatch();
+ final int[] result = this.statement.executeBatch();
logger().debug("Batch result: {}", Arrays.toString(result));
}
logger().debug("Committing Connection {}", this.connection);
@@ -361,7 +361,7 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
this.statement.setObject(i++, DateTypeConverter.fromMillis(event.getTimeMillis(),
mapping.getType().asSubclass(Date.class)));
} else {
- StringLayout layout = mapping.getLayout();
+ final StringLayout layout = mapping.getLayout();
if (layout != null) {
if (Clob.class.isAssignableFrom(mapping.getType())) {
this.statement.setClob(i++, new StringReader(layout.toSerializable(event)));
@@ -409,7 +409,7 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
// Release ASAP
try {
statement.clearParameters();
- } catch (SQLException e) {
+ } catch (final SQLException e) {
// Ignore
}
Closer.closeSilently(reader);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
index 7a7bd43..04a5c3a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
@@ -112,7 +112,7 @@ public class JmsAppender extends AbstractAppender {
// JmsManagerFactory has already logged an ERROR.
return null;
}
- Layout<? extends Serializable> layout = getLayout();
+ final Layout<? extends Serializable> layout = getLayout();
if (layout == null) {
LOGGER.error("No layout provided for JmsAppender");
return null;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
index fd3ca5d..a5c691a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
@@ -90,7 +90,7 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
* buffer reaches this size.
* @return this
*/
- public B setBufferSize(int bufferSize) {
+ public B setBufferSize(final int bufferSize) {
this.bufferSize = bufferSize;
return asBuilder();
}
@@ -102,7 +102,7 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
* The NoSQL provider that provides connections to the chosen NoSQL database.
* @return this
*/
- public B setProvider(NoSqlProvider<?> provider) {
+ public B setProvider(final NoSqlProvider<?> provider) {
this.provider = provider;
return asBuilder();
}
@@ -163,7 +163,7 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
private final String description;
- private NoSqlAppender(final String name, final Filter filter, Layout<? extends Serializable> layout,
+ private NoSqlAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
final boolean ignoreExceptions, final Property[] properties, final NoSqlDatabaseManager<?> manager) {
super(name, filter, layout, ignoreExceptions, properties, manager);
this.description = this.getName() + "{ manager=" + this.getManager() + " }";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
index 3c733d4..c6eb6ff 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
@@ -143,7 +143,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy {
}
final int compressionLevel = Integers.parseInt(compressionLevelStr, Deflater.DEFAULT_COMPRESSION);
// The config object can be null when this object is built programmatically.
- StrSubstitutor nonNullStrSubstitutor = config != null ? config.getStrSubstitutor() : new StrSubstitutor();
+ final StrSubstitutor nonNullStrSubstitutor = config != null ? config.getStrSubstitutor() : new StrSubstitutor();
return new DefaultRolloverStrategy(minIndex, maxIndex, useMax, compressionLevel, nonNullStrSubstitutor,
customActions, stopCustomActionsOnError, tempCompressedFilePattern);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
index affb809..a3fb930 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
@@ -130,8 +130,8 @@ public class RollingRandomAccessFileManager extends RollingFileManager {
protected synchronized void writeToDestination(final byte[] bytes, final int offset, final int length) {
try {
if (randomAccessFile == null) {
- String fileName = getFileName();
- File file = new File(fileName);
+ final String fileName = getFileName();
+ final File file = new File(fileName);
FileUtils.makeParentDirs(file);
createFileAfterRollover(fileName);
}
@@ -148,7 +148,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager {
createFileAfterRollover(getFileName());
}
- private void createFileAfterRollover(String fileName) throws IOException {
+ private void createFileAfterRollover(final String fileName) throws IOException {
this.randomAccessFile = new RandomAccessFile(fileName, "rw");
if (isAppend()) {
randomAccessFile.seek(randomAccessFile.length());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
index 06d219a..527a74f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
@@ -120,7 +120,7 @@ public class AsyncLoggerConfig extends LoggerConfig {
super.callAppenders(event);
}
- private void logToAsyncDelegate(LogEvent event) {
+ private void logToAsyncDelegate(final LogEvent event) {
if (!isFiltered(event)) {
// Passes on the event to a separate thread that will call
// asyncCallAppenders(LogEvent).
[10/13] logging-log4j2 git commit: Checkstyle: Remove trailing white
spaces on all lines.
Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategy.java
index f21a92d..223e0ed 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategy.java
@@ -1,79 +1,79 @@
-/*
- * 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.config;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.util.Supplier;
-
-/**
- * Interface for objects that know how to ensure delivery of log events to the appropriate appenders, even during and
- * after the configuration has been modified while the system is actively used.
- */
-public interface ReliabilityStrategy {
-
- /**
- * Logs an event.
- *
- * @param reconfigured supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
- * @param loggerName The name of the Logger.
- * @param fqcn The fully qualified class name of the caller.
- * @param marker A Marker or null if none is present.
- * @param level The event Level.
- * @param data The Message.
- * @param t A Throwable or null.
- */
- void log(Supplier<LoggerConfig> reconfigured, String loggerName, String fqcn, Marker marker, Level level,
- Message data, Throwable t);
-
- /**
- * Logs an event.
- *
- * @param reconfigured supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
- * @param event The log event.
- */
- void log(Supplier<LoggerConfig> reconfigured, LogEvent event);
-
- /**
- * For internal use by the ReliabilityStrategy; returns the LoggerConfig to use.
- *
- * @param next supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
- * @return the currently active LoggerConfig
- */
- LoggerConfig getActiveLoggerConfig(Supplier<LoggerConfig> next);
-
- /**
- * Called after a log event was logged.
- */
- void afterLogEvent();
-
- /**
- * Called before all appenders are stopped.
- */
- void beforeStopAppenders();
-
- /**
- * Called before the configuration is stopped.
- *
- * @param configuration the configuration that will be stopped
- */
- void beforeStopConfiguration(Configuration configuration);
-
-}
+/*
+ * 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.config;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.util.Supplier;
+
+/**
+ * Interface for objects that know how to ensure delivery of log events to the appropriate appenders, even during and
+ * after the configuration has been modified while the system is actively used.
+ */
+public interface ReliabilityStrategy {
+
+ /**
+ * Logs an event.
+ *
+ * @param reconfigured supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
+ * @param loggerName The name of the Logger.
+ * @param fqcn The fully qualified class name of the caller.
+ * @param marker A Marker or null if none is present.
+ * @param level The event Level.
+ * @param data The Message.
+ * @param t A Throwable or null.
+ */
+ void log(Supplier<LoggerConfig> reconfigured, String loggerName, String fqcn, Marker marker, Level level,
+ Message data, Throwable t);
+
+ /**
+ * Logs an event.
+ *
+ * @param reconfigured supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
+ * @param event The log event.
+ */
+ void log(Supplier<LoggerConfig> reconfigured, LogEvent event);
+
+ /**
+ * For internal use by the ReliabilityStrategy; returns the LoggerConfig to use.
+ *
+ * @param next supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
+ * @return the currently active LoggerConfig
+ */
+ LoggerConfig getActiveLoggerConfig(Supplier<LoggerConfig> next);
+
+ /**
+ * Called after a log event was logged.
+ */
+ void afterLogEvent();
+
+ /**
+ * Called before all appenders are stopped.
+ */
+ void beforeStopAppenders();
+
+ /**
+ * Called before the configuration is stopped.
+ *
+ * @param configuration the configuration that will be stopped
+ */
+ void beforeStopConfiguration(Configuration configuration);
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
index 953d96f..542cd75 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
@@ -39,7 +39,7 @@ public final class ReliabilityStrategyFactory {
* <p>
* Users may also use this system property to specify the fully qualified class name of a class that implements the
* {@code ReliabilityStrategy} and has a constructor that accepts a single {@code LoggerConfig} argument.
- *
+ *
* @param loggerConfig the LoggerConfig the resulting {@code ReliabilityStrategy} is associated with
* @return a ReliabilityStrategy that helps the specified LoggerConfig to log events reliably during or after a
* configuration change
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index b41b8e4..c0595d7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -58,7 +58,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
private static final String INDENT = " ";
private static final String EOL = System.lineSeparator();
-
+
private final Component root = new Component();
private Component loggers;
private Component appenders;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
index dc833f0..e688874 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
@@ -91,7 +91,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@code byte[]}.
- *
+ *
* The supported formats are:
* <ul>
* <li>0x0123456789ABCDEF</li>
@@ -394,7 +394,7 @@ public final class TypeConverters {
* Converts a String to a given class if a TypeConverter is available for that class. Falls back to the provided
* default value if the conversion is unsuccessful. However, if the default value is <em>also</em> invalid, then
* {@code null} is returned (along with a nasty status log message).
- *
+ *
* @param s
* the string to convert
* @param clazz
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
index 704ffd1..abe2aa9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
@@ -43,7 +43,7 @@ public class PluginManager {
/**
* Constructs a PluginManager for the plugin category name given.
- *
+ *
* @param category The plugin category name.
*/
public PluginManager(final String category) {
@@ -52,7 +52,7 @@ public class PluginManager {
/**
* Process annotated plugins.
- *
+ *
* @deprecated Use {@link org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor} instead. To do so,
* simply include {@code log4j-core} in your dependencies and make sure annotation processing is not
* disabled. By default, supported Java compilers will automatically use that plugin processor provided
@@ -69,7 +69,7 @@ public class PluginManager {
/**
* Adds a package name to be scanned for plugins. Must be invoked prior to plugins being collected.
- *
+ *
* @param p The package name. Ignored if {@code null} or empty.
*/
public static void addPackage(final String p) {
@@ -94,7 +94,7 @@ public class PluginManager {
/**
* Returns the type of a specified plugin.
- *
+ *
* @param name The name of the plugin.
* @return The plugin's type.
*/
@@ -104,7 +104,7 @@ public class PluginManager {
/**
* Returns all the matching plugins.
- *
+ *
* @return A Map containing the name of the plugin and its type.
*/
public Map<String, PluginType<?>> getPlugins() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
index 73b5fc0..1aa9a36 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
@@ -112,7 +112,7 @@ public class ResolverUtil {
/**
* Returns the matching resources.
- *
+ *
* @return A Set of URIs that match the criteria.
*/
public Set<URI> getResources() {
@@ -432,7 +432,7 @@ public class ResolverUtil {
/**
* Will be called repeatedly with candidate classes. Must return True if a class is to be included in the
* results, false otherwise.
- *
+ *
* @param type
* The Class to match against.
* @return true if the Class matches.
@@ -441,7 +441,7 @@ public class ResolverUtil {
/**
* Test for a resource.
- *
+ *
* @param resource
* The URI to the resource.
* @return true if the resource matches.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/ConstraintValidator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/ConstraintValidator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/ConstraintValidator.java
index 1d8c0c5..b9c697a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/ConstraintValidator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/ConstraintValidator.java
@@ -37,7 +37,7 @@ public interface ConstraintValidator<A extends Annotation> {
* Indicates if the given value is valid.
*
* @param name the name to use for error reporting
- * @param value the value to validate.
+ * @param value the value to validate.
* @return {@code true} if the given value is valid.
*/
boolean isValid(String name, Object value);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
index 560cbe3..089d1f2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
@@ -40,27 +40,27 @@ public abstract class AbstractPluginVisitor<A extends Annotation> implements Plu
protected static final Logger LOGGER = StatusLogger.getLogger();
/**
- *
+ *
*/
protected final Class<A> clazz;
/**
- *
+ *
*/
protected A annotation;
/**
- *
+ *
*/
protected String[] aliases;
/**
- *
+ *
*/
protected Class<?> conversionType;
/**
- *
+ *
*/
protected StrSubstitutor substitutor;
/**
- *
+ *
*/
protected Member member;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
index 3143259..f77707e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
@@ -184,9 +184,9 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory
if (props.size() > 0) {
builder.add(createRootLogger(props));
}
-
+
builder.setLoggerContext(loggerContext);
-
+
return builder.build(false);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
index 07d5740..6b0e79a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
@@ -182,7 +182,7 @@ public class XmlConfiguration extends AbstractConfiguration implements Reconfigu
/**
* Creates a new DocumentBuilder suitable for parsing a configuration file.
- *
+ *
* @param xIncludeAware enabled XInclude
* @return a new DocumentBuilder
* @throws ParserConfigurationException
@@ -206,7 +206,7 @@ public class XmlConfiguration extends AbstractConfiguration implements Reconfigu
setFeature(factory, "http://xml.org/sax/features/external-parameter-entities", false);
setFeature(factory, "http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
}
-
+
private static void setFeature(final DocumentBuilderFactory factory, final String featureName, final boolean value) {
try {
factory.setFeature(featureName, value);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
index 5e3c133..75071ea 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
@@ -69,21 +69,21 @@ public abstract class AbstractFilter extends AbstractLifeCycle implements Filter
/**
* Sets the Result to return when the filter does not match. The default is Result.DENY.
- * @param onMismatch the Result to return when the filter does not match.
+ * @param onMismatch the Result to return when the filter does not match.
* @return this
*/
public B setOnMismatch(final Result onMismatch) {
this.onMismatch = onMismatch;
return asBuilder();
}
-
+
@SuppressWarnings("unchecked")
public B asBuilder() {
return (B) this;
}
}
-
+
/**
* The onMatch Result.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
index 5024a21..d2368b3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
@@ -71,7 +71,7 @@ public abstract class AbstractFilterable extends AbstractLifeCycle implements Fi
/**
* Sets the filter.
- *
+ *
* @param filter The filter
* @return this
* @deprecated Use {@link #setFilter(Filter)}.
@@ -87,7 +87,7 @@ public abstract class AbstractFilterable extends AbstractLifeCycle implements Fi
* May be null.
*/
private volatile Filter filter;
-
+
@PluginElement("Properties")
private final Property[] propertyArray;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
index c2326ad..95df851 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
@@ -303,7 +303,7 @@ public final class BurstFilter extends AbstractFilter {
/**
* Sets the logging level to use.
- * @param level the logging level to use.
+ * @param level the logging level to use.
* @return this
*/
public Builder setLevel(final Level level) {
@@ -313,7 +313,7 @@ public final class BurstFilter extends AbstractFilter {
/**
* Sets the average number of events per second to allow.
- * @param rate the average number of events per second to allow. This must be a positive number.
+ * @param rate the average number of events per second to allow. This must be a positive number.
* @return this
*/
public Builder setRate(final float rate) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
index e6dd630..993d04b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.LogEvent;
/**
* Interface implemented by Classes that allow filtering to occur.
- *
+ *
* <p>
* Extends {@link LifeCycle} since filters have a life cycle.
* </p>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
index 1e47d4e..d06465f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
@@ -123,11 +123,11 @@ public final class ScriptFilter extends AbstractFilter {
/**
* Creates the ScriptFilter.
- * @param script The script to run. The script must return a boolean value. Either script or scriptFile must be
+ * @param script The script to run. The script must return a boolean value. Either script or scriptFile must be
* provided.
* @param match The action to take if a match occurs.
* @param mismatch The action to take if no match occurs.
- * @param configuration the configuration
+ * @param configuration the configuration
* @return A ScriptFilter.
*/
// TODO Consider refactoring to use AbstractFilter.AbstractFilterBuilder
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
index 44d42f9..2be5f5c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
@@ -36,7 +36,7 @@ public final class ExtendedClassInfo implements Serializable {
/**
* Constructs a new instance.
- *
+ *
* @param exact
* @param location
* @param version
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 017a690..ff5a6da 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
@@ -762,7 +762,7 @@ public class Log4jLogEvent implements LogEvent {
public static LogEvent createMemento(final LogEvent logEvent) {
return new Log4jLogEvent.Builder(logEvent).build();
}
-
+
/**
* Creates and returns a new immutable copy of this {@code Log4jLogEvent}.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ExtendedStackTraceElementMixIn.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ExtendedStackTraceElementMixIn.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ExtendedStackTraceElementMixIn.java
index 84df3d6..1aa3e4c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ExtendedStackTraceElementMixIn.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ExtendedStackTraceElementMixIn.java
@@ -76,7 +76,7 @@ abstract class ExtendedStackTraceElementMixIn implements Serializable {
@JsonProperty("method")
@JacksonXmlProperty(localName = "method", isAttribute = true)
public abstract String getMethodName();
-
+
@JsonIgnore
abstract StackTraceElement getStackTraceElement();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
index 950c2c8..85f2db9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
@@ -48,7 +48,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
</Parents>
</Marker>
* </pre>
- *
+ *
* @see Marker
*/
// Alternate for multiple Marker implementation.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/StackTraceElementMixIn.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/StackTraceElementMixIn.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/StackTraceElementMixIn.java
index 9a3b022..16e655e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/StackTraceElementMixIn.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/StackTraceElementMixIn.java
@@ -26,7 +26,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
* <p>
* <em>Consider this class private.</em>
* </p>
- *
+ *
* @see StackTraceElement
*/
@JsonIgnoreProperties("nativeMethod")
@@ -34,9 +34,9 @@ abstract class StackTraceElementMixIn {
@JsonCreator
StackTraceElementMixIn(
// @formatter:off
- @JsonProperty("class") final String declaringClass,
+ @JsonProperty("class") final String declaringClass,
@JsonProperty("method") final String methodName,
- @JsonProperty("file") final String fileName,
+ @JsonProperty("file") final String fileName,
@JsonProperty("line") final int lineNumber)
// @formatter:on
{
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
index 5a173ea..caaa433 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
@@ -91,7 +91,7 @@ public class AsyncAppenderAdmin implements AsyncAppenderAdminMBean {
public String[] getAppenderRefs() {
return asyncAppender.getAppenderRefStrings();
}
-
+
/**
* Returns {@code true} if this AsyncAppender will take a snapshot of the stack with
* every log event to determine the class and method where the logging call
@@ -102,7 +102,7 @@ public class AsyncAppenderAdmin implements AsyncAppenderAdminMBean {
public boolean isIncludeLocation() {
return asyncAppender.isIncludeLocation();
}
-
+
/**
* Returns {@code true} if this AsyncAppender will block when the queue is full,
* or {@code false} if events are dropped when the queue is full.
@@ -112,7 +112,7 @@ public class AsyncAppenderAdmin implements AsyncAppenderAdminMBean {
public boolean isBlocking() {
return asyncAppender.isBlocking();
}
-
+
/**
* Returns the name of the appender that any errors are logged to or {@code null}.
* @return the name of the appender that any errors are logged to or {@code null}
@@ -121,12 +121,12 @@ public class AsyncAppenderAdmin implements AsyncAppenderAdminMBean {
public String getErrorRef() {
return asyncAppender.getErrorRef();
}
-
+
@Override
public int getQueueCapacity() {
return asyncAppender.getQueueCapacity();
}
-
+
@Override
public int getQueueRemainingCapacity() {
return asyncAppender.getQueueRemainingCapacity();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdminMBean.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdminMBean.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdminMBean.java
index 37dad2e..7348145 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdminMBean.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdminMBean.java
@@ -27,7 +27,7 @@ public interface AsyncAppenderAdminMBean {
* <p>
* You can find all registered AsyncAppenderAdmin MBeans like this:
* </p>
- *
+ *
* <pre>
* MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
* String pattern = String.format(AsyncAppenderAdminMBean.PATTERN, "*", "*");
@@ -38,21 +38,21 @@ public interface AsyncAppenderAdminMBean {
* and appender name may be quoted. When AsyncAppenderAdmin MBeans are
* registered, their ObjectNames are created using this pattern as follows:
* </p>
- *
+ *
* <pre>
* String ctxName = Server.escape(loggerContext.getName());
* String appenderName = Server.escape(appender.getName());
* String name = String.format(PATTERN, ctxName, appenderName);
* ObjectName objectName = new ObjectName(name);
* </pre>
- *
+ *
* @see Server#escape(String)
*/
String PATTERN = Server.DOMAIN + ":type=%s,component=AsyncAppenders,name=%s";
/**
* Returns the name of the instrumented {@code AsyncAppender}.
- *
+ *
* @return the name of the AsyncAppender
*/
String getName();
@@ -60,7 +60,7 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns the result of calling {@code toString} on the {@code Layout}
* object of the instrumented {@code AsyncAppender}.
- *
+ *
* @return the {@code Layout} of the instrumented {@code AsyncAppender} as a
* string
*/
@@ -69,7 +69,7 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns how exceptions thrown on the instrumented {@code AsyncAppender}
* are handled.
- *
+ *
* @return {@code true} if any exceptions thrown by the AsyncAppender will
* be logged or {@code false} if such exceptions are re-thrown.
*/
@@ -78,7 +78,7 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns the result of calling {@code toString} on the error handler of
* this appender, or {@code "null"} if no error handler was set.
- *
+ *
* @return result of calling {@code toString} on the error handler of this
* appender, or {@code "null"}
*/
@@ -87,7 +87,7 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns a string description of all filters configured for the
* instrumented {@code AsyncAppender}.
- *
+ *
* @return a string description of all configured filters for this appender
*/
String getFilter();
@@ -95,7 +95,7 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns a String array with the appender refs configured for the
* instrumented {@code AsyncAppender}.
- *
+ *
* @return the appender refs for the instrumented {@code AsyncAppender}.
*/
String[] getAppenderRefs();
@@ -104,7 +104,7 @@ public interface AsyncAppenderAdminMBean {
* Returns {@code true} if this AsyncAppender will take a snapshot of the
* stack with every log event to determine the class and method where the
* logging call was made.
- *
+ *
* @return {@code true} if location is included with every event,
* {@code false} otherwise
*/
@@ -113,19 +113,19 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns {@code true} if this AsyncAppender will block when the queue is
* full, or {@code false} if events are dropped when the queue is full.
- *
+ *
* @return whether this AsyncAppender will block or drop events when the
* queue is full.
*/
boolean isBlocking();
-
+
/**
* Returns the name of the appender that any errors are logged to or {@code null}.
* @return the name of the appender that any errors are logged to or {@code null}
*/
String getErrorRef();
-
+
int getQueueCapacity();
-
+
int getQueueRemainingCapacity();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
index fb41b04..53b6079 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
@@ -32,7 +32,7 @@ public class ContextSelectorAdmin implements ContextSelectorAdminMBean {
/**
* Constructs a new {@code ContextSelectorAdmin}.
- *
+ *
* @param contextName name of the LoggerContext under which to register this
* ContextSelectorAdmin. Note that the ContextSelector may be
* registered multiple times, once for each LoggerContext. In web
@@ -55,7 +55,7 @@ public class ContextSelectorAdmin implements ContextSelectorAdminMBean {
/**
* Returns the {@code ObjectName} of this mbean.
- *
+ *
* @return the {@code ObjectName}
* @see ContextSelectorAdminMBean#PATTERN
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java
index 7526982..6cb65d6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java
@@ -32,7 +32,7 @@ public interface LoggerContextAdminMBean {
* <p>
* You can find all registered LoggerContextAdmin MBeans like this:
* </p>
- *
+ *
* <pre>
* MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
* String pattern = String.format(LoggerContextAdminMBean.PATTERN, "*");
@@ -43,13 +43,13 @@ public interface LoggerContextAdminMBean {
* may be quoted. When LoggerContextAdmin MBeans are registered, their
* ObjectNames are created using this pattern as follows:
* </p>
- *
+ *
* <pre>
* String ctxName = Server.escape(loggerContext.getName());
* String name = String.format(PATTERN, ctxName);
* ObjectName objectName = new ObjectName(name);
* </pre>
- *
+ *
* @see Server#escape(String)
*/
String PATTERN = Server.DOMAIN + ":type=%s";
@@ -69,21 +69,21 @@ public interface LoggerContextAdminMBean {
/**
* Returns the status of the instrumented {@code LoggerContext}.
- *
+ *
* @return the LoggerContext status.
*/
String getStatus();
/**
* Returns the name of the instrumented {@code LoggerContext}.
- *
+ *
* @return the name of the instrumented {@code LoggerContext}.
*/
String getName();
/**
* Returns the configuration location URI as a String.
- *
+ *
* @return the configuration location
*/
String getConfigLocationUri();
@@ -91,7 +91,7 @@ public interface LoggerContextAdminMBean {
/**
* Sets the configuration location to the specified URI. This will cause the
* instrumented {@code LoggerContext} to reconfigure.
- *
+ *
* @param configLocation location of the configuration file in
* {@link java.net.URI} format.
* @throws URISyntaxException if the format of the specified
@@ -105,7 +105,7 @@ public interface LoggerContextAdminMBean {
* configuration file or the text that was last set with a call to
* {@code setConfigText}. If reading a file, this method assumes the file's
* character encoding is UTF-8.
- *
+ *
* @return the configuration text
* @throws IOException if a problem occurred reading the contents of the
* config file.
@@ -116,7 +116,7 @@ public interface LoggerContextAdminMBean {
* Returns the configuration text, which may be the contents of the
* configuration file or the text that was last set with a call to
* {@code setConfigText}.
- *
+ *
* @param charsetName the encoding to use to convert the file's bytes into
* the resulting string.
* @return the configuration text
@@ -129,7 +129,7 @@ public interface LoggerContextAdminMBean {
* Sets the configuration text. This does not replace the contents of the
* configuration file, but <em>does</em> cause the instrumented
* {@code LoggerContext} to be reconfigured with the specified text.
- *
+ *
* @param configText the configuration text in XML or JSON format
* @param charsetName name of the {@code Charset} used to convert the
* specified configText to bytes
@@ -140,7 +140,7 @@ public interface LoggerContextAdminMBean {
/**
* Returns the name of the Configuration of the instrumented LoggerContext.
- *
+ *
* @return the Configuration name
*/
String getConfigName();
@@ -148,7 +148,7 @@ public interface LoggerContextAdminMBean {
/**
* Returns the class name of the {@code Configuration} of the instrumented
* LoggerContext.
- *
+ *
* @return the class name of the {@code Configuration}.
*/
String getConfigClassName();
@@ -156,14 +156,14 @@ public interface LoggerContextAdminMBean {
/**
* Returns a string description of all Filters configured in the
* {@code Configuration} of the instrumented LoggerContext.
- *
+ *
* @return a string description of all Filters configured
*/
String getConfigFilter();
/**
* Returns a map with configured properties.
- *
+ *
* @return a map with configured properties.
*/
Map<String, String> getConfigProperties();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
index 15a9e56..b40d2f4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
@@ -34,28 +34,28 @@ public class RingBufferAdmin implements RingBufferAdminMBean {
return new RingBufferAdmin(ringBuffer, name);
}
- public static RingBufferAdmin forAsyncLoggerConfig(final RingBuffer<?> ringBuffer,
+ public static RingBufferAdmin forAsyncLoggerConfig(final RingBuffer<?> ringBuffer,
final String contextName, final String configName) {
final String ctxName = Server.escape(contextName);
final String cfgName = Server.escape(configName);
final String name = String.format(PATTERN_ASYNC_LOGGER_CONFIG, ctxName, cfgName);
return new RingBufferAdmin(ringBuffer, name);
}
-
+
protected RingBufferAdmin(final RingBuffer<?> ringBuffer, final String mbeanName) {
- this.ringBuffer = ringBuffer;
+ this.ringBuffer = ringBuffer;
try {
objectName = new ObjectName(mbeanName);
} catch (final Exception e) {
throw new IllegalStateException(e);
}
}
-
+
@Override
public long getBufferSize() {
return ringBuffer == null ? 0 : ringBuffer.getBufferSize();
}
-
+
@Override
public long getRemainingCapacity() {
return ringBuffer == null ? 0 : ringBuffer.remainingCapacity();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdminMBean.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdminMBean.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdminMBean.java
index 052dcc8..83a8278 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdminMBean.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdminMBean.java
@@ -35,7 +35,7 @@ public interface RingBufferAdminMBean {
* </pre>
*/
String PATTERN_ASYNC_LOGGER = Server.DOMAIN + ":type=%s,component=AsyncLoggerRingBuffer";
-
+
/**
* ObjectName pattern ({@value}) for RingBufferAdmin MBeans that instrument
* {@code AsyncLoggerConfig} ring buffers.
@@ -56,7 +56,7 @@ public interface RingBufferAdminMBean {
* Returns the number of slots that the ring buffer was configured with.
* Disruptor ring buffers are bounded-size data structures, this number does
* not change during the life of the ring buffer.
- *
+ *
* @return the number of slots that the ring buffer was configured with
*/
long getBufferSize();
@@ -64,7 +64,7 @@ public interface RingBufferAdminMBean {
/**
* Returns the number of available slots in the ring buffer. May vary wildly
* between invocations.
- *
+ *
* @return the number of available slots in the ring buffer
*/
long getRemainingCapacity();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdmin.java
index a602f4e..dbd7a6b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdmin.java
@@ -44,7 +44,7 @@ public class StatusLoggerAdmin extends NotificationBroadcasterSupport implements
/**
* Constructs a new {@code StatusLoggerAdmin} with the {@code Executor} to
* be used for sending {@code Notification}s asynchronously to listeners.
- *
+ *
* @param contextName name of the LoggerContext under which to register this
* StatusLoggerAdmin. Note that the StatusLogger may be
* registered multiple times, once for each LoggerContext. In web
@@ -132,7 +132,7 @@ public class StatusLoggerAdmin extends NotificationBroadcasterSupport implements
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.logging.log4j.status.StatusListener#log(org.apache.logging
* .log4j.status.StatusData)
@@ -150,7 +150,7 @@ public class StatusLoggerAdmin extends NotificationBroadcasterSupport implements
/**
* Returns the {@code ObjectName} of this mbean.
- *
+ *
* @return the {@code ObjectName}
* @see StatusLoggerAdminMBean#PATTERN
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java
index 91a6063..e6510e6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java
@@ -68,7 +68,7 @@ public interface StatusLoggerAdminMBean {
* @return the ObjectName of this StatusLogger MBean
*/
ObjectName getObjectName();
-
+
/**
* Returns a list with the most recent {@code StatusData} objects in the
* status history. The list has up to 200 entries by default but the length
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
index e47b5e6..dee3cc9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
@@ -24,9 +24,9 @@ import org.apache.logging.log4j.core.config.Configuration;
/**
* A superclass for Comma-Separated Value (CSV) layouts.
- *
+ *
* Depends on Apache Commons CSV 1.2.
- *
+ *
* @since 2.4
*/
public abstract class AbstractCsvLayout extends AbstractStringLayout {
@@ -67,7 +67,7 @@ public abstract class AbstractCsvLayout extends AbstractStringLayout {
protected AbstractCsvLayout(final Configuration config, final Charset charset, final CSVFormat csvFormat,
final String header, final String footer) {
- super(config, charset,
+ super(config, charset,
PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(header).build(),
PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(footer).build());
this.format = csvFormat;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
index fe079fb..549bedd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
@@ -34,17 +34,17 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* A Comma-Separated Value (CSV) layout to log event parameters.
- * The event message is currently ignored.
- *
+ * The event message is currently ignored.
+ *
* <p>
* Best used with:
* </p>
* <p>
* {@code logger.debug(new ObjectArrayMessage(1, 2, "Bob"));}
* </p>
- *
+ *
* Depends on Apache Commons CSV 1.4.
- *
+ *
* @since 2.4
*/
@Plugin(name = "CsvParameterLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
@@ -70,7 +70,7 @@ public class CsvParameterLayout extends AbstractCsvLayout {
@PluginAttribute("nullString") final String nullString,
@PluginAttribute("recordSeparator") final String recordSeparator,
@PluginAttribute(value = "charset", defaultString = DEFAULT_CHARSET) final Charset charset,
- @PluginAttribute("header") final String header,
+ @PluginAttribute("header") final String header,
@PluginAttribute("footer") final String footer)
// @formatter:on
{
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
index 719af9d..d91e53a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
@@ -47,16 +47,16 @@ public class MarkerPatternSelector implements PatternSelector {
@PluginElement("PatternMatch")
private PatternMatch[] properties;
-
+
@PluginBuilderAttribute("defaultPattern")
private String defaultPattern;
-
- @PluginBuilderAttribute(value = "alwaysWriteExceptions")
+
+ @PluginBuilderAttribute(value = "alwaysWriteExceptions")
private boolean alwaysWriteExceptions = true;
-
+
@PluginBuilderAttribute(value = "disableAnsi")
private boolean disableAnsi;
-
+
@PluginBuilderAttribute(value = "noConsoleNoAnsi")
private boolean noConsoleNoAnsi;
@@ -107,7 +107,7 @@ public class MarkerPatternSelector implements PatternSelector {
}
}
-
+
private final Map<String, PatternFormatter[]> formatterMap = new HashMap<>();
private final Map<String, String> patternMap = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
index 35c6f4b..4172fcc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
@@ -48,21 +48,21 @@ public class ScriptPatternSelector implements PatternSelector {
*/
public static class Builder implements org.apache.logging.log4j.core.util.Builder<ScriptPatternSelector> {
- @PluginElement("Script")
+ @PluginElement("Script")
private AbstractScript script;
-
- @PluginElement("PatternMatch")
+
+ @PluginElement("PatternMatch")
private PatternMatch[] properties;
-
- @PluginBuilderAttribute("defaultPattern")
+
+ @PluginBuilderAttribute("defaultPattern")
private String defaultPattern;
-
- @PluginBuilderAttribute("alwaysWriteExceptions")
+
+ @PluginBuilderAttribute("alwaysWriteExceptions")
private boolean alwaysWriteExceptions = true;
-
+
@PluginBuilderAttribute("disableAnsi")
private boolean disableAnsi;
-
+
@PluginBuilderAttribute("noConsoleNoAnsi")
private boolean noConsoleNoAnsi;
@@ -131,7 +131,7 @@ public class ScriptPatternSelector implements PatternSelector {
return this;
}
}
-
+
private final Map<String, PatternFormatter[]> formatterMap = new HashMap<>();
private final Map<String, String> patternMap = new HashMap<>();
@@ -204,7 +204,7 @@ public class ScriptPatternSelector implements PatternSelector {
/**
* Deprecated, use {@link #newBuilder()} instead.
- *
+ *
* @param script
* @param properties
* @param defaultPattern
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
index 97fcc3b..b6d58de 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
@@ -46,17 +46,17 @@ public final class SyslogLayout extends AbstractStringLayout {
/**
* Builds a SyslogLayout.
* <p>The main arguments are</p>
- * <ul>
+ * <ul>
* <li>facility: The Facility is used to try to classify the message.</li>
* <li>includeNewLine: If true a newline will be appended to the result.</li>
* <li>escapeNL: Pattern to use for replacing newlines.</li>
* <li>charset: The character set.</li>
- * </ul>
+ * </ul>
* @param <B> the builder type
*/
public static class Builder<B extends Builder<B>> extends AbstractStringLayout.Builder<B>
implements org.apache.logging.log4j.core.util.Builder<SyslogLayout> {
-
+
public Builder() {
super();
setCharset(StandardCharsets.UTF_8);
@@ -104,7 +104,7 @@ public final class SyslogLayout extends AbstractStringLayout {
}
}
-
+
@PluginBuilderFactory
public static <B extends Builder<B>> B newBuilder() {
return new Builder<B>().asBuilder();
@@ -123,7 +123,7 @@ public final class SyslogLayout extends AbstractStringLayout {
* Date format used if header = true.
*/
private final SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd HH:mm:ss", Locale.ENGLISH);
-
+
/**
* Host name used to identify messages from this appender.
*/
@@ -184,7 +184,7 @@ public final class SyslogLayout extends AbstractStringLayout {
* <li>Key: "formatType" Value: "logfilepatternreceiver" (format uses the keywords supported by
* LogFilePatternReceiver)</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting SyslogLayout
*/
@Override
@@ -199,7 +199,7 @@ public final class SyslogLayout extends AbstractStringLayout {
/**
* Creates a SyslogLayout.
- *
+ *
* @param facility The Facility is used to try to classify the message.
* @param includeNewLine If true a newline will be appended to the result.
* @param escapeNL Pattern to use for replacing newlines.
@@ -215,7 +215,7 @@ public final class SyslogLayout extends AbstractStringLayout {
/**
* Gets the facility.
- *
+ *
* @return the facility
*/
public Facility getFacility() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
index b09add7..c9cd886 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
@@ -146,7 +146,7 @@ public final class XmlLayout extends AbstractJacksonLayout {
* <li>Key: "dtd" Value: "log4j-events.dtd"</li>
* <li>Key: "version" Value: "2.0"</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting XmlLayout
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
index 1d8576f..0245cd8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
@@ -157,7 +157,7 @@ public final class YamlLayout extends AbstractJacksonLayout {
/**
* Creates a YAML Layout.
- *
+ *
* @param config
* The plugin configuration.
* @param locationInfo
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
index 1dba499..c76561c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
@@ -18,14 +18,14 @@ package org.apache.logging.log4j.core.lookup;
/**
* A default lookup for others to extend.
- *
+ *
* @since 2.1
*/
public abstract class AbstractLookup implements StrLookup {
/**
* Calls {@code lookup(null, key)} in the super class.
- *
+ *
* @see StrLookup#lookup(LogEvent, String)
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
index a50de0d..34b2fd3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
@@ -23,9 +23,9 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* A map-based lookup for main arguments.
- *
+ *
* See {@link #setMainArguments(String[])}.
- *
+ *
* @since 2.4
*/
@Plugin(name = "main", category = StrLookup.CATEGORY)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
index 320db49..fbbef22 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Looks-up markers.
- *
+ *
* @since 2.4
*/
@Plugin(name = "marker", category = StrLookup.CATEGORY)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
index f6d787a..bea4262 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
@@ -369,7 +369,7 @@ public abstract class StrMatcher {
}
return len;
}
-
+
@Override
public String toString() {
return super.toString() + Chars.SPACE + Arrays.toString(chars);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
index 5157365..76d3e46 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
@@ -34,12 +34,12 @@ public abstract class AbstractSocketManager extends OutputStreamManager {
* The Internet address of the host.
*/
protected final InetAddress inetAddress;
-
+
/**
* The name of the host.
*/
protected final String host;
-
+
/**
* The port on the host.
*/
@@ -55,7 +55,7 @@ public abstract class AbstractSocketManager extends OutputStreamManager {
* @param bufferSize The buffer size.
*/
public AbstractSocketManager(final String name, final OutputStream os, final InetAddress inetAddress,
- final String host, final int port, final Layout<? extends Serializable> layout, final boolean writeHeader,
+ final String host, final int port, final Layout<? extends Serializable> layout, final boolean writeHeader,
final int bufferSize) {
super(os, name, layout, writeHeader, bufferSize);
this.inetAddress = inetAddress;
@@ -69,7 +69,7 @@ public abstract class AbstractSocketManager extends OutputStreamManager {
* <li>Key: "port" Value: provided "port" param</li>
* <li>Key: "address" Value: provided "address" param</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting AbstractSocketManager
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
index 844c614..8f22c85 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
@@ -75,7 +75,7 @@ public class DatagramSocketManager extends AbstractSocketManager {
* <li>Key: "protocol" Value: "udp"</li>
* <li>Key: "direction" Value: "out"</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting DatagramSocketManager
*/
@Override
@@ -94,7 +94,7 @@ public class DatagramSocketManager extends AbstractSocketManager {
private final int port;
private final Layout<? extends Serializable> layout;
private final int bufferSize;
-
+
public FactoryData(final String host, final int port, final Layout<? extends Serializable> layout, final int bufferSize) {
this.host = host;
this.port = port;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
index a5eadf3..a03dc33 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
@@ -125,76 +125,76 @@ import org.apache.logging.log4j.util.EnglishEnums;
* </table>
*/
public enum Facility {
-
+
/** Kernel messages. */
KERN(0),
-
+
/** User level messages. */
USER(1),
-
+
/** Mail system. */
MAIL(2),
-
+
/** System daemons. */
DAEMON(3),
-
+
/** Security/Authorization messages. */
AUTH(4),
-
+
/** Messages generated by syslogd. */
SYSLOG(5),
-
+
/** Line printer subsystem. */
LPR(6),
-
+
/** Network news subsystem. */
NEWS(7),
-
+
/** UUCP subsystem. */
UUCP(8),
-
+
/** Clock daemon. */
CRON(9),
-
+
/** Security/Authorization messages. */
AUTHPRIV(10),
-
+
/** FTP daemon. */
FTP(11),
-
+
/** NTP subsystem. */
NTP(12),
-
+
/** Log audit. */
LOG_AUDIT(13),
-
+
/** Log alert. */
LOG_ALERT(14),
-
+
/** Clock daemon. */
CLOCK(15),
-
+
/** Local use 0. */
LOCAL0(16),
-
+
/** Local use 1. */
LOCAL1(17),
-
+
/** Local use 2. */
LOCAL2(18),
-
+
/** Local use 3. */
LOCAL3(19),
-
+
/** Local use 4. */
LOCAL4(20),
-
+
/** Local use 5. */
LOCAL5(21),
-
+
/** Local use 6. */
LOCAL6(22),
-
+
/** Local use 7. */
LOCAL7(23);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
index 22ab3aa..2670857 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
@@ -55,7 +55,7 @@ public class JndiManager extends AbstractManager {
/**
* Gets a named JndiManager using the default {@link javax.naming.InitialContext}.
- *
+ *
* @param name the name of the JndiManager instance to create or use if available
* @return a default JndiManager
*/
@@ -89,7 +89,7 @@ public class JndiManager extends AbstractManager {
/**
* Gets a JndiManager with the provided configuration information.
- *
+ *
* @param properties JNDI properties, usually created by calling {@link #createProperties(String, String, String, String, String, Properties)}.
* @return the JndiManager for the provided parameters.
* @see #createProperties(String, String, String, String, String, Properties)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
index 3d610bf..5f86c53 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
@@ -116,7 +116,7 @@ public class MulticastDnsAdvertiser implements Advertiser {
/**
* Unadvertise the previously advertised entity.
- *
+ *
* @param serviceInfo
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
index c7c6acc..decd996 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
@@ -49,7 +49,7 @@ public class Priority {
private static int toPriority(final Facility aFacility, final Severity aSeverity) {
return (aFacility.getCode() << 3) + aSeverity.getCode();
}
-
+
/**
* Returns the Facility.
* @return the Facility.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
index 8144e45..fe5d6f1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.net;
/**
* Enumerates the <a href="https://tools.ietf.org/html/rfc1349">RFC 1349</a> TOS field.
- *
+ *
* <ul>
* <li><code>IPTOS_LOWCOST (0x02)</code></li>
* <li><code>IPTOS_RELIABILITY (0x04)</code></li>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
index f01719e..074b34a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
@@ -164,7 +164,7 @@ public class SslSocketManager extends TcpSocketManager {
data.connectTimeoutMillis, data.reconnectDelayMillis, data.immediateFail, data.layout, data.bufferSize,
data.socketOptions);
}
-
+
@Override
Socket createSocket(final SslFactoryData data) throws IOException {
return SslSocketManager.createSocket(data.host, data.port, data.connectTimeoutMillis, data.sslConfiguration,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 4988202..c5967c0 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
@@ -68,7 +68,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Constructs.
- *
+ *
* @param name
* The unique name of this connection.
* @param os
@@ -105,7 +105,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Constructs.
- *
+ *
* @param name
* The unique name of this connection.
* @param os
@@ -148,7 +148,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Obtains a TcpSocketManager.
- *
+ *
* @param host
* The host to connect to.
* @param port
@@ -172,7 +172,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Obtains a TcpSocketManager.
- *
+ *
* @param host
* The host to connect to.
* @param port
@@ -282,7 +282,7 @@ public class TcpSocketManager extends AbstractSocketManager {
* <li>Key: "protocol" Value: "tcp"</li>
* <li>Key: "direction" Value: "out"</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting TcpSocketManager
*/
@Override
@@ -422,7 +422,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Factory to create a TcpSocketManager.
- *
+ *
* @param <M>
* The manager type.
* @param <T>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
index b129184..5603e89 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
@@ -66,7 +66,7 @@ public class SslConfiguration {
this.trustStoreConfig.clearSecrets();
}
}
-
+
public SSLSocketFactory getSslSocketFactory() {
return sslContext.getSocketFactory();
}
@@ -219,7 +219,7 @@ public class SslConfiguration {
/**
* Creates an SslConfiguration from a KeyStoreConfiguration and a TrustStoreConfiguration.
- *
+ *
* @param protocol The protocol, see http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#SSLContext
* @param keyStoreConfig The KeyStoreConfiguration.
* @param trustStoreConfig The TrustStoreConfiguration.
@@ -229,7 +229,7 @@ public class SslConfiguration {
public static SslConfiguration createSSLConfiguration(
// @formatter:off
@PluginAttribute("protocol") final String protocol,
- @PluginElement("KeyStore") final KeyStoreConfiguration keyStoreConfig,
+ @PluginElement("KeyStore") final KeyStoreConfiguration keyStoreConfig,
@PluginElement("TrustStore") final TrustStoreConfiguration trustStoreConfig) {
// @formatter:on
return new SslConfiguration(protocol, keyStoreConfig, trustStoreConfig);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
index ca20335..2ef2bc3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.LogEvent;
* Parses the output from a text based layout into instances of {@link LogEvent}.
*/
public interface TextLogEventParser extends LogEventParser {
-
+
/**
* Parses a String, which is expected to contain exactly one log event.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
index 8ec9b7d..9485746 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
@@ -35,7 +35,7 @@ public final class ExtendedThrowablePatternConverter extends ThrowablePatternCon
/**
* Private constructor.
- *
+ *
* @param config
* @param options options, may be null.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
index 8377036..ea47a68 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
@@ -34,9 +34,9 @@ import org.fusesource.jansi.AnsiRenderer.Code;
/**
* Renders an input as ANSI escaped output.
- *
+ *
* Uses the JAnsi rendering syntax as the default to render a message into an ANSI escaped string.
- *
+ *
* The default syntax for embedded ANSI codes is:
*
* <pre>
@@ -54,28 +54,28 @@ import org.fusesource.jansi.AnsiRenderer.Code;
* <pre>
* @|bold,red Warning!|@
* </pre>
- *
+ *
* You can also define custom style names in the configuration with the syntax:
- *
+ *
* <pre>
* %message{ansi}{StyleName=value(,value)*( StyleName=value(,value)*)*}%n
* </pre>
- *
+ *
* For example:
- *
+ *
* <pre>
* %message{ansi}{WarningStyle=red,bold KeyStyle=white ValueStyle=blue}%n
* </pre>
- *
+ *
* The call site can look like this:
- *
+ *
* <pre>
* logger.info("@|KeyStyle {}|@ = @|ValueStyle {}|@", entry.getKey(), entry.getValue());
* </pre>
- *
+ *
* Note: This class originally copied and then heavily modified code from JAnsi's AnsiRenderer (which is licensed as
* Apache 2.0.)
- *
+ *
* @see AnsiRenderer
*/
public final class JAnsiTextRenderer implements TextRenderer {
@@ -254,7 +254,7 @@ public final class JAnsiTextRenderer implements TextRenderer {
/**
* Renders the given text with the given names which can be ANSI code names or Log4j style names.
- *
+ *
* @param text
* The text to render
* @param names
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
index 5233432..a29634d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.core.pattern;
Renders input unchanged.
*/
public final class PlainTextRenderer implements TextRenderer {
-
+
private static final PlainTextRenderer INSTANCE = new PlainTextRenderer();
public static PlainTextRenderer getInstance() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
index 2355c88..3a9e210 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
@@ -23,7 +23,7 @@ public interface TextRenderer {
/**
* Renders input text to an output.
- *
+ *
* @param input
* The input
* @param output
@@ -35,7 +35,7 @@ public interface TextRenderer {
/**
* Renders input text to an output.
- *
+ *
* @param input
* The input
* @param output
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
index 90f04fa..b78bff2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
@@ -26,7 +26,7 @@ public abstract class AbstractScript {
protected static final Logger LOGGER = StatusLogger.getLogger();
protected static final String DEFAULT_LANGUAGE = "JavaScript";
-
+
private final String language;
private final String scriptText;
private final String name;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
index b790eaf..b054e9a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
@@ -44,7 +44,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* Here is an example of an <code>env-entry</code>:
* </p>
* <blockquote>
- *
+ *
* <pre>
* <env-entry>
* <description>JNDI logging context name for this app</description>
@@ -53,7 +53,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* <env-entry-type>java.lang.String</env-entry-type>
* </env-entry>
* </pre>
- *
+ *
* </blockquote>
*
* <p>
@@ -66,7 +66,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* (ContextJNDISelector) will use this resource to automatically configure the log4j repository.
* </p>
** <blockquote>
- *
+ *
* <pre>
* <env-entry>
* <description>URL for configuring log4j context</description>
@@ -75,7 +75,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* <env-entry-type>java.lang.String</env-entry-type>
* </env-entry>
* </pre>
- *
+ *
* </blockquote>
*
* <p>
[11/13] logging-log4j2 git commit: Checkstyle: Remove trailing white
spaces on all lines.
Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java
index b1ee506..8c6d259 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java
@@ -60,7 +60,7 @@ import org.apache.logging.log4j.core.util.Integers;
public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implements DirectFileRolloverStrategy {
private static final int DEFAULT_MAX_FILES = 7;
-
+
/**
* Builds DirectWriteRolloverStrategy instances.
*/
@@ -181,7 +181,7 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem
/**
* Defines configuration.
- *
+ *
* @param config The Configuration.
* @return This builder for chaining convenience
*/
@@ -349,7 +349,7 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem
nextIndex = fileIndex + 1;
final FileExtension fileExtension = manager.getFileExtension();
if (fileExtension != null) {
- compressedName += fileExtension.getExtension();
+ compressedName += fileExtension.getExtension();
if (tempCompressedFilePattern != null) {
final StringBuilder buf = new StringBuilder();
tempCompressedFilePattern.formatFileName(strSubstitutor, buf, fileIndex);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java
index 9d0016f..b859d79 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java
@@ -121,5 +121,5 @@ public enum FileExtension {
File target(final String fileName) {
return new File(fileName);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/NoOpTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/NoOpTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/NoOpTriggeringPolicy.java
index b9af0a0..ff554e7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/NoOpTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/NoOpTriggeringPolicy.java
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
/*
* Never triggers and is handy for edge-cases in tests for example.
- *
+ *
* @since 2.11.1
*/
@Plugin(name = "NoOpTriggeringPolicy", category = Core.CATEGORY_NAME, printObject = true)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
index 7f6ac79..3cadd42 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
@@ -33,18 +33,18 @@ import org.apache.logging.log4j.core.util.Integers;
@Plugin(name = "TimeBasedTriggeringPolicy", category = Core.CATEGORY_NAME, printObject = true)
public final class TimeBasedTriggeringPolicy extends AbstractTriggeringPolicy {
-
+
public static class Builder implements org.apache.logging.log4j.core.util.Builder<TimeBasedTriggeringPolicy> {
@PluginBuilderAttribute
private int interval = 1;
-
+
@PluginBuilderAttribute
private boolean modulate = false;
-
+
@PluginBuilderAttribute
private int maxRandomDelay = 0;
-
+
@Override
public TimeBasedTriggeringPolicy build() {
final long maxRandomDelayMillis = TimeUnit.SECONDS.toMillis(maxRandomDelay);
@@ -62,17 +62,17 @@ public final class TimeBasedTriggeringPolicy extends AbstractTriggeringPolicy {
public int getMaxRandomDelay() {
return maxRandomDelay;
}
-
+
public Builder withInterval(final int interval){
this.interval = interval;
return this;
}
-
+
public Builder withModulate(final boolean modulate){
this.modulate = modulate;
return this;
}
-
+
public Builder withMaxRandomDelay(final int maxRandomDelay){
this.maxRandomDelay = maxRandomDelay;
return this;
@@ -108,10 +108,10 @@ public final class TimeBasedTriggeringPolicy extends AbstractTriggeringPolicy {
@Override
public void initialize(final RollingFileManager aManager) {
this.manager = aManager;
-
+
// LOG4J2-531: call getNextTime twice to force initialization of both prevFileTime and nextFileTime
aManager.getPatternProcessor().getNextTime(aManager.getFileTime(), interval, modulate);
-
+
nextRolloverMillis = ThreadLocalRandom.current().nextLong(0, 1 + maxRandomDelayMillis)
+ aManager.getPatternProcessor().getNextTime(aManager.getFileTime(), interval, modulate);
}
@@ -151,7 +151,7 @@ public final class TimeBasedTriggeringPolicy extends AbstractTriggeringPolicy {
.withModulate(Boolean.parseBoolean(modulate))
.build();
}
-
+
@PluginBuilderFactory
public static TimeBasedTriggeringPolicy.Builder newBuilder() {
return new Builder();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
index ed6a3f1..bb68d90 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TriggeringPolicy.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.LogEvent;
* A <code>TriggeringPolicy</code> controls the conditions under which rollover
* occurs. Such conditions include time of day, file size, an
* external event, the log request or a combination thereof.
- *
+ *
* @see AbstractTriggeringPolicy
*/
public interface TriggeringPolicy /* TODO 3.0: extends LifeCycle */ {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractAction.java
index 633d4bc..f6a92ff 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractAction.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* Abstract base class for implementations of Action.
*/
public abstract class AbstractAction implements Action {
-
+
/**
* Allows subclasses access to the status logger without creating another instance.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
index f8ddf48..7d8ac06 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
@@ -45,7 +45,7 @@ public abstract class AbstractPathAction extends AbstractAction {
/**
* Creates a new AbstractPathAction that starts scanning for files to process from the specified base path.
- *
+ *
* @param basePath base path from where to start scanning for files to process.
* @param followSymbolicLinks whether to follow symbolic links. Default is false.
* @param maxDepth The maxDepth parameter is the maximum number of levels of directories to visit. A value of 0
@@ -57,7 +57,7 @@ public abstract class AbstractPathAction extends AbstractAction {
protected AbstractPathAction(final String basePath, final boolean followSymbolicLinks, final int maxDepth,
final PathCondition[] pathFilters, final StrSubstitutor subst) {
this.basePathString = basePath;
- this.options = followSymbolicLinks ? EnumSet.of(FileVisitOption.FOLLOW_LINKS)
+ this.options = followSymbolicLinks ? EnumSet.of(FileVisitOption.FOLLOW_LINKS)
: Collections.<FileVisitOption> emptySet();
this.maxDepth = maxDepth;
this.pathConditions = Arrays.asList(Arrays.copyOf(pathFilters, pathFilters.length));
@@ -87,7 +87,7 @@ public abstract class AbstractPathAction extends AbstractAction {
* method when the {@link #execute()} method is invoked.
* <p>
* The visitor is responsible for processing the files it encounters that are accepted by all filters.
- *
+ *
* @param visitorBaseDir base dir from where to start scanning for files to process
* @param conditions filters that determine if a file should be processed
* @return a new {@code FileVisitor<Path>}
@@ -99,7 +99,7 @@ public abstract class AbstractPathAction extends AbstractAction {
* Returns the base path from where to start scanning for files to delete. Lookups are resolved, so if the
* configuration was <code><Delete basePath="${sys:user.home}/abc" /></code> then this method returns a path
* to the "abc" file or directory in the user's home directory.
- *
+ *
* @return the base path (all lookups resolved)
*/
public Path getBasePath() {
@@ -108,7 +108,7 @@ public abstract class AbstractPathAction extends AbstractAction {
/**
* Returns the base path as it was specified in the configuration. Lookups are not resolved.
- *
+ *
* @return the base path as it was specified in the configuration
*/
public String getBasePathString() {
@@ -121,16 +121,16 @@ public abstract class AbstractPathAction extends AbstractAction {
/**
* Returns whether to follow symbolic links or not.
- *
+ *
* @return the options
*/
public Set<FileVisitOption> getOptions() {
return Collections.unmodifiableSet(options);
}
-
+
/**
* Returns whether to follow symbolic links or not.
- *
+ *
* @return whether to follow symbolic links or not
*/
public boolean isFollowSymbolicLinks() {
@@ -139,7 +139,7 @@ public abstract class AbstractPathAction extends AbstractAction {
/**
* Returns the the maximum number of directory levels to visit.
- *
+ *
* @return the maxDepth
*/
public int getMaxDepth() {
@@ -148,7 +148,7 @@ public abstract class AbstractPathAction extends AbstractAction {
/**
* Returns the list of PathCondition objects.
- *
+ *
* @return the pathFilters
*/
public List<PathCondition> getPathConditions() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java
index 6d0c6e2..e461a8c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java
@@ -140,7 +140,7 @@ public final class CommonsCompressAction extends AbstractAction {
@Override
public String toString() {
- return CommonsCompressAction.class.getSimpleName() + '[' + source + " to " + destination
+ return CommonsCompressAction.class.getSimpleName() + '[' + source + " to " + destination
+ ", deleteSource=" + deleteSource + ']';
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CompositeAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CompositeAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CompositeAction.java
index 5637144..8d5a48b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CompositeAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CompositeAction.java
@@ -25,7 +25,7 @@ import java.util.List;
* A group of Actions to be executed in sequence.
*/
public class CompositeAction extends AbstractAction {
-
+
/**
* Actions to perform.
*/
@@ -99,7 +99,7 @@ public class CompositeAction extends AbstractAction {
return status;
}
-
+
@Override
public String toString() {
return CompositeAction.class.getSimpleName() + Arrays.toString(actions);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
index 76e9b00..a0fbac6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
@@ -45,7 +45,7 @@ public class DeleteAction extends AbstractPathAction {
/**
* Creates a new DeleteAction that starts scanning for files to delete from the specified base path.
- *
+ *
* @param basePath base path from where to start scanning for files to delete.
* @param followSymbolicLinks whether to follow symbolic links. Default is false.
* @param maxDepth The maxDepth parameter is the maximum number of levels of directories to visit. A value of 0
@@ -74,7 +74,7 @@ public class DeleteAction extends AbstractPathAction {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.AbstractPathAction#execute()
*/
@Override
@@ -113,7 +113,7 @@ public class DeleteAction extends AbstractPathAction {
/**
* Deletes the specified file.
- *
+ *
* @param path the file to delete
* @throws IOException if a problem occurred deleting the file
*/
@@ -124,7 +124,7 @@ public class DeleteAction extends AbstractPathAction {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.AbstractPathAction#execute(FileVisitor)
*/
@Override
@@ -153,7 +153,7 @@ public class DeleteAction extends AbstractPathAction {
/**
* Returns a sorted list of all files up to maxDepth under the basePath.
- *
+ *
* @return a sorted list of files
* @throws IOException
*/
@@ -166,7 +166,7 @@ public class DeleteAction extends AbstractPathAction {
/**
* Returns {@code true} if files are not deleted even when all conditions accept a path, {@code false} otherwise.
- *
+ *
* @return {@code true} if files are not deleted even when all conditions accept a path, {@code false} otherwise
*/
public boolean isTestMode() {
@@ -180,7 +180,7 @@ public class DeleteAction extends AbstractPathAction {
/**
* Create a DeleteAction.
- *
+ *
* @param basePath base path from where to start scanning for files to delete.
* @param followLinks whether to follow symbolic links. Default is false.
* @param maxDepth The maxDepth parameter is the maximum number of levels of directories to visit. A value of 0
@@ -199,7 +199,7 @@ public class DeleteAction extends AbstractPathAction {
@PluginFactory
public static DeleteAction createDeleteAction(
// @formatter:off
- @PluginAttribute("basePath") final String basePath,
+ @PluginAttribute("basePath") final String basePath,
@PluginAttribute(value = "followLinks") final boolean followLinks,
@PluginAttribute(value = "maxDepth", defaultInt = 1) final int maxDepth,
@PluginAttribute(value = "testMode") final boolean testMode,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeletingVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeletingVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeletingVisitor.java
index 825e774..45ddd33 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeletingVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeletingVisitor.java
@@ -1,97 +1,97 @@
-/*
- * 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.appender.rolling.action;
-
-import java.io.IOException;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.List;
-import java.util.Objects;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.status.StatusLogger;
-
-/**
- * FileVisitor that deletes files that are accepted by all PathFilters. Directories are ignored.
- */
-public class DeletingVisitor extends SimpleFileVisitor<Path> {
- private static final Logger LOGGER = StatusLogger.getLogger();
-
- private final Path basePath;
- private final boolean testMode;
- private final List<? extends PathCondition> pathConditions;
-
- /**
- * Constructs a new DeletingVisitor.
- *
- * @param basePath used to relativize paths
- * @param pathConditions objects that need to confirm whether a file can be deleted
- * @param testMode if true, files are not deleted but instead a message is printed to the <a
- * href="http://logging.apache.org/log4j/2.x/manual/configuration.html#StatusMessages">status logger</a>
- * at INFO level. Users can use this to do a dry run to test if their configuration works as expected.
- */
- public DeletingVisitor(final Path basePath, final List<? extends PathCondition> pathConditions,
- final boolean testMode) {
- this.testMode = testMode;
- this.basePath = Objects.requireNonNull(basePath, "basePath");
- this.pathConditions = Objects.requireNonNull(pathConditions, "pathConditions");
- for (final PathCondition condition : pathConditions) {
- condition.beforeFileTreeWalk();
- }
- }
-
- @Override
- public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException {
- for (final PathCondition pathFilter : pathConditions) {
- final Path relative = basePath.relativize(file);
- if (!pathFilter.accept(basePath, relative, attrs)) {
- LOGGER.trace("Not deleting base={}, relative={}", basePath, relative);
- return FileVisitResult.CONTINUE;
- }
- }
- if (isTestMode()) {
- LOGGER.info("Deleting {} (TEST MODE: file not actually deleted)", file);
- } else {
- delete(file);
- }
- return FileVisitResult.CONTINUE;
- }
-
- /**
- * Deletes the specified file.
- *
- * @param file the file to delete
- * @throws IOException if a problem occurred deleting the file
- */
- protected void delete(final Path file) throws IOException {
- LOGGER.trace("Deleting {}", file);
- Files.deleteIfExists(file);
- }
-
- /**
- * Returns {@code true} if files are not deleted even when all conditions accept a path, {@code false} otherwise.
- *
- * @return {@code true} if files are not deleted even when all conditions accept a path, {@code false} otherwise
- */
- public boolean isTestMode() {
- return testMode;
- }
-}
+/*
+ * 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.appender.rolling.action;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.status.StatusLogger;
+
+/**
+ * FileVisitor that deletes files that are accepted by all PathFilters. Directories are ignored.
+ */
+public class DeletingVisitor extends SimpleFileVisitor<Path> {
+ private static final Logger LOGGER = StatusLogger.getLogger();
+
+ private final Path basePath;
+ private final boolean testMode;
+ private final List<? extends PathCondition> pathConditions;
+
+ /**
+ * Constructs a new DeletingVisitor.
+ *
+ * @param basePath used to relativize paths
+ * @param pathConditions objects that need to confirm whether a file can be deleted
+ * @param testMode if true, files are not deleted but instead a message is printed to the <a
+ * href="http://logging.apache.org/log4j/2.x/manual/configuration.html#StatusMessages">status logger</a>
+ * at INFO level. Users can use this to do a dry run to test if their configuration works as expected.
+ */
+ public DeletingVisitor(final Path basePath, final List<? extends PathCondition> pathConditions,
+ final boolean testMode) {
+ this.testMode = testMode;
+ this.basePath = Objects.requireNonNull(basePath, "basePath");
+ this.pathConditions = Objects.requireNonNull(pathConditions, "pathConditions");
+ for (final PathCondition condition : pathConditions) {
+ condition.beforeFileTreeWalk();
+ }
+ }
+
+ @Override
+ public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException {
+ for (final PathCondition pathFilter : pathConditions) {
+ final Path relative = basePath.relativize(file);
+ if (!pathFilter.accept(basePath, relative, attrs)) {
+ LOGGER.trace("Not deleting base={}, relative={}", basePath, relative);
+ return FileVisitResult.CONTINUE;
+ }
+ }
+ if (isTestMode()) {
+ LOGGER.info("Deleting {} (TEST MODE: file not actually deleted)", file);
+ } else {
+ delete(file);
+ }
+ return FileVisitResult.CONTINUE;
+ }
+
+ /**
+ * Deletes the specified file.
+ *
+ * @param file the file to delete
+ * @throws IOException if a problem occurred deleting the file
+ */
+ protected void delete(final Path file) throws IOException {
+ LOGGER.trace("Deleting {}", file);
+ Files.deleteIfExists(file);
+ }
+
+ /**
+ * Returns {@code true} if files are not deleted even when all conditions accept a path, {@code false} otherwise.
+ *
+ * @return {@code true} if files are not deleted even when all conditions accept a path, {@code false} otherwise
+ */
+ public boolean isTestMode() {
+ return testMode;
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Duration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Duration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Duration.java
index 5305c91..8684a29 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Duration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Duration.java
@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
* <p>
* Similarly to the {@code java.time.Duration} class, this class does not support year or month sections in the format.
* This implementation does not support fractions or negative values.
- *
+ *
* @see #parse(CharSequence)
*/
public class Duration implements Serializable, Comparable<Duration> {
@@ -101,7 +101,7 @@ public class Duration implements Serializable, Comparable<Duration> {
* positive symbol. The number of days, hours, minutes and seconds must parse to a {@code long}.
* <p>
* Examples:
- *
+ *
* <pre>
* "PT20S" -- parses as "20 seconds"
* "PT15M" -- parses as "15 minutes" (where a minute is 60 seconds)
@@ -205,14 +205,14 @@ public class Duration implements Serializable, Comparable<Duration> {
* all positive.
* <p>
* Examples:
- *
+ *
* <pre>
* "20 seconds" -- "PT20S
* "15 minutes" (15 * 60 seconds) -- "PT15M"
* "10 hours" (10 * 3600 seconds) -- "PT10H"
* "2 days" (2 * 86400 seconds) -- "P2D"
* </pre>
- *
+ *
* @return an ISO-8601 representation of this duration, not null
*/
@Override
@@ -247,7 +247,7 @@ public class Duration implements Serializable, Comparable<Duration> {
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
index 1c9b082..eb8e6e3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
@@ -121,7 +121,7 @@ public final class GzCompressAction extends AbstractAction {
@Override
public String toString() {
- return GzCompressAction.class.getSimpleName() + '[' + source + " to " + destination
+ return GzCompressAction.class.getSimpleName() + '[' + source + " to " + destination
+ ", deleteSource=" + deleteSource + ']';
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
index b47954f..f5761bb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
@@ -59,7 +59,7 @@ public final class IfAccumulatedFileCount implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#accept(java.nio.file.Path,
* java.nio.file.Path, java.nio.file.attribute.BasicFileAttributes)
*/
@@ -78,7 +78,7 @@ public final class IfAccumulatedFileCount implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
*/
@Override
@@ -89,12 +89,12 @@ public final class IfAccumulatedFileCount implements PathCondition {
/**
* Create an IfAccumulatedFileCount condition.
- *
+ *
* @param threshold The threshold count from which files will be deleted.
* @return An IfAccumulatedFileCount condition.
*/
@PluginFactory
- public static IfAccumulatedFileCount createFileCountCondition(
+ public static IfAccumulatedFileCount createFileCountCondition(
// @formatter:off
@PluginAttribute(value = "exceeds", defaultInt = Integer.MAX_VALUE) final int threshold,
@PluginElement("PathConditions") final PathCondition... nestedConditions) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
index 7c1d908..6cc6ab6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
@@ -60,7 +60,7 @@ public final class IfAccumulatedFileSize implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#accept(java.nio.file.Path,
* java.nio.file.Path, java.nio.file.attribute.BasicFileAttributes)
*/
@@ -80,7 +80,7 @@ public final class IfAccumulatedFileSize implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
*/
@Override
@@ -91,12 +91,12 @@ public final class IfAccumulatedFileSize implements PathCondition {
/**
* Create an IfAccumulatedFileSize condition.
- *
+ *
* @param threshold The threshold accumulated file size from which files will be deleted.
* @return An IfAccumulatedFileSize condition.
*/
@PluginFactory
- public static IfAccumulatedFileSize createFileSizeCondition(
+ public static IfAccumulatedFileSize createFileSizeCondition(
// @formatter:off
@PluginAttribute("exceeds") final String size,
@PluginElement("PathConditions") final PathCondition... nestedConditions) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
index 2eaea8b..27596cb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
@@ -45,7 +45,7 @@ public final class IfAll implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#accept(java.nio.file.Path,
* java.nio.file.Path, java.nio.file.attribute.BasicFileAttributes)
*/
@@ -59,7 +59,7 @@ public final class IfAll implements PathCondition {
/**
* Returns {@code true} if all the specified conditions accept the specified path, {@code false} otherwise.
- *
+ *
* @param list the array of conditions to evaluate
* @param baseDir the directory from where to start scanning for deletion candidate files
* @param relativePath the candidate for deletion. This path is relative to the baseDir.
@@ -79,7 +79,7 @@ public final class IfAll implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
*/
@Override
@@ -89,7 +89,7 @@ public final class IfAll implements PathCondition {
/**
* Calls {@link #beforeFileTreeWalk()} on all of the specified nested conditions.
- *
+ *
* @param nestedConditions the conditions to call {@link #beforeFileTreeWalk()} on
*/
public static void beforeFileTreeWalk(final PathCondition[] nestedConditions) {
@@ -100,12 +100,12 @@ public final class IfAll implements PathCondition {
/**
* Create a Composite PathCondition whose components all need to accept before this condition accepts.
- *
+ *
* @param components The component filters.
* @return A Composite PathCondition.
*/
@PluginFactory
- public static IfAll createAndCondition(
+ public static IfAll createAndCondition(
@PluginElement("PathConditions") final PathCondition... components) {
return new IfAll(components);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
index 6d5841f..a982b58 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
@@ -70,12 +70,12 @@ public final class IfAny implements PathCondition {
/**
* Create a Composite PathCondition: accepts if any of the nested conditions accepts.
- *
+ *
* @param components The component conditions.
* @return A Composite PathCondition.
*/
@PluginFactory
- public static IfAny createOrCondition(
+ public static IfAny createOrCondition(
@PluginElement("PathConditions") final PathCondition... components) {
return new IfAny(components);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java
index 1084a77..34ee066 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java
@@ -52,7 +52,7 @@ public final class IfFileName implements PathCondition {
/**
* Constructs a FileNameFilter filter. If both a regular expression and a glob pattern are specified the glob
* pattern is used and the regular expression is ignored.
- *
+ *
* @param glob the baseDir-relative path pattern of the files to delete (may contain '*' and '?' wildcarts)
* @param regex the regular expression that matches the baseDir-relative path of the file(s) to delete
* @param nestedConditions nested conditions to evaluate if this condition accepts a path
@@ -80,7 +80,7 @@ public final class IfFileName implements PathCondition {
* {@code syntax:pattern} where syntax is one of "glob" or "regex" and the pattern is either a {@linkplain Pattern
* regular expression} or a simplified pattern expression described under "glob" in
* {@link FileSystem#getPathMatcher(String)}.
- *
+ *
* @return relative path of the file(s) to delete (may contain regular expression or wildcarts)
*/
public String getSyntaxAndPattern() {
@@ -93,7 +93,7 @@ public final class IfFileName implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#accept(java.nio.file.Path,
* java.nio.file.Path, java.nio.file.attribute.BasicFileAttributes)
*/
@@ -112,7 +112,7 @@ public final class IfFileName implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
*/
@Override
@@ -125,7 +125,7 @@ public final class IfFileName implements PathCondition {
* {@linkplain FileSystem#getPathMatcher(String) glob pattern} or the regular expression matches the relative path.
* If both a regular expression and a glob pattern are specified the glob pattern is used and the regular expression
* is ignored.
- *
+ *
* @param glob the baseDir-relative path pattern of the files to delete (may contain '*' and '?' wildcarts)
* @param regex the regular expression that matches the baseDir-relative path of the file(s) to delete
* @param nestedConditions nested conditions to evaluate if this condition accepts a path
@@ -133,10 +133,10 @@ public final class IfFileName implements PathCondition {
* @see FileSystem#getPathMatcher(String)
*/
@PluginFactory
- public static IfFileName createNameCondition(
+ public static IfFileName createNameCondition(
// @formatter:off
- @PluginAttribute("glob") final String glob,
- @PluginAttribute("regex") final String regex,
+ @PluginAttribute("glob") final String glob,
+ @PluginAttribute("regex") final String regex,
@PluginElement("PathConditions") final PathCondition... nestedConditions) {
// @formatter:on
return new IfFileName(glob, regex, nestedConditions);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java
index 4a4c717..eff6536 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java
@@ -61,7 +61,7 @@ public final class IfLastModified implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#accept(java.nio.file.Path,
* java.nio.file.Path, java.nio.file.attribute.BasicFileAttributes)
*/
@@ -82,7 +82,7 @@ public final class IfLastModified implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
*/
@Override
@@ -92,15 +92,15 @@ public final class IfLastModified implements PathCondition {
/**
* Create an IfLastModified condition.
- *
+ *
* @param age The path age that is accepted by this condition. Must be a valid Duration.
* @param nestedConditions nested conditions to evaluate if this condition accepts a path
* @return An IfLastModified condition.
*/
@PluginFactory
- public static IfLastModified createAgeCondition(
+ public static IfLastModified createAgeCondition(
// @formatter:off
- @PluginAttribute("age") final Duration age,
+ @PluginAttribute("age") final Duration age,
@PluginElement("PathConditions") final PathCondition... nestedConditions) {
// @formatter:on
return new IfLastModified(age, nestedConditions);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfNot.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfNot.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfNot.java
index 1baf187..998a713 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfNot.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfNot.java
@@ -61,12 +61,12 @@ public final class IfNot implements PathCondition {
/**
* Create an IfNot PathCondition.
- *
+ *
* @param condition The condition to negate.
* @return An IfNot PathCondition.
*/
@PluginFactory
- public static IfNot createNotCondition(
+ public static IfNot createNotCondition(
@PluginElement("PathConditions") final PathCondition condition) {
return new IfNot(condition);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathCondition.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathCondition.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathCondition.java
index 0fa7873..8b8944c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathCondition.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathCondition.java
@@ -1,44 +1,44 @@
-/*
- * 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.appender.rolling.action;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-
-/**
- * Filter that accepts or rejects a candidate {@code Path} for deletion.
- */
-public interface PathCondition {
-
- /**
- * Invoked before a new {@linkplain Files#walkFileTree(Path, java.util.Set, int, java.nio.file.FileVisitor) file
- * tree walk} is started. Stateful PathConditions can reset their state when this method is called.
- */
- void beforeFileTreeWalk();
-
- /**
- * Returns {@code true} if the specified candidate path should be deleted, {@code false} otherwise.
- *
- * @param baseDir the directory from where to start scanning for deletion candidate files
- * @param relativePath the candidate for deletion. This path is relative to the baseDir.
- * @param attrs attributes of the candidate path
- * @return whether the candidate path should be deleted
- */
- boolean accept(final Path baseDir, final Path relativePath, final BasicFileAttributes attrs);
-}
+/*
+ * 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.appender.rolling.action;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+
+/**
+ * Filter that accepts or rejects a candidate {@code Path} for deletion.
+ */
+public interface PathCondition {
+
+ /**
+ * Invoked before a new {@linkplain Files#walkFileTree(Path, java.util.Set, int, java.nio.file.FileVisitor) file
+ * tree walk} is started. Stateful PathConditions can reset their state when this method is called.
+ */
+ void beforeFileTreeWalk();
+
+ /**
+ * Returns {@code true} if the specified candidate path should be deleted, {@code false} otherwise.
+ *
+ * @param baseDir the directory from where to start scanning for deletion candidate files
+ * @param relativePath the candidate for deletion. This path is relative to the baseDir.
+ * @param attrs attributes of the candidate path
+ * @return whether the candidate path should be deleted
+ */
+ boolean accept(final Path baseDir, final Path relativePath, final BasicFileAttributes attrs);
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTime.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTime.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTime.java
index e0a04b5..468dee7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTime.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTime.java
@@ -37,7 +37,7 @@ public class PathSortByModificationTime implements PathSorter, Serializable {
/**
* Constructs a new SortByModificationTime sorter.
- *
+ *
* @param recentFirst if true, most recently modified paths should come first
*/
public PathSortByModificationTime(final boolean recentFirst) {
@@ -47,19 +47,19 @@ public class PathSortByModificationTime implements PathSorter, Serializable {
/**
* Create a PathSorter that sorts by lastModified time.
- *
+ *
* @param recentFirst if true, most recently modified paths should come first.
* @return A PathSorter.
*/
@PluginFactory
- public static PathSorter createSorter(
+ public static PathSorter createSorter(
@PluginAttribute(value = "recentFirst", defaultBoolean = true) final boolean recentFirst) {
return new PathSortByModificationTime(recentFirst);
}
/**
* Returns whether this sorter sorts recent files first.
- *
+ *
* @return whether this sorter sorts recent files first
*/
public boolean isRecentFirst() {
@@ -68,7 +68,7 @@ public class PathSortByModificationTime implements PathSorter, Serializable {
/*
* (non-Javadoc)
- *
+ *
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathWithAttributes.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathWithAttributes.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathWithAttributes.java
index 42640c3..7dbc92c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathWithAttributes.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathWithAttributes.java
@@ -1,59 +1,59 @@
-/*
- * 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.appender.rolling.action;
-
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Objects;
-
-/**
- * Tuple of a {@code Path} and {@code BasicFileAttributes}, used for sorting.
- */
-public class PathWithAttributes {
-
- private final Path path;
- private final BasicFileAttributes attributes;
-
- public PathWithAttributes(final Path path, final BasicFileAttributes attributes) {
- this.path = Objects.requireNonNull(path, "path");
- this.attributes = Objects.requireNonNull(attributes, "attributes");
- }
-
- @Override
- public String toString() {
- return path + " (modified: " + attributes.lastModifiedTime() + ")";
- }
-
- /**
- * Returns the path.
- *
- * @return the path
- */
- public Path getPath() {
- return path;
- }
-
- /**
- * Returns the attributes.
- *
- * @return the attributes
- */
- public BasicFileAttributes getAttributes() {
- return attributes;
- }
-}
+/*
+ * 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.appender.rolling.action;
+
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Objects;
+
+/**
+ * Tuple of a {@code Path} and {@code BasicFileAttributes}, used for sorting.
+ */
+public class PathWithAttributes {
+
+ private final Path path;
+ private final BasicFileAttributes attributes;
+
+ public PathWithAttributes(final Path path, final BasicFileAttributes attributes) {
+ this.path = Objects.requireNonNull(path, "path");
+ this.attributes = Objects.requireNonNull(attributes, "attributes");
+ }
+
+ @Override
+ public String toString() {
+ return path + " (modified: " + attributes.lastModifiedTime() + ")";
+ }
+
+ /**
+ * Returns the path.
+ *
+ * @return the path
+ */
+ public Path getPath() {
+ return path;
+ }
+
+ /**
+ * Returns the attributes.
+ *
+ * @return the attributes
+ */
+ public BasicFileAttributes getAttributes() {
+ return attributes;
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java
index bb5bc74..0cf6ba5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java
@@ -43,12 +43,12 @@ import org.apache.logging.log4j.util.Strings;
/**
* File posix attribute view action.
- *
+ *
* Allow to define file permissions, user and group for log files on posix supported OS.
*/
@Plugin(name = "PosixViewAttribute", category = Core.CATEGORY_NAME, printObject = true)
public class PosixViewAttributeAction extends AbstractPathAction {
-
+
/**
* File permissions.
*/
@@ -86,7 +86,7 @@ public class PosixViewAttributeAction extends AbstractPathAction {
@PluginConfiguration
private Configuration configuration;
-
+
private StrSubstitutor subst;
@PluginBuilderAttribute
@@ -183,7 +183,7 @@ public class PosixViewAttributeAction extends AbstractPathAction {
/**
* Define max folder depth to search for eligible files to apply posix attribute view.
- * @param maxDepth Max search depth
+ * @param maxDepth Max search depth
* @return This builder
*/
public Builder withMaxDepth(final int maxDepth) {
@@ -275,10 +275,10 @@ public class PosixViewAttributeAction extends AbstractPathAction {
public Set<PosixFilePermission> getFilePermissions() {
return filePermissions;
}
-
+
/**
* Returns file owner if defined and the OS supports owner file attribute view,
- * null otherwise.
+ * null otherwise.
* @return File owner
* @see FileOwnerAttributeView
*/
@@ -288,7 +288,7 @@ public class PosixViewAttributeAction extends AbstractPathAction {
/**
* Returns file group if defined and the OS supports posix/group file attribute view,
- * null otherwise.
+ * null otherwise.
* @return File group
* @see PosixFileAttributeView
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptCondition.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptCondition.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptCondition.java
index 9d728c0..6ef46ed 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptCondition.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptCondition.java
@@ -38,7 +38,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* A condition of the {@link DeleteAction} where a user-provided script selects the files to delete from a provided
* list. The specified script may be a {@link Script}, a {@link ScriptFile} or a {@link ScriptRef}.
- *
+ *
* @see #createCondition(AbstractScript, Configuration)
*/
@Plugin(name = "ScriptCondition", category = Core.CATEGORY_NAME, printObject = true)
@@ -50,7 +50,7 @@ public class ScriptCondition {
/**
* Constructs a new ScriptCondition.
- *
+ *
* @param script the script that can select files to delete
* @param configuration configuration containing the StrSubstitutor passed to the script
*/
@@ -64,7 +64,7 @@ public class ScriptCondition {
/**
* Executes the script
- *
+ *
* @param baseDir
* @param candidates
* @return
@@ -84,7 +84,7 @@ public class ScriptCondition {
/**
* Creates the ScriptCondition.
- *
+ *
* @param script The script to run. This may be a {@link Script}, a {@link ScriptFile} or a {@link ScriptRef}. The
* script must return a {@code List<PathWithAttributes>}. When the script is executed, it is provided the
* following bindings:
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitor.java
index 7bf76b6..7b6d956 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitor.java
@@ -1,58 +1,58 @@
-/*
- * 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.appender.rolling.action;
-
-import java.io.IOException;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * FileVisitor that sorts files.
- */
-public class SortingVisitor extends SimpleFileVisitor<Path> {
-
- private final PathSorter sorter;
- private final List<PathWithAttributes> collected = new ArrayList<>();
-
- /**
- * Constructs a new DeletingVisitor.
- *
- * @param basePath used to relativize paths
- * @param pathFilters objects that need to confirm whether a file can be deleted
- */
- public SortingVisitor(final PathSorter sorter) {
- this.sorter = Objects.requireNonNull(sorter, "sorter");
- }
-
- @Override
- public FileVisitResult visitFile(final Path path, final BasicFileAttributes attrs) throws IOException {
- collected.add(new PathWithAttributes(path, attrs));
- return FileVisitResult.CONTINUE;
- }
-
- public List<PathWithAttributes> getSortedPaths() {
- Collections.sort(collected, sorter);
- return collected;
- }
-}
+/*
+ * 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.appender.rolling.action;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * FileVisitor that sorts files.
+ */
+public class SortingVisitor extends SimpleFileVisitor<Path> {
+
+ private final PathSorter sorter;
+ private final List<PathWithAttributes> collected = new ArrayList<>();
+
+ /**
+ * Constructs a new DeletingVisitor.
+ *
+ * @param basePath used to relativize paths
+ * @param pathFilters objects that need to confirm whether a file can be deleted
+ */
+ public SortingVisitor(final PathSorter sorter) {
+ this.sorter = Objects.requireNonNull(sorter, "sorter");
+ }
+
+ @Override
+ public FileVisitResult visitFile(final Path path, final BasicFileAttributes attrs) throws IOException {
+ collected.add(new PathWithAttributes(path, attrs));
+ return FileVisitResult.CONTINUE;
+ }
+
+ public List<PathWithAttributes> getSortedPaths() {
+ Collections.sort(collected, sorter);
+ return collected;
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
index a7705da..3a0019f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
@@ -132,7 +132,7 @@ public final class ZipCompressAction extends AbstractAction {
@Override
public String toString() {
- return ZipCompressAction.class.getSimpleName() + '[' + source + " to " + destination
+ return ZipCompressAction.class.getSimpleName() + '[' + source + " to " + destination
+ ", level=" + level + ", deleteSource=" + deleteSource + ']';
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
index e892f66..1babc38 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
@@ -41,7 +41,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, Runnable {
private final long timeToLive;
- private final long checkInterval;
+ private final long checkInterval;
private final ConcurrentMap<String, Long> appendersUsage = new ConcurrentHashMap<>();
private RoutingAppender routingAppender;
private final ConfigurationScheduler scheduler;
@@ -123,7 +123,7 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R
* Create the PurgePolicy
*
* @param timeToLive the number of increments of timeUnit before the Appender should be purged.
- * @param checkInterval when all appenders purged, the number of increments of timeUnit to check if any appenders appeared
+ * @param checkInterval when all appenders purged, the number of increments of timeUnit to check if any appenders appeared
* @param timeUnit the unit of time the timeToLive and the checkInterval is expressed in.
* @return The Routes container.
*/
@@ -155,7 +155,7 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R
LOGGER.error("timeToLive must be positive. timeToLive set to 0");
ttl = 0;
}
-
+
long ci;
if (checkInterval == null) {
ci = ttl;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/PurgePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/PurgePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/PurgePolicy.java
index b0c8c61..f780b15 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/PurgePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/PurgePolicy.java
@@ -27,9 +27,9 @@ public interface PurgePolicy {
* Activates purging appenders
*/
void purge();
-
+
/**
- *
+ *
* @param routed appender key
* @param event
*/
@@ -37,7 +37,7 @@ public interface PurgePolicy {
/**
* Initializes with routing appender
- *
+ *
* @param routingAppender
*/
void initialize(RoutingAppender routingAppender);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
index e179ad7..f02b7cf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
@@ -47,12 +47,12 @@ public final class Routes {
public static class Builder implements org.apache.logging.log4j.core.util.Builder<Routes> {
- @PluginConfiguration
+ @PluginConfiguration
private Configuration configuration;
- @PluginAttribute("pattern")
+ @PluginAttribute("pattern")
private String pattern;
-
+
@PluginElement("Script")
private AbstractScript patternScript;
@@ -114,7 +114,7 @@ public final class Routes {
this.routes = routes;
return this;
}
-
+
}
private static final Logger LOGGER = StatusLogger.getLogger();
@@ -141,16 +141,16 @@ public final class Routes {
public static Builder newBuilder() {
return new Builder();
}
-
+
private final Configuration configuration;
-
+
private final String pattern;
private final AbstractScript patternScript;
-
+
// TODO Why not make this a Map or add a Map.
private final Route[] routes;
-
+
private Routes(final Configuration configuration, final AbstractScript patternScript, final String pattern, final Route... routes) {
this.configuration = configuration;
this.patternScript = patternScript;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContext.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContext.java
index 68326f7..fa93851 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContext.java
@@ -58,7 +58,7 @@ public class AsyncLoggerContext extends LoggerContext {
protected Logger newInstance(final LoggerContext ctx, final String name, final MessageFactory messageFactory) {
return new AsyncLogger(ctx, name, messageFactory, loggerDisruptor);
}
-
+
@Override
public void setName(final String name) {
super.setName("AsyncContext[" + name + "]");
@@ -67,7 +67,7 @@ public class AsyncLoggerContext extends LoggerContext {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.LoggerContext#start()
*/
@Override
@@ -78,7 +78,7 @@ public class AsyncLoggerContext extends LoggerContext {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.LoggerContext#start(org.apache.logging.log4j.core.config.Configuration)
*/
@Override
@@ -102,7 +102,7 @@ public class AsyncLoggerContext extends LoggerContext {
public boolean stop(final long timeout, final TimeUnit timeUnit) {
setStopping();
// first stop Disruptor
- loggerDisruptor.stop(timeout, timeUnit);
+ loggerDisruptor.stop(timeout, timeUnit);
super.stop(timeout, timeUnit);
return true;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java
index 358b265..b8fe437 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java
@@ -33,7 +33,7 @@ public class AsyncLoggerContextSelector extends ClassLoaderContextSelector {
/**
* Returns {@code true} if the user specified this selector as the Log4jContextSelector, to make all loggers
* asynchronous.
- *
+ *
* @return {@code true} if all loggers are asynchronous, {@code false} otherwise.
*/
public static boolean isSelected() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
index 1e4a820..8194ffc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
@@ -40,7 +40,7 @@ public class AppenderControl extends AbstractFilterable {
/**
* Constructor.
- *
+ *
* @param appender The target Appender.
* @param level the Level to filter on.
* @param filter the Filter(s) to apply.
@@ -56,7 +56,7 @@ public class AppenderControl extends AbstractFilterable {
/**
* Returns the name the appender had when this AppenderControl was constructed.
- *
+ *
* @return the appender name
*/
public String getAppenderName() {
@@ -65,7 +65,7 @@ public class AppenderControl extends AbstractFilterable {
/**
* Returns the Appender.
- *
+ *
* @return the Appender.
*/
public Appender getAppender() {
@@ -74,7 +74,7 @@ public class AppenderControl extends AbstractFilterable {
/**
* Call the appender.
- *
+ *
* @param event The event to process.
*/
public void callAppender(final LogEvent event) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitUnconditionallyReliabilityStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitUnconditionallyReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitUnconditionallyReliabilityStrategy.java
index 357f18b..bd582b5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitUnconditionallyReliabilityStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitUnconditionallyReliabilityStrategy.java
@@ -47,7 +47,7 @@ public class AwaitUnconditionallyReliabilityStrategy implements ReliabilityStrat
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#log(org.apache.logging.log4j.util.Supplier,
* java.lang.String, java.lang.String, org.apache.logging.log4j.Marker, org.apache.logging.log4j.Level,
* org.apache.logging.log4j.message.Message, java.lang.Throwable)
@@ -60,7 +60,7 @@ public class AwaitUnconditionallyReliabilityStrategy implements ReliabilityStrat
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#log(org.apache.logging.log4j.util.Supplier,
* org.apache.logging.log4j.core.LogEvent)
*/
@@ -71,7 +71,7 @@ public class AwaitUnconditionallyReliabilityStrategy implements ReliabilityStrat
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeLogEvent(org.apache.logging.log4j.core.config.
* LoggerConfig, org.apache.logging.log4j.util.Supplier)
@@ -83,7 +83,7 @@ public class AwaitUnconditionallyReliabilityStrategy implements ReliabilityStrat
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#afterLogEvent()
*/
@Override
@@ -93,7 +93,7 @@ public class AwaitUnconditionallyReliabilityStrategy implements ReliabilityStrat
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeStopAppenders()
*/
@Override
@@ -103,7 +103,7 @@ public class AwaitUnconditionallyReliabilityStrategy implements ReliabilityStrat
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeStopConfiguration(org.apache.logging.log4j.core
* .config.Configuration)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
index 5341337..dd7525c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
@@ -38,7 +38,7 @@ public class ConfigurationScheduler extends AbstractLifeCycle {
private static final Logger LOGGER = StatusLogger.getLogger();
private static final String SIMPLE_NAME = "Log4j2 " + ConfigurationScheduler.class.getSimpleName();
private static final int MAX_SCHEDULED_ITEMS = 5;
-
+
private ScheduledExecutorService executorService;
private int scheduledItems = 0;
private final String name;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
index 3c87695..21558fc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
@@ -275,7 +275,7 @@ public class ConfigurationSource {
if (is == null) {
return null;
}
-
+
if (FileUtils.isFile(url)) {
try {
return new ConfigurationSource(is, FileUtils.fileFromUri(url.toURI()));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
index 28dd85f..0747399 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
@@ -335,7 +335,7 @@ public final class Configurator {
* rollover thread is done. When this method returns, these tasks' status are undefined, the tasks may be done or
* not.
* </p>
- *
+ *
* @param ctx
* the logger context to shut down, may be null.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
index ca6bd9b..d28753d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
@@ -42,7 +42,7 @@ public final class CustomLevelConfig {
/**
* Creates a CustomLevelConfig object. This also defines the Level object with a call to
* {@link Level#forName(String, int)}.
- *
+ *
* @param levelName name of the custom level.
* @param intLevel the intLevel that determines where this level resides relative to the built-in levels
* @return A CustomLevelConfig object.
@@ -60,7 +60,7 @@ public final class CustomLevelConfig {
/**
* Returns the custom level name.
- *
+ *
* @return the custom level name
*/
public String getLevelName() {
@@ -70,7 +70,7 @@ public final class CustomLevelConfig {
/**
* Returns the custom level intLevel that determines the strength of the custom level relative to the built-in
* levels.
- *
+ *
* @return the custom level intLevel
*/
public int getIntLevel() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevels.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevels.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevels.java
index 0b43858..db6eab3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevels.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevels.java
@@ -40,7 +40,7 @@ public final class CustomLevels {
/**
* Create a CustomLevels object to contain all the CustomLevelConfigs.
- *
+ *
* @param customLevels An array of CustomLevelConfigs.
* @return A CustomLevels object.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
index cbedf7c..973eb27 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
@@ -28,12 +28,12 @@ public class DefaultConfiguration extends AbstractConfiguration {
* The name of the default configuration.
*/
public static final String DEFAULT_NAME = "Default";
-
+
/**
* The System Property used to specify the logging level.
*/
public static final String DEFAULT_LEVEL = "org.apache.logging.log4j.level";
-
+
/**
* The default Pattern used for the default Layout.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.java
index 18fcae4..f6e32f5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.java
@@ -38,7 +38,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#log(org.apache.logging.log4j.util.Supplier,
* java.lang.String, java.lang.String, org.apache.logging.log4j.Marker, org.apache.logging.log4j.Level,
* org.apache.logging.log4j.message.Message, java.lang.Throwable)
@@ -51,7 +51,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#log(org.apache.logging.log4j.util.Supplier,
* org.apache.logging.log4j.core.LogEvent)
*/
@@ -62,7 +62,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeLogEvent(org.apache.logging.log4j.core.config.
* LoggerConfig, org.apache.logging.log4j.util.Supplier)
@@ -74,7 +74,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#afterLogEvent()
*/
@Override
@@ -84,7 +84,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeStopAppenders()
*/
@Override
@@ -94,7 +94,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeStopConfiguration(org.apache.logging.log4j.core
* .config.Configuration)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java
index cb4731e..137fba8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java
@@ -36,7 +36,7 @@ public final class Property {
* @since 2.11.2
*/
public static final Property[] EMPTY_ARRAY = new Property[0];
-
+
private static final Logger LOGGER = StatusLogger.getLogger();
private final String name;
[12/13] logging-log4j2 git commit: Checkstyle: Remove trailing white
spaces on all lines.
Posted by gg...@apache.org.
Checkstyle: Remove trailing white spaces on all lines.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/30970229
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/30970229
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/30970229
Branch: refs/heads/release-2.x
Commit: 3097022914f66cb2f8f9963eacc76c779a651384
Parents: de97a11
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Oct 30 10:51:57 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Oct 30 10:51:57 2018 -0600
----------------------------------------------------------------------
.../log4j/appserver/jetty/Log4j2Logger.java | 2 +-
.../log4j/cassandra/CassandraManager.java | 2 +-
.../logging/log4j/core/SimplePerfTest.java | 2 +-
.../logging/log4j/core/AbstractLifeCycle.java | 2 +-
.../core/DefaultLoggerContextAccessor.java | 2 +-
.../org/apache/logging/log4j/core/LogEvent.java | 2 +-
.../apache/logging/log4j/core/StringLayout.java | 66 +-
.../org/apache/logging/log4j/core/Version.java | 2 +-
.../log4j/core/appender/AbstractAppender.java | 34 +-
.../core/appender/AbstractFileAppender.java | 4 +-
.../appender/AbstractOutputStreamAppender.java | 12 +-
.../core/appender/AbstractWriterAppender.java | 12 +-
.../log4j/core/appender/AppenderSet.java | 2 +-
.../log4j/core/appender/AsyncAppender.java | 4 +-
.../core/appender/ConfigurationFactoryData.java | 2 +-
.../log4j/core/appender/FileAppender.java | 10 +-
.../core/appender/MemoryMappedFileAppender.java | 4 +-
.../core/appender/OutputStreamAppender.java | 8 +-
.../core/appender/RandomAccessFileAppender.java | 8 +-
.../core/appender/RollingFileAppender.java | 12 +-
.../RollingRandomAccessFileAppender.java | 4 +-
.../log4j/core/appender/SocketAppender.java | 16 +-
.../log4j/core/appender/SyslogAppender.java | 38 +-
.../log4j/core/appender/TlsSyslogFrame.java | 2 +-
.../log4j/core/appender/WriterAppender.java | 6 +-
.../appender/db/AbstractDatabaseAppender.java | 2 +-
.../appender/db/AbstractDatabaseManager.java | 2 +-
.../log4j/core/appender/db/ColumnMapping.java | 28 +-
.../db/jdbc/AbstractConnectionSource.java | 2 +-
.../core/appender/db/jdbc/ColumnConfig.java | 28 +-
.../core/appender/db/jdbc/ConnectionSource.java | 2 +-
.../core/appender/db/jdbc/JdbcAppender.java | 8 +-
.../appender/db/jdbc/JdbcDatabaseManager.java | 8 +-
.../mom/kafka/DefaultKafkaProducerFactory.java | 2 +-
.../core/appender/mom/kafka/KafkaAppender.java | 6 +-
.../mom/kafka/KafkaProducerFactory.java | 2 +-
.../core/appender/nosql/NoSqlAppender.java | 10 +-
.../appender/nosql/NoSqlDatabaseManager.java | 2 +-
.../core/appender/nosql/NoSqlProvider.java | 4 +-
.../rewrite/LoggerNameLevelRewritePolicy.java | 4 +-
.../core/appender/rewrite/MapRewritePolicy.java | 6 +-
.../rewrite/PropertiesRewritePolicy.java | 2 +-
.../appender/rolling/CronTriggeringPolicy.java | 6 +-
.../rolling/DefaultRolloverStrategy.java | 6 +-
.../rolling/DirectWriteRolloverStrategy.java | 6 +-
.../core/appender/rolling/FileExtension.java | 2 +-
.../appender/rolling/NoOpTriggeringPolicy.java | 2 +-
.../rolling/TimeBasedTriggeringPolicy.java | 20 +-
.../core/appender/rolling/TriggeringPolicy.java | 2 +-
.../appender/rolling/action/AbstractAction.java | 2 +-
.../rolling/action/AbstractPathAction.java | 20 +-
.../rolling/action/CommonsCompressAction.java | 2 +-
.../rolling/action/CompositeAction.java | 4 +-
.../appender/rolling/action/DeleteAction.java | 16 +-
.../rolling/action/DeletingVisitor.java | 194 +-
.../core/appender/rolling/action/Duration.java | 10 +-
.../rolling/action/GzCompressAction.java | 2 +-
.../rolling/action/IfAccumulatedFileCount.java | 8 +-
.../rolling/action/IfAccumulatedFileSize.java | 8 +-
.../core/appender/rolling/action/IfAll.java | 12 +-
.../core/appender/rolling/action/IfAny.java | 4 +-
.../appender/rolling/action/IfFileName.java | 16 +-
.../appender/rolling/action/IfLastModified.java | 10 +-
.../core/appender/rolling/action/IfNot.java | 4 +-
.../appender/rolling/action/PathCondition.java | 88 +-
.../action/PathSortByModificationTime.java | 10 +-
.../rolling/action/PathWithAttributes.java | 118 +-
.../action/PosixViewAttributeAction.java | 14 +-
.../rolling/action/ScriptCondition.java | 8 +-
.../appender/rolling/action/SortingVisitor.java | 116 +-
.../rolling/action/ZipCompressAction.java | 2 +-
.../core/appender/routing/IdlePurgePolicy.java | 6 +-
.../core/appender/routing/PurgePolicy.java | 6 +-
.../log4j/core/appender/routing/Routes.java | 16 +-
.../log4j/core/async/AsyncLoggerContext.java | 8 +-
.../core/async/AsyncLoggerContextSelector.java | 2 +-
.../log4j/core/config/AppenderControl.java | 8 +-
...AwaitUnconditionallyReliabilityStrategy.java | 12 +-
.../core/config/ConfigurationScheduler.java | 2 +-
.../log4j/core/config/ConfigurationSource.java | 2 +-
.../logging/log4j/core/config/Configurator.java | 2 +-
.../log4j/core/config/CustomLevelConfig.java | 6 +-
.../logging/log4j/core/config/CustomLevels.java | 2 +-
.../log4j/core/config/DefaultConfiguration.java | 4 +-
.../core/config/DefaultReliabilityStrategy.java | 12 +-
.../logging/log4j/core/config/Property.java | 2 +-
.../log4j/core/config/ReliabilityStrategy.java | 158 +-
.../core/config/ReliabilityStrategyFactory.java | 2 +-
.../impl/DefaultConfigurationBuilder.java | 2 +-
.../config/plugins/convert/TypeConverters.java | 4 +-
.../core/config/plugins/util/PluginManager.java | 10 +-
.../core/config/plugins/util/ResolverUtil.java | 6 +-
.../plugins/validation/ConstraintValidator.java | 2 +-
.../plugins/visitors/AbstractPluginVisitor.java | 12 +-
.../PropertiesConfigurationBuilder.java | 4 +-
.../log4j/core/config/xml/XmlConfiguration.java | 4 +-
.../log4j/core/filter/AbstractFilter.java | 6 +-
.../log4j/core/filter/AbstractFilterable.java | 4 +-
.../logging/log4j/core/filter/BurstFilter.java | 4 +-
.../logging/log4j/core/filter/Filterable.java | 2 +-
.../logging/log4j/core/filter/ScriptFilter.java | 4 +-
.../log4j/core/impl/ExtendedClassInfo.java | 2 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 2 +-
.../jackson/ExtendedStackTraceElementMixIn.java | 2 +-
.../logging/log4j/core/jackson/MarkerMixIn.java | 2 +-
.../core/jackson/StackTraceElementMixIn.java | 6 +-
.../log4j/core/jmx/AsyncAppenderAdmin.java | 10 +-
.../log4j/core/jmx/AsyncAppenderAdminMBean.java | 28 +-
.../log4j/core/jmx/ContextSelectorAdmin.java | 4 +-
.../log4j/core/jmx/LoggerContextAdminMBean.java | 28 +-
.../logging/log4j/core/jmx/RingBufferAdmin.java | 10 +-
.../log4j/core/jmx/RingBufferAdminMBean.java | 6 +-
.../log4j/core/jmx/StatusLoggerAdmin.java | 6 +-
.../log4j/core/jmx/StatusLoggerAdminMBean.java | 2 +-
.../log4j/core/layout/AbstractCsvLayout.java | 6 +-
.../log4j/core/layout/CsvParameterLayout.java | 10 +-
.../core/layout/MarkerPatternSelector.java | 12 +-
.../core/layout/ScriptPatternSelector.java | 22 +-
.../logging/log4j/core/layout/SyslogLayout.java | 16 +-
.../logging/log4j/core/layout/XmlLayout.java | 2 +-
.../logging/log4j/core/layout/YamlLayout.java | 2 +-
.../log4j/core/lookup/AbstractLookup.java | 4 +-
.../log4j/core/lookup/MainMapLookup.java | 4 +-
.../logging/log4j/core/lookup/MarkerLookup.java | 2 +-
.../logging/log4j/core/lookup/StrMatcher.java | 2 +-
.../log4j/core/net/AbstractSocketManager.java | 8 +-
.../log4j/core/net/DatagramSocketManager.java | 4 +-
.../apache/logging/log4j/core/net/Facility.java | 48 +-
.../logging/log4j/core/net/JndiManager.java | 4 +-
.../log4j/core/net/MulticastDnsAdvertiser.java | 2 +-
.../apache/logging/log4j/core/net/Priority.java | 2 +-
.../log4j/core/net/Rfc1349TrafficClass.java | 2 +-
.../log4j/core/net/SslSocketManager.java | 2 +-
.../log4j/core/net/TcpSocketManager.java | 12 +-
.../log4j/core/net/ssl/SslConfiguration.java | 6 +-
.../log4j/core/parser/TextLogEventParser.java | 2 +-
.../ExtendedThrowablePatternConverter.java | 2 +-
.../log4j/core/pattern/JAnsiTextRenderer.java | 22 +-
.../log4j/core/pattern/PlainTextRenderer.java | 2 +-
.../log4j/core/pattern/TextRenderer.java | 4 +-
.../log4j/core/script/AbstractScript.java | 2 +-
.../core/selector/JndiContextSelector.java | 8 +-
.../logging/log4j/core/tools/Generate.java | 1698 +++++++++---------
.../logging/log4j/core/util/DummyNanoClock.java | 2 +-
.../log4j/core/util/ExecutorServices.java | 2 +-
.../logging/log4j/core/util/FileUtils.java | 6 +-
.../logging/log4j/core/util/FileWatcher.java | 4 +-
.../logging/log4j/core/util/JndiCloser.java | 120 +-
.../log4j/core/util/Log4jThreadFactory.java | 6 +-
.../logging/log4j/core/util/NetUtils.java | 2 +-
.../log4j/core/util/NullOutputStream.java | 16 +-
.../logging/log4j/core/util/Patterns.java | 4 +-
.../log4j/core/util/StringBuilderWriter.java | 336 ++--
.../logging/log4j/core/util/TypeUtil.java | 4 +-
.../logging/log4j/core/util/WatchManager.java | 14 +-
.../log4j/core/util/datetime/DateParser.java | 44 +-
.../log4j/core/util/datetime/DatePrinter.java | 6 +-
.../core/util/datetime/FastDateFormat.java | 16 +-
.../core/util/datetime/FastDateParser.java | 36 +-
.../core/util/datetime/FastDatePrinter.java | 40 +-
.../log4j/core/util/datetime/FormatCache.java | 44 +-
.../logging/log4j/core/CustomLevelsTest.java | 4 +-
.../apache/logging/log4j/core/DeadlockTest.java | 2 +-
.../logging/log4j/core/LateConfigTest.java | 2 +-
.../apache/logging/log4j/core/LogEventTest.java | 4 +-
.../appender/ConsoleAppenderBuilderTest.java | 2 +-
...nsoleAppenderDefaultSuppressedThrowable.java | 2 +-
.../appender/FileAppenderPermissionsTest.java | 2 +-
.../FileAppenderPermissionsXmlConfigTest.java | 2 +-
.../log4j/core/appender/Jira739Test.java | 2 +-
.../MemoryMappedFileAppenderRemapTest.java | 4 +-
.../MemoryMappedFileAppenderSimpleTest.java | 8 +-
.../appender/ScriptAppenderSelectorTest.java | 2 +-
.../JdbcAppenderStringSubstitutionTest.java | 2 +-
.../appender/mom/jeromq/JeroMqAppenderTest.java | 2 +-
.../appender/mom/jeromq/JeroMqTestClient.java | 108 +-
.../LoggerNameLevelRewritePolicyTest.java | 2 +-
.../appender/rewrite/MapRewritePolicyTest.java | 2 +-
.../rolling/CronTriggeringPolicyTest.java | 4 +-
.../core/appender/rolling/FileSizeTest.java | 2 +-
.../RollingAppenderDeleteNestedTest.java | 2 +-
.../RollingAppenderUncompressedTest.java | 2 +-
.../RollingFileAppenderReconfigureTest.java | 4 +-
...rReconfigureUndefinedSystemPropertyTest.java | 4 +-
.../rolling/action/DummyFileAttributes.java | 172 +-
.../core/appender/rolling/action/IfAllTest.java | 108 +-
.../core/appender/rolling/action/IfAnyTest.java | 104 +-
.../appender/rolling/action/IfFileNameTest.java | 262 +--
.../rolling/action/IfLastModifiedTest.java | 2 +-
.../action/PathSortByModificationTimeTest.java | 12 +-
.../rolling/action/SortingVisitorTest.java | 6 +-
.../routing/DefaultRouteScriptAppenderTest.java | 2 +-
.../routing/RoutesScriptAppenderTest.java | 4 +-
.../async/AsyncLoggerConfigAutoFlushTest.java | 2 +-
.../core/async/AsyncLoggerConfigTest2.java | 4 +-
.../AsyncLoggerConfigUseAfterShutdownTest.java | 2 +-
.../async/AsyncLoggerContextSelectorTest.java | 2 +-
.../core/async/AsyncLoggerLocationTest.java | 2 +-
.../log4j/core/async/AsyncLoggerTest.java | 4 +-
.../async/AsyncLoggerThreadContextTest.java | 4 +-
.../async/AsyncLoggerUseAfterShutdownTest.java | 2 +-
.../core/async/RingBufferLogEventTest.java | 2 +-
.../core/async/perftest/PerfTestDriver.java | 6 +-
.../log4j/core/config/ConfigurationTest.java | 4 +-
.../log4j/core/config/LoggerConfigTest.java | 2 +-
.../util/ResolverUtilCustomProtocolTest.java | 2 +-
.../config/plugins/util/ResolverUtilTest.java | 16 +-
.../ValidatingPluginWithTypedBuilderTest.java | 4 +-
.../core/filter/DynamicThresholdFilterTest.java | 10 +-
.../log4j/core/filter/LevelRangeFilterTest.java | 2 +-
.../core/impl/Log4jLogEventNanoTimeTest.java | 4 +-
.../impl/NestedLoggingFromToStringTest.java | 2 +-
.../core/impl/ThrowableFormatOptionsTest.java | 2 +-
.../logging/log4j/core/jmx/ServerTest.java | 20 +-
.../core/layout/CsvLogEventLayoutTest.java | 4 +-
.../log4j/core/layout/GelfLayoutTest.java | 6 +-
.../log4j/core/layout/HtmlLayoutTest.java | 2 +-
.../log4j/core/layout/JsonLayoutTest.java | 10 +-
.../log4j/core/layout/Log4j2_1482_Test.java | 2 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 2 +-
.../log4j/core/layout/SerializedLayoutTest.java | 2 +-
.../log4j/core/layout/SyslogLayoutTest.java | 2 +-
.../log4j/core/layout/XmlLayoutTest.java | 2 +-
.../lookup/MainInputArgumentsJmxLookupTest.java | 4 +-
.../lookup/MainInputArgumentsLookupTest.java | 4 +-
.../lookup/MainInputArgumentsMapLookup.java | 2 +-
.../core/lookup/MarkerLookupConfigTest.java | 2 +-
.../log4j/core/lookup/MarkerLookupTest.java | 2 +-
.../log4j/core/pattern/DisableAnsiTest.java | 2 +-
.../ExtendedThrowablePatternConverterTest.java | 2 +-
.../core/pattern/HighlightConverterTest.java | 2 +-
.../core/pattern/MdcPatternConverterTest.java | 2 +-
.../core/pattern/NdcPatternConverterTest.java | 2 +-
.../log4j/core/pattern/NoConsoleNoAnsiTest.java | 2 +-
.../log4j/core/pattern/PatternParserTest2.java | 2 +-
.../core/pattern/RegexReplacementTest.java | 2 +-
.../core/tools/GenerateCustomLoggerTest.java | 2 +-
.../core/tools/GenerateExtendedLoggerTest.java | 6 +-
.../util/datetime/FastDateParserSDFTest.java | 14 +-
.../core/util/datetime/FastDateParserTest.java | 24 +-
.../datetime/FastDateParser_MoreOrLessTest.java | 24 +-
.../apache/logging/log4j/junit/CleanFiles.java | 2 +-
.../logging/log4j/junit/LoggerContextRule.java | 4 +-
.../logging/log4j/test/RuleChainFactory.java | 2 +-
.../log4j/flume/appender/FlumeEventFactory.java | 2 +-
.../appender/FlumePersistentAppenderTest.java | 4 +-
.../logging/log4j/io/ByteStreamLogger.java | 4 +-
.../logging/log4j/io/CharStreamLogger.java | 2 +-
.../log4j/io/LoggerBufferedInputStream.java | 8 +-
.../logging/log4j/io/LoggerBufferedReader.java | 14 +-
.../log4j/io/LoggerFilterOutputStream.java | 2 +-
.../logging/log4j/io/LoggerFilterWriter.java | 2 +-
.../logging/log4j/io/LoggerInputStream.java | 2 +-
.../logging/log4j/io/LoggerOutputStream.java | 2 +-
.../logging/log4j/io/LoggerPrintStream.java | 2 +-
.../apache/logging/log4j/io/LoggerReader.java | 2 +-
.../apache/logging/log4j/io/LoggerWriter.java | 2 +-
.../io/AbstractLoggerOutputStreamTest.java | 2 +-
.../logging/log4j/io/AbstractStreamTest.java | 118 +-
.../log4j/io/IoBuilderCallerInfoTesting.java | 110 +-
...LoggerBufferedInputStreamCallerInfoTest.java | 2 +-
.../io/LoggerBufferedReaderCallerInfoTest.java | 2 +-
.../io/LoggerInputStreamCallerInfoTest.java | 2 +-
.../logging/log4j/io/LoggerInputStreamTest.java | 2 +-
.../io/LoggerOutputStreamCallerInfoTest.java | 6 +-
.../io/LoggerPrintStreamCallerInfoTest.java | 30 +-
.../io/LoggerPrintWriterCallerInfoTest.java | 32 +-
.../log4j/io/LoggerPrintWriterJdbcH2Test.java | 192 +-
.../logging/log4j/io/LoggerPrintWriterTest.java | 2 +-
.../log4j/io/LoggerReaderCallerInfoTest.java | 2 +-
.../logging/log4j/io/LoggerReaderTest.java | 2 +-
.../org/apache/logging/log4j/jcl/Log4jLog.java | 2 +-
.../appender/db/jpa/JpaDatabaseManager.java | 2 +-
.../ContextStackJsonAttributeConverterTest.java | 2 +-
.../org/apache/logging/log4j/jul/Constants.java | 2 +-
.../log4j/jul/DefaultLevelConverter.java | 2 +-
...efaultLevelConverterCustomJulLevelsTest.java | 2 +-
.../logging/log4j/mongodb2/MongoDbTestRule.java | 2 +-
.../logging/log4j/mongodb3/MongoDbTestRule.java | 2 +-
.../osgi/tests/AbstractLoadBundleTest.java | 50 +-
.../log4j/osgi/tests/junit/OsgiRule.java | 2 +-
.../log4j/perf/jmh/LoggerConfigBenchmark.java | 4 +-
.../perf/jmh/ThreadLocalVsPoolBenchmark.java | 4 +-
.../perf/jmh/ThreadsafeDateFormatBenchmark.java | 2 +-
.../logging/log4j/web/Log4jWebLifeCycle.java | 2 +-
.../log4j/web/appender/ServletAppender.java | 6 +-
286 files changed, 2921 insertions(+), 2921 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
----------------------------------------------------------------------
diff --git a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
index 561cfaf..5b4bac2 100644
--- a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
+++ b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
@@ -26,7 +26,7 @@ import org.eclipse.jetty.util.log.Logger;
/**
* Provides a native Apache Log4j 2 logger for Eclipse Jetty logging.
- *
+ *
* <p>
* To direct Jetty to use this class, set the system property {{org.eclipse.jetty.util.log.class}} to this class name.
* </p>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
----------------------------------------------------------------------
diff --git a/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java b/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
index 65ee60e..391857b 100644
--- a/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
+++ b/log4j-cassandra/src/main/java/org/apache/logging/log4j/cassandra/CassandraManager.java
@@ -92,7 +92,7 @@ public class CassandraManager extends AbstractDatabaseManager {
protected void writeInternal(final LogEvent event) {
writeInternal(event, null);
}
-
+
@Override
protected void writeInternal(final LogEvent event, final Serializable serializable) {
for (int i = 0; i < columnMappings.size(); i++) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
----------------------------------------------------------------------
diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
index 97ed395..e24f5f8 100644
--- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
+++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
@@ -49,7 +49,7 @@ public class SimplePerfTest {
public static void setupClass() {
final Configuration config = LoggerContext.getContext().getConfiguration();
-
+
if (!DefaultConfiguration.DEFAULT_NAME.equals(config.getName())) {
System.out.println("Configuration was " + config.getName());
LoggerContext.getContext().start(new DefaultConfiguration());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
index cf2961d..46b10a5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
@@ -39,7 +39,7 @@ public class AbstractLifeCycle implements LifeCycle2 {
/**
* Gets the status logger.
- *
+ *
* @return the status logger.
*/
protected static org.apache.logging.log4j.Logger getStatusLogger() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/DefaultLoggerContextAccessor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/DefaultLoggerContextAccessor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/DefaultLoggerContextAccessor.java
index 4401247..ef9837e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/DefaultLoggerContextAccessor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/DefaultLoggerContextAccessor.java
@@ -29,7 +29,7 @@ public class DefaultLoggerContextAccessor implements LoggerContextAccessor {
/*
* Returns the current LoggerContext.
- *
+ *
* @see org.apache.logging.log4j.core.LoggerContextAccessor#getLoggerContext()
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
index 0879f40..0aa77a0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
@@ -51,7 +51,7 @@ public interface LogEvent extends Serializable {
/**
* Returns an immutable version of this log event, which MAY BE a copy of this event.
- *
+ *
* @return an immutable version of this log event
*/
LogEvent toImmutable();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
index 3eb99e8..895393f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
@@ -1,33 +1,33 @@
-/*
- * 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;
-
-import java.nio.charset.Charset;
-
-/**
- * Instantiates the @{link Layout} type for String-based layouts.
- */
-public interface StringLayout extends Layout<String> {
-
- /**
- * Gets the Charset this layout uses to encode Strings into bytes.
- *
- * @return the Charset this layout uses to encode Strings into bytes.
- */
- Charset getCharset();
-
-}
+/*
+ * 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;
+
+import java.nio.charset.Charset;
+
+/**
+ * Instantiates the @{link Layout} type for String-based layouts.
+ */
+public interface StringLayout extends Layout<String> {
+
+ /**
+ * Gets the Charset this layout uses to encode Strings into bytes.
+ *
+ * @return the Charset this layout uses to encode Strings into bytes.
+ */
+ Charset getCharset();
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/Version.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Version.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Version.java
index afab5c9..13e2bf8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Version.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Version.java
@@ -22,7 +22,7 @@ public class Version {
public static void main(final String[] args) {
System.out.println(getProductString());
}
-
+
public static String getProductString() {
final Package pkg = Version.class.getPackage();
if (pkg == null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
index 77e547e..aa844ff 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
@@ -42,15 +42,15 @@ import org.apache.logging.log4j.core.util.Integers;
public abstract class AbstractAppender extends AbstractFilterable implements Appender {
/**
- * Subclasses can extend this abstract Builder.
- *
+ * Subclasses can extend this abstract Builder.
+ *
* @param <B> The type to build.
*/
public abstract static class Builder<B extends Builder<B>> extends AbstractFilterable.Builder<B> {
@PluginBuilderAttribute
private boolean ignoreExceptions = true;
-
+
@PluginElement("Layout")
private Layout<? extends Serializable> layout;
@@ -110,7 +110,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
this.name = name;
return asBuilder();
}
-
+
/**
* @deprecated Use {@link #setConfiguration(Configuration)}
*/
@@ -143,9 +143,9 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
public B withName(final String name) {
return setName(name);
}
-
+
}
-
+
public static int parseInt(final String s, final int defaultValue) {
try {
return Integers.parseInt(s, defaultValue);
@@ -162,7 +162,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Constructor that defaults to suppressing exceptions.
- *
+ *
* @param name The Appender name.
* @param filter The Filter to associate with the Appender.
* @param layout The layout to use to format the event.
@@ -175,7 +175,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Constructor.
- *
+ *
* @param name The Appender name.
* @param filter The Filter to associate with the Appender.
* @param layout The layout to use to format the event.
@@ -191,7 +191,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Constructor.
- *
+ *
* @param name The Appender name.
* @param filter The Filter to associate with the Appender.
* @param layout The layout to use to format the event.
@@ -209,7 +209,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Handle an error with a message using the {@link ErrorHandler} configured for this Appender.
- *
+ *
* @param msg The message.
*/
public void error(final String msg) {
@@ -219,7 +219,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Handle an error with a message, exception, and a logging event, using the {@link ErrorHandler} configured for
* this Appender.
- *
+ *
* @param msg The message.
* @param event The LogEvent.
* @param t The Throwable.
@@ -230,7 +230,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Handle an error with a message and an exception using the {@link ErrorHandler} configured for this Appender.
- *
+ *
* @param msg The message.
* @param t The Throwable.
*/
@@ -240,7 +240,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Returns the ErrorHandler, if any.
- *
+ *
* @return The ErrorHandler.
*/
@Override
@@ -250,7 +250,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Returns the Layout for the appender.
- *
+ *
* @return The Layout used to format the event.
*/
@Override
@@ -260,7 +260,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Returns the name of the Appender.
- *
+ *
* @return The name of the Appender.
*/
@Override
@@ -281,7 +281,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* The handler must be set before the appender is started.
- *
+ *
* @param handler The ErrorHandler to use.
*/
@Override
@@ -299,7 +299,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Serializes the given event using the appender's layout if present.
- *
+ *
* @param event
* the event to serialize.
* @return the serialized event or null if no layout is present.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractFileAppender.java
index 7537d99..f9283f0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractFileAppender.java
@@ -35,7 +35,7 @@ public abstract class AbstractFileAppender<M extends OutputStreamManager> extend
/**
* Builds FileAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -151,7 +151,7 @@ public abstract class AbstractFileAppender<M extends OutputStreamManager> extend
}
}
-
+
private final String fileName;
private final Advertiser advertiser;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
index d6acc08..25803a3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
@@ -34,12 +34,12 @@ import org.apache.logging.log4j.core.util.Constants;
public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager> extends AbstractAppender {
/**
- * Subclasses can extend this abstract Builder.
- *
+ * Subclasses can extend this abstract Builder.
+ *
* @param <B> The type to build.
*/
public abstract static class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B> {
-
+
@PluginBuilderAttribute
private boolean bufferedIo = true;
@@ -60,12 +60,12 @@ public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager
public boolean isImmediateFlush() {
return immediateFlush;
}
-
+
public B withImmediateFlush(final boolean immediateFlush) {
this.immediateFlush = immediateFlush;
return asBuilder();
}
-
+
public B withBufferedIo(final boolean bufferedIo) {
this.bufferedIo = bufferedIo;
return asBuilder();
@@ -77,7 +77,7 @@ public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager
}
}
-
+
/**
* Immediate flush means that the underlying writer or output stream will be flushed at the end of each append
* operation. Immediate flush is slower but ensures that each append request is actually written. If
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
index 21f2082..078f6cb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.config.Property;
/**
* Appends log events as strings to a writer.
- *
+ *
* @param <M>
* The kind of {@link WriterManager} under management
*/
@@ -49,12 +49,12 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
/**
* Instantiates.
- *
+ *
* @param name
* The name of the Appender.
* @param layout
* The layout to format the message.
- * @param properties
+ * @param properties
* Optional properties.
* @param manager
* The OutputStreamManager.
@@ -68,7 +68,7 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
/**
* Instantiates.
- *
+ *
* @param name
* The name of the Appender.
* @param layout
@@ -90,7 +90,7 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
* <p>
* Most subclasses will need to override this method.
* </p>
- *
+ *
* @param event
* The LogEvent.
*/
@@ -115,7 +115,7 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
/**
* Gets the manager.
- *
+ *
* @return the manager.
*/
public M getManager() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
index 5400d13..533a604 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
@@ -50,7 +50,7 @@ public class AppenderSet {
public AppenderSet build() {
if (configuration == null) {
LOGGER.error("Configuration is missing from AppenderSet {}", this);
- return null;
+ return null;
}
if (node == null) {
LOGGER.error("No node in AppenderSet {}", this);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
index bf8a163..f7c9694 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
@@ -529,8 +529,8 @@ public final class AsyncAppender extends AbstractAppender {
/**
* Returns the number of elements in the queue.
- *
- * @return the number of elements in the queue.
+ *
+ * @return the number of elements in the queue.
* @since 2.11.1
*/
public int getQueueSize() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
index cadfea0..7a93ad1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
@@ -40,7 +40,7 @@ public class ConfigurationFactoryData {
/**
* Gets the LoggerContext from the Configuration or null.
- *
+ *
* @return the LoggerContext from the Configuration or null.
*/
public LoggerContext getLoggerContext() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
index 7140d7d..7c55fac 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
@@ -45,7 +45,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
/**
* Builds FileAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -186,9 +186,9 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
}
}
-
+
private static final int DEFAULT_BUFFER_SIZE = 8192;
-
+
/**
* Create a File Appender.
* @param fileName The name and path of the file.
@@ -240,12 +240,12 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
.build();
// @formatter:on
}
-
+
@PluginBuilderFactory
public static <B extends Builder<B>> B newBuilder() {
return new Builder<B>().asBuilder();
}
-
+
private final String fileName;
private final Advertiser advertiser;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
index 15a3a63..54b8402 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
@@ -45,7 +45,7 @@ public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender
/**
* Builds RandomAccessFileAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -118,7 +118,7 @@ public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender
}
}
-
+
private static final int BIT_POSITION_1GB = 30; // 2^30 ~= 1GB
private static final int MAX_REGION_LENGTH = 1 << BIT_POSITION_1GB;
private static final int MIN_REGION_LENGTH = 256;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
index 7e7fdcb..6d8102e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
@@ -73,7 +73,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
return asBuilder();
}
}
-
+
/**
* Holds data to pass to factory method.
*/
@@ -84,7 +84,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
/**
* Builds instances.
- *
+ *
* @param os
* The OutputStream.
* @param type
@@ -106,7 +106,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
/**
* Creates an OutputStreamManager.
- *
+ *
* @param name
* The name of the entity to manage.
* @param data
@@ -123,7 +123,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
/**
* Creates an OutputStream Appender.
- *
+ *
* @param layout
* The layout to use or null to get the default layout.
* @param filter
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
index 98df988..6970126 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
@@ -43,7 +43,7 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender
/**
* Builds RandomAccessFileAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -107,14 +107,14 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender
}
}
-
+
private final String fileName;
private Object advertisement;
private final Advertiser advertiser;
private RandomAccessFileAppender(final String name, final Layout<? extends Serializable> layout,
final Filter filter, final RandomAccessFileManager manager, final String filename,
- final boolean ignoreExceptions, final boolean immediateFlush, final Advertiser advertiser,
+ final boolean ignoreExceptions, final boolean immediateFlush, final Advertiser advertiser,
final Property[] properties) {
super(name, layout, filter, ignoreExceptions, immediateFlush, properties, manager);
@@ -233,7 +233,7 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender
.withImmediateFlush(isFlush).setLayout(layout).setName(name)
.build();
}
-
+
/**
* Creates a builder for a RandomAccessFileAppender.
* @return a builder for a RandomAccessFileAppender.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
index ed42236..8373441 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
@@ -54,7 +54,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
/**
* Builds FileAppender instances.
- *
+ *
* @param <B>
* The type to build
* @since 2.7
@@ -75,11 +75,11 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
@PluginBuilderAttribute
private boolean locking;
- @PluginElement("Policy")
+ @PluginElement("Policy")
@Required
private TriggeringPolicy policy;
-
- @PluginElement("Strategy")
+
+ @PluginElement("Strategy")
private RolloverStrategy strategy;
@PluginBuilderAttribute
@@ -266,7 +266,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
}
}
-
+
private static final int DEFAULT_BUFFER_SIZE = 8192;
private final String fileName;
@@ -400,7 +400,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
/**
* Creates a new Builder.
- *
+ *
* @return a new Builder.
* @since 2.7
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
index 87bd023..b84275b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
@@ -195,7 +195,7 @@ public final class RollingRandomAccessFileAppender extends AbstractOutputStreamA
}
}
-
+
private final String fileName;
private final String filePattern;
private final Object advertisement;
@@ -342,7 +342,7 @@ public final class RollingRandomAccessFileAppender extends AbstractOutputStreamA
.withStrategy(strategy)
.build();
}
-
+
@PluginBuilderFactory
public static <B extends Builder<B>> B newBuilder() {
return new Builder<B>().asBuilder();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 39be95e..316663c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -65,7 +65,7 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
* <li>Removed deprecated "delayMillis", use "reconnectionDelayMillis".</li>
* <li>Removed deprecated "reconnectionDelay", use "reconnectionDelayMillis".</li>
* </ul>
- *
+ *
* @param <B>
* The type to build.
*/
@@ -94,10 +94,10 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
@PluginBuilderAttribute
@PluginAliases({ "reconnectDelay", "reconnectionDelay", "delayMillis", "reconnectionDelayMillis" })
private int reconnectDelayMillis;
-
+
@PluginElement("SocketOptions")
private SocketOptions socketOptions;
-
+
@PluginElement("SslConfiguration")
@PluginAliases({ "SslConfig" })
private SslConfiguration sslConfiguration;
@@ -184,13 +184,13 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
}
}
-
+
/**
* Builds a SocketAppender.
- * <ul>
+ * <ul>
* <li>Removed deprecated "delayMillis", use "reconnectionDelayMillis".</li>
* <li>Removed deprecated "reconnectionDelay", use "reconnectionDelayMillis".</li>
- * </ul>
+ * </ul>
*/
public static class Builder extends AbstractBuilder<Builder>
implements org.apache.logging.log4j.core.util.Builder<SocketAppender> {
@@ -226,7 +226,7 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
getPropertyArray());
}
}
-
+
@PluginBuilderFactory
public static Builder newBuilder() {
return new Builder();
@@ -341,7 +341,7 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
.build();
// @formatter:on
}
-
+
/**
* Creates a socket appender.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
index 95af878..7ccb80d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
@@ -55,52 +55,52 @@ public class SyslogAppender extends SocketAppender {
@PluginBuilderAttribute("id")
private String id;
-
+
@PluginBuilderAttribute(value = "enterpriseNumber")
private int enterpriseNumber = Rfc5424Layout.DEFAULT_ENTERPRISE_NUMBER;
-
+
@PluginBuilderAttribute(value = "includeMdc")
private boolean includeMdc = true;
-
+
@PluginBuilderAttribute("mdcId")
private String mdcId;
-
+
@PluginBuilderAttribute("mdcPrefix")
private String mdcPrefix;
-
+
@PluginBuilderAttribute("eventPrefix")
private String eventPrefix;
-
+
@PluginBuilderAttribute(value = "newLine")
private boolean newLine;
-
+
@PluginBuilderAttribute("newLineEscape")
private String escapeNL;
-
+
@PluginBuilderAttribute("appName")
private String appName;
-
+
@PluginBuilderAttribute("messageId")
private String msgId;
-
+
@PluginBuilderAttribute("mdcExcludes")
private String excludes;
-
+
@PluginBuilderAttribute("mdcIncludes")
private String includes;
-
+
@PluginBuilderAttribute("mdcRequired")
private String required;
-
+
@PluginBuilderAttribute("format")
private String format;
-
+
@PluginBuilderAttribute("charset")
private Charset charsetName = StandardCharsets.UTF_8;
-
+
@PluginBuilderAttribute("exceptionPattern")
private String exceptionPattern;
-
+
@PluginElement("LoggerFields")
private LoggerFields[] loggerFields;
@@ -301,7 +301,7 @@ public class SyslogAppender extends SocketAppender {
return asBuilder();
}
}
-
+
protected static final String RFC5424 = "RFC5424";
protected SyslogAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
@@ -392,7 +392,7 @@ public class SyslogAppender extends SocketAppender {
final Configuration configuration,
final Charset charset,
final String exceptionPattern,
- final LoggerFields[] loggerFields,
+ final LoggerFields[] loggerFields,
final boolean advertise) {
// @formatter:on
@@ -428,7 +428,7 @@ public class SyslogAppender extends SocketAppender {
.build();
// @formatter:on
}
-
+
// Calling this method newBuilder() does not compile
@PluginBuilderFactory
public static <B extends Builder<B>> B newSyslogAppenderBuilder() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
index 1b1a61a..27e90cd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.util.Chars;
/**
* Wraps messages that are formatted according to RFC 5425.
- *
+ *
* @see <a href="https://tools.ietf.org/html/rfc5425">RFC 5425</a>
*/
public class TlsSyslogFrame {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
index 59fb176..a3f46e6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
@@ -76,7 +76,7 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
/**
* Builds instances.
- *
+ *
* @param writer
* The OutputStream.
* @param type
@@ -95,7 +95,7 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
/**
* Creates a WriterManager.
- *
+ *
* @param name
* The name of the entity to manage.
* @param data
@@ -112,7 +112,7 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
/**
* Creates a WriterAppender.
- *
+ *
* @param layout
* The layout to use or null to get the default layout.
* @param filter
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
index f720461..e977c1b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
@@ -92,7 +92,7 @@ public abstract class AbstractDatabaseAppender<T extends AbstractDatabaseManager
* @param manager The matching {@link AbstractDatabaseManager} implementation.
*/
protected AbstractDatabaseAppender(final String name, final Filter filter,
- final Layout<? extends Serializable> layout, final boolean ignoreExceptions,
+ final Layout<? extends Serializable> layout, final boolean ignoreExceptions,
final Property[] properties, final T manager) {
super(name, filter, layout, ignoreExceptions, properties);
this.manager = manager;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
index 0350543..f9a0082 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
@@ -272,7 +272,7 @@ public abstract class AbstractDatabaseManager extends AbstractManager implements
/**
* Gets the layout.
- *
+ *
* @return the layout.
*/
public Layout<? extends Serializable> getLayout() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/ColumnMapping.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/ColumnMapping.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/ColumnMapping.java
index 8d2759b..1178156 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/ColumnMapping.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/ColumnMapping.java
@@ -106,8 +106,8 @@ public class ColumnMapping {
/**
* Layout of value to write to database (before type conversion). Not applicable if {@link #setType(Class)} is
* a {@link ReadOnlyStringMap}, {@link ThreadContextMap}, or {@link ThreadContextStack}.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setLayout(final StringLayout layout) {
this.layout = layout;
@@ -117,8 +117,8 @@ public class ColumnMapping {
/**
* Literal value to use for populating a column. This is generally useful for functions, stored procedures,
* etc. No escaping will be done on this value.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setLiteral(final String literal) {
this.literal = literal;
@@ -127,8 +127,8 @@ public class ColumnMapping {
/**
* Column name.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setName(final String name) {
this.name = name;
@@ -138,8 +138,8 @@ public class ColumnMapping {
/**
* Parameter value to use for populating a column, MUST contain a single parameter marker '?'. This is generally useful for functions, stored procedures,
* etc. No escaping will be done on this value.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setParameter(final String parameter) {
this.parameter= parameter;
@@ -149,8 +149,8 @@ public class ColumnMapping {
/**
* Pattern to use as a {@link PatternLayout}. Convenient shorthand for {@link #setLayout(StringLayout)} with a
* PatternLayout.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setPattern(final String pattern) {
this.pattern = pattern;
@@ -160,7 +160,7 @@ public class ColumnMapping {
/**
* Source name. Useful when combined with a {@link org.apache.logging.log4j.message.MapMessage} depending on the
* appender.
- *
+ *
* @return this.
*/
public Builder setSource(final String source) {
@@ -172,8 +172,8 @@ public class ColumnMapping {
* Class to convert value to before storing in database. If the type is compatible with {@link ThreadContextMap} or
* {@link ReadOnlyStringMap}, then the MDC will be used. If the type is compatible with {@link ThreadContextStack},
* then the NDC will be used. If the type is compatible with {@link Date}, then the event timestamp will be used.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setType(final Class<?> type) {
this.type = type;
@@ -192,7 +192,7 @@ public class ColumnMapping {
public static Builder newBuilder() {
return new Builder();
}
-
+
private final StringLayout layout;
private final String literalValue;
private final String name;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractConnectionSource.java
index bd04eac..72698b9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractConnectionSource.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.core.appender.db.jdbc;
import org.apache.logging.log4j.core.AbstractLifeCycle;
public abstract class AbstractConnectionSource extends AbstractLifeCycle implements ConnectionSource {
-
+
// nothing yet
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
index 1377b2a..ba0ad25 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
@@ -147,8 +147,8 @@ public final class ColumnConfig {
/**
* The configuration object.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setConfiguration(final Configuration configuration) {
this.configuration = configuration;
@@ -157,8 +157,8 @@ public final class ColumnConfig {
/**
* The name of the database column as it exists within the database table.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setName(final String name) {
this.name = name;
@@ -168,8 +168,8 @@ public final class ColumnConfig {
/**
* The {@link PatternLayout} pattern to insert in this column. Mutually exclusive with
* {@code literal!=null} and {@code eventTimestamp=true}
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setPattern(final String pattern) {
this.pattern = pattern;
@@ -179,8 +179,8 @@ public final class ColumnConfig {
/**
* The literal value to insert into the column as-is without any quoting or escaping. Mutually exclusive with
* {@code pattern!=null} and {@code eventTimestamp=true}.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setLiteral(final String literal) {
this.literal = literal;
@@ -190,8 +190,8 @@ public final class ColumnConfig {
/**
* If {@code "true"}, indicates that this column is a date-time column in which the event timestamp should be
* inserted. Mutually exclusive with {@code pattern!=null} and {@code literal!=null}.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setEventTimestamp(final boolean eventTimestamp) {
isEventTimestamp = eventTimestamp;
@@ -200,8 +200,8 @@ public final class ColumnConfig {
/**
* If {@code "true"}, indicates that the column is a Unicode String.
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setUnicode(final boolean unicode) {
isUnicode = unicode;
@@ -210,8 +210,8 @@ public final class ColumnConfig {
/**
* If {@code "true"}, indicates that the column is a character LOB (CLOB).
- *
- * @return this.
+ *
+ * @return this.
*/
public Builder setClob(final boolean clob) {
isClob = clob;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java
index 42b6e1d..5ae51c6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ConnectionSource.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.core.LifeCycle;
* connection sources meet your needs, you can simply create your own connection source.
*/
public interface ConnectionSource extends LifeCycle {
-
+
/**
* This should return a new connection every time it is called.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
index b241f29..6f98eba 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
@@ -121,7 +121,7 @@ public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseMan
/**
* The connections source from which database connections should be retrieved.
- *
+ *
* @return this
*/
public B setConnectionSource(final ConnectionSource connectionSource) {
@@ -132,7 +132,7 @@ public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseMan
/**
* If an integer greater than 0, this causes the appender to buffer log events and flush whenever the buffer
* reaches this size.
- *
+ *
* @return this
*/
public B setBufferSize(final int bufferSize) {
@@ -142,7 +142,7 @@ public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseMan
/**
* The name of the database table to insert log events into.
- *
+ *
* @return this
*/
public B setTableName(final String tableName) {
@@ -152,7 +152,7 @@ public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseMan
/**
* Information about the columns that log event data should be inserted into and how to insert that data.
- *
+ *
* @return this
*/
public B setColumnConfigs(final ColumnConfig... columnConfigs) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
index deebeb7..72a3a3f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
@@ -78,7 +78,7 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
* Creates managers.
*/
private static final class JdbcDatabaseManagerFactory implements ManagerFactory<JdbcDatabaseManager, FactoryData> {
-
+
private static final char PARAMETER_MARKER = '?';
@Override
@@ -215,11 +215,11 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
private final String sqlStatement;
private Connection connection;
-
+
private PreparedStatement statement;
-
+
private boolean isBatchSupported;
-
+
private JdbcDatabaseManager(final String name, final int bufferSize, final ConnectionSource connectionSource,
final String sqlStatement, final List<ColumnConfig> columnConfigs,
final List<ColumnMapping> columnMappings) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/DefaultKafkaProducerFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/DefaultKafkaProducerFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/DefaultKafkaProducerFactory.java
index e0b3921..1f7a278 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/DefaultKafkaProducerFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/DefaultKafkaProducerFactory.java
@@ -29,7 +29,7 @@ public class DefaultKafkaProducerFactory implements KafkaProducerFactory {
/**
* Creates a new Kafka Producer from the given configuration properties.
- *
+ *
* @param config
* <a href="https://kafka.apache.org/documentation.html#producerconfigs">Kafka Producer configuration
* properties.</a>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
index 642d6bb..ef4d656 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
@@ -50,12 +50,12 @@ public final class KafkaAppender extends AbstractAppender {
public static class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B>
implements org.apache.logging.log4j.core.util.Builder<KafkaAppender> {
- @PluginAttribute("topic")
+ @PluginAttribute("topic")
private String topic;
@PluginAttribute("key")
private String key;
-
+
@PluginAttribute(value = "syncSend", defaultBoolean = true)
private boolean syncSend;
@@ -92,7 +92,7 @@ public final class KafkaAppender extends AbstractAppender {
}
}
-
+
@Deprecated
public static KafkaAppender createAppender(
final Layout<? extends Serializable> layout,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaProducerFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaProducerFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaProducerFactory.java
index 7532bb8..a58fb38 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaProducerFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaProducerFactory.java
@@ -28,7 +28,7 @@ public interface KafkaProducerFactory {
/**
* Creates a new Kafka Producer from the given configuration properties.
- *
+ *
* @param config
* <a href="https://kafka.apache.org/documentation.html#producerconfigs">Kafka Producer configuration
* properties.</a>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
index a5c691a..8ed9efa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlAppender.java
@@ -38,7 +38,7 @@ import org.apache.logging.log4j.core.util.Booleans;
* For examples on how to write your own NoSQL provider, see the simple source code for the MongoDB and CouchDB
* providers.
* </p>
- *
+ *
* @see NoSqlObject
* @see NoSqlConnection
* @see NoSqlProvider
@@ -48,7 +48,7 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
/**
* Builds ConsoleAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -84,7 +84,7 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
/**
* Sets the buffer size.
- *
+ *
* @param bufferSize
* If an integer greater than 0, this causes the appender to buffer log events and flush whenever the
* buffer reaches this size.
@@ -97,7 +97,7 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
/**
* Sets the provider.
- *
+ *
* @param provider
* The NoSQL provider that provides connections to the chosen NoSQL database.
* @return this
@@ -131,7 +131,7 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
public static NoSqlAppender createAppender(
// @formatter:off
final String name,
- final String ignore,
+ final String ignore,
final Filter filter,
final String bufferSize,
final NoSqlProvider<?> provider) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
index 80acae7..a0a3877 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlDatabaseManager.java
@@ -74,7 +74,7 @@ public final class NoSqlDatabaseManager<W> extends AbstractDatabaseManager {
protected void writeInternal(final LogEvent event) {
writeInternal(event, null);
}
-
+
@Override
protected void writeInternal(final LogEvent event, final Serializable serializable) {
if (!this.isRunning() || this.connection == null || this.connection.isClosed()) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlProvider.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlProvider.java
index 39c4d60..2726795 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlProvider.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/NoSqlProvider.java
@@ -23,7 +23,7 @@ package org.apache.logging.log4j.core.appender.nosql;
* @param <C> Specifies which implementation of {@link NoSqlConnection} this provider provides.
*/
public interface NoSqlProvider<C extends NoSqlConnection<?, ? extends NoSqlObject<?>>> {
-
+
/**
* Obtains a connection from this provider. The concept of a connection in this case is not strictly an active
* duplex UDP or TCP connection to the underlying database. It can be thought of more as a gateway, a path for
@@ -32,7 +32,7 @@ public interface NoSqlProvider<C extends NoSqlConnection<?, ? extends NoSqlObjec
* Where applicable, this method should return a connection from the connection pool as opposed to opening a
* brand new connection every time.
* </p>
- *
+ *
* @return a connection that can be used to create and persist objects to this database.
* @see NoSqlConnection
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
index a1ef2ef..c6f9d44 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.util.KeyValuePair;
/**
* Rewrites log event levels for a given logger name.
- *
+ *
* @since 2.4
*/
@Plugin(name = "LoggerNameLevelRewritePolicy", category = Core.CATEGORY_NAME, elementType = "rewritePolicy", printObject = true)
@@ -40,7 +40,7 @@ public class LoggerNameLevelRewritePolicy implements RewritePolicy {
/**
* Creates a policy to rewrite levels for a given logger name.
- *
+ *
* @param loggerNamePrefix
* The logger name prefix for events to rewrite; all event logger names that start with this string will be
* rewritten.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
index 5302a07..61b41b1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
@@ -37,7 +37,7 @@ import org.apache.logging.log4j.status.StatusLogger;
*/
@Plugin(name = "MapRewritePolicy", category = Core.CATEGORY_NAME, elementType = "rewritePolicy", printObject = true)
public final class MapRewritePolicy implements RewritePolicy {
-
+
/**
* Allow subclasses access to the status logger without creating another instance.
*/
@@ -90,12 +90,12 @@ public final class MapRewritePolicy implements RewritePolicy {
* keys should be updated.
*/
public enum Mode {
-
+
/**
* Keys should be added.
*/
Add,
-
+
/**
* Keys should be updated.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
index 88a574d..687f916 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
@@ -40,7 +40,7 @@ import org.apache.logging.log4j.util.StringMap;
*/
@Plugin(name = "PropertiesRewritePolicy", category = Core.CATEGORY_NAME, elementType = "rewritePolicy", printObject = true)
public final class PropertiesRewritePolicy implements RewritePolicy {
-
+
/**
* Allows subclasses access to the status logger without creating another instance.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
index 6eb3e50..060e7fa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
@@ -57,7 +57,7 @@ public final class CronTriggeringPolicy extends AbstractTriggeringPolicy {
/**
* Initializes the policy.
- *
+ *
* @param aManager
* The RollingFileManager.
*/
@@ -91,7 +91,7 @@ public final class CronTriggeringPolicy extends AbstractTriggeringPolicy {
/**
* Determines whether a rollover should occur.
- *
+ *
* @param event
* A reference to the currently event.
* @return true if a rollover should occur.
@@ -107,7 +107,7 @@ public final class CronTriggeringPolicy extends AbstractTriggeringPolicy {
/**
* Creates a ScheduledTriggeringPolicy.
- *
+ *
* @param configuration
* the Configuration.
* @param evaluateOnStartup
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
index c6eb6ff..335018e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
@@ -90,10 +90,10 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy {
public static class Builder implements org.apache.logging.log4j.core.util.Builder<DefaultRolloverStrategy> {
@PluginBuilderAttribute("max")
private String max;
-
+
@PluginBuilderAttribute("min")
private String min;
-
+
@PluginBuilderAttribute("fileIndex")
private String fileIndex;
@@ -260,7 +260,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy {
/**
* Defines configuration.
- *
+ *
* @param config The Configuration.
* @return This builder for chaining convenience
*/
[07/13] logging-log4j2 git commit: Checkstyle: Remove trailing white
spaces on all lines.
Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DummyFileAttributes.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DummyFileAttributes.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DummyFileAttributes.java
index 81e316f..c2bbb1b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DummyFileAttributes.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DummyFileAttributes.java
@@ -1,86 +1,86 @@
-/*
- * 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.appender.rolling.action;
-
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileTime;
-
-/**
- * Test helper class: file attributes.
- */
-public class DummyFileAttributes implements BasicFileAttributes {
-
- public FileTime lastModified;
- public FileTime lastAccessTime;
- public FileTime creationTime;
- public boolean isRegularFile;
- public boolean isDirectory;
- public boolean isSymbolicLink;
- public boolean isOther;
- public long size;
- public Object fileKey;
-
- public DummyFileAttributes() {
- }
-
- @Override
- public FileTime lastModifiedTime() {
- return lastModified;
- }
-
- @Override
- public FileTime lastAccessTime() {
- return lastAccessTime;
- }
-
- @Override
- public FileTime creationTime() {
- return creationTime;
- }
-
- @Override
- public boolean isRegularFile() {
- return isRegularFile;
- }
-
- @Override
- public boolean isDirectory() {
- return isDirectory;
- }
-
- @Override
- public boolean isSymbolicLink() {
- return isSymbolicLink;
- }
-
- @Override
- public boolean isOther() {
- return isOther;
- }
-
- @Override
- public long size() {
- return size;
- }
-
- @Override
- public Object fileKey() {
- return fileKey;
- }
-
-}
+/*
+ * 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.appender.rolling.action;
+
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
+
+/**
+ * Test helper class: file attributes.
+ */
+public class DummyFileAttributes implements BasicFileAttributes {
+
+ public FileTime lastModified;
+ public FileTime lastAccessTime;
+ public FileTime creationTime;
+ public boolean isRegularFile;
+ public boolean isDirectory;
+ public boolean isSymbolicLink;
+ public boolean isOther;
+ public long size;
+ public Object fileKey;
+
+ public DummyFileAttributes() {
+ }
+
+ @Override
+ public FileTime lastModifiedTime() {
+ return lastModified;
+ }
+
+ @Override
+ public FileTime lastAccessTime() {
+ return lastAccessTime;
+ }
+
+ @Override
+ public FileTime creationTime() {
+ return creationTime;
+ }
+
+ @Override
+ public boolean isRegularFile() {
+ return isRegularFile;
+ }
+
+ @Override
+ public boolean isDirectory() {
+ return isDirectory;
+ }
+
+ @Override
+ public boolean isSymbolicLink() {
+ return isSymbolicLink;
+ }
+
+ @Override
+ public boolean isOther() {
+ return isOther;
+ }
+
+ @Override
+ public long size() {
+ return size;
+ }
+
+ @Override
+ public Object fileKey() {
+ return fileKey;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAllTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAllTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAllTest.java
index 12d5a05..aa4884a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAllTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAllTest.java
@@ -1,54 +1,54 @@
-/*
- * 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.appender.rolling.action;
-
-import org.apache.logging.log4j.core.appender.rolling.action.IfAll;
-import org.apache.logging.log4j.core.appender.rolling.action.PathCondition;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Tests the And composite condition.
- */
-public class IfAllTest {
-
- @Test
- public void testAccept() {
- final PathCondition TRUE = new FixedCondition(true);
- final PathCondition FALSE = new FixedCondition(false);
- assertTrue(IfAll.createAndCondition(TRUE, TRUE).accept(null, null, null));
- assertFalse(IfAll.createAndCondition(FALSE, TRUE).accept(null, null, null));
- assertFalse(IfAll.createAndCondition(TRUE, FALSE).accept(null, null, null));
- assertFalse(IfAll.createAndCondition(FALSE, FALSE).accept(null, null, null));
- }
-
- @Test
- public void testEmptyIsFalse() {
- assertFalse(IfAll.createAndCondition().accept(null, null, null));
- }
-
- @Test
- public void testBeforeTreeWalk() {
- final CountingCondition counter = new CountingCondition(true);
- final IfAll and = IfAll.createAndCondition(counter, counter, counter);
- and.beforeFileTreeWalk();
- assertEquals(3, counter.getBeforeFileTreeWalkCount());
- }
-
-}
+/*
+ * 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.appender.rolling.action;
+
+import org.apache.logging.log4j.core.appender.rolling.action.IfAll;
+import org.apache.logging.log4j.core.appender.rolling.action.PathCondition;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Tests the And composite condition.
+ */
+public class IfAllTest {
+
+ @Test
+ public void testAccept() {
+ final PathCondition TRUE = new FixedCondition(true);
+ final PathCondition FALSE = new FixedCondition(false);
+ assertTrue(IfAll.createAndCondition(TRUE, TRUE).accept(null, null, null));
+ assertFalse(IfAll.createAndCondition(FALSE, TRUE).accept(null, null, null));
+ assertFalse(IfAll.createAndCondition(TRUE, FALSE).accept(null, null, null));
+ assertFalse(IfAll.createAndCondition(FALSE, FALSE).accept(null, null, null));
+ }
+
+ @Test
+ public void testEmptyIsFalse() {
+ assertFalse(IfAll.createAndCondition().accept(null, null, null));
+ }
+
+ @Test
+ public void testBeforeTreeWalk() {
+ final CountingCondition counter = new CountingCondition(true);
+ final IfAll and = IfAll.createAndCondition(counter, counter, counter);
+ and.beforeFileTreeWalk();
+ assertEquals(3, counter.getBeforeFileTreeWalkCount());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAnyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAnyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAnyTest.java
index 52a8b27..ba63a27 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAnyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAnyTest.java
@@ -1,52 +1,52 @@
-/*
- * 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.appender.rolling.action;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Tests the Or composite condition.
- */
-public class IfAnyTest {
-
- @Test
- public void test() {
- final PathCondition TRUE = new FixedCondition(true);
- final PathCondition FALSE = new FixedCondition(false);
- assertTrue(IfAny.createOrCondition(TRUE, TRUE).accept(null, null, null));
- assertTrue(IfAny.createOrCondition(FALSE, TRUE).accept(null, null, null));
- assertTrue(IfAny.createOrCondition(TRUE, FALSE).accept(null, null, null));
- assertFalse(IfAny.createOrCondition(FALSE, FALSE).accept(null, null, null));
- }
-
- @Test
- public void testEmptyIsFalse() {
- assertFalse(IfAny.createOrCondition().accept(null, null, null));
- }
-
- @Test
- public void testBeforeTreeWalk() {
- final CountingCondition counter = new CountingCondition(true);
- final IfAny or = IfAny.createOrCondition(counter, counter, counter);
- or.beforeFileTreeWalk();
- assertEquals(3, counter.getBeforeFileTreeWalkCount());
- }
-
-}
+/*
+ * 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.appender.rolling.action;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Tests the Or composite condition.
+ */
+public class IfAnyTest {
+
+ @Test
+ public void test() {
+ final PathCondition TRUE = new FixedCondition(true);
+ final PathCondition FALSE = new FixedCondition(false);
+ assertTrue(IfAny.createOrCondition(TRUE, TRUE).accept(null, null, null));
+ assertTrue(IfAny.createOrCondition(FALSE, TRUE).accept(null, null, null));
+ assertTrue(IfAny.createOrCondition(TRUE, FALSE).accept(null, null, null));
+ assertFalse(IfAny.createOrCondition(FALSE, FALSE).accept(null, null, null));
+ }
+
+ @Test
+ public void testEmptyIsFalse() {
+ assertFalse(IfAny.createOrCondition().accept(null, null, null));
+ }
+
+ @Test
+ public void testBeforeTreeWalk() {
+ final CountingCondition counter = new CountingCondition(true);
+ final IfAny or = IfAny.createOrCondition(counter, counter, counter);
+ or.beforeFileTreeWalk();
+ assertEquals(3, counter.getBeforeFileTreeWalkCount());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileNameTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileNameTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileNameTest.java
index 2e84aa9..978031e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileNameTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileNameTest.java
@@ -1,131 +1,131 @@
-/*
- * 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.appender.rolling.action;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class IfFileNameTest {
-
- @Test(expected = IllegalArgumentException.class)
- public void testCreateNameConditionFailsIfBothRegexAndPathAreNull() {
- IfFileName.createNameCondition(null, null);
- }
-
- @Test()
- public void testCreateNameConditionAcceptsIfEitherRegexOrPathOrBothAreNonNull() {
- IfFileName.createNameCondition("bar", null);
- IfFileName.createNameCondition(null, "foo");
- IfFileName.createNameCondition("bar", "foo");
- }
-
- @Test
- public void testGetSyntaxAndPattern() {
- assertEquals("glob:path", IfFileName.createNameCondition("path", null).getSyntaxAndPattern());
- assertEquals("glob:path", IfFileName.createNameCondition("glob:path", null).getSyntaxAndPattern());
- assertEquals("regex:bar", IfFileName.createNameCondition(null, "bar").getSyntaxAndPattern());
- assertEquals("regex:bar", IfFileName.createNameCondition(null, "regex:bar").getSyntaxAndPattern());
- }
-
- @Test
- public void testAcceptUsesPathPatternIfExists() {
- final IfFileName filter = IfFileName.createNameCondition("path", "regex");
- final Path relativePath = Paths.get("path");
- assertTrue(filter.accept(null, relativePath, null));
-
- final Path pathMatchingRegex = Paths.get("regex");
- assertFalse(filter.accept(null, pathMatchingRegex, null));
- }
-
- @Test
- public void testAcceptUsesRegexIfNoPathPatternExists() {
- final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex");
- final Path pathMatchingRegex = Paths.get("regex");
- assertTrue(regexFilter.accept(null, pathMatchingRegex, null));
-
- final Path noMatch = Paths.get("nomatch");
- assertFalse(regexFilter.accept(null, noMatch, null));
- }
-
- @Test
- public void testAcceptIgnoresBasePathAndAttributes() {
- final IfFileName pathFilter = IfFileName.createNameCondition("path", null);
- final Path relativePath = Paths.get("path");
- assertTrue(pathFilter.accept(null, relativePath, null));
-
- final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex");
- final Path pathMatchingRegex = Paths.get("regex");
- assertTrue(regexFilter.accept(null, pathMatchingRegex, null));
- }
-
- @Test
- public void testAcceptCallsNestedConditionsOnlyIfPathAccepted1() {
- final CountingCondition counter = new CountingCondition(true);
- final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex", counter);
- final Path pathMatchingRegex = Paths.get("regex");
-
- assertTrue(regexFilter.accept(null, pathMatchingRegex, null));
- assertEquals(1, counter.getAcceptCount());
- assertTrue(regexFilter.accept(null, pathMatchingRegex, null));
- assertEquals(2, counter.getAcceptCount());
- assertTrue(regexFilter.accept(null, pathMatchingRegex, null));
- assertEquals(3, counter.getAcceptCount());
-
- final Path noMatch = Paths.get("nomatch");
- assertFalse(regexFilter.accept(null, noMatch, null));
- assertEquals(3, counter.getAcceptCount()); // no increase
- assertFalse(regexFilter.accept(null, noMatch, null));
- assertEquals(3, counter.getAcceptCount());
- assertFalse(regexFilter.accept(null, noMatch, null));
- assertEquals(3, counter.getAcceptCount());
- }
-
- @Test
- public void testAcceptCallsNestedConditionsOnlyIfPathAccepted2() {
- final CountingCondition counter = new CountingCondition(true);
- final IfFileName globFilter = IfFileName.createNameCondition("glob", null, counter);
- final Path pathMatchingGlob = Paths.get("glob");
-
- assertTrue(globFilter.accept(null, pathMatchingGlob, null));
- assertEquals(1, counter.getAcceptCount());
- assertTrue(globFilter.accept(null, pathMatchingGlob, null));
- assertEquals(2, counter.getAcceptCount());
- assertTrue(globFilter.accept(null, pathMatchingGlob, null));
- assertEquals(3, counter.getAcceptCount());
-
- final Path noMatch = Paths.get("nomatch");
- assertFalse(globFilter.accept(null, noMatch, null));
- assertEquals(3, counter.getAcceptCount()); // no increase
- assertFalse(globFilter.accept(null, noMatch, null));
- assertEquals(3, counter.getAcceptCount());
- assertFalse(globFilter.accept(null, noMatch, null));
- assertEquals(3, counter.getAcceptCount());
- }
-
- @Test
- public void testBeforeTreeWalk() {
- final CountingCondition counter = new CountingCondition(true);
- final IfFileName pathFilter = IfFileName.createNameCondition("path", null, counter, counter, counter);
- pathFilter.beforeFileTreeWalk();
- assertEquals(3, counter.getBeforeFileTreeWalkCount());
- }
-}
+/*
+ * 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.appender.rolling.action;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class IfFileNameTest {
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreateNameConditionFailsIfBothRegexAndPathAreNull() {
+ IfFileName.createNameCondition(null, null);
+ }
+
+ @Test()
+ public void testCreateNameConditionAcceptsIfEitherRegexOrPathOrBothAreNonNull() {
+ IfFileName.createNameCondition("bar", null);
+ IfFileName.createNameCondition(null, "foo");
+ IfFileName.createNameCondition("bar", "foo");
+ }
+
+ @Test
+ public void testGetSyntaxAndPattern() {
+ assertEquals("glob:path", IfFileName.createNameCondition("path", null).getSyntaxAndPattern());
+ assertEquals("glob:path", IfFileName.createNameCondition("glob:path", null).getSyntaxAndPattern());
+ assertEquals("regex:bar", IfFileName.createNameCondition(null, "bar").getSyntaxAndPattern());
+ assertEquals("regex:bar", IfFileName.createNameCondition(null, "regex:bar").getSyntaxAndPattern());
+ }
+
+ @Test
+ public void testAcceptUsesPathPatternIfExists() {
+ final IfFileName filter = IfFileName.createNameCondition("path", "regex");
+ final Path relativePath = Paths.get("path");
+ assertTrue(filter.accept(null, relativePath, null));
+
+ final Path pathMatchingRegex = Paths.get("regex");
+ assertFalse(filter.accept(null, pathMatchingRegex, null));
+ }
+
+ @Test
+ public void testAcceptUsesRegexIfNoPathPatternExists() {
+ final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex");
+ final Path pathMatchingRegex = Paths.get("regex");
+ assertTrue(regexFilter.accept(null, pathMatchingRegex, null));
+
+ final Path noMatch = Paths.get("nomatch");
+ assertFalse(regexFilter.accept(null, noMatch, null));
+ }
+
+ @Test
+ public void testAcceptIgnoresBasePathAndAttributes() {
+ final IfFileName pathFilter = IfFileName.createNameCondition("path", null);
+ final Path relativePath = Paths.get("path");
+ assertTrue(pathFilter.accept(null, relativePath, null));
+
+ final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex");
+ final Path pathMatchingRegex = Paths.get("regex");
+ assertTrue(regexFilter.accept(null, pathMatchingRegex, null));
+ }
+
+ @Test
+ public void testAcceptCallsNestedConditionsOnlyIfPathAccepted1() {
+ final CountingCondition counter = new CountingCondition(true);
+ final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex", counter);
+ final Path pathMatchingRegex = Paths.get("regex");
+
+ assertTrue(regexFilter.accept(null, pathMatchingRegex, null));
+ assertEquals(1, counter.getAcceptCount());
+ assertTrue(regexFilter.accept(null, pathMatchingRegex, null));
+ assertEquals(2, counter.getAcceptCount());
+ assertTrue(regexFilter.accept(null, pathMatchingRegex, null));
+ assertEquals(3, counter.getAcceptCount());
+
+ final Path noMatch = Paths.get("nomatch");
+ assertFalse(regexFilter.accept(null, noMatch, null));
+ assertEquals(3, counter.getAcceptCount()); // no increase
+ assertFalse(regexFilter.accept(null, noMatch, null));
+ assertEquals(3, counter.getAcceptCount());
+ assertFalse(regexFilter.accept(null, noMatch, null));
+ assertEquals(3, counter.getAcceptCount());
+ }
+
+ @Test
+ public void testAcceptCallsNestedConditionsOnlyIfPathAccepted2() {
+ final CountingCondition counter = new CountingCondition(true);
+ final IfFileName globFilter = IfFileName.createNameCondition("glob", null, counter);
+ final Path pathMatchingGlob = Paths.get("glob");
+
+ assertTrue(globFilter.accept(null, pathMatchingGlob, null));
+ assertEquals(1, counter.getAcceptCount());
+ assertTrue(globFilter.accept(null, pathMatchingGlob, null));
+ assertEquals(2, counter.getAcceptCount());
+ assertTrue(globFilter.accept(null, pathMatchingGlob, null));
+ assertEquals(3, counter.getAcceptCount());
+
+ final Path noMatch = Paths.get("nomatch");
+ assertFalse(globFilter.accept(null, noMatch, null));
+ assertEquals(3, counter.getAcceptCount()); // no increase
+ assertFalse(globFilter.accept(null, noMatch, null));
+ assertEquals(3, counter.getAcceptCount());
+ assertFalse(globFilter.accept(null, noMatch, null));
+ assertEquals(3, counter.getAcceptCount());
+ }
+
+ @Test
+ public void testBeforeTreeWalk() {
+ final CountingCondition counter = new CountingCondition(true);
+ final IfFileName pathFilter = IfFileName.createNameCondition("path", null, counter, counter, counter);
+ pathFilter.beforeFileTreeWalk();
+ assertEquals(3, counter.getBeforeFileTreeWalkCount());
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModifiedTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModifiedTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModifiedTest.java
index 48d2a10..520e68d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModifiedTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModifiedTest.java
@@ -75,7 +75,7 @@ public class IfLastModifiedTest {
assertEquals(2, counter.getAcceptCount());
assertTrue(filter.accept(null, null, attrs));
assertEquals(3, counter.getAcceptCount());
-
+
final long tooYoung = 33 * 1000 - 5;
attrs.lastModified = FileTime.fromMillis(System.currentTimeMillis() - tooYoung);
assertFalse(filter.accept(null, null, attrs));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTimeTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTimeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTimeTest.java
index 255fec4..15b2eae 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTimeTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTimeTest.java
@@ -49,15 +49,15 @@ public class PathSortByModificationTimeTest {
final DummyFileAttributes a2 = new DummyFileAttributes();
a1.lastModified = FileTime.fromMillis(100);
a2.lastModified = FileTime.fromMillis(222);
-
+
assertEquals("same path, 2nd more recent", 1, sorter.compare(path(p1, a1), path(p1, a2)));
assertEquals("path ignored, 2nd more recent", 1, sorter.compare(path(p1, a1), path(p2, a2)));
assertEquals("path ignored, 2nd more recent", 1, sorter.compare(path(p2, a1), path(p1, a2)));
-
+
assertEquals("same path, 1st more recent", -1, sorter.compare(path(p1, a2), path(p1, a1)));
assertEquals("path ignored, 1st more recent", -1, sorter.compare(path(p1, a2), path(p2, a1)));
assertEquals("path ignored, 1st more recent", -1, sorter.compare(path(p2, a2), path(p1, a1)));
-
+
assertEquals("same path, same time", 0, sorter.compare(path(p1, a1), path(p1, a1)));
assertEquals("p2 < p1, same time", 1, sorter.compare(path(p1, a1), path(p2, a1)));
assertEquals("p2 < p1, same time", -1, sorter.compare(path(p2, a1), path(p1, a1)));
@@ -72,15 +72,15 @@ public class PathSortByModificationTimeTest {
final DummyFileAttributes a2 = new DummyFileAttributes();
a1.lastModified = FileTime.fromMillis(100);
a2.lastModified = FileTime.fromMillis(222);
-
+
assertEquals("same path, 2nd more recent", -1, sorter.compare(path(p1, a1), path(p1, a2)));
assertEquals("path ignored, 2nd more recent", -1, sorter.compare(path(p1, a1), path(p2, a2)));
assertEquals("path ignored, 2nd more recent", -1, sorter.compare(path(p2, a1), path(p1, a2)));
-
+
assertEquals("same path, 1st more recent", 1, sorter.compare(path(p1, a2), path(p1, a1)));
assertEquals("path ignored, 1st more recent", 1, sorter.compare(path(p1, a2), path(p2, a1)));
assertEquals("path ignored, 1st more recent", 1, sorter.compare(path(p2, a2), path(p1, a1)));
-
+
assertEquals("same path, same time", 0, sorter.compare(path(p1, a1), path(p1, a1)));
assertEquals("p1 < p2, same time", -1, sorter.compare(path(p1, a1), path(p2, a1)));
assertEquals("p1 < p2, same time", 1, sorter.compare(path(p2, a1), path(p1, a1)));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitorTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitorTest.java
index dd32a0c..35cd870 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitorTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitorTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
* Tests the SortingVisitor class.
*/
public class SortingVisitorTest {
-
+
private Path base;
private Path aaa;
private Path bbb;
@@ -48,14 +48,14 @@ public class SortingVisitorTest {
aaa = Files.createTempFile(base, "aaa", null, new FileAttribute<?>[0]);
bbb = Files.createTempFile(base, "bbb", null, new FileAttribute<?>[0]);
ccc = Files.createTempFile(base, "ccc", null, new FileAttribute<?>[0]);
-
+
// lastModified granularity is 1 sec(!) on some file systems...
final long now = System.currentTimeMillis();
Files.setLastModifiedTime(aaa, FileTime.fromMillis(now));
Files.setLastModifiedTime(bbb, FileTime.fromMillis(now + 1000));
Files.setLastModifiedTime(ccc, FileTime.fromMillis(now + 2000));
}
-
+
@After
public void tearDown() throws Exception {
Files.deleteIfExists(ccc);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 b112fb7..c0a66e2 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
@@ -45,7 +45,7 @@ public class DefaultRouteScriptAppenderTest {
@Parameterized.Parameters(name = "{0} {1}")
public static Object[][] getParameters() {
// @formatter:off
- return new Object[][] {
+ return new Object[][] {
{ "log4j-routing-default-route-script-groovy.xml", false },
{ "log4j-routing-default-route-script-javascript.xml", false },
{ "log4j-routing-script-staticvars-javascript.xml", true },
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 12b571f..f9bbbd9 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
@@ -51,7 +51,7 @@ public class RoutesScriptAppenderTest {
@Parameterized.Parameters(name = "{0} {1}")
public static Object[][] getParameters() {
// @formatter:off
- return new Object[][] {
+ return new Object[][] {
{ "log4j-routing-routes-script-groovy.xml", false },
{ "log4j-routing-routes-script-javascript.xml", false },
{ "log4j-routing-script-staticvars-javascript.xml", true },
@@ -64,7 +64,7 @@ public class RoutesScriptAppenderTest {
public final LoggerContextRule loggerContextRule;
private final boolean expectBindingEntries;
-
+
public RoutesScriptAppenderTest(final String configLocation, final boolean expectBindingEntries) {
this.loggerContextRule = new LoggerContextRule(configLocation);
this.expectBindingEntries = expectBindingEntries;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java
index d032943..d7ae4a4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java
@@ -44,7 +44,7 @@ public class AsyncLoggerConfigAutoFlushTest {
public void testFlushAtEndOfBatch() throws Exception {
final File file = new File("target", "AsyncLoggerConfigAutoFlushTest.log");
assertTrue("Deleted old file before test", !file.exists() || file.delete());
-
+
final Logger log = LogManager.getLogger("com.foo.Bar");
final String msg = "Message flushed with immediate flush=false";
log.info(msg);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java
index 3c09ff5..6b0dc9b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java
@@ -40,7 +40,7 @@ public class AsyncLoggerConfigTest2 {
"AsyncLoggerConfigTest2.xml");
final File file = new File("target", "AsyncLoggerConfigTest2.log");
assertTrue("Deleted old file before test", !file.exists() || file.delete());
-
+
final Logger log = LogManager.getLogger("com.foo.Bar");
final String msg = "Message before reconfig";
log.info(msg);
@@ -48,7 +48,7 @@ public class AsyncLoggerConfigTest2 {
final LoggerContext ctx = LoggerContext.getContext(false);
ctx.reconfigure();
ctx.reconfigure();
-
+
final String msg2 = "Message after reconfig";
log.info(msg2);
CoreLoggerContexts.stopLoggerContext(file); // stop async thread
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java
index e7dcf82..a4a2513 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java
@@ -42,7 +42,7 @@ public class AsyncLoggerConfigUseAfterShutdownTest {
log.info("some message");
CoreLoggerContexts.stopLoggerContext(); // stop async thread
- // call the #logMessage() method to bypass the isEnabled check:
+ // call the #logMessage() method to bypass the isEnabled check:
// before the LOG4J2-639 fix this would throw a NPE
((AbstractLogger) log).logMessage("com.foo.Bar", Level.INFO, null, new SimpleMessage("msg"), null);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java
index fc5cb63..29f21a5 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.*;
@Category(AsyncLoggers.class)
public class AsyncLoggerContextSelectorTest {
-
+
private static final String FQCN = AsyncLoggerContextSelectorTest.class.getName();
@Test
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java
index 5b61d8e..2642d2b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java
@@ -41,7 +41,7 @@ public class AsyncLoggerLocationTest {
public static void beforeClass() {
final File file = new File("target", "AsyncLoggerLocationTest.log");
file.delete();
-
+
System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR,
AsyncLoggerContextSelector.class.getName());
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java
index aad8ce7..27c6678 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java
@@ -55,10 +55,10 @@ public class AsyncLoggerTest {
final File file = new File("target", "AsyncLoggerTest.log");
// System.out.println(f.getAbsolutePath());
file.delete();
-
+
final AsyncLogger log = (AsyncLogger) LogManager.getLogger("com.foo.Bar");
assertTrue(log.getNanoClock() instanceof DummyNanoClock);
-
+
final String msg = "Async logger msg";
log.info(msg, new InternalError("this is not a real error"));
CoreLoggerContexts.stopLoggerContext(false, file); // stop async thread
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextTest.java
index 0b5ff64..76bf257 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextTest.java
@@ -56,10 +56,10 @@ public class AsyncLoggerThreadContextTest {
final File file = new File("target", "AsyncLoggerTest.log");
// System.out.println(f.getAbsolutePath());
file.delete();
-
+
ThreadContext.push("stackvalue");
ThreadContext.put("KEY", "mapvalue");
-
+
final Logger log = LogManager.getLogger("com.foo.Bar");
final String msg = "Async logger msg";
log.info(msg, new InternalError("this is not a real error"));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java
index 2e4ab33..f553137 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java
@@ -57,7 +57,7 @@ public class AsyncLoggerUseAfterShutdownTest {
log.info(msg, new InternalError("this is not a real error"));
CoreLoggerContexts.stopLoggerContext(); // stop async thread
- // call the #logMessage() method to bypass the isEnabled check:
+ // call the #logMessage() method to bypass the isEnabled check:
// before the LOG4J2-639 fix this would throw a NPE
((AbstractLogger) log).logMessage("com.foo.Bar", Level.INFO, null, new SimpleMessage("msg"), null);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
index 53ada5b..02a1f8a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
@@ -58,7 +58,7 @@ public class RingBufferLogEventTest {
final LogEvent logEvent = new RingBufferLogEvent();
Assert.assertNotSame(logEvent, logEvent.toImmutable());
}
-
+
@Test
public void testGetLevelReturnsOffIfNullLevelSet() {
final RingBufferLogEvent evt = new RingBufferLogEvent();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
index 2be6499..e9934fc 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
@@ -206,10 +206,10 @@ public class PerfTestDriver {
public static void main(final String[] args) throws Exception {
final long start = System.nanoTime();
-
+
final List<Setup> tests = selectTests();
runPerfTests(args, tests);
-
+
System.out.printf("Done. Total duration: %.1f minutes%n", (System.nanoTime() - start)
/ (60.0 * 1000.0 * 1000.0 * 1000.0));
@@ -218,7 +218,7 @@ public class PerfTestDriver {
private static List<Setup> selectTests() throws IOException {
final List<Setup> tests = new ArrayList<>();
-
+
// final String CACHEDCLOCK = "-Dlog4j.Clock=CachedClock";
final String SYSCLOCK = "-Dlog4j.Clock=SystemClock";
final String ALL_ASYNC = "-DLog4jContextSelector=" + AsyncLoggerContextSelector.class.getName();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
index a9b48e7..a7cfe17 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
@@ -111,13 +111,13 @@ public class ConfigurationTest {
final Configuration config = this.ctx.getConfiguration();
assertEquals(config.getRootLogger(), config.getLoggerConfig(Strings.EMPTY));
}
-
+
@Test(expected = NullPointerException.class)
public void testGetLoggerConfigNull() throws Exception {
final Configuration config = this.ctx.getConfiguration();
assertEquals(config.getRootLogger(), config.getLoggerConfig(null));
}
-
+
@Test
public void testLogger() throws Exception {
final Logger logger = this.ctx.getLogger(LOGGER_NAME);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java
index a7cceff..ab4acdb 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java
@@ -79,7 +79,7 @@ public class LoggerConfigTest {
};
final LoggerConfig loggerConfig = createForProperties(all);
final List<Property> list = loggerConfig.getPropertyList();
- assertEquals("map and list contents equal", new HashSet<>(list),
+ assertEquals("map and list contents equal", new HashSet<>(list),
new HashSet<>(loggerConfig.getPropertyList()));
final Object[] actualListHolder = new Object[1];
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
index 33e0ee1..ed2db6e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
@@ -47,7 +47,7 @@ public class ResolverUtilCustomProtocolTest {
@Rule
public RuleChain chain = RuleChain.outerRule(new CleanFolders(ResolverUtilTest.WORK_DIR));
-
+
static class NoopURLStreamHandlerFactory implements URLStreamHandlerFactory {
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
index 1c6371b..a9de08a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
@@ -51,7 +51,7 @@ public class ResolverUtilTest {
@Rule
public RuleChain chain = RuleChain.outerRule(new CleanFolders(WORK_DIR));
-
+
@Test
public void testExtractPathFromJarUrl() throws Exception {
final URL url = new URL("jar:file:/C:/Users/me/.m2/repository/junit/junit/4.11/junit-4.11.jar!/org/junit/Test.class");
@@ -193,29 +193,29 @@ public class ResolverUtilTest {
if (!parent.exists()) {
assertTrue("Create customplugin" + suffix + " folder KO", f.getParentFile().mkdirs());
}
-
+
final String content = new String(Files.readAllBytes(orig.toPath()))
.replaceAll("FixedString", "FixedString" + suffix)
.replaceAll("customplugin", "customplugin" + suffix);
Files.write(f.toPath(), content.getBytes());
-
+
PluginManagerPackagesTest.compile(f);
return workDir;
}
static void createJar(final URI jarURI, final File workDir, final File f) throws Exception {
- final Map<String, String> env = new HashMap<>();
+ final Map<String, String> env = new HashMap<>();
env.put("create", "true");
final URI uri = URI.create("jar:file://" + jarURI.getRawPath());
- try (FileSystem zipfs = FileSystems.newFileSystem(uri, env)) {
+ try (FileSystem zipfs = FileSystems.newFileSystem(uri, env)) {
final Path path = zipfs.getPath(workDir.toPath().relativize(f.toPath()).toString());
if (path.getParent() != null) {
Files.createDirectories(path.getParent());
}
Files.copy(f.toPath(),
- path,
- StandardCopyOption.REPLACE_EXISTING );
- }
+ path,
+ StandardCopyOption.REPLACE_EXISTING );
+ }
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java
index ae236b4..2b0ebd1 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java
@@ -48,7 +48,7 @@ public class ValidatingPluginWithTypedBuilderTest {
@Test
public void testNullDefaultValue() throws Exception {
// @formatter:off
- final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder)
+ final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder)
new PluginBuilder(plugin).
withConfiguration(new NullConfiguration()).
withConfigurationNode(node).build();
@@ -60,7 +60,7 @@ public class ValidatingPluginWithTypedBuilderTest {
public void testNonNullValue() throws Exception {
node.getAttributes().put("name", "foo");
// @formatter:off
- final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder)
+ final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder)
new PluginBuilder(plugin).
withConfiguration(new NullConfiguration()).
withConfigurationNode(node).build();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
index 0488d0f..fce48e5 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
@@ -45,8 +45,8 @@ import org.junit.Test;
public class DynamicThresholdFilterTest {
@Rule
- public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule();
-
+ public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule();
+
@After
public void cleanup() {
final LoggerContext ctx = LoggerContext.getContext(false);
@@ -88,11 +88,11 @@ public class DynamicThresholdFilterTest {
filter.start();
assertTrue(filter.isStarted());
final Object [] replacements = {"one", "two", "three"};
- assertSame(Filter.Result.ACCEPT, filter.filter(null, Level.DEBUG, null, "some test message", replacements));
- assertSame(Filter.Result.ACCEPT, filter.filter(null, Level.DEBUG, null, "some test message", "one", "two", "three"));
+ assertSame(Filter.Result.ACCEPT, filter.filter(null, Level.DEBUG, null, "some test message", replacements));
+ assertSame(Filter.Result.ACCEPT, filter.filter(null, Level.DEBUG, null, "some test message", "one", "two", "three"));
ThreadContext.clearMap();
}
-
+
@Test
public void testConfig() {
try (final LoggerContext ctx = Configurator.initialize("Test1",
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java
index b99c6a9..336d3ce 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java
@@ -56,5 +56,5 @@ public class LevelRangeFilterTest {
assertTrue(filter.isStarted());
assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, (Object) null, (Throwable) null));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 93d60c4..caae76b 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
@@ -62,7 +62,7 @@ public class Log4jLogEventNanoTimeTest {
Log4jLogEvent.setNanoClock(new DummyNanoClock(DUMMYNANOTIME));
log.info("Use dummy nano clock");
assertTrue("using SystemNanoClock", Log4jLogEvent.getNanoClock() instanceof DummyNanoClock);
-
+
CoreLoggerContexts.stopLoggerContext(file); // stop async thread
String line1;
@@ -82,7 +82,7 @@ public class Log4jLogEventNanoTimeTest {
assertEquals(line1Parts[0], line1Parts[1]);
final long loggedNanoTime = Long.parseLong(line1Parts[0]);
assertTrue("used system nano time", loggedNanoTime - before < TimeUnit.SECONDS.toNanos(1));
-
+
final String[] line2Parts = line2.split(" AND ");
assertEquals("Use dummy nano clock", line2Parts[2]);
assertEquals(String.valueOf(DUMMYNANOTIME), line2Parts[0]);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 d0c35cb..e95e308 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
@@ -50,7 +50,7 @@ public class NestedLoggingFromToStringTest {
public static void beforeClass() {
System.setProperty("log4j2.is.webapp", "false");
}
-
+
@Rule
public LoggerContextRule context = new LoggerContextRule("log4j-sync-to-list.xml");
private ListAppender listAppender;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
index d099da1..be2fd7f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
@@ -37,7 +37,7 @@ public final class ThrowableFormatOptionsTest {
/**
* Runs a given test comparing against the expected values.
- *
+ *
* @param options
* The list of options to parse.
* @param expectedLines
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java
index 2533869..57c8910 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java
@@ -33,7 +33,7 @@ public class ServerTest {
final String ctx = "WebAppClassLoader=1320771902@4eb9613e"; // LOG4J2-492
final String ctxName = Server.escape(ctx);
assertEquals("\"WebAppClassLoader=1320771902@4eb9613e\"", ctxName);
- new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
+ new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
// no MalformedObjectNameException = success
}
@@ -42,7 +42,7 @@ public class ServerTest {
final String ctx = "a,b,c";
final String ctxName = Server.escape(ctx);
assertEquals("\"a,b,c\"", ctxName);
- new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
+ new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
// no MalformedObjectNameException = success
}
@@ -51,7 +51,7 @@ public class ServerTest {
final String ctx = "a:b:c";
final String ctxName = Server.escape(ctx);
assertEquals("\"a:b:c\"", ctxName);
- new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
+ new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
// no MalformedObjectNameException = success
}
@@ -60,7 +60,7 @@ public class ServerTest {
final String ctx = "a?c";
final String ctxName = Server.escape(ctx);
assertEquals("\"a\\?c\"", ctxName);
- new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
+ new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
// no MalformedObjectNameException = success
}
@@ -69,7 +69,7 @@ public class ServerTest {
final String ctx = "a*c";
final String ctxName = Server.escape(ctx);
assertEquals("\"a\\*c\"", ctxName);
- new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
+ new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
// no MalformedObjectNameException = success
}
@@ -78,7 +78,7 @@ public class ServerTest {
final String ctx = "a\\c";
final String ctxName = Server.escape(ctx);
assertEquals("\"a\\\\c\"", ctxName);
- new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
+ new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
// no MalformedObjectNameException = success
}
@@ -87,7 +87,7 @@ public class ServerTest {
final String ctx = "a\"c";
final String ctxName = Server.escape(ctx);
assertEquals("\"a\\\"c\"", ctxName);
- new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
+ new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
// no MalformedObjectNameException = success
}
@@ -96,7 +96,7 @@ public class ServerTest {
final String ctx = "a c";
final String ctxName = Server.escape(ctx);
assertEquals("a c", ctxName);
- new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
+ new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
// no MalformedObjectNameException = success
}
@@ -105,7 +105,7 @@ public class ServerTest {
final String ctx = "a\rc";
final String ctxName = Server.escape(ctx);
assertEquals("ac", ctxName);
- new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
+ new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
// no MalformedObjectNameException = success
}
@@ -114,7 +114,7 @@ public class ServerTest {
final String ctx = "a\nc";
final String ctxName = Server.escape(ctx);
assertEquals("\"a\\nc\"", ctxName);
- new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
+ new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName));
// no MalformedObjectNameException = success
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvLogEventLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvLogEventLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvLogEventLayoutTest.java
index 0ee8861..078ed02 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvLogEventLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvLogEventLayoutTest.java
@@ -49,7 +49,7 @@ public class CsvLogEventLayoutTest {
static ConfigurationFactory cf = new BasicConfigurationFactory();
@Rule
- public final ThreadContextRule threadContextRule = new ThreadContextRule();
+ public final ThreadContextRule threadContextRule = new ThreadContextRule();
@AfterClass
public static void cleanupClass() {
@@ -127,7 +127,7 @@ public class CsvLogEventLayoutTest {
final String quote = del == ',' ? "\"" : "";
Assert.assertTrue(event0, event0.contains(del + quote + "one=1, two=2, three=3" + quote + del));
Assert.assertTrue(event1, event1.contains(del + "INFO" + del));
-
+
if (hasHeaderSerializer && header == null) {
Assert.fail();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 095bec6..e18bceb 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
@@ -45,9 +45,9 @@ import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals;
import static org.junit.Assert.assertEquals;
public class GelfLayoutTest {
-
+
static ConfigurationFactory configFactory = new BasicConfigurationFactory();
-
+
private static final String HOSTNAME = "TheHost";
private static final String KEY1 = "Key1";
private static final String KEY2 = "Key2";
@@ -61,7 +61,7 @@ public class GelfLayoutTest {
private static final String VALUE1 = "Value1";
@Rule
- public final ThreadContextRule threadContextRule = new ThreadContextRule();
+ public final ThreadContextRule threadContextRule = new ThreadContextRule();
@AfterClass
public static void cleanupClass() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java
index 80acb1f..20a8dde 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java
@@ -46,7 +46,7 @@ public class HtmlLayoutTest {
static ConfigurationFactory cf = new BasicConfigurationFactory();
@Rule
- public final ThreadContextRule threadContextRule = new ThreadContextRule();
+ public final ThreadContextRule threadContextRule = new ThreadContextRule();
@BeforeClass
public static void setupClass() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
index dec48ec..9dfade0 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
@@ -499,19 +499,19 @@ public class JsonLayoutTest {
// @formatter:off
return layout.toSerializable(expected);
}
-
+
@Test
public void testObjectMessageAsJsonString() {
final String str = prepareJSONForObjectMessageAsJsonObjectTests(1234, false);
assertTrue(str, str.contains("\"message\":\"" + this.getClass().getCanonicalName() + "$TestClass@"));
}
-
+
@Test
public void testObjectMessageAsJsonObject() {
final String str = prepareJSONForObjectMessageAsJsonObjectTests(1234, true);
assertTrue(str, str.contains("\"message\":{\"value\":1234}"));
}
-
+
private String prepareJSONForObjectMessageAsJsonObjectTests(final int value, final boolean objectMessageAsJsonObject) {
final TestClass testClass = new TestClass();
testClass.setValue(value);
@@ -551,11 +551,11 @@ public class JsonLayoutTest {
final String str = layout.toSerializable(LogEventFixtures.createLogEvent());
assertFalse(str.endsWith("\0"));
}
-
+
private String toPropertySeparator(final boolean compact) {
return compact ? ":" : " : ";
}
-
+
private static class TestClass {
private int value;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java
index abd1852..3c94d58 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java
@@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category;
public abstract class Log4j2_1482_Test {
static final String CONFIG_LOCATION = "log4j2-1482.xml";
-
+
static final String FOLDER = "target/log4j2-1482";
private static final int LOOP_COUNT = 10;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
index d1bb7a8..0b9b50d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
@@ -73,7 +73,7 @@ public class Rfc5424LayoutTest {
static ConfigurationFactory cf = new BasicConfigurationFactory();
@Rule
- public final ThreadContextRule threadContextRule = new ThreadContextRule();
+ public final ThreadContextRule threadContextRule = new ThreadContextRule();
@BeforeClass
public static void setupClass() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
index 0d5205d..da20507 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
@@ -59,7 +59,7 @@ public class SerializedLayoutTest {
static boolean useObjectInputStream = false;
@Rule
- public final ThreadContextRule threadContextRule = new ThreadContextRule();
+ public final ThreadContextRule threadContextRule = new ThreadContextRule();
@BeforeClass
public static void setupClass() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
index b5bea03..d9bd5b0 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
@@ -55,7 +55,7 @@ public class SyslogLayoutTest {
static ConfigurationFactory cf = new BasicConfigurationFactory();
@Rule
- public final ThreadContextRule threadContextRule = new ThreadContextRule();
+ public final ThreadContextRule threadContextRule = new ThreadContextRule();
@BeforeClass
public static void setupClass() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java
index 4ee8f1e..9d97f6a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java
@@ -61,7 +61,7 @@ public class XmlLayoutTest {
private static final String markerTag = "<Marker name=\"EVENT\"/>";
@Rule
- public final ThreadContextRule threadContextRule = new ThreadContextRule();
+ public final ThreadContextRule threadContextRule = new ThreadContextRule();
@AfterClass
public static void cleanupClass() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsJmxLookupTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsJmxLookupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsJmxLookupTest.java
index be1f587..22583d3 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsJmxLookupTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsJmxLookupTest.java
@@ -22,9 +22,9 @@ import org.junit.Test;
/**
* Tests {@link JmxRuntimeInputArgumentsLookup} from the command line, not a JUnit test.
- *
+ *
* From an IDE or CLI: --file foo.txt
- *
+ *
* @since 2.1
*/
public class MainInputArgumentsJmxLookupTest {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupTest.java
index 6150afd..966c6fd 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupTest.java
@@ -23,9 +23,9 @@ import org.apache.logging.log4j.core.config.Configurator;
/**
* Tests {@link org.apache.logging.log4j.core.lookup.MainMapLookup#MAIN_SINGLETON} from the command line, not a real
* JUnit test.
- *
+ *
* From an IDE or CLI: --file foo.txt
- *
+ *
* @since 2.4
*/
public class MainInputArgumentsLookupTest {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java
index f6bad22..1ec64a8 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java
@@ -20,7 +20,7 @@ import java.util.Map;
/**
* Work in progress, saved for future experimentation.
- *
+ *
* TODO The goal is to use the Sun debugger API to find the main arg values on the stack.
*/
public class MainInputArgumentsMapLookup extends MapLookup {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupConfigTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupConfigTest.java
index 62f8897..e3ce8d4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupConfigTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
/**
* Tests {@link MarkerLookup} with a configuration file.
- *
+ *
* @since 2.4
*/
public class MarkerLookupConfigTest {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupTest.java
index d26f895..fac33d4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
/**
* Tests {@link MarkerLookup}.
- *
+ *
* @since 2.4
*/
public class MarkerLookupTest {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DisableAnsiTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DisableAnsiTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DisableAnsiTest.java
index 7fea6fe..b841ea4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DisableAnsiTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DisableAnsiTest.java
@@ -55,5 +55,5 @@ public class DisableAnsiTest {
assertEquals("Incorrect number of messages. Should be 1 is " + msgs.size(), 1, msgs.size());
assertTrue("Replacement failed - expected ending " + EXPECTED + ", actual " + msgs.get(0), msgs.get(0).endsWith(EXPECTED));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
index 445b893..bcb9b1c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
@@ -159,7 +159,7 @@ public class ExtendedThrowablePatternConverterTest {
final String expected = sw.toString(); //.replaceAll("\r", Strings.EMPTY);
assertEquals(expected, result);
}
-
+
@Test
public void testFiltersAndSeparator() {
final ExtendedThrowablePatternConverter exConverter = ExtendedThrowablePatternConverter.newInstance(null,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
index 0987f76..442c5ab 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
@@ -53,7 +53,7 @@ public class HighlightConverterTest {
converter.format(event, buffer);
assertEquals("\u001B[32mINFO : message in a bottle\u001B[m", buffer.toString());
}
-
+
@Test
public void testLevelNamesBad() {
final String colorName = "red";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java
index 00e97f7..4cb6c7d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
public class MdcPatternConverterTest {
@Rule
- public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule();
+ public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule();
@Before
public void setup() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NdcPatternConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NdcPatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NdcPatternConverterTest.java
index 92557ec..4088a17 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NdcPatternConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NdcPatternConverterTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
public class NdcPatternConverterTest {
@Rule
- public final ThreadContextStackRule threadContextRule = new ThreadContextStackRule();
+ public final ThreadContextStackRule threadContextRule = new ThreadContextStackRule();
@Test
public void testEmpty() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NoConsoleNoAnsiTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NoConsoleNoAnsiTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NoConsoleNoAnsiTest.java
index cc9ac03..ee29c6f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NoConsoleNoAnsiTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NoConsoleNoAnsiTest.java
@@ -57,5 +57,5 @@ public class NoConsoleNoAnsiTest {
assertEquals("Incorrect number of messages. Should be 1 is " + msgs.size(), 1, msgs.size());
assertTrue("Replacement failed - expected ending " + EXPECTED + ", actual " + msgs.get(0), msgs.get(0).endsWith(EXPECTED));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java
index 45c0a8b..22f9c28 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java
@@ -74,7 +74,7 @@ public class PatternParserTest2 {
/**
* Format file name.
- *
+ *
* @param buf string buffer to which formatted file name is appended, may not be null.
* @param objects objects to be evaluated in formatting, may not be null.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
index f357111..16b08d9 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
@@ -46,7 +46,7 @@ public class RegexReplacementTest {
public static LoggerContextRule context = new LoggerContextRule(CONFIG);
@Rule
- public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule();
+ public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule();
@Before
public void setUp() throws Exception {
[02/13] logging-log4j2 git commit: Use final.
Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
index 8b965b6..01a448a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
@@ -68,7 +68,7 @@ public final class ClockFactory {
}
private static Map<String, Supplier<Clock>> aliases() {
- Map<String, Supplier<Clock>> result = new HashMap<>();
+ final Map<String, Supplier<Clock>> result = new HashMap<>();
result.put("SystemClock", new Supplier<Clock>() { @Override public Clock get() { return new SystemClock(); } });
result.put("SystemMillisClock", new Supplier<Clock>() { @Override public Clock get() { return new SystemMillisClock(); } });
result.put("CachedClock", new Supplier<Clock>() { @Override public Clock get() { return CachedClock.instance(); } });
@@ -84,7 +84,7 @@ public final class ClockFactory {
LOGGER.trace("Using default SystemClock for timestamps.");
return logSupportedPrecision(new SystemClock());
}
- Supplier<Clock> specified = aliases().get(userRequest);
+ final Supplier<Clock> specified = aliases().get(userRequest);
if (specified != null) {
LOGGER.trace("Using specified {} for timestamps.", userRequest);
return logSupportedPrecision(specified.get());
@@ -100,8 +100,8 @@ public final class ClockFactory {
}
}
- private static Clock logSupportedPrecision(Clock clock) {
- String support = clock instanceof PreciseClock ? "supports" : "does not support";
+ private static Clock logSupportedPrecision(final Clock clock) {
+ final String support = clock instanceof PreciseClock ? "supports" : "does not support";
LOGGER.debug("{} {} precise timestamps.", clock.getClass().getName(), support);
return clock;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
index 1380b7a..ee36fea 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
@@ -276,7 +276,7 @@ public final class Loader {
InstantiationException,
NoSuchMethodException,
InvocationTargetException {
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClassLoader());
return LoaderUtil.newInstanceOf(className);
@@ -305,7 +305,7 @@ public final class Loader {
IllegalAccessException,
InvocationTargetException,
InstantiationException {
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClassLoader());
return LoaderUtil.newCheckedInstanceOf(className, clazz);
@@ -332,7 +332,7 @@ public final class Loader {
throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException,
IllegalAccessException {
final String className = PropertiesUtil.getProperties().getStringProperty(propertyName);
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClassLoader());
return LoaderUtil.newCheckedInstanceOfProperty(propertyName, clazz);
@@ -348,7 +348,7 @@ public final class Loader {
* @return {@code true} if the class could be found or {@code false} otherwise.
*/
public static boolean isClassAvailable(final String className) {
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClassLoader());
return LoaderUtil.isClassAvailable(className);
@@ -371,7 +371,7 @@ public final class Loader {
*/
public static Class<?> loadClass(final String className) throws ClassNotFoundException {
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClassLoader());
return LoaderUtil.loadClass(className);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
index f814b62..f58a29b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
@@ -539,11 +539,11 @@ public class FixedDateFormat {
1, // 5
};
- private void formatNanoOfMillisecond(int nanoOfMillisecond, final char[] buffer, int pos) {
+ private void formatNanoOfMillisecond(final int nanoOfMillisecond, final char[] buffer, int pos) {
int temp;
int remain = nanoOfMillisecond;
for (int i = 0; i < secondFractionDigits - FixedFormat.MILLI_FRACTION_DIGITS; i++) {
- int divisor = TABLE[i];
+ final int divisor = TABLE[i];
temp = remain / divisor;
buffer[pos++] = ((char) (temp + '0'));
remain -= divisor * temp; // equivalent of remain % 10
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/EventParameterMemoryLeakTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/EventParameterMemoryLeakTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/EventParameterMemoryLeakTest.java
index 9996f8b..0205720 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/EventParameterMemoryLeakTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/EventParameterMemoryLeakTest.java
@@ -50,7 +50,7 @@ public class EventParameterMemoryLeakTest {
assertTrue("Deleted old file before test", !file.exists() || file.delete());
final Logger log = LogManager.getLogger("com.foo.Bar");
- CountDownLatch latch = new CountDownLatch(1);
+ final CountDownLatch latch = new CountDownLatch(1);
Object parameter = new ParameterObject("paramValue", latch);
log.info("Message with parameter {}", parameter);
log.info(parameter);
@@ -71,7 +71,7 @@ public class EventParameterMemoryLeakTest {
assertThat(line3, containsString("paramValue"));
assertThat(line4, containsString("paramValue"));
assertNull("Expected only three lines", line5);
- GarbageCollectionHelper gcHelper = new GarbageCollectionHelper();
+ final GarbageCollectionHelper gcHelper = new GarbageCollectionHelper();
gcHelper.run();
try {
assertTrue("Parameter should have been garbage collected", latch.await(30, TimeUnit.SECONDS));
@@ -83,7 +83,7 @@ public class EventParameterMemoryLeakTest {
private static final class ParameterObject {
private final String value;
private final CountDownLatch latch;
- ParameterObject(String value, CountDownLatch latch) {
+ ParameterObject(final String value, final CountDownLatch latch) {
this.value = value;
this.latch = latch;
}
@@ -103,7 +103,7 @@ public class EventParameterMemoryLeakTest {
private static final class ObjectThrowable extends RuntimeException {
private final Object object;
- ObjectThrowable(Object object) {
+ ObjectThrowable(final Object object) {
super(String.valueOf(object));
this.object = object;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java
index 01b9d8a..0e0c9ad 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java
@@ -40,7 +40,7 @@ final class GarbageCollectionHelper implements Closeable, Runnable {
try {
// 1mb of heap
sink.write(new byte[1024 * 1024]);
- } catch (IOException ignored) {
+ } catch (final IOException ignored) {
}
// May no-op depending on the jvm configuration
System.gc();
@@ -64,7 +64,7 @@ final class GarbageCollectionHelper implements Closeable, Runnable {
try {
assertTrue("GarbageCollectionHelper did not shut down cleanly",
latch.await(10, TimeUnit.SECONDS));
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
throw new RuntimeException(e);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/ReusableParameterizedMessageMemoryLeakTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/ReusableParameterizedMessageMemoryLeakTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/ReusableParameterizedMessageMemoryLeakTest.java
index c08f705..c4d212d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/ReusableParameterizedMessageMemoryLeakTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/ReusableParameterizedMessageMemoryLeakTest.java
@@ -30,12 +30,12 @@ public class ReusableParameterizedMessageMemoryLeakTest {
@Test
@SuppressWarnings("UnusedAssignment") // parameter set to null to allow garbage collection
public void testParametersAreNotLeaked() throws Exception {
- CountDownLatch latch = new CountDownLatch(1);
- ReusableMessage message = (ReusableMessage) ReusableMessageFactory.INSTANCE.newMessage(
+ final CountDownLatch latch = new CountDownLatch(1);
+ final ReusableMessage message = (ReusableMessage) ReusableMessageFactory.INSTANCE.newMessage(
"foo {}", new ParameterObject("paramValue", latch));
// Large enough for the parameters, but smaller than the default reusable array size.
message.swapParameters(new Object[5]);
- GarbageCollectionHelper gcHelper = new GarbageCollectionHelper();
+ final GarbageCollectionHelper gcHelper = new GarbageCollectionHelper();
gcHelper.run();
try {
assertTrue("Parameter should have been garbage collected", latch.await(30, TimeUnit.SECONDS));
@@ -47,7 +47,7 @@ public class ReusableParameterizedMessageMemoryLeakTest {
private static final class ParameterObject {
private final String value;
private final CountDownLatch latch;
- ParameterObject(String value, CountDownLatch latch) {
+ ParameterObject(final String value, final CountDownLatch latch) {
this.value = value;
this.latch = latch;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/TestPatternConverters.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/TestPatternConverters.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/TestPatternConverters.java
index 5cba8e0..0f6fca9 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/TestPatternConverters.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/TestPatternConverters.java
@@ -44,7 +44,7 @@ public final class TestPatternConverters {
@Override
public void format(final LogEvent event, final StringBuilder toAppendTo) {
toAppendTo.append('[');
- Object[] parameters = event.getMessage().getParameters();
+ final Object[] parameters = event.getMessage().getParameters();
if (parameters != null) {
for (int i = 0; i < parameters.length; i++) {
StringBuilders.appendValue(toAppendTo, parameters[i]);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
index d0ff679..59fc45f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
@@ -53,7 +53,7 @@ public class ConsoleAppenderBuilderTest {
@Test
public void testSetNullErrorHandlerIsNotAllowed() {
final ConsoleAppender appender = ConsoleAppender.newBuilder().setName("test").build();
- ErrorHandler handler = appender.getHandler();
+ final ErrorHandler handler = appender.getHandler();
Assert.assertNotNull(handler);
// This could likely be allowed to throw, but we're just testing that
// setting null does not actually set a null handler.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
index 5e063ee..bfc6963 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
@@ -41,7 +41,7 @@ public class HangingAppender extends AbstractAppender {
private final long shutdownDelay;
public HangingAppender(final String name, final long delay, final long startupDelay, final long shutdownDelay,
- Property[] properties) {
+ final Property[] properties) {
super(name, null, null, true, Property.EMPTY_ARRAY);
this.delay = delay;
this.startupDelay = startupDelay;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
index 323ca13..1680d16 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
@@ -87,9 +87,9 @@ public class JsonCompleteFileAppenderTest {
logger.error(logMsg, new IllegalArgumentException("badarg"));
this.loggerContextRule.getLoggerContext().stop(); // stops async thread
- List<String> lines = Files.readAllLines(logFile.toPath(), Charset.forName("UTF8"));
+ final List<String> lines = Files.readAllLines(logFile.toPath(), Charset.forName("UTF8"));
- String[] expected = {
+ final String[] expected = {
"[", // equals
"{", // equals
" \"thread\" : \"main\",", //
@@ -104,7 +104,7 @@ public class JsonCompleteFileAppenderTest {
" },", //
};
for (int i = 0; i < expected.length; i++) {
- String line = lines.get(i);
+ final String line = lines.get(i);
assertTrue("line " + i + " incorrect: [" + line + "], does not contain: [" + expected[i] + ']', line.contains(expected[i]));
}
final String location = "testFlushAtEndOfBatch";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderAsyncTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderAsyncTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderAsyncTest.java
index 91503d3..ccac7e6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderAsyncTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderAsyncTest.java
@@ -64,7 +64,7 @@ public class SmtpAppenderAsyncTest {
testSmtpAppender(ctx.getLogger("async"));
}
- private void testSmtpAppender(Logger logger) {
+ private void testSmtpAppender(final Logger logger) {
ThreadContext.put("MDC1", "mdc1");
logger.error("the message");
ctx.getLoggerContext().stop();
@@ -78,7 +78,7 @@ public class SmtpAppenderAsyncTest {
assertEquals("from@example.com", email.getHeaderValue("From"));
assertEquals("[mdc1]", email.getHeaderValue("Subject"));
- String body = email.getBody();
+ final String body = email.getBody();
if (!body.contains("Body:[mdc1]")) {
fail(body);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 08b7f20..a817814 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -294,7 +294,7 @@ public class SocketAppenderTest {
thread.interrupt();
try {
thread.join(100);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
System.out.println("Unable to stop server");
}
}
@@ -361,7 +361,7 @@ public class SocketAppenderTest {
interrupt();
try {
this.join(100);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
System.out.println("Unable to stop server");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
index c77b464..fd0859a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
@@ -141,7 +141,7 @@ public class XmlCompleteFileAppenderTest {
logger.info(secondLogMsg);
CoreLoggerContexts.stopLoggerContext(false, logFile); // stop async thread
- int[] indentations = {
+ final int[] indentations = {
0, //"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
0, //"<Events xmlns=\"http://logging.apache.org/log4j/2.0/events\">\n"
-1, // empty
@@ -156,15 +156,15 @@ public class XmlCompleteFileAppenderTest {
2, //" </Event>\n" +
0, //"</Events>\n";
};
- List<String> lines1 = Files.readAllLines(logFile.toPath(), Charset.forName("UTF-8"));
+ final List<String> lines1 = Files.readAllLines(logFile.toPath(), Charset.forName("UTF-8"));
assertEquals("number of lines", indentations.length, lines1.size());
for (int i = 0; i < indentations.length; i++) {
- String line = lines1.get(i);
+ final String line = lines1.get(i);
if (line.trim().isEmpty()) {
assertEquals(-1, indentations[i]);
} else {
- String padding = " ".substring(0, indentations[i]);
+ final String padding = " ".substring(0, indentations[i]);
assertTrue("Expected " + indentations[i] + " leading spaces but got: " + line, line.startsWith(padding));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
index f9cdff3..3fd2f71 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
@@ -56,10 +56,10 @@ public class XmlFileAppenderTest {
log.info(logMsg);
CoreLoggerContexts.stopLoggerContext(false, file); // stop async thread
- List<String> lines = Files.readAllLines(file.toPath(), Charset.forName("UTF8"));
+ final List<String> lines = Files.readAllLines(file.toPath(), Charset.forName("UTF8"));
file.delete();
- String[] expect = {
+ final String[] expect = {
"", // ? unsure why initial empty line...
"<Event ", //
"<Instant epochSecond=", //
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
index 932724d..c042032 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
@@ -246,7 +246,7 @@ public class AbstractDatabaseManagerTest {
}
@Override
- protected void writeInternal(LogEvent event, Serializable serializable) {
+ protected void writeInternal(final LogEvent event, final Serializable serializable) {
// noop
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSourceTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSourceTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSourceTest.java
index c6b2de1..b7ad8ac 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSourceTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSourceTest.java
@@ -28,14 +28,14 @@ public class DriverManagerConnectionSourceTest {
@Test
public void testH2Properties() throws SQLException {
- Property[] properties = new Property[] {
+ final Property[] properties = new Property[] {
// @formatter:off
Property.createProperty("username", JdbcH2TestHelper.USER_NAME),
Property.createProperty("password", JdbcH2TestHelper.PASSWORD),
// @formatter:on
};
// @formatter:off
- DriverManagerConnectionSource source = DriverManagerConnectionSource.newBuilder()
+ final DriverManagerConnectionSource source = DriverManagerConnectionSource.newBuilder()
.setConnectionString(JdbcH2TestHelper.CONNECTION_STRING_MEM)
.setProperties(properties)
.build();
@@ -48,7 +48,7 @@ public class DriverManagerConnectionSourceTest {
@Test
public void testH2UserAndPassword() throws SQLException {
// @formatter:off
- DriverManagerConnectionSource source = DriverManagerConnectionSource.newBuilder()
+ final DriverManagerConnectionSource source = DriverManagerConnectionSource.newBuilder()
.setConnectionString(JdbcH2TestHelper.CONNECTION_STRING_MEM)
.setUserName(JdbcH2TestHelper.USER_NAME.toCharArray())
.setPassword(JdbcH2TestHelper.PASSWORD.toCharArray())
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderMapMessageDataSourceTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderMapMessageDataSourceTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderMapMessageDataSourceTest.java
index a45139b..027919d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderMapMessageDataSourceTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderMapMessageDataSourceTest.java
@@ -97,7 +97,7 @@ public class JdbcAppenderMapMessageDataSourceTest {
writer.close();
final Logger logger = LogManager.getLogger(this.getClass().getName() + ".testDataSourceConfig");
- MapMessage mapMessage = new MapMessage();
+ final MapMessage mapMessage = new MapMessage();
mapMessage.with("Id", 1);
mapMessage.with("ColumnA", "ValueA");
mapMessage.with("ColumnB", "ValueB");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
index f77ef56..1dda3aa 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
@@ -42,11 +42,11 @@ public class JdbcAppenderStringSubstitutionTest {
@Test
public void test() throws Exception {
- JdbcAppender appender = rule.getAppender("databaseAppender", JdbcAppender.class);
+ final JdbcAppender appender = rule.getAppender("databaseAppender", JdbcAppender.class);
Assert.assertNotNull(appender);
- JdbcDatabaseManager manager = appender.getManager();
+ final JdbcDatabaseManager manager = appender.getManager();
Assert.assertNotNull(manager);
- String sqlStatement = manager.getSqlStatement();
+ final String sqlStatement = manager.getSqlStatement();
Assert.assertFalse(sqlStatement, sqlStatement.contains(KEY));
Assert.assertTrue(sqlStatement, sqlStatement.contains(VALUE));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java
index a8d3566..aaa5441 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java
@@ -39,15 +39,15 @@ public class KafkaAppenderCloseTimeoutTest {
public void close() {
try {
Thread.sleep(3000);
- } catch (InterruptedException ignore) {
+ } catch (final InterruptedException ignore) {
}
}
@Override
- public void close(long timeout, TimeUnit timeUnit) {
+ public void close(final long timeout, final TimeUnit timeUnit) {
try {
Thread.sleep(timeUnit.toMillis(timeout));
- } catch (InterruptedException ignore) {
+ } catch (final InterruptedException ignore) {
}
}
};
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
index 613bd74..80a93a9 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
@@ -137,8 +137,8 @@ public class KafkaAppenderTest {
final ProducerRecord<byte[], byte[]> item = history.get(0);
assertNotNull(item);
assertEquals(TOPIC_NAME, item.topic());
- String msgKey = item.key().toString();
- byte[] keyValue = "key".getBytes(StandardCharsets.UTF_8);
+ final String msgKey = item.key().toString();
+ final byte[] keyValue = "key".getBytes(StandardCharsets.UTF_8);
assertArrayEquals(item.key(), keyValue);
assertEquals(LOG_MESSAGE, new String(item.value(), StandardCharsets.UTF_8));
}
@@ -147,15 +147,15 @@ public class KafkaAppenderTest {
public void testAppendWithKeyLookup() throws Exception {
final Appender appender = ctx.getRequiredAppender("KafkaAppenderWithKeyLookup");
final LogEvent logEvent = createLogEvent();
- Date date = new Date();
- SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy");
+ final Date date = new Date();
+ final SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy");
appender.append(logEvent);
final List<ProducerRecord<byte[], byte[]>> history = kafka.history();
assertEquals(1, history.size());
final ProducerRecord<byte[], byte[]> item = history.get(0);
assertNotNull(item);
assertEquals(TOPIC_NAME, item.topic());
- byte[] keyValue = format.format(date).getBytes(StandardCharsets.UTF_8);
+ final byte[] keyValue = format.format(date).getBytes(StandardCharsets.UTF_8);
assertArrayEquals(item.key(), keyValue);
assertEquals(LOG_MESSAGE, new String(item.value(), StandardCharsets.UTF_8));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithReconfigureTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithReconfigureTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithReconfigureTest.java
index 0d8edaf..d1398d3 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithReconfigureTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithReconfigureTest.java
@@ -57,7 +57,7 @@ public class RollingAppenderDirectWriteWithReconfigureTest {
@SuppressWarnings("resource") // managed by the rule.
final LoggerContext context = loggerContextRule.getLoggerContext();
- Configuration config = context.getConfiguration();
+ final Configuration config = context.getConfiguration();
context.setConfigLocation(new URI(CONFIG));
context.reconfigure();
logger.debug("Force a rollover");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest3.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest3.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest3.java
index 301fb73..1cf88c4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest3.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest3.java
@@ -53,7 +53,7 @@ public class AsyncLoggerConfigTest3 {
}
final Message msg = new ParameterizedMessage("{}", map);
- Log4jLogEvent event = Log4jLogEvent.newBuilder()
+ final Log4jLogEvent event = Log4jLogEvent.newBuilder()
.setLevel(Level.WARN)
.setLoggerName(getClass().getName())
.setMessage(msg)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigWithAsyncEnabledTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigWithAsyncEnabledTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigWithAsyncEnabledTest.java
index 454c08e..00ddcf4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigWithAsyncEnabledTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigWithAsyncEnabledTest.java
@@ -57,7 +57,7 @@ public class AsyncLoggerConfigWithAsyncEnabledTest {
assertTrue("Deleted old file before test", !file.exists() || file.delete());
final Logger log = LogManager.getLogger("com.foo.Bar");
- String format = "Additive logging: {} for the price of {}!";
+ final String format = "Additive logging: {} for the price of {}!";
log.info(format, 2, 1);
CoreLoggerContexts.stopLoggerContext(file); // stop async thread
@@ -67,7 +67,7 @@ public class AsyncLoggerConfigWithAsyncEnabledTest {
reader.close();
file.delete();
- String expected = "Additive logging: {} for the price of {}! [2,1] Additive logging: 2 for the price of 1!";
+ final String expected = "Additive logging: {} for the price of {}! [2,1] Additive logging: 2 for the price of 1!";
assertThat(line1, containsString(expected));
assertThat(line2, containsString(expected));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java
index 56cbfc6..e5984aa 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java
@@ -88,12 +88,12 @@ public class AsyncLoggerCustomSelectorLocationTest {
public static final class CustomAsyncContextSelector implements ContextSelector {
private static final LoggerContext CONTEXT = new AsyncLoggerContext("AsyncDefault");
@Override
- public LoggerContext getContext(String fqcn, ClassLoader loader, boolean currentContext) {
+ public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext) {
return CONTEXT;
}
@Override
- public LoggerContext getContext(String fqcn, ClassLoader loader, boolean currentContext, URI configLocation) {
+ public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext, final URI configLocation) {
return CONTEXT;
}
@@ -103,7 +103,7 @@ public class AsyncLoggerCustomSelectorLocationTest {
}
@Override
- public void removeContext(LoggerContext context) {
+ public void removeContext(final LoggerContext context) {
// does not remove anything
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/BlockingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/BlockingAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/BlockingAppender.java
index 6c8423f..c8e5ecd 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/BlockingAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/BlockingAppender.java
@@ -64,7 +64,7 @@ public class BlockingAppender extends AbstractAppender {
// block until the test class tells us to continue
try {
countDownLatch.await();
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
throw new RuntimeException(e);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java
index d0542dc..187a08f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java
@@ -40,7 +40,7 @@ public abstract class QueueFullAbstractTest {
protected BlockingAppender blockingAppender;
protected Unlocker unlocker;
- protected static void TRACE(Object msg) {
+ protected static void TRACE(final Object msg) {
if (TRACE) {
System.out.println(msg);
}
@@ -48,7 +48,7 @@ public abstract class QueueFullAbstractTest {
class Unlocker extends Thread {
final CountDownLatch countDownLatch;
- Unlocker(CountDownLatch countDownLatch) {
+ Unlocker(final CountDownLatch countDownLatch) {
this.countDownLatch = countDownLatch;
}
@Override
@@ -57,7 +57,7 @@ public abstract class QueueFullAbstractTest {
countDownLatch.await();
TRACE("Unlocker activated. Sleeping 500 millis before taking action...");
Thread.sleep(500);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
throw new RuntimeException(e);
}
TRACE("Unlocker signalling BlockingAppender to proceed...");
@@ -66,9 +66,9 @@ public abstract class QueueFullAbstractTest {
}
class DomainObject {
- private Logger innerLogger = LogManager.getLogger(DomainObject.class);
+ private final Logger innerLogger = LogManager.getLogger(DomainObject.class);
final int count;
- DomainObject(int loggingCount) {
+ DomainObject(final int loggingCount) {
this.count = loggingCount;
}
@@ -86,34 +86,34 @@ public abstract class QueueFullAbstractTest {
static Stack transform(final List<LogEvent> logEvents) {
final List<String> filtered = new ArrayList<>(logEvents.size());
- for (LogEvent event : logEvents) {
+ for (final LogEvent event : logEvents) {
filtered.add(event.getMessage().getFormattedMessage());
}
Collections.reverse(filtered);
- Stack<String> result = new Stack<>();
+ final Stack<String> result = new Stack<>();
result.addAll(filtered);
return result;
}
- static long asyncRemainingCapacity(Logger logger) {
+ static long asyncRemainingCapacity(final Logger logger) {
if (logger instanceof AsyncLogger) {
try {
- Field f = field(AsyncLogger.class, "loggerDisruptor");
+ final Field f = field(AsyncLogger.class, "loggerDisruptor");
return ((AsyncLoggerDisruptor) f.get(logger)).getDisruptor().getRingBuffer().remainingCapacity();
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new RuntimeException(ex);
}
} else {
- LoggerConfig loggerConfig = ((org.apache.logging.log4j.core.Logger) logger).get();
+ final LoggerConfig loggerConfig = ((org.apache.logging.log4j.core.Logger) logger).get();
if (loggerConfig instanceof AsyncLoggerConfig) {
try {
- Object delegate = field(AsyncLoggerConfig.class, "delegate").get(loggerConfig);
+ final Object delegate = field(AsyncLoggerConfig.class, "delegate").get(loggerConfig);
return ((Disruptor) field(AsyncLoggerConfigDisruptor.class, "disruptor").get(delegate)).getRingBuffer().remainingCapacity();
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new RuntimeException(ex);
}
} else {
- Appender async = loggerConfig.getAppenders().get("async");
+ final Appender async = loggerConfig.getAppenders().get("async");
if (async instanceof AsyncAppender) {
return ((AsyncAppender) async).getQueueCapacity();
}
@@ -121,8 +121,8 @@ public abstract class QueueFullAbstractTest {
}
throw new IllegalStateException("Neither Async Loggers nor AsyncAppender are configured");
}
- private static Field field(Class<?> c, String name) throws NoSuchFieldException {
- Field f = c.getDeclaredField(name);
+ private static Field field(final Class<?> c, final String name) throws NoSuchFieldException {
+ final Field f = c.getDeclaredField(name);
f.setAccessible(true);
return f;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java
index 307a93d..d11c2ff 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java
@@ -94,10 +94,10 @@ public class QueueFullAsyncLoggerConfigLoggingFromToStringTest extends QueueFull
final Stack<String> actual = transform(blockingAppender.logEvents);
assertEquals("Logging in toString() #0", actual.pop());
- List<StatusData> statusDataList = StatusLogger.getLogger().getStatusData();
+ final List<StatusData> statusDataList = StatusLogger.getLogger().getStatusData();
assertEquals("Jumped the queue: queue full",
"Logging in toString() #128", actual.pop());
- StatusData mostRecentStatusData = statusDataList.get(statusDataList.size() - 1);
+ final StatusData mostRecentStatusData = statusDataList.get(statusDataList.size() - 1);
assertEquals("Expected warn level status message", Level.WARN, mostRecentStatusData.getLevel());
assertThat(mostRecentStatusData.getFormattedStatus(), containsString(
"Log4j2 logged an event out of order to prevent deadlock caused by domain " +
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
index 099d660..53ada5b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
@@ -192,8 +192,8 @@ public class RingBufferLogEventTest {
final Marker marker = MarkerManager.getMarker("marked man");
final String fqcn = "f.q.c.n";
final Level level = Level.TRACE;
- ReusableMessageFactory factory = new ReusableMessageFactory();
- Message message = factory.newMessage("Hello {}!", "World");
+ final ReusableMessageFactory factory = new ReusableMessageFactory();
+ final Message message = factory.newMessage("Hello {}!", "World");
try {
final Throwable t = new InternalError("not a real error");
final ContextStack contextStack = new MutableThreadContextStack(Arrays.asList("a", "b"));
@@ -221,8 +221,8 @@ public class RingBufferLogEventTest {
final Marker marker = MarkerManager.getMarker("marked man");
final String fqcn = "f.q.c.n";
final Level level = Level.TRACE;
- ReusableMessageFactory factory = new ReusableMessageFactory();
- Message message = factory.newMessage("Hello {}!", "World");
+ final ReusableMessageFactory factory = new ReusableMessageFactory();
+ final Message message = factory.newMessage("Hello {}!", "World");
try {
final Throwable t = new InternalError("not a real error");
final ContextStack contextStack = new MutableThreadContextStack(Arrays.asList("a", "b"));
@@ -255,7 +255,7 @@ public class RingBufferLogEventTest {
final RingBufferLogEvent evt = new RingBufferLogEvent();
evt.forEachParameter(new ParameterConsumer<Void>() {
@Override
- public void accept(Object parameter, int parameterIndex, Void state) {
+ public void accept(final Object parameter, final int parameterIndex, final Void state) {
fail("Should not have been called");
}
}, null);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
index bf0823b..39cde5f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
@@ -130,7 +130,7 @@ public final class Histogram
// do a classic binary search to find the high value
while (low < high)
{
- int mid = low + ((high - low) >> 1);
+ final int mid = low + ((high - low) >> 1);
if (upperBounds[mid] < value)
{
low = mid + 1;
@@ -287,10 +287,10 @@ public final class Histogram
{
if (0L != counts[i])
{
- long upperBound = Math.min(upperBounds[i], maxValue);
- long midPoint = lowerBound + ((upperBound - lowerBound) / 2L);
+ final long upperBound = Math.min(upperBounds[i], maxValue);
+ final long midPoint = lowerBound + ((upperBound - lowerBound) / 2L);
- BigDecimal intervalTotal = new BigDecimal(midPoint).multiply(new BigDecimal(counts[i]));
+ final BigDecimal intervalTotal = new BigDecimal(midPoint).multiply(new BigDecimal(counts[i]));
total = total.add(intervalTotal);
}
@@ -360,7 +360,7 @@ public final class Histogram
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
sb.append("Histogram{");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
index cb7b497..2eb61b2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
@@ -96,7 +96,7 @@ public class CompositeConfigurationTest {
appendersMap.size());
assertTrue(appendersMap.get("STDOUT") instanceof ConsoleAppender);
- Filter loggerFilter = config.getLogger("cat1").getFilter();
+ final Filter loggerFilter = config.getLogger("cat1").getFilter();
assertTrue(loggerFilter instanceof RegexFilter);
assertEquals(loggerFilter.getOnMatch(), Filter.Result.DENY);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
index b94a5a9..67217f6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
@@ -38,23 +38,23 @@ public class JiraLog4j2_2134Test {
@Test
public void testRefresh() {
- Logger log = LogManager.getLogger(this.getClass());
+ final Logger log = LogManager.getLogger(this.getClass());
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
final Configuration config = ctx.getConfiguration();
- PatternLayout layout = PatternLayout.newBuilder()
+ final PatternLayout layout = PatternLayout.newBuilder()
// @formatter:off
.withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN)
.withConfiguration(config)
.build();
final Layout<? extends Serializable> layout1 = layout;
// @formatter:on
- Appender appender = FileAppender.newBuilder().withFileName("target/test.log").setLayout(layout1)
+ final Appender appender = FileAppender.newBuilder().withFileName("target/test.log").setLayout(layout1)
.setConfiguration(config).withBufferSize(4000).setName("File").build();
// appender.start();
config.addAppender(appender);
- AppenderRef ref = AppenderRef.createAppenderRef("File", null, null);
- AppenderRef[] refs = new AppenderRef[] { ref };
- LoggerConfig loggerConfig = LoggerConfig.createLogger(false, Level.INFO, "testlog4j2refresh", "true", refs,
+ final AppenderRef ref = AppenderRef.createAppenderRef("File", null, null);
+ final AppenderRef[] refs = new AppenderRef[] { ref };
+ final LoggerConfig loggerConfig = LoggerConfig.createLogger(false, Level.INFO, "testlog4j2refresh", "true", refs,
null, config, null);
loggerConfig.addAppender(appender, null, null);
config.addLogger("testlog4j2refresh", loggerConfig);
@@ -66,7 +66,7 @@ public class JiraLog4j2_2134Test {
@Test
public void testRefreshMinimalCodeStart() {
- Logger log = LogManager.getLogger(this.getClass());
+ final Logger log = LogManager.getLogger(this.getClass());
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
final Configuration config = ctx.getConfiguration();
ctx.start(config);
@@ -76,7 +76,7 @@ public class JiraLog4j2_2134Test {
@Test
public void testRefreshMinimalCodeStopStart() {
- Logger log = LogManager.getLogger(this.getClass());
+ final Logger log = LogManager.getLogger(this.getClass());
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
ctx.stop();
ctx.start();
@@ -86,7 +86,7 @@ public class JiraLog4j2_2134Test {
@Test
public void testRefreshMinimalCodeStopStartConfig() {
- Logger log = LogManager.getLogger(this.getClass());
+ final Logger log = LogManager.getLogger(this.getClass());
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
final Configuration config = ctx.getConfiguration();
ctx.stop();
@@ -98,18 +98,18 @@ public class JiraLog4j2_2134Test {
@SuppressWarnings("deprecation")
@Test
public void testRefreshDeprecatedApis() {
- Logger log = LogManager.getLogger(this.getClass());
+ final Logger log = LogManager.getLogger(this.getClass());
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
final Configuration config = ctx.getConfiguration();
- PatternLayout layout = PatternLayout.createLayout(PatternLayout.SIMPLE_CONVERSION_PATTERN, null, config, null,
+ final PatternLayout layout = PatternLayout.createLayout(PatternLayout.SIMPLE_CONVERSION_PATTERN, null, config, null,
null, false, false, null, null);
- Appender appender = FileAppender.createAppender("target/test.log", "false", "false", "File", "true", "false",
+ final Appender appender = FileAppender.createAppender("target/test.log", "false", "false", "File", "true", "false",
"false", "4000", layout, null, "false", null, config);
appender.start();
config.addAppender(appender);
- AppenderRef ref = AppenderRef.createAppenderRef("File", null, null);
- AppenderRef[] refs = new AppenderRef[] { ref };
- LoggerConfig loggerConfig = LoggerConfig.createLogger("false", Level.INFO, "testlog4j2refresh", "true", refs,
+ final AppenderRef ref = AppenderRef.createAppenderRef("File", null, null);
+ final AppenderRef[] refs = new AppenderRef[] { ref };
+ final LoggerConfig loggerConfig = LoggerConfig.createLogger("false", Level.INFO, "testlog4j2refresh", "true", refs,
null, config, null);
loggerConfig.addAppender(appender, null, null);
config.addLogger("testlog4j2refresh", loggerConfig);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java
index bbc9837..740818e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java
@@ -54,13 +54,13 @@ public class NestedLoggerConfigTest {
private final String prefix;
- public NestedLoggerConfigTest(String prefix) {
+ public NestedLoggerConfigTest(final String prefix) {
this.prefix = prefix;
}
@Test
public void testInheritParentDefaultLevel() throws IOException {
- Configuration configuration = loadConfiguration(prefix + "default-level.xml");
+ final Configuration configuration = loadConfiguration(prefix + "default-level.xml");
try {
assertEquals(Level.ERROR, configuration.getLoggerConfig("com.foo").getLevel());
} finally {
@@ -70,7 +70,7 @@ public class NestedLoggerConfigTest {
@Test
public void testInheritParentLevel() throws IOException {
- Configuration configuration = loadConfiguration(prefix + "inherit-level.xml");
+ final Configuration configuration = loadConfiguration(prefix + "inherit-level.xml");
try {
assertEquals(Level.TRACE, configuration.getLoggerConfig("com.foo").getLevel());
} finally {
@@ -78,10 +78,10 @@ public class NestedLoggerConfigTest {
}
}
- private Configuration loadConfiguration(String resourcePath) throws IOException {
- InputStream in = getClass().getClassLoader().getResourceAsStream(resourcePath);
+ private Configuration loadConfiguration(final String resourcePath) throws IOException {
+ final InputStream in = getClass().getClassLoader().getResourceAsStream(resourcePath);
try {
- Configuration configuration = new XmlConfiguration(new LoggerContext("test"), new ConfigurationSource(in));
+ final Configuration configuration = new XmlConfiguration(new LoggerContext("test"), new ConfigurationSource(in));
configuration.initialize();
configuration.start();
return configuration;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMap.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMap.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMap.java
index 47872fa..aacdf2d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMap.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMap.java
@@ -63,7 +63,7 @@ public class FactoryTestStringMap implements IndexedStringMap {
}
@Override
- public String getKeyAt(int index) {
+ public String getKeyAt(final int index) {
return null;
}
@@ -73,12 +73,12 @@ public class FactoryTestStringMap implements IndexedStringMap {
}
@Override
- public <V> V getValueAt(int index) {
+ public <V> V getValueAt(final int index) {
return null;
}
@Override
- public int indexOfKey(String key) {
+ public int indexOfKey(final String key) {
return 0;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/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 273502a..033cc9d 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
@@ -63,7 +63,7 @@ public class MutableLogEventTest {
try {
Class.forName("java.io.ObjectInputFilter");
useObjectInputStream = true;
- } catch (ClassNotFoundException ex) {
+ } catch (final ClassNotFoundException ex) {
// Ignore the exception
}
}
@@ -116,7 +116,7 @@ public class MutableLogEventTest {
@Test
public void testInitFromReusableCopiesFormatString() {
- Message message = ReusableMessageFactory.INSTANCE.newMessage("msg in a {}", "bottle");
+ final Message message = ReusableMessageFactory.INSTANCE.newMessage("msg in a {}", "bottle");
final Log4jLogEvent source = Log4jLogEvent.newBuilder() //
.setContextData(CONTEXT_DATA) //
.setContextStack(STACK) //
@@ -138,17 +138,17 @@ public class MutableLogEventTest {
assertEquals("format", "msg in a {}", mutable.getFormat());
assertEquals("formatted", "msg in a bottle", mutable.getFormattedMessage());
assertEquals("parameters", new String[] {"bottle"}, mutable.getParameters());
- Message memento = mutable.memento();
+ final Message memento = mutable.memento();
assertEquals("format", "msg in a {}", memento.getFormat());
assertEquals("formatted", "msg in a bottle", memento.getFormattedMessage());
assertEquals("parameters", new String[] {"bottle"}, memento.getParameters());
- Message eventMementoMessage = mutable.createMemento().getMessage();
+ final Message eventMementoMessage = mutable.createMemento().getMessage();
assertEquals("format", "msg in a {}", eventMementoMessage.getFormat());
assertEquals("formatted", "msg in a bottle", eventMementoMessage.getFormattedMessage());
assertEquals("parameters", new String[] {"bottle"}, eventMementoMessage.getParameters());
- Message log4JLogEventMessage = new Log4jLogEvent.Builder(mutable).build().getMessage();
+ final Message log4JLogEventMessage = new Log4jLogEvent.Builder(mutable).build().getMessage();
assertEquals("format", "msg in a {}", log4JLogEventMessage.getFormat());
assertEquals("formatted", "msg in a bottle", log4JLogEventMessage.getFormattedMessage());
assertEquals("parameters", new String[] {"bottle"}, log4JLogEventMessage.getParameters());
@@ -156,8 +156,8 @@ public class MutableLogEventTest {
@Test
public void testInitFromReusableObjectCopiesParameter() {
- Object param = new Object();
- Message message = ReusableMessageFactory.INSTANCE.newMessage(param);
+ final Object param = new Object();
+ final Message message = ReusableMessageFactory.INSTANCE.newMessage(param);
final Log4jLogEvent source = Log4jLogEvent.newBuilder()
.setContextData(CONTEXT_DATA)
.setContextStack(STACK)
@@ -180,7 +180,7 @@ public class MutableLogEventTest {
assertNull("format", mutable.getFormat());
assertEquals("formatted", param.toString(), mutable.getFormattedMessage());
assertEquals("parameters", new Object[] {param}, mutable.getParameters());
- Message memento = mutable.memento();
+ final Message memento = mutable.memento();
assertNull("format", memento.getFormat());
assertEquals("formatted", param.toString(), memento.getFormattedMessage());
assertEquals("parameters", new Object[] {param}, memento.getParameters());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java
index 912f1a8..2f1bc04 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java
@@ -76,8 +76,8 @@ public class NestedLoggingFromThrowableMessageTest {
CoreLoggerContexts.stopLoggerContext(false, file1);
CoreLoggerContexts.stopLoggerContext(false, file2);
- Set<String> lines1 = readUniqueLines(file1);
- Set<String> lines2 = readUniqueLines(file2);
+ final Set<String> lines1 = readUniqueLines(file1);
+ final Set<String> lines2 = readUniqueLines(file2);
assertEquals("Expected the same data from both appenders", lines1, lines2);
assertEquals(2, lines1.size());
@@ -85,9 +85,9 @@ public class NestedLoggingFromThrowableMessageTest {
assertTrue(lines1.contains("ERROR NestedLoggingFromThrowableMessageTest Test message"));
}
- private static Set<String> readUniqueLines(File input) throws IOException {
- Set<String> lines = new HashSet<>();
- BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(input)));
+ private static Set<String> readUniqueLines(final File input) throws IOException {
+ final Set<String> lines = new HashSet<>();
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(input)));
try {
String line;
while ((line = reader.readLine()) != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjectorTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjectorTest.java
index f553d3a..2f913f7 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjectorTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjectorTest.java
@@ -78,13 +78,13 @@ public class ThreadContextDataInjectorTest {
}
private void testContextDataInjector() {
- ReadOnlyThreadContextMap readOnlythreadContextMap = getThreadContextMap();
+ final ReadOnlyThreadContextMap readOnlythreadContextMap = getThreadContextMap();
assertThat("thread context map class name",
(readOnlythreadContextMap == null) ? null : readOnlythreadContextMap.getClass().getName(),
is(equalTo(readOnlythreadContextMapClassName)));
- ContextDataInjector contextDataInjector = createInjector();
- StringMap stringMap = contextDataInjector.injectContextData(null, new SortedArrayStringMap());
+ final ContextDataInjector contextDataInjector = createInjector();
+ final StringMap stringMap = contextDataInjector.injectContextData(null, new SortedArrayStringMap());
assertThat("thread context map", ThreadContext.getContext(), allOf(hasEntry("foo", "bar"), not(hasKey("baz"))));
assertThat("context map", stringMap.toMap(), allOf(hasEntry("foo", "bar"), not(hasKey("baz"))));
@@ -106,7 +106,7 @@ public class ThreadContextDataInjectorTest {
}
}
- private void prepareThreadContext(boolean isThreadContextMapInheritable) {
+ private void prepareThreadContext(final boolean isThreadContextMapInheritable) {
System.setProperty("log4j2.isThreadContextMapInheritable", Boolean.toString(isThreadContextMapInheritable));
PropertiesUtil.getProperties().reload();
ThreadContextTest.reinitThreadContext();
@@ -130,7 +130,7 @@ public class ThreadContextDataInjectorTest {
testContextDataInjector();
}
}).get();
- } catch (ExecutionException ee) {
+ } catch (final ExecutionException ee) {
throw ee.getCause();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
index 6eb5c4f..dec48ec 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
@@ -391,7 +391,7 @@ public class JsonLayoutTest {
.setCharset(StandardCharsets.UTF_8)
.setIncludeStacktrace(true)
.build();
- Message message = ReusableMessageFactory.INSTANCE.newMessage("Testing {}", new TestObj());
+ final Message message = ReusableMessageFactory.INSTANCE.newMessage("Testing {}", new TestObj());
try {
final Log4jLogEvent expected = Log4jLogEvent.newBuilder()
.setLoggerName("a.B")
@@ -400,7 +400,7 @@ public class JsonLayoutTest {
.setMessage(message)
.setThreadName("threadName")
.setTimeMillis(1).build();
- MutableLogEvent mutableLogEvent = new MutableLogEvent();
+ final MutableLogEvent mutableLogEvent = new MutableLogEvent();
mutableLogEvent.initFrom(expected);
final String str = layout.toSerializable(mutableLogEvent);
final String expectedMessage = "Testing " + TestObj.TO_STRING_VALUE;
@@ -426,9 +426,9 @@ public class JsonLayoutTest {
.setCharset(StandardCharsets.UTF_8)
.setIncludeStacktrace(true)
.build();
- Message message = ReusableMessageFactory.INSTANCE.newMessage("Testing {}", new TestObj());
+ final Message message = ReusableMessageFactory.INSTANCE.newMessage("Testing {}", new TestObj());
try {
- RingBufferLogEvent ringBufferEvent = new RingBufferLogEvent();
+ final RingBufferLogEvent ringBufferEvent = new RingBufferLogEvent();
ringBufferEvent.setValues(
null, "a.B", null, "f.q.c.n", Level.DEBUG, message,
null, new SortedArrayStringMap(), ThreadContext.EMPTY_STACK, 1L,
@@ -563,7 +563,7 @@ public class JsonLayoutTest {
return value;
}
- public void setValue(int value) {
+ public void setValue(final int value) {
this.value = value;
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_2195_Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_2195_Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_2195_Test.java
index 958e38a..5112e5d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_2195_Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_2195_Test.java
@@ -41,20 +41,20 @@ public class Log4j2_2195_Test {
@Test
public void test() {
logger.info("This is a test.", new Exception("Test exception!"));
- ListAppender listAppender = loggerContextRule.getListAppender("ListAppender");
+ final ListAppender listAppender = loggerContextRule.getListAppender("ListAppender");
Assert.assertNotNull(listAppender);
- List<String> events = listAppender.getMessages();
+ final List<String> events = listAppender.getMessages();
Assert.assertNotNull(events);
Assert.assertEquals(1, events.size());
- String logEvent = events.get(0);
+ final String logEvent = events.get(0);
Assert.assertNotNull(logEvent);
Assert.assertFalse("\"org.junit\" should not be here", logEvent.contains("org.junit"));
Assert.assertFalse("\"org.eclipse\" should not be here", logEvent.contains("org.eclipse"));
//
- Layout<? extends Serializable> layout = listAppender.getLayout();
- PatternLayout pLayout = (PatternLayout) layout;
+ final Layout<? extends Serializable> layout = listAppender.getLayout();
+ final PatternLayout pLayout = (PatternLayout) layout;
Assert.assertNotNull(pLayout);
- Serializer eventSerializer = pLayout.getEventSerializer();
+ final Serializer eventSerializer = pLayout.getEventSerializer();
Assert.assertNotNull(eventSerializer);
//
Assert.assertTrue("Missing \"|\"", logEvent.contains("|"));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
index db70075..d1bb7a8 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
@@ -195,15 +195,15 @@ public class Rfc5424LayoutTest {
final StructuredDataMessage msg2 = new StructuredDataMessage("Extra@18060", null, "Audit");
msg2.put("Item1", "Hello");
msg2.put("Item2", "World");
- List<StructuredDataMessage> messages = new ArrayList<>();
+ final List<StructuredDataMessage> messages = new ArrayList<>();
messages.add(msg);
messages.add(msg2);
final StructuredDataCollectionMessage collectionMessage = new StructuredDataCollectionMessage(messages);
root.info(MarkerManager.getMarker("EVENT"), collectionMessage);
- List<String> list = appender.getMessages();
- String result = list.get(0);
+ final List<String> list = appender.getMessages();
+ final String result = list.get(0);
assertTrue("Expected line to contain " + collectionLine1 + ", Actual " + result,
result.contains(collectionLine1));
assertTrue("Expected line to contain " + collectionLine2 + ", Actual " + result,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
index c01c82e..0d5205d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
@@ -66,7 +66,7 @@ public class SerializedLayoutTest {
try {
Class.forName("java.io.ObjectInputFilter");
useObjectInputStream = true;
- } catch (ClassNotFoundException ex) {
+ } catch (final ClassNotFoundException ex) {
// Ignore the exception
}
ConfigurationFactory.setConfigurationFactory(cf);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
index ea41e61..919eebc 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
@@ -46,7 +46,7 @@ public class MockTcpSyslogServer extends MockSyslogServer {
thread.interrupt();
try {
thread.join(100);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
System.out.println("Shutdown of TCP server thread failed.");
}
}
@@ -76,7 +76,7 @@ public class MockTcpSyslogServer extends MockSyslogServer {
System.out.println("Message too long");
}
}
- } catch (BindException be) {
+ } catch (final BindException be) {
be.printStackTrace();
} finally {
if (socket != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
index a445464..b116e40 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
@@ -67,7 +67,7 @@ public class MockTlsSyslogServer extends MockSyslogServer {
if (thread != null) {
try {
thread.join(100);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
System.out.println("Shutdown of TLS server thread failed.");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
index a74940b..a41b26b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
@@ -42,7 +42,7 @@ public class MockUdpSyslogServer extends MockSyslogServer {
thread.interrupt();
try {
thread.join(100);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
System.out.println("Shutdown of Log4j UDP server thread failed.");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProviderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProviderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProviderTest.java
index 26cda80..13ca8a4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProviderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProviderTest.java
@@ -31,7 +31,7 @@ public class FilePasswordProviderTest {
final Path path = Files.createTempFile("testPass", ".txt");
Files.write(path, PASSWORD.getBytes(Charset.defaultCharset()));
- char[] actual = new FilePasswordProvider(path.toString()).getPassword();
+ final char[] actual = new FilePasswordProvider(path.toString()).getPassword();
Files.delete(path);
assertArrayEquals(PASSWORD.toCharArray(), actual);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/MemoryPasswordProviderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/MemoryPasswordProviderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/MemoryPasswordProviderTest.java
index df4b5f2..99b3097 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/MemoryPasswordProviderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/MemoryPasswordProviderTest.java
@@ -29,16 +29,16 @@ public class MemoryPasswordProviderTest {
@Test
public void testConstructorDoesNotModifyOriginalParameterArray() {
- char[] initial = "123".toCharArray();
+ final char[] initial = "123".toCharArray();
new MemoryPasswordProvider(initial);
assertArrayEquals("123".toCharArray(), initial);
}
@Test
public void testGetPasswordReturnsCopyOfConstructorArray() {
- char[] initial = "123".toCharArray();
- MemoryPasswordProvider provider = new MemoryPasswordProvider(initial);
- char[] actual = provider.getPassword();
+ final char[] initial = "123".toCharArray();
+ final MemoryPasswordProvider provider = new MemoryPasswordProvider(initial);
+ final char[] actual = provider.getPassword();
assertArrayEquals("123".toCharArray(), actual);
assertNotSame(initial, actual);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
index 728254a..affb5b2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
@@ -150,8 +150,8 @@ public class DatePatternConverterTest {
}
}
- private String precisePattern(final String pattern, int precision) {
- String seconds = pattern.substring(0, pattern.indexOf("SSS"));
+ private String precisePattern(final String pattern, final int precision) {
+ final String seconds = pattern.substring(0, pattern.indexOf("SSS"));
return seconds + "nnnnnnnnn".substring(0, precision);
}
@@ -162,7 +162,7 @@ public class DatePatternConverterTest {
final StringBuilder milli = new StringBuilder();
final LogEvent event = new MyLogEvent();
- for (String timeZone : new String[]{"PDT", null}) { // Pacific Daylight Time=UTC-8:00
+ for (final String timeZone : new String[]{"PDT", null}) { // Pacific Daylight Time=UTC-8:00
for (final FixedDateFormat.FixedFormat format : FixedDateFormat.FixedFormat.values()) {
for (int i = 1; i <= 9; i++) {
if (format.getPattern().endsWith("n")) {
@@ -178,7 +178,7 @@ public class DatePatternConverterTest {
final String[] milliOptions = {format.getPattern(), timeZone};
DatePatternConverter.newInstance(milliOptions).format(event, milli);
milli.setLength(milli.length() - 3); // truncate millis
- String expected = milli.append("987123456".substring(0, i)).toString();
+ final String expected = milli.append("987123456".substring(0, i)).toString();
assertEquals(expected, precise.toString());
//System.out.println(preciseOptions[0] + ": " + precise);
@@ -208,7 +208,7 @@ public class DatePatternConverterTest {
final String[] milliOptions = {format.getPattern()};
DatePatternConverter.newInstance(milliOptions).format(event, milli);
milli.setLength(milli.length() - 3); // truncate millis
- String expected = milli.append("987123456").toString();
+ final String expected = milli.append("987123456").toString();
assertEquals(expected, precise.toString());
//System.out.println(preciseOptions[0] + ": " + precise);
@@ -228,7 +228,7 @@ public class DatePatternConverterTest {
@Override
public Instant getInstant() {
- MutableInstant result = new MutableInstant();
+ final MutableInstant result = new MutableInstant();
result.initFromEpochMilli(getTimeMillis(), 123456);
return result;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
index c3b1ba6..0987f76 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
@@ -56,7 +56,7 @@ public class HighlightConverterTest {
@Test
public void testLevelNamesBad() {
- String colorName = "red";
+ final String colorName = "red";
final String[] options = { "%-5level: %msg", PatternParser.NO_CONSOLE_NO_ANSI + "=false, "
+ PatternParser.DISABLE_ANSI + "=false, " + "BAD_LEVEL_A=" + colorName + ", BAD_LEVEL_B=" + colorName };
final HighlightConverter converter = HighlightConverter.newInstance(null, options);
@@ -67,7 +67,7 @@ public class HighlightConverterTest {
@Test
public void testLevelNamesGood() {
- String colorName = "red";
+ final String colorName = "red";
final String[] options = { "%-5level: %msg", PatternParser.NO_CONSOLE_NO_ANSI + "=false, "
+ PatternParser.DISABLE_ANSI + "=false, " + "DEBUG=" + colorName + ", TRACE=" + colorName };
final HighlightConverter converter = HighlightConverter.newInstance(null, options);
[03/13] logging-log4j2 git commit: Use final.
Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
index a4cc8d2..f61d216 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
@@ -139,11 +139,11 @@ public class CommandLine {
private String commandName = Help.DEFAULT_COMMAND_NAME;
private boolean overwrittenOptionsAllowed = false;
private boolean unmatchedArgumentsAllowed = false;
- private List<String> unmatchedArguments = new ArrayList<String>();
+ private final List<String> unmatchedArguments = new ArrayList<String>();
private CommandLine parent;
private boolean usageHelpRequested;
private boolean versionHelpRequested;
- private List<String> versionLines = new ArrayList<String>();
+ private final List<String> versionLines = new ArrayList<String>();
/**
* Constructs a new {@code CommandLine} interpreter with the specified annotated object.
@@ -152,7 +152,7 @@ public class CommandLine {
* @param command the object to initialize from the command line arguments
* @throws InitializationException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
*/
- public CommandLine(Object command) {
+ public CommandLine(final Object command) {
interpreter = new Interpreter(command);
}
@@ -197,8 +197,8 @@ public class CommandLine {
* @since 0.9.7
* @see Command#subcommands()
*/
- public CommandLine addSubcommand(String name, Object command) {
- CommandLine commandLine = toCommandLine(command);
+ public CommandLine addSubcommand(final String name, final Object command) {
+ final CommandLine commandLine = toCommandLine(command);
commandLine.parent = this;
interpreter.commands.put(name, commandLine);
return this;
@@ -259,9 +259,9 @@ public class CommandLine {
* @return this {@code CommandLine} object, to allow method chaining
* @since 0.9.7
*/
- public CommandLine setOverwrittenOptionsAllowed(boolean newValue) {
+ public CommandLine setOverwrittenOptionsAllowed(final boolean newValue) {
this.overwrittenOptionsAllowed = newValue;
- for (CommandLine command : interpreter.commands.values()) {
+ for (final CommandLine command : interpreter.commands.values()) {
command.setOverwrittenOptionsAllowed(newValue);
}
return this;
@@ -288,9 +288,9 @@ public class CommandLine {
* @since 0.9.7
* @see #getUnmatchedArguments()
*/
- public CommandLine setUnmatchedArgumentsAllowed(boolean newValue) {
+ public CommandLine setUnmatchedArgumentsAllowed(final boolean newValue) {
this.unmatchedArgumentsAllowed = newValue;
- for (CommandLine command : interpreter.commands.values()) {
+ for (final CommandLine command : interpreter.commands.values()) {
command.setUnmatchedArgumentsAllowed(newValue);
}
return this;
@@ -325,8 +325,8 @@ public class CommandLine {
* @throws ParameterException if the specified command line arguments are invalid
* @since 0.9.7
*/
- public static <T> T populateCommand(T command, String... args) {
- CommandLine cli = toCommandLine(command);
+ public static <T> T populateCommand(final T command, final String... args) {
+ final CommandLine cli = toCommandLine(command);
cli.parse(args);
return command;
}
@@ -345,7 +345,7 @@ public class CommandLine {
* @throws ParameterException if the specified command line arguments are invalid; use
* {@link ParameterException#getCommandLine()} to get the command or subcommand whose user input was invalid
*/
- public List<CommandLine> parse(String... args) {
+ public List<CommandLine> parse(final String... args) {
return interpreter.parse(args);
}
/**
@@ -407,7 +407,7 @@ public class CommandLine {
* @since 2.0 */
public static class DefaultExceptionHandler implements IExceptionHandler {
@Override
- public List<Object> handleException(ParameterException ex, PrintStream out, Help.Ansi ansi, String... args) {
+ public List<Object> handleException(final ParameterException ex, final PrintStream out, final Help.Ansi ansi, final String... args) {
out.println(ex.getMessage());
ex.getCommandLine().usage(out, ansi);
return Collections.emptyList();
@@ -429,8 +429,8 @@ public class CommandLine {
* @param ansi for printing help messages using ANSI styles and colors
* @return {@code true} if help was printed, {@code false} otherwise
* @since 2.0 */
- public static boolean printHelpIfRequested(List<CommandLine> parsedCommands, PrintStream out, Help.Ansi ansi) {
- for (CommandLine parsed : parsedCommands) {
+ public static boolean printHelpIfRequested(final List<CommandLine> parsedCommands, final PrintStream out, final Help.Ansi ansi) {
+ for (final CommandLine parsed : parsedCommands) {
if (parsed.isUsageHelpRequested()) {
parsed.usage(out, ansi);
return true;
@@ -441,19 +441,19 @@ public class CommandLine {
}
return false;
}
- private static Object execute(CommandLine parsed) {
- Object command = parsed.getCommand();
+ private static Object execute(final CommandLine parsed) {
+ final Object command = parsed.getCommand();
if (command instanceof Runnable) {
try {
((Runnable) command).run();
return null;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new ExecutionException(parsed, "Error while running command (" + command + ")", ex);
}
} else if (command instanceof Callable) {
try {
return ((Callable<Object>) command).call();
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new ExecutionException(parsed, "Error while calling command (" + command + ")", ex);
}
}
@@ -482,7 +482,7 @@ public class CommandLine {
* {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
*/
@Override
- public List<Object> handleParseResult(List<CommandLine> parsedCommands, PrintStream out, Help.Ansi ansi) {
+ public List<Object> handleParseResult(final List<CommandLine> parsedCommands, final PrintStream out, final Help.Ansi ansi) {
if (printHelpIfRequested(parsedCommands, out, ansi)) { return Collections.emptyList(); }
return Arrays.asList(execute(parsedCommands.get(0)));
}
@@ -533,9 +533,9 @@ public class CommandLine {
* {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
*/
@Override
- public List<Object> handleParseResult(List<CommandLine> parsedCommands, PrintStream out, Help.Ansi ansi) {
+ public List<Object> handleParseResult(final List<CommandLine> parsedCommands, final PrintStream out, final Help.Ansi ansi) {
if (printHelpIfRequested(parsedCommands, out, ansi)) { return Collections.emptyList(); }
- CommandLine last = parsedCommands.get(parsedCommands.size() - 1);
+ final CommandLine last = parsedCommands.get(parsedCommands.size() - 1);
return Arrays.asList(execute(last));
}
}
@@ -559,12 +559,12 @@ public class CommandLine {
* {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed
*/
@Override
- public List<Object> handleParseResult(List<CommandLine> parsedCommands, PrintStream out, Help.Ansi ansi) {
+ public List<Object> handleParseResult(final List<CommandLine> parsedCommands, final PrintStream out, final Help.Ansi ansi) {
if (printHelpIfRequested(parsedCommands, out, ansi)) {
return null;
}
- List<Object> result = new ArrayList<Object>();
- for (CommandLine parsed : parsedCommands) {
+ final List<Object> result = new ArrayList<Object>();
+ for (final CommandLine parsed : parsedCommands) {
result.add(execute(parsed));
}
return result;
@@ -607,7 +607,7 @@ public class CommandLine {
* @see RunLast
* @see RunAll
* @since 2.0 */
- public List<Object> parseWithHandler(IParseResultHandler handler, PrintStream out, String... args) {
+ public List<Object> parseWithHandler(final IParseResultHandler handler, final PrintStream out, final String... args) {
return parseWithHandlers(handler, out, Help.Ansi.AUTO, new DefaultExceptionHandler(), args);
}
/**
@@ -652,11 +652,11 @@ public class CommandLine {
* @see RunAll
* @see DefaultExceptionHandler
* @since 2.0 */
- public List<Object> parseWithHandlers(IParseResultHandler handler, PrintStream out, Help.Ansi ansi, IExceptionHandler exceptionHandler, String... args) {
+ public List<Object> parseWithHandlers(final IParseResultHandler handler, final PrintStream out, final Help.Ansi ansi, final IExceptionHandler exceptionHandler, final String... args) {
try {
- List<CommandLine> result = parse(args);
+ final List<CommandLine> result = parse(args);
return handler.handleParseResult(result, out, ansi);
- } catch (ParameterException ex) {
+ } catch (final ParameterException ex) {
return exceptionHandler.handleException(ex, out, ansi, args);
}
}
@@ -666,7 +666,7 @@ public class CommandLine {
* @param out the print stream to print the help message to
* @throws IllegalArgumentException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
*/
- public static void usage(Object command, PrintStream out) {
+ public static void usage(final Object command, final PrintStream out) {
toCommandLine(command).usage(out);
}
@@ -678,7 +678,7 @@ public class CommandLine {
* @param ansi whether the usage message should contain ANSI escape codes or not
* @throws IllegalArgumentException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
*/
- public static void usage(Object command, PrintStream out, Help.Ansi ansi) {
+ public static void usage(final Object command, final PrintStream out, final Help.Ansi ansi) {
toCommandLine(command).usage(out, ansi);
}
@@ -690,7 +690,7 @@ public class CommandLine {
* @param colorScheme the {@code ColorScheme} defining the styles for options, parameters and commands when ANSI is enabled
* @throws IllegalArgumentException if the specified command object does not have a {@link Command}, {@link Option} or {@link Parameters} annotation
*/
- public static void usage(Object command, PrintStream out, Help.ColorScheme colorScheme) {
+ public static void usage(final Object command, final PrintStream out, final Help.ColorScheme colorScheme) {
toCommandLine(command).usage(out, colorScheme);
}
@@ -699,7 +699,7 @@ public class CommandLine {
* @param out the printStream to print to
* @see #usage(PrintStream, Help.ColorScheme)
*/
- public void usage(PrintStream out) {
+ public void usage(final PrintStream out) {
usage(out, Help.Ansi.AUTO);
}
@@ -709,7 +709,7 @@ public class CommandLine {
* @param ansi whether the usage message should include ANSI escape codes or not
* @see #usage(PrintStream, Help.ColorScheme)
*/
- public void usage(PrintStream out, Help.Ansi ansi) {
+ public void usage(final PrintStream out, final Help.Ansi ansi) {
usage(out, Help.defaultColorScheme(ansi));
}
/**
@@ -744,8 +744,8 @@ public class CommandLine {
* @param out the {@code PrintStream} to print the usage help message to
* @param colorScheme the {@code ColorScheme} defining the styles for options, parameters and commands when ANSI is enabled
*/
- public void usage(PrintStream out, Help.ColorScheme colorScheme) {
- Help help = new Help(interpreter.command, colorScheme).addAllSubcommands(getSubcommands());
+ public void usage(final PrintStream out, final Help.ColorScheme colorScheme) {
+ final Help help = new Help(interpreter.command, colorScheme).addAllSubcommands(getSubcommands());
if (!Help.DEFAULT_SEPARATOR.equals(getSeparator())) {
help.separator = getSeparator();
help.parameterLabelRenderer = help.createDefaultParamLabelRenderer(); // update for new separator
@@ -753,7 +753,7 @@ public class CommandLine {
if (!Help.DEFAULT_COMMAND_NAME.equals(getCommandName())) {
help.commandName = getCommandName();
}
- StringBuilder sb = new StringBuilder()
+ final StringBuilder sb = new StringBuilder()
.append(help.headerHeading())
.append(help.header())
.append(help.synopsisHeading()) //e.g. Usage:
@@ -777,7 +777,7 @@ public class CommandLine {
* @see #printVersionHelp(PrintStream, Help.Ansi)
* @since 0.9.8
*/
- public void printVersionHelp(PrintStream out) { printVersionHelp(out, Help.Ansi.AUTO); }
+ public void printVersionHelp(final PrintStream out) { printVersionHelp(out, Help.Ansi.AUTO); }
/**
* Prints version information from the {@link Command#version()} annotation to the specified {@code PrintStream}.
@@ -790,8 +790,8 @@ public class CommandLine {
* @see #isVersionHelpRequested()
* @since 0.9.8
*/
- public void printVersionHelp(PrintStream out, Help.Ansi ansi) {
- for (String versionInfo : versionLines) {
+ public void printVersionHelp(final PrintStream out, final Help.Ansi ansi) {
+ for (final String versionInfo : versionLines) {
out.println(ansi.new Text(versionInfo));
}
}
@@ -808,8 +808,8 @@ public class CommandLine {
* @see #isVersionHelpRequested()
* @since 1.0.0
*/
- public void printVersionHelp(PrintStream out, Help.Ansi ansi, Object... params) {
- for (String versionInfo : versionLines) {
+ public void printVersionHelp(final PrintStream out, final Help.Ansi ansi, final Object... params) {
+ for (final String versionInfo : versionLines) {
out.println(ansi.new Text(String.format(versionInfo, params)));
}
}
@@ -832,7 +832,7 @@ public class CommandLine {
* @see #parseWithHandlers(IParseResultHandler, PrintStream, Help.Ansi, IExceptionHandler, String...)
* @see RunFirst
*/
- public static <C extends Callable<T>, T> T call(C callable, PrintStream out, String... args) {
+ public static <C extends Callable<T>, T> T call(final C callable, final PrintStream out, final String... args) {
return call(callable, out, Help.Ansi.AUTO, args);
}
/**
@@ -880,9 +880,9 @@ public class CommandLine {
* @see #parseWithHandlers(IParseResultHandler, PrintStream, Help.Ansi, IExceptionHandler, String...)
* @see RunLast
*/
- public static <C extends Callable<T>, T> T call(C callable, PrintStream out, Help.Ansi ansi, String... args) {
- CommandLine cmd = new CommandLine(callable); // validate command outside of try-catch
- List<Object> results = cmd.parseWithHandlers(new RunLast(), out, ansi, new DefaultExceptionHandler(), args);
+ public static <C extends Callable<T>, T> T call(final C callable, final PrintStream out, final Help.Ansi ansi, final String... args) {
+ final CommandLine cmd = new CommandLine(callable); // validate command outside of try-catch
+ final List<Object> results = cmd.parseWithHandlers(new RunLast(), out, ansi, new DefaultExceptionHandler(), args);
return results == null || results.isEmpty() ? null : (T) results.get(0);
}
@@ -902,7 +902,7 @@ public class CommandLine {
* @see #parseWithHandlers(IParseResultHandler, PrintStream, Help.Ansi, IExceptionHandler, String...)
* @see RunFirst
*/
- public static <R extends Runnable> void run(R runnable, PrintStream out, String... args) {
+ public static <R extends Runnable> void run(final R runnable, final PrintStream out, final String... args) {
run(runnable, out, Help.Ansi.AUTO, args);
}
/**
@@ -948,8 +948,8 @@ public class CommandLine {
* @see #parseWithHandlers(IParseResultHandler, PrintStream, Help.Ansi, IExceptionHandler, String...)
* @see RunLast
*/
- public static <R extends Runnable> void run(R runnable, PrintStream out, Help.Ansi ansi, String... args) {
- CommandLine cmd = new CommandLine(runnable); // validate command outside of try-catch
+ public static <R extends Runnable> void run(final R runnable, final PrintStream out, final Help.Ansi ansi, final String... args) {
+ final CommandLine cmd = new CommandLine(runnable); // validate command outside of try-catch
cmd.parseWithHandlers(new RunLast(), out, ansi, new DefaultExceptionHandler(), args);
}
@@ -996,9 +996,9 @@ public class CommandLine {
* @return this CommandLine object, to allow method chaining
* @see #addSubcommand(String, Object)
*/
- public <K> CommandLine registerConverter(Class<K> cls, ITypeConverter<K> converter) {
+ public <K> CommandLine registerConverter(final Class<K> cls, final ITypeConverter<K> converter) {
interpreter.converterRegistry.put(Assert.notNull(cls, "class"), Assert.notNull(converter, "converter"));
- for (CommandLine command : interpreter.commands.values()) {
+ for (final CommandLine command : interpreter.commands.values()) {
command.registerConverter(cls, converter);
}
return this;
@@ -1014,7 +1014,7 @@ public class CommandLine {
* The separator may also be set declaratively with the {@link CommandLine.Command#separator()} annotation attribute.
* @param separator the String that separates option names from option values
* @return this {@code CommandLine} object, to allow method chaining */
- public CommandLine setSeparator(String separator) {
+ public CommandLine setSeparator(final String separator) {
interpreter.separator = Assert.notNull(separator, "separator");
return this;
}
@@ -1030,35 +1030,35 @@ public class CommandLine {
* The command name may also be set declaratively with the {@link CommandLine.Command#name()} annotation attribute.
* @param commandName command name (also called program name) displayed in the usage help synopsis
* @return this {@code CommandLine} object, to allow method chaining */
- public CommandLine setCommandName(String commandName) {
+ public CommandLine setCommandName(final String commandName) {
this.commandName = Assert.notNull(commandName, "commandName");
return this;
}
- private static boolean empty(String str) { return str == null || str.trim().length() == 0; }
- private static boolean empty(Object[] array) { return array == null || array.length == 0; }
- private static boolean empty(Text txt) { return txt == null || txt.plain.toString().trim().length() == 0; }
- private static String str(String[] arr, int i) { return (arr == null || arr.length == 0) ? "" : arr[i]; }
- private static boolean isBoolean(Class<?> type) { return type == Boolean.class || type == Boolean.TYPE; }
- private static CommandLine toCommandLine(Object obj) { return obj instanceof CommandLine ? (CommandLine) obj : new CommandLine(obj);}
- private static boolean isMultiValue(Field field) { return isMultiValue(field.getType()); }
- private static boolean isMultiValue(Class<?> cls) { return cls.isArray() || Collection.class.isAssignableFrom(cls) || Map.class.isAssignableFrom(cls); }
- private static Class<?>[] getTypeAttribute(Field field) {
- Class<?>[] explicit = field.isAnnotationPresent(Parameters.class) ? field.getAnnotation(Parameters.class).type() : field.getAnnotation(Option.class).type();
+ private static boolean empty(final String str) { return str == null || str.trim().length() == 0; }
+ private static boolean empty(final Object[] array) { return array == null || array.length == 0; }
+ private static boolean empty(final Text txt) { return txt == null || txt.plain.toString().trim().length() == 0; }
+ private static String str(final String[] arr, final int i) { return (arr == null || arr.length == 0) ? "" : arr[i]; }
+ private static boolean isBoolean(final Class<?> type) { return type == Boolean.class || type == Boolean.TYPE; }
+ private static CommandLine toCommandLine(final Object obj) { return obj instanceof CommandLine ? (CommandLine) obj : new CommandLine(obj);}
+ private static boolean isMultiValue(final Field field) { return isMultiValue(field.getType()); }
+ private static boolean isMultiValue(final Class<?> cls) { return cls.isArray() || Collection.class.isAssignableFrom(cls) || Map.class.isAssignableFrom(cls); }
+ private static Class<?>[] getTypeAttribute(final Field field) {
+ final Class<?>[] explicit = field.isAnnotationPresent(Parameters.class) ? field.getAnnotation(Parameters.class).type() : field.getAnnotation(Option.class).type();
if (explicit.length > 0) { return explicit; }
if (field.getType().isArray()) { return new Class<?>[] { field.getType().getComponentType() }; }
if (isMultiValue(field)) {
- Type type = field.getGenericType(); // e.g. Map<Long, ? extends Number>
+ final Type type = field.getGenericType(); // e.g. Map<Long, ? extends Number>
if (type instanceof ParameterizedType) {
- ParameterizedType parameterizedType = (ParameterizedType) type;
- Type[] paramTypes = parameterizedType.getActualTypeArguments(); // e.g. ? extends Number
- Class<?>[] result = new Class<?>[paramTypes.length];
+ final ParameterizedType parameterizedType = (ParameterizedType) type;
+ final Type[] paramTypes = parameterizedType.getActualTypeArguments(); // e.g. ? extends Number
+ final Class<?>[] result = new Class<?>[paramTypes.length];
for (int i = 0; i < paramTypes.length; i++) {
if (paramTypes[i] instanceof Class) { result[i] = (Class<?>) paramTypes[i]; continue; } // e.g. Long
if (paramTypes[i] instanceof WildcardType) { // e.g. ? extends Number
- WildcardType wildcardType = (WildcardType) paramTypes[i];
- Type[] lower = wildcardType.getLowerBounds(); // e.g. []
+ final WildcardType wildcardType = (WildcardType) paramTypes[i];
+ final Type[] lower = wildcardType.getLowerBounds(); // e.g. []
if (lower.length > 0 && lower[0] instanceof Class) { result[i] = (Class<?>) lower[0]; continue; }
- Type[] upper = wildcardType.getUpperBounds(); // e.g. Number
+ final Type[] upper = wildcardType.getUpperBounds(); // e.g. Number
if (upper.length > 0 && upper[0] instanceof Class) { result[i] = (Class<?>) upper[0]; continue; }
}
Arrays.fill(result, String.class); return result; // too convoluted generic type, giving up
@@ -1656,7 +1656,7 @@ public class CommandLine {
* @param unspecified {@code true} if no arity was specified on the option/parameter (value is based on type)
* @param originalValue the original value that was specified on the option or parameter
*/
- public Range(int min, int max, boolean variable, boolean unspecified, String originalValue) {
+ public Range(final int min, final int max, final boolean variable, final boolean unspecified, final String originalValue) {
this.min = min;
this.max = max;
this.isVariable = variable;
@@ -1667,7 +1667,7 @@ public class CommandLine {
* or the field type's default arity if no arity was specified.
* @param field the field whose Option annotation to inspect
* @return a new {@code Range} based on the Option arity annotation on the specified field */
- public static Range optionArity(Field field) {
+ public static Range optionArity(final Field field) {
return field.isAnnotationPresent(Option.class)
? adjustForType(Range.valueOf(field.getAnnotation(Option.class).arity()), field)
: new Range(0, 0, false, true, "0");
@@ -1676,7 +1676,7 @@ public class CommandLine {
* or the field type's default arity if no arity was specified.
* @param field the field whose Parameters annotation to inspect
* @return a new {@code Range} based on the Parameters arity annotation on the specified field */
- public static Range parameterArity(Field field) {
+ public static Range parameterArity(final Field field) {
return field.isAnnotationPresent(Parameters.class)
? adjustForType(Range.valueOf(field.getAnnotation(Parameters.class).arity()), field)
: new Range(0, 0, false, true, "0");
@@ -1684,12 +1684,12 @@ public class CommandLine {
/** Returns a new {@code Range} based on the {@link Parameters#index()} annotation on the specified field.
* @param field the field whose Parameters annotation to inspect
* @return a new {@code Range} based on the Parameters index annotation on the specified field */
- public static Range parameterIndex(Field field) {
+ public static Range parameterIndex(final Field field) {
return field.isAnnotationPresent(Parameters.class)
? Range.valueOf(field.getAnnotation(Parameters.class).index())
: new Range(0, 0, false, true, "0");
}
- static Range adjustForType(Range result, Field field) {
+ static Range adjustForType(final Range result, final Field field) {
return result.isUnspecified ? defaultArity(field) : result;
}
/** Returns the default arity {@code Range}: for {@link Option options} this is 0 for booleans and 1 for
@@ -1698,8 +1698,8 @@ public class CommandLine {
* @param field the field whose default arity to return
* @return a new {@code Range} indicating the default arity of the specified field
* @since 2.0 */
- public static Range defaultArity(Field field) {
- Class<?> type = field.getType();
+ public static Range defaultArity(final Field field) {
+ final Class<?> type = field.getType();
if (field.isAnnotationPresent(Option.class)) {
return defaultArity(type);
}
@@ -1711,14 +1711,14 @@ public class CommandLine {
/** Returns the default arity {@code Range} for {@link Option options}: booleans have arity 0, other types have arity 1.
* @param type the type whose default arity to return
* @return a new {@code Range} indicating the default arity of the specified type */
- public static Range defaultArity(Class<?> type) {
+ public static Range defaultArity(final Class<?> type) {
return isBoolean(type) ? Range.valueOf("0") : Range.valueOf("1");
}
private int size() { return 1 + max - min; }
- static Range parameterCapacity(Field field) {
- Range arity = parameterArity(field);
+ static Range parameterCapacity(final Field field) {
+ final Range arity = parameterArity(field);
if (!isMultiValue(field)) { return arity; }
- Range index = parameterIndex(field);
+ final Range index = parameterIndex(field);
if (arity.max == 0) { return arity; }
if (index.size() == 1) { return arity; }
if (index.isVariable) { return Range.valueOf(arity.min + "..*"); }
@@ -1734,7 +1734,7 @@ public class CommandLine {
* @return a new {@code Range} value */
public static Range valueOf(String range) {
range = range.trim();
- boolean unspecified = range.length() == 0 || range.startsWith(".."); // || range.endsWith("..");
+ final boolean unspecified = range.length() == 0 || range.startsWith(".."); // || range.endsWith("..");
int min = -1, max = -1;
boolean variable = false;
int dots = -1;
@@ -1747,13 +1747,13 @@ public class CommandLine {
variable = max == Integer.MAX_VALUE;
min = variable ? 0 : max;
}
- Range result = new Range(min, max, variable, unspecified, range);
+ final Range result = new Range(min, max, variable, unspecified, range);
return result;
}
- private static int parseInt(String str, int defaultValue) {
+ private static int parseInt(final String str, final int defaultValue) {
try {
return Integer.parseInt(str);
- } catch (Exception ex) {
+ } catch (final Exception ex) {
return defaultValue;
}
}
@@ -1761,25 +1761,25 @@ public class CommandLine {
* The {@code max} of the returned Range is guaranteed not to be less than the new {@code min} value.
* @param newMin the {@code min} value of the returned Range object
* @return a new Range object with the specified {@code min} value */
- public Range min(int newMin) { return new Range(newMin, Math.max(newMin, max), isVariable, isUnspecified, originalValue); }
+ public Range min(final int newMin) { return new Range(newMin, Math.max(newMin, max), isVariable, isUnspecified, originalValue); }
/** Returns a new Range object with the {@code max} value replaced by the specified value.
* The {@code min} of the returned Range is guaranteed not to be greater than the new {@code max} value.
* @param newMax the {@code max} value of the returned Range object
* @return a new Range object with the specified {@code max} value */
- public Range max(int newMax) { return new Range(Math.min(min, newMax), newMax, isVariable, isUnspecified, originalValue); }
+ public Range max(final int newMax) { return new Range(Math.min(min, newMax), newMax, isVariable, isUnspecified, originalValue); }
/**
* Returns {@code true} if this Range includes the specified value, {@code false} otherwise.
* @param value the value to check
* @return {@code true} if the specified value is not less than the minimum and not greater than the maximum of this Range
*/
- public boolean contains(int value) { return min <= value && max >= value; }
+ public boolean contains(final int value) { return min <= value && max >= value; }
@Override
- public boolean equals(Object object) {
+ public boolean equals(final Object object) {
if (!(object instanceof Range)) { return false; }
- Range other = (Range) object;
+ final Range other = (Range) object;
return other.max == this.max && other.min == this.min && other.isVariable == this.isVariable;
}
@Override
@@ -1791,32 +1791,32 @@ public class CommandLine {
return min == max ? String.valueOf(min) : min + ".." + (isVariable ? "*" : max);
}
@Override
- public int compareTo(Range other) {
- int result = min - other.min;
+ public int compareTo(final Range other) {
+ final int result = min - other.min;
return (result == 0) ? max - other.max : result;
}
}
- static void init(Class<?> cls,
- List<Field> requiredFields,
- Map<String, Field> optionName2Field,
- Map<Character, Field> singleCharOption2Field,
- List<Field> positionalParametersFields) {
- Field[] declaredFields = cls.getDeclaredFields();
- for (Field field : declaredFields) {
+ static void init(final Class<?> cls,
+ final List<Field> requiredFields,
+ final Map<String, Field> optionName2Field,
+ final Map<Character, Field> singleCharOption2Field,
+ final List<Field> positionalParametersFields) {
+ final Field[] declaredFields = cls.getDeclaredFields();
+ for (final Field field : declaredFields) {
field.setAccessible(true);
if (field.isAnnotationPresent(Option.class)) {
- Option option = field.getAnnotation(Option.class);
+ final Option option = field.getAnnotation(Option.class);
if (option.required()) {
requiredFields.add(field);
}
- for (String name : option.names()) { // cannot be null or empty
- Field existing = optionName2Field.put(name, field);
+ for (final String name : option.names()) { // cannot be null or empty
+ final Field existing = optionName2Field.put(name, field);
if (existing != null && existing != field) {
throw DuplicateOptionAnnotationsException.create(name, field, existing);
}
if (name.length() == 2 && name.startsWith("-")) {
- char flag = name.charAt(1);
- Field existing2 = singleCharOption2Field.put(flag, field);
+ final char flag = name.charAt(1);
+ final Field existing2 = singleCharOption2Field.put(flag, field);
if (existing2 != null && existing2 != field) {
throw DuplicateOptionAnnotationsException.create(name, field, existing2);
}
@@ -1829,17 +1829,17 @@ public class CommandLine {
+ field.getName() + "' is both.");
}
positionalParametersFields.add(field);
- Range arity = Range.parameterArity(field);
+ final Range arity = Range.parameterArity(field);
if (arity.min > 0) {
requiredFields.add(field);
}
}
}
}
- static void validatePositionalParameters(List<Field> positionalParametersFields) {
+ static void validatePositionalParameters(final List<Field> positionalParametersFields) {
int min = 0;
- for (Field field : positionalParametersFields) {
- Range index = Range.parameterIndex(field);
+ for (final Field field : positionalParametersFields) {
+ final Range index = Range.parameterIndex(field);
if (index.min > min) {
throw new ParameterIndexGapException("Missing field annotated with @Parameter(index=" + min +
"). Nearest field '" + field.getName() + "' has index=" + index.min);
@@ -1848,7 +1848,7 @@ public class CommandLine {
min = min == Integer.MAX_VALUE ? min : min + 1;
}
}
- private static <T> Stack<T> reverse(Stack<T> stack) {
+ private static <T> Stack<T> reverse(final Stack<T> stack) {
Collections.reverse(stack);
return stack;
}
@@ -1867,7 +1867,7 @@ public class CommandLine {
private String separator = Help.DEFAULT_SEPARATOR;
private int position;
- Interpreter(Object command) {
+ Interpreter(final Object command) {
converterRegistry.put(Path.class, new BuiltIn.PathConverter());
converterRegistry.put(Object.class, new BuiltIn.StringConverter());
converterRegistry.put(String.class, new BuiltIn.StringConverter());
@@ -1910,28 +1910,28 @@ public class CommandLine {
init(cls, requiredFields, optionName2Field, singleCharOption2Field, positionalParametersFields);
if (cls.isAnnotationPresent(Command.class)) {
hasCommandAnnotation = true;
- Command cmd = cls.getAnnotation(Command.class);
+ final Command cmd = cls.getAnnotation(Command.class);
declaredSeparator = (declaredSeparator == null) ? cmd.separator() : declaredSeparator;
declaredName = (declaredName == null) ? cmd.name() : declaredName;
CommandLine.this.versionLines.addAll(Arrays.asList(cmd.version()));
- for (Class<?> sub : cmd.subcommands()) {
- Command subCommand = sub.getAnnotation(Command.class);
+ for (final Class<?> sub : cmd.subcommands()) {
+ final Command subCommand = sub.getAnnotation(Command.class);
if (subCommand == null || Help.DEFAULT_COMMAND_NAME.equals(subCommand.name())) {
throw new InitializationException("Subcommand " + sub.getName() +
" is missing the mandatory @Command annotation with a 'name' attribute");
}
try {
- Constructor<?> constructor = sub.getDeclaredConstructor();
+ final Constructor<?> constructor = sub.getDeclaredConstructor();
constructor.setAccessible(true);
- CommandLine commandLine = toCommandLine(constructor.newInstance());
+ final CommandLine commandLine = toCommandLine(constructor.newInstance());
commandLine.parent = CommandLine.this;
commands.put(subCommand.name(), commandLine);
}
- catch (InitializationException ex) { throw ex; }
- catch (NoSuchMethodException ex) { throw new InitializationException("Cannot instantiate subcommand " +
+ catch (final InitializationException ex) { throw ex; }
+ catch (final NoSuchMethodException ex) { throw new InitializationException("Cannot instantiate subcommand " +
sub.getName() + ": the class has no constructor", ex); }
- catch (Exception ex) {
+ catch (final Exception ex) {
throw new InitializationException("Could not instantiate and add subcommand " +
sub.getName() + ": " + ex, ex);
}
@@ -1956,41 +1956,41 @@ public class CommandLine {
* @return a list with all commands and subcommands initialized by this method
* @throws ParameterException if the specified command line arguments are invalid
*/
- List<CommandLine> parse(String... args) {
+ List<CommandLine> parse(final String... args) {
Assert.notNull(args, "argument array");
if (tracer.isInfo()) {tracer.info("Parsing %d command line args %s%n", args.length, Arrays.toString(args));}
- Stack<String> arguments = new Stack<String>();
+ final Stack<String> arguments = new Stack<String>();
for (int i = args.length - 1; i >= 0; i--) {
arguments.push(args[i]);
}
- List<CommandLine> result = new ArrayList<CommandLine>();
+ final List<CommandLine> result = new ArrayList<CommandLine>();
parse(result, arguments, args);
return result;
}
- private void parse(List<CommandLine> parsedCommands, Stack<String> argumentStack, String[] originalArgs) {
+ private void parse(final List<CommandLine> parsedCommands, final Stack<String> argumentStack, final String[] originalArgs) {
// first reset any state in case this CommandLine instance is being reused
isHelpRequested = false;
CommandLine.this.versionHelpRequested = false;
CommandLine.this.usageHelpRequested = false;
- Class<?> cmdClass = this.command.getClass();
+ final Class<?> cmdClass = this.command.getClass();
if (tracer.isDebug()) {tracer.debug("Initializing %s: %d options, %d positional parameters, %d required, %d subcommands.%n", cmdClass.getName(), new HashSet<Field>(optionName2Field.values()).size(), positionalParametersFields.size(), requiredFields.size(), commands.size());}
parsedCommands.add(CommandLine.this);
- List<Field> required = new ArrayList<Field>(requiredFields);
- Set<Field> initialized = new HashSet<Field>();
+ final List<Field> required = new ArrayList<Field>(requiredFields);
+ final Set<Field> initialized = new HashSet<Field>();
Collections.sort(required, new PositionalParametersSorter());
try {
processArguments(parsedCommands, argumentStack, required, initialized, originalArgs);
- } catch (ParameterException ex) {
+ } catch (final ParameterException ex) {
throw ex;
- } catch (Exception ex) {
- int offendingArgIndex = originalArgs.length - argumentStack.size() - 1;
- String arg = offendingArgIndex >= 0 && offendingArgIndex < originalArgs.length ? originalArgs[offendingArgIndex] : "?";
+ } catch (final Exception ex) {
+ final int offendingArgIndex = originalArgs.length - argumentStack.size() - 1;
+ final String arg = offendingArgIndex >= 0 && offendingArgIndex < originalArgs.length ? originalArgs[offendingArgIndex] : "?";
throw ParameterException.create(CommandLine.this, ex, arg, offendingArgIndex, originalArgs);
}
if (!isAnyHelpRequested() && !required.isEmpty()) {
- for (Field missing : required) {
+ for (final Field missing : required) {
if (missing.isAnnotationPresent(Option.class)) {
throw MissingParameterException.create(CommandLine.this, required, separator);
} else {
@@ -2004,11 +2004,11 @@ public class CommandLine {
}
}
- private void processArguments(List<CommandLine> parsedCommands,
- Stack<String> args,
- Collection<Field> required,
- Set<Field> initialized,
- String[] originalArgs) throws Exception {
+ private void processArguments(final List<CommandLine> parsedCommands,
+ final Stack<String> args,
+ final Collection<Field> required,
+ final Set<Field> initialized,
+ final String[] originalArgs) throws Exception {
// arg must be one of:
// 1. the "--" double dash separating options from positional arguments
// 1. a stand-alone flag, like "-v" or "--verbose": no value required, must map to boolean or Boolean field
@@ -2045,13 +2045,13 @@ public class CommandLine {
// or an option may have one or more option parameters.
// A parameter may be attached to the option.
boolean paramAttachedToOption = false;
- int separatorIndex = arg.indexOf(separator);
+ final int separatorIndex = arg.indexOf(separator);
if (separatorIndex > 0) {
- String key = arg.substring(0, separatorIndex);
+ final String key = arg.substring(0, separatorIndex);
// be greedy. Consume the whole arg as an option if possible.
if (optionName2Field.containsKey(key) && !optionName2Field.containsKey(arg)) {
paramAttachedToOption = true;
- String optionParam = arg.substring(separatorIndex + separator.length());
+ final String optionParam = arg.substring(separatorIndex + separator.length());
args.push(optionParam);
arg = key;
if (tracer.isDebug()) {tracer.debug("Separated '%s' option from '%s' option parameter%n", key, optionParam);}
@@ -2081,43 +2081,44 @@ public class CommandLine {
}
}
}
- private boolean resemblesOption(String arg) {
+ private boolean resemblesOption(final String arg) {
int count = 0;
- for (String optionName : optionName2Field.keySet()) {
+ for (final String optionName : optionName2Field.keySet()) {
for (int i = 0; i < arg.length(); i++) {
if (optionName.length() > i && arg.charAt(i) == optionName.charAt(i)) { count++; } else { break; }
}
}
- boolean result = count > 0 && count * 10 >= optionName2Field.size() * 9; // at least one prefix char in common with 9 out of 10 options
+ final boolean result = count > 0 && count * 10 >= optionName2Field.size() * 9; // at least one prefix char in common with 9 out of 10 options
if (tracer.isDebug()) {tracer.debug("%s %s an option: %d matching prefix chars out of %d option names%n", arg, (result ? "resembles" : "doesn't resemble"), count, optionName2Field.size());}
return result;
}
- private void handleUnmatchedArguments(String arg) {Stack<String> args = new Stack<String>(); args.add(arg); handleUnmatchedArguments(args);}
- private void handleUnmatchedArguments(Stack<String> args) {
+ private void handleUnmatchedArguments(final String arg) {final Stack<String> args = new Stack<String>(); args.add(arg); handleUnmatchedArguments(args);}
+ private void handleUnmatchedArguments(final Stack<String> args) {
while (!args.isEmpty()) { unmatchedArguments.add(args.pop()); } // addAll would give args in reverse order
}
- private void processRemainderAsPositionalParameters(Collection<Field> required, Set<Field> initialized, Stack<String> args) throws Exception {
+ private void processRemainderAsPositionalParameters(final Collection<Field> required, final Set<Field> initialized, final Stack<String> args) throws Exception {
while (!args.empty()) {
processPositionalParameter(required, initialized, args);
}
}
- private void processPositionalParameter(Collection<Field> required, Set<Field> initialized, Stack<String> args) throws Exception {
+ private void processPositionalParameter(final Collection<Field> required, final Set<Field> initialized, final Stack<String> args) throws Exception {
if (tracer.isDebug()) {tracer.debug("Processing next arg as a positional parameter at index=%d. Remainder=%s%n", position, reverse((Stack<String>) args.clone()));}
int consumed = 0;
- for (Field positionalParam : positionalParametersFields) {
- Range indexRange = Range.parameterIndex(positionalParam);
+ for (final Field positionalParam : positionalParametersFields) {
+ final Range indexRange = Range.parameterIndex(positionalParam);
if (!indexRange.contains(position)) {
continue;
}
@SuppressWarnings("unchecked")
+ final
Stack<String> argsCopy = (Stack<String>) args.clone();
- Range arity = Range.parameterArity(positionalParam);
+ final Range arity = Range.parameterArity(positionalParam);
if (tracer.isDebug()) {tracer.debug("Position %d is in index range %s. Trying to assign args to %s, arity=%s%n", position, indexRange, positionalParam, arity);}
assertNoMissingParameters(positionalParam, arity.min, argsCopy);
- int originalSize = argsCopy.size();
+ final int originalSize = argsCopy.size();
applyOption(positionalParam, Parameters.class, arity, false, argsCopy, initialized, "args[" + indexRange + "] at position " + position);
- int count = originalSize - argsCopy.size();
+ final int count = originalSize - argsCopy.size();
if (count > 0) { required.remove(positionalParam); }
consumed = Math.max(consumed, count);
}
@@ -2130,12 +2131,12 @@ public class CommandLine {
}
}
- private void processStandaloneOption(Collection<Field> required,
- Set<Field> initialized,
- String arg,
- Stack<String> args,
- boolean paramAttachedToKey) throws Exception {
- Field field = optionName2Field.get(arg);
+ private void processStandaloneOption(final Collection<Field> required,
+ final Set<Field> initialized,
+ final String arg,
+ final Stack<String> args,
+ final boolean paramAttachedToKey) throws Exception {
+ final Field field = optionName2Field.get(arg);
required.remove(field);
Range arity = Range.optionArity(field);
if (paramAttachedToKey) {
@@ -2145,19 +2146,19 @@ public class CommandLine {
applyOption(field, Option.class, arity, paramAttachedToKey, args, initialized, "option " + arg);
}
- private void processClusteredShortOptions(Collection<Field> required,
- Set<Field> initialized,
- String arg,
- Stack<String> args)
+ private void processClusteredShortOptions(final Collection<Field> required,
+ final Set<Field> initialized,
+ final String arg,
+ final Stack<String> args)
throws Exception {
- String prefix = arg.substring(0, 1);
+ final String prefix = arg.substring(0, 1);
String cluster = arg.substring(1);
boolean paramAttachedToOption = true;
do {
if (cluster.length() > 0 && singleCharOption2Field.containsKey(cluster.charAt(0))) {
- Field field = singleCharOption2Field.get(cluster.charAt(0));
+ final Field field = singleCharOption2Field.get(cluster.charAt(0));
Range arity = Range.optionArity(field);
- String argDescription = "option " + prefix + cluster.charAt(0);
+ final String argDescription = "option " + prefix + cluster.charAt(0);
if (tracer.isDebug()) {tracer.debug("Found option '%s%s' in %s: field %s, arity=%s%n", prefix, cluster.charAt(0), arg, field, arity);}
required.remove(field);
cluster = cluster.length() > 0 ? cluster.substring(1) : "";
@@ -2175,7 +2176,7 @@ public class CommandLine {
if (!empty(cluster)) {
args.push(cluster); // interpret remainder as option parameter
}
- int consumed = applyOption(field, Option.class, arity, paramAttachedToOption, args, initialized, argDescription);
+ final int consumed = applyOption(field, Option.class, arity, paramAttachedToOption, args, initialized, argDescription);
// only return if cluster (and maybe more) was consumed, otherwise continue do-while loop
if (empty(cluster) || consumed > 0 || args.isEmpty()) {
return;
@@ -2208,15 +2209,15 @@ public class CommandLine {
} while (true);
}
- private int applyOption(Field field,
- Class<?> annotation,
- Range arity,
- boolean valueAttachedToOption,
- Stack<String> args,
- Set<Field> initialized,
- String argDescription) throws Exception {
+ private int applyOption(final Field field,
+ final Class<?> annotation,
+ final Range arity,
+ final boolean valueAttachedToOption,
+ final Stack<String> args,
+ final Set<Field> initialized,
+ final String argDescription) throws Exception {
updateHelpRequested(field);
- int length = args.size();
+ final int length = args.size();
assertNoMissingParameters(field, arity.min, args);
Class<?> cls = field.getType();
@@ -2233,13 +2234,13 @@ public class CommandLine {
return applyValueToSingleValuedField(field, arity, args, cls, initialized, argDescription);
}
- private int applyValueToSingleValuedField(Field field,
- Range arity,
- Stack<String> args,
- Class<?> cls,
- Set<Field> initialized,
- String argDescription) throws Exception {
- boolean noMoreValues = args.isEmpty();
+ private int applyValueToSingleValuedField(final Field field,
+ final Range arity,
+ final Stack<String> args,
+ final Class<?> cls,
+ final Set<Field> initialized,
+ final String argDescription) throws Exception {
+ final boolean noMoreValues = args.isEmpty();
String value = args.isEmpty() ? null : trim(args.pop()); // unquote the value
int result = arity.min; // the number or args we need to consume
@@ -2253,16 +2254,16 @@ public class CommandLine {
if (value != null) {
args.push(value); // we don't consume the value
}
- Boolean currentValue = (Boolean) field.get(command);
+ final Boolean currentValue = (Boolean) field.get(command);
value = String.valueOf(currentValue == null ? true : !currentValue); // #147 toggle existing boolean value
}
}
if (noMoreValues && value == null) {
return 0;
}
- ITypeConverter<?> converter = getTypeConverter(cls, field);
- Object newValue = tryConvert(field, -1, converter, value, cls);
- Object oldValue = field.get(command);
+ final ITypeConverter<?> converter = getTypeConverter(cls, field);
+ final Object newValue = tryConvert(field, -1, converter, value, cls);
+ final Object oldValue = field.get(command);
TraceLevel level = TraceLevel.INFO;
String traceMessage = "Setting %s field '%s.%s' to '%5$s' (was '%4$s') for %6$s%n";
if (initialized != null) {
@@ -2281,34 +2282,34 @@ public class CommandLine {
field.set(command, newValue);
return result;
}
- private int applyValuesToMapField(Field field,
- Class<?> annotation,
- Range arity,
- Stack<String> args,
- Class<?> cls,
- String argDescription) throws Exception {
- Class<?>[] classes = getTypeAttribute(field);
+ private int applyValuesToMapField(final Field field,
+ final Class<?> annotation,
+ final Range arity,
+ final Stack<String> args,
+ final Class<?> cls,
+ final String argDescription) throws Exception {
+ final Class<?>[] classes = getTypeAttribute(field);
if (classes.length < 2) { throw new ParameterException(CommandLine.this, "Field " + field + " needs two types (one for the map key, one for the value) but only has " + classes.length + " types configured."); }
- ITypeConverter<?> keyConverter = getTypeConverter(classes[0], field);
- ITypeConverter<?> valueConverter = getTypeConverter(classes[1], field);
+ final ITypeConverter<?> keyConverter = getTypeConverter(classes[0], field);
+ final ITypeConverter<?> valueConverter = getTypeConverter(classes[1], field);
Map<Object, Object> result = (Map<Object, Object>) field.get(command);
if (result == null) {
result = createMap(cls);
field.set(command, result);
}
- int originalSize = result.size();
+ final int originalSize = result.size();
consumeMapArguments(field, arity, args, classes, keyConverter, valueConverter, result, argDescription);
return result.size() - originalSize;
}
- private void consumeMapArguments(Field field,
- Range arity,
- Stack<String> args,
- Class<?>[] classes,
- ITypeConverter<?> keyConverter,
- ITypeConverter<?> valueConverter,
- Map<Object, Object> result,
- String argDescription) throws Exception {
+ private void consumeMapArguments(final Field field,
+ final Range arity,
+ final Stack<String> args,
+ final Class<?>[] classes,
+ final ITypeConverter<?> keyConverter,
+ final ITypeConverter<?> valueConverter,
+ final Map<Object, Object> result,
+ final String argDescription) throws Exception {
// first do the arity.min mandatory parameters
for (int i = 0; i < arity.min; i++) {
consumeOneMapArgument(field, arity, args, classes, keyConverter, valueConverter, result, i, argDescription);
@@ -2324,19 +2325,19 @@ public class CommandLine {
}
}
- private void consumeOneMapArgument(Field field,
- Range arity,
- Stack<String> args,
- Class<?>[] classes,
- ITypeConverter<?> keyConverter, ITypeConverter<?> valueConverter,
- Map<Object, Object> result,
- int index,
- String argDescription) throws Exception {
- String[] values = split(trim(args.pop()), field);
- for (String value : values) {
- String[] keyValue = value.split("=");
+ private void consumeOneMapArgument(final Field field,
+ final Range arity,
+ final Stack<String> args,
+ final Class<?>[] classes,
+ final ITypeConverter<?> keyConverter, final ITypeConverter<?> valueConverter,
+ final Map<Object, Object> result,
+ final int index,
+ final String argDescription) throws Exception {
+ final String[] values = split(trim(args.pop()), field);
+ for (final String value : values) {
+ final String[] keyValue = value.split("=");
if (keyValue.length < 2) {
- String splitRegex = splitRegex(field);
+ final String splitRegex = splitRegex(field);
if (splitRegex.length() == 0) {
throw new ParameterException(CommandLine.this, "Value for option " + optionDescription("", field,
0) + " should be in KEY=VALUE format but was " + value);
@@ -2345,44 +2346,44 @@ public class CommandLine {
0) + " should be in KEY=VALUE[" + splitRegex + "KEY=VALUE]... format but was " + value);
}
}
- Object mapKey = tryConvert(field, index, keyConverter, keyValue[0], classes[0]);
- Object mapValue = tryConvert(field, index, valueConverter, keyValue[1], classes[1]);
+ final Object mapKey = tryConvert(field, index, keyConverter, keyValue[0], classes[0]);
+ final Object mapValue = tryConvert(field, index, valueConverter, keyValue[1], classes[1]);
result.put(mapKey, mapValue);
if (tracer.isInfo()) {tracer.info("Putting [%s : %s] in %s<%s, %s> field '%s.%s' for %s%n", String.valueOf(mapKey), String.valueOf(mapValue),
result.getClass().getSimpleName(), classes[0].getSimpleName(), classes[1].getSimpleName(), field.getDeclaringClass().getSimpleName(), field.getName(), argDescription);}
}
}
- private void checkMaxArityExceeded(Range arity, int remainder, Field field, String[] values) {
+ private void checkMaxArityExceeded(final Range arity, final int remainder, final Field field, final String[] values) {
if (values.length <= remainder) { return; }
- String desc = arity.max == remainder ? "" + remainder : arity + ", remainder=" + remainder;
+ final String desc = arity.max == remainder ? "" + remainder : arity + ", remainder=" + remainder;
throw new MaxValuesforFieldExceededException(CommandLine.this, optionDescription("", field, -1) +
" max number of values (" + arity.max + ") exceeded: remainder is " + remainder + " but " +
values.length + " values were specified: " + Arrays.toString(values));
}
- private int applyValuesToArrayField(Field field,
- Class<?> annotation,
- Range arity,
- Stack<String> args,
- Class<?> cls,
- String argDescription) throws Exception {
- Object existing = field.get(command);
- int length = existing == null ? 0 : Array.getLength(existing);
- Class<?> type = getTypeAttribute(field)[0];
- List<Object> converted = consumeArguments(field, annotation, arity, args, type, length, argDescription);
- List<Object> newValues = new ArrayList<Object>();
+ private int applyValuesToArrayField(final Field field,
+ final Class<?> annotation,
+ final Range arity,
+ final Stack<String> args,
+ final Class<?> cls,
+ final String argDescription) throws Exception {
+ final Object existing = field.get(command);
+ final int length = existing == null ? 0 : Array.getLength(existing);
+ final Class<?> type = getTypeAttribute(field)[0];
+ final List<Object> converted = consumeArguments(field, annotation, arity, args, type, length, argDescription);
+ final List<Object> newValues = new ArrayList<Object>();
for (int i = 0; i < length; i++) {
newValues.add(Array.get(existing, i));
}
- for (Object obj : converted) {
+ for (final Object obj : converted) {
if (obj instanceof Collection<?>) {
newValues.addAll((Collection<?>) obj);
} else {
newValues.add(obj);
}
}
- Object array = Array.newInstance(type, newValues.size());
+ final Object array = Array.newInstance(type, newValues.size());
field.set(command, array);
for (int i = 0; i < newValues.size(); i++) {
Array.set(array, i, newValues.get(i));
@@ -2391,21 +2392,21 @@ public class CommandLine {
}
@SuppressWarnings("unchecked")
- private int applyValuesToCollectionField(Field field,
- Class<?> annotation,
- Range arity,
- Stack<String> args,
- Class<?> cls,
- String argDescription) throws Exception {
+ private int applyValuesToCollectionField(final Field field,
+ final Class<?> annotation,
+ final Range arity,
+ final Stack<String> args,
+ final Class<?> cls,
+ final String argDescription) throws Exception {
Collection<Object> collection = (Collection<Object>) field.get(command);
- Class<?> type = getTypeAttribute(field)[0];
- int length = collection == null ? 0 : collection.size();
- List<Object> converted = consumeArguments(field, annotation, arity, args, type, length, argDescription);
+ final Class<?> type = getTypeAttribute(field)[0];
+ final int length = collection == null ? 0 : collection.size();
+ final List<Object> converted = consumeArguments(field, annotation, arity, args, type, length, argDescription);
if (collection == null) {
collection = createCollection(cls);
field.set(command, collection);
}
- for (Object element : converted) {
+ for (final Object element : converted) {
if (element instanceof Collection<?>) {
collection.addAll((Collection<?>) element);
} else {
@@ -2415,14 +2416,14 @@ public class CommandLine {
return converted.size();
}
- private List<Object> consumeArguments(Field field,
- Class<?> annotation,
- Range arity,
- Stack<String> args,
- Class<?> type,
- int originalSize,
- String argDescription) throws Exception {
- List<Object> result = new ArrayList<Object>();
+ private List<Object> consumeArguments(final Field field,
+ final Class<?> annotation,
+ final Range arity,
+ final Stack<String> args,
+ final Class<?> type,
+ final int originalSize,
+ final String argDescription) throws Exception {
+ final List<Object> result = new ArrayList<Object>();
// first do the arity.min mandatory parameters
for (int i = 0; i < arity.min; i++) {
@@ -2440,16 +2441,16 @@ public class CommandLine {
return result;
}
- private int consumeOneArgument(Field field,
- Range arity,
- Stack<String> args,
- Class<?> type,
- List<Object> result,
+ private int consumeOneArgument(final Field field,
+ final Range arity,
+ final Stack<String> args,
+ final Class<?> type,
+ final List<Object> result,
int index,
- int originalSize,
- String argDescription) throws Exception {
- String[] values = split(trim(args.pop()), field);
- ITypeConverter<?> converter = getTypeConverter(type, field);
+ final int originalSize,
+ final String argDescription) throws Exception {
+ final String[] values = split(trim(args.pop()), field);
+ final ITypeConverter<?> converter = getTypeConverter(type, field);
for (int j = 0; j < values.length; j++) {
result.add(tryConvert(field, index, converter, values[j], type));
@@ -2465,13 +2466,13 @@ public class CommandLine {
return ++index;
}
- private String splitRegex(Field field) {
+ private String splitRegex(final Field field) {
if (field.isAnnotationPresent(Option.class)) { return field.getAnnotation(Option.class).split(); }
if (field.isAnnotationPresent(Parameters.class)) { return field.getAnnotation(Parameters.class).split(); }
return "";
}
- private String[] split(String value, Field field) {
- String regex = splitRegex(field);
+ private String[] split(final String value, final Field field) {
+ final String regex = splitRegex(field);
return regex.length() == 0 ? new String[] {value} : value.split(regex);
}
@@ -2481,7 +2482,7 @@ public class CommandLine {
* @param arg the string to determine whether it is an option or not
* @return true if it is an option, false otherwise
*/
- private boolean isOption(String arg) {
+ private boolean isOption(final String arg) {
if ("--".equals(arg)) {
return true;
}
@@ -2489,7 +2490,7 @@ public class CommandLine {
if (optionName2Field.containsKey(arg)) { // -v or -f or --file (not attached to param or other option)
return true;
}
- int separatorIndex = arg.indexOf(separator);
+ final int separatorIndex = arg.indexOf(separator);
if (separatorIndex > 0) { // -f=FILE or --file==FILE (attached to param via separator)
if (optionName2Field.containsKey(arg.substring(0, separatorIndex))) {
return true;
@@ -2497,33 +2498,33 @@ public class CommandLine {
}
return (arg.length() > 2 && arg.startsWith("-") && singleCharOption2Field.containsKey(arg.charAt(1)));
}
- private Object tryConvert(Field field, int index, ITypeConverter<?> converter, String value, Class<?> type)
+ private Object tryConvert(final Field field, final int index, final ITypeConverter<?> converter, final String value, final Class<?> type)
throws Exception {
try {
return converter.convert(value);
- } catch (TypeConversionException ex) {
+ } catch (final TypeConversionException ex) {
throw new ParameterException(CommandLine.this, ex.getMessage() + optionDescription(" for ", field, index));
- } catch (Exception other) {
- String desc = optionDescription(" for ", field, index) + ": " + other;
+ } catch (final Exception other) {
+ final String desc = optionDescription(" for ", field, index) + ": " + other;
throw new ParameterException(CommandLine.this, "Could not convert '" + value + "' to " + type.getSimpleName() + desc, other);
}
}
- private String optionDescription(String prefix, Field field, int index) {
- Help.IParamLabelRenderer labelRenderer = Help.createMinimalParamLabelRenderer();
+ private String optionDescription(final String prefix, final Field field, final int index) {
+ final Help.IParamLabelRenderer labelRenderer = Help.createMinimalParamLabelRenderer();
String desc = "";
if (field.isAnnotationPresent(Option.class)) {
desc = prefix + "option '" + field.getAnnotation(Option.class).names()[0] + "'";
if (index >= 0) {
- Range arity = Range.optionArity(field);
+ final Range arity = Range.optionArity(field);
if (arity.max > 1) {
desc += " at index " + index;
}
desc += " (" + labelRenderer.renderParameterLabel(field, Help.Ansi.OFF, Collections.<IStyle>emptyList()) + ")";
}
} else if (field.isAnnotationPresent(Parameters.class)) {
- Range indexRange = Range.parameterIndex(field);
- Text label = labelRenderer.renderParameterLabel(field, Help.Ansi.OFF, Collections.<IStyle>emptyList());
+ final Range indexRange = Range.parameterIndex(field);
+ final Text label = labelRenderer.renderParameterLabel(field, Help.Ansi.OFF, Collections.<IStyle>emptyList());
desc = prefix + "positional parameter at index " + indexRange + " (" + label + ")";
}
return desc;
@@ -2531,19 +2532,19 @@ public class CommandLine {
private boolean isAnyHelpRequested() { return isHelpRequested || versionHelpRequested || usageHelpRequested; }
- private void updateHelpRequested(Field field) {
+ private void updateHelpRequested(final Field field) {
if (field.isAnnotationPresent(Option.class)) {
isHelpRequested |= is(field, "help", field.getAnnotation(Option.class).help());
CommandLine.this.versionHelpRequested |= is(field, "versionHelp", field.getAnnotation(Option.class).versionHelp());
CommandLine.this.usageHelpRequested |= is(field, "usageHelp", field.getAnnotation(Option.class).usageHelp());
}
}
- private boolean is(Field f, String description, boolean value) {
+ private boolean is(final Field f, final String description, final boolean value) {
if (value) { if (tracer.isInfo()) {tracer.info("Field '%s.%s' has '%s' annotation: not validating required fields%n", f.getDeclaringClass().getSimpleName(), f.getName(), description); }}
return value;
}
@SuppressWarnings("unchecked")
- private Collection<Object> createCollection(Class<?> collectionClass) throws Exception {
+ private Collection<Object> createCollection(final Class<?> collectionClass) throws Exception {
if (collectionClass.isInterface()) {
if (List.class.isAssignableFrom(collectionClass)) {
return new ArrayList<Object>();
@@ -2559,14 +2560,14 @@ public class CommandLine {
// custom Collection implementation class must have default constructor
return (Collection<Object>) collectionClass.newInstance();
}
- private Map<Object, Object> createMap(Class<?> mapClass) throws Exception {
+ private Map<Object, Object> createMap(final Class<?> mapClass) throws Exception {
try { // if it is an implementation class, instantiate it
return (Map<Object, Object>) mapClass.newInstance();
- } catch (Exception ignored) {}
+ } catch (final Exception ignored) {}
return new LinkedHashMap<Object, Object>();
}
- private ITypeConverter<?> getTypeConverter(final Class<?> type, Field field) {
- ITypeConverter<?> result = converterRegistry.get(type);
+ private ITypeConverter<?> getTypeConverter(final Class<?> type, final Field field) {
+ final ITypeConverter<?> result = converterRegistry.get(type);
if (result != null) {
return result;
}
@@ -2574,7 +2575,7 @@ public class CommandLine {
return new ITypeConverter<Object>() {
@Override
@SuppressWarnings("unchecked")
- public Object convert(String value) throws Exception {
+ public Object convert(final String value) throws Exception {
return Enum.valueOf((Class<Enum>) type, value);
}
};
@@ -2582,15 +2583,15 @@ public class CommandLine {
throw new MissingTypeConverterException(CommandLine.this, "No TypeConverter registered for " + type.getName() + " of field " + field);
}
- private void assertNoMissingParameters(Field field, int arity, Stack<String> args) {
+ private void assertNoMissingParameters(final Field field, final int arity, final Stack<String> args) {
if (arity > args.size()) {
if (arity == 1) {
if (field.isAnnotationPresent(Option.class)) {
throw new MissingParameterException(CommandLine.this, "Missing required parameter for " +
optionDescription("", field, 0));
}
- Range indexRange = Range.parameterIndex(field);
- Help.IParamLabelRenderer labelRenderer = Help.createMinimalParamLabelRenderer();
+ final Range indexRange = Range.parameterIndex(field);
+ final Help.IParamLabelRenderer labelRenderer = Help.createMinimalParamLabelRenderer();
String sep = "";
String names = "";
int count = 0;
@@ -2603,7 +2604,7 @@ public class CommandLine {
}
}
String msg = "Missing required parameter";
- Range paramArity = Range.parameterArity(field);
+ final Range paramArity = Range.parameterArity(field);
if (paramArity.isVariable) {
msg += "s at positions " + indexRange + ": ";
} else {
@@ -2619,11 +2620,11 @@ public class CommandLine {
" requires at least " + arity + " values, but only " + args.size() + " were specified: " + reverse(args));
}
}
- private String trim(String value) {
+ private String trim(final String value) {
return unquote(value);
}
- private String unquote(String value) {
+ private String unquote(final String value) {
return value == null
? null
: (value.length() > 1 && value.startsWith("\"") && value.endsWith("\""))
@@ -2633,8 +2634,8 @@ public class CommandLine {
}
private static class PositionalParametersSorter implements Comparator<Field> {
@Override
- public int compare(Field o1, Field o2) {
- int result = Range.parameterIndex(o1).compareTo(Range.parameterIndex(o2));
+ public int compare(final Field o1, final Field o2) {
+ final int result = Range.parameterIndex(o1).compareTo(Range.parameterIndex(o2));
return (result == 0) ? Range.parameterArity(o1).compareTo(Range.parameterArity(o2)) : result;
}
}
@@ -2647,25 +2648,25 @@ public class CommandLine {
}
static class StringConverter implements ITypeConverter<String> {
@Override
- public String convert(String value) { return value; }
+ public String convert(final String value) { return value; }
}
static class StringBuilderConverter implements ITypeConverter<StringBuilder> {
@Override
- public StringBuilder convert(String value) { return new StringBuilder(value); }
+ public StringBuilder convert(final String value) { return new StringBuilder(value); }
}
static class CharSequenceConverter implements ITypeConverter<CharSequence> {
@Override
- public String convert(String value) { return value; }
+ public String convert(final String value) { return value; }
}
/** Converts text to a {@code Byte} by delegating to {@link Byte#valueOf(String)}.*/
static class ByteConverter implements ITypeConverter<Byte> {
@Override
- public Byte convert(String value) { return Byte.valueOf(value); }
+ public Byte convert(final String value) { return Byte.valueOf(value); }
}
/** Converts {@code "true"} or {@code "false"} to a {@code Boolean}. Other values result in a ParameterException.*/
static class BooleanConverter implements ITypeConverter<Boolean> {
@Override
- public Boolean convert(String value) {
+ public Boolean convert(final String value) {
if ("true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value)) {
return Boolean.parseBoolean(value);
} else {
@@ -2675,7 +2676,7 @@ public class CommandLine {
}
static class CharacterConverter implements ITypeConverter<Character> {
@Override
- public Character convert(String value) {
+ public Character convert(final String value) {
if (value.length() > 1) {
throw new TypeConversionException("'" + value + "' is not a single character");
}
@@ -2685,45 +2686,45 @@ public class CommandLine {
/** Converts text to a {@code Short} by delegating to {@link Short#valueOf(String)}.*/
static class ShortConverter implements ITypeConverter<Short> {
@Override
- public Short convert(String value) { return Short.valueOf(value); }
+ public Short convert(final String value) { return Short.valueOf(value); }
}
/** Converts text to an {@code Integer} by delegating to {@link Integer#valueOf(String)}.*/
static class IntegerConverter implements ITypeConverter<Integer> {
@Override
- public Integer convert(String value) { return Integer.valueOf(value); }
+ public Integer convert(final String value) { return Integer.valueOf(value); }
}
/** Converts text to a {@code Long} by delegating to {@link Long#valueOf(String)}.*/
static class LongConverter implements ITypeConverter<Long> {
@Override
- public Long convert(String value) { return Long.valueOf(value); }
+ public Long convert(final String value) { return Long.valueOf(value); }
}
static class FloatConverter implements ITypeConverter<Float> {
@Override
- public Float convert(String value) { return Float.valueOf(value); }
+ public Float convert(final String value) { return Float.valueOf(value); }
}
static class DoubleConverter implements ITypeConverter<Double> {
@Override
- public Double convert(String value) { return Double.valueOf(value); }
+ public Double convert(final String value) { return Double.valueOf(value); }
}
static class FileConverter implements ITypeConverter<File> {
@Override
- public File convert(String value) { return new File(value); }
+ public File convert(final String value) { return new File(value); }
}
static class URLConverter implements ITypeConverter<URL> {
@Override
- public URL convert(String value) throws MalformedURLException { return new URL(value); }
+ public URL convert(final String value) throws MalformedURLException { return new URL(value); }
}
static class URIConverter implements ITypeConverter<URI> {
@Override
- public URI convert(String value) throws URISyntaxException { return new URI(value); }
+ public URI convert(final String value) throws URISyntaxException { return new URI(value); }
}
/** Converts text in {@code yyyy-mm-dd} format to a {@code java.util.Date}. ParameterException on failure. */
static class ISO8601DateConverter implements ITypeConverter<Date> {
@Override
- public Date convert(String value) {
+ public Date convert(final String value) {
try {
return new SimpleDateFormat("yyyy-MM-dd").parse(value);
- } catch (ParseException e) {
+ } catch (final ParseException e) {
throw new TypeConversionException("'" + value + "' is not a yyyy-MM-dd date");
}
}
@@ -2732,7 +2733,7 @@ public class CommandLine {
* {@code HH:mm:ss.SSS}, {@code HH:mm:ss,SSS}. Other formats result in a ParameterException. */
static class ISO8601TimeConverter implements ITypeConverter<Time> {
@Override
- public Time convert(String value) {
+ public Time convert(final String value) {
try {
if (value.length() <= 5) {
return new Time(new SimpleDateFormat("HH:mm").parse(value).getTime());
@@ -2741,11 +2742,11 @@ public class CommandLine {
} else if (value.length() <= 12) {
try {
return new Time(new SimpleDateFormat("HH:mm:ss.SSS").parse(value).getTime());
- } catch (ParseException e2) {
+ } catch (final ParseException e2) {
return new Time(new SimpleDateFormat("HH:mm:ss,SSS").parse(value).getTime());
}
}
- } catch (ParseException ignored) {
+ } catch (final ParseException ignored) {
// ignored because we throw a ParameterException below
}
throw new TypeConversionException("'" + value + "' is not a HH:mm[:ss[.SSS]] time");
@@ -2753,28 +2754,28 @@ public class CommandLine {
}
static class BigDecimalConverter implements ITypeConverter<BigDecimal> {
@Override
- public BigDecimal convert(String value) { return new BigDecimal(value); }
+ public BigDecimal convert(final String value) { return new BigDecimal(value); }
}
static class BigIntegerConverter implements ITypeConverter<BigIntege
<TRUNCATED>
[08/13] logging-log4j2 git commit: Checkstyle: Remove trailing white
spaces on all lines.
Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DummyNanoClock.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DummyNanoClock.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DummyNanoClock.java
index e3d6c2b..91f5ae5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DummyNanoClock.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DummyNanoClock.java
@@ -37,7 +37,7 @@ public final class DummyNanoClock implements NanoClock {
/**
* Returns the constructor value.
- *
+ *
* @return the constructor value
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
index 37a44f5..064b38b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
@@ -32,7 +32,7 @@ public class ExecutorServices {
* <p>
* If the timeout is 0, then a plain shutdown takes place.
* </p>
- *
+ *
* @param executorService
* the pool to shutdown.
* @param timeout
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
index 609a005..6fd73c2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
@@ -112,7 +112,7 @@ public final class FileUtils {
/**
* Asserts that the given directory exists and creates it if necessary.
- *
+ *
* @param dir the directory that shall exist
* @param createDirectoryIfNotExisting specifies if the directory shall be created if it does not exist.
* @throws java.io.IOException thrown if the directory could not be created.
@@ -131,10 +131,10 @@ public final class FileUtils {
throw new IOException("File " + dir + " exists and is not a directory. Unable to create directory.");
}
}
-
+
/**
* Creates the parent directories for the given File.
- *
+ *
* @param file
* @throws IOException
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileWatcher.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileWatcher.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileWatcher.java
index ab7752e..d7ddb54 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileWatcher.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileWatcher.java
@@ -20,14 +20,14 @@ import java.io.File;
/**
* Watches for changes in a {@link File} and performs an action when the file is modified.
- *
+ *
* @see WatchManager
*/
public interface FileWatcher {
/**
* Called when a {@link WatchManager} detects that the given {@link File} changed.
- *
+ *
* @param file
* the file that changed.
* @see WatchManager
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JndiCloser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JndiCloser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JndiCloser.java
index 2114b40..32178f1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JndiCloser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JndiCloser.java
@@ -1,60 +1,60 @@
-/*
- * 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.util;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-/**
- * Helper class for closing JNDI resources.
- *
- * This class is separate from {@link Closer} because JNDI is not in Android.
- */
-public final class JndiCloser {
-
- private JndiCloser() {
- }
-
- /**
- * Closes the specified {@code Context}.
- *
- * @param context the JNDI Context to close, may be {@code null}
- * @throws NamingException if a problem occurred closing the specified JNDI Context
- */
- public static void close(final Context context) throws NamingException {
- if (context != null) {
- context.close();
- }
- }
-
- /**
- * Closes the specified {@code Context}, ignoring any exceptions thrown by the close operation.
- *
- * @param context the JNDI Context to close, may be {@code null}
- */
- public static boolean closeSilently(final Context context) {
- try {
- close(context);
- return true;
- } catch (final NamingException ignored) {
- // ignored
- return false;
- }
- }
-
-}
+/*
+ * 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.util;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+/**
+ * Helper class for closing JNDI resources.
+ *
+ * This class is separate from {@link Closer} because JNDI is not in Android.
+ */
+public final class JndiCloser {
+
+ private JndiCloser() {
+ }
+
+ /**
+ * Closes the specified {@code Context}.
+ *
+ * @param context the JNDI Context to close, may be {@code null}
+ * @throws NamingException if a problem occurred closing the specified JNDI Context
+ */
+ public static void close(final Context context) throws NamingException {
+ if (context != null) {
+ context.close();
+ }
+ }
+
+ /**
+ * Closes the specified {@code Context}, ignoring any exceptions thrown by the close operation.
+ *
+ * @param context the JNDI Context to close, may be {@code null}
+ */
+ public static boolean closeSilently(final Context context) {
+ try {
+ close(context);
+ return true;
+ } catch (final NamingException ignored) {
+ // ignored
+ return false;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Log4jThreadFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Log4jThreadFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Log4jThreadFactory.java
index 8b636f6..112b9d0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Log4jThreadFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Log4jThreadFactory.java
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* Creates {@link Log4jThread}s.
- *
+ *
* @since 2.7
*/
public class Log4jThreadFactory implements ThreadFactory {
@@ -31,7 +31,7 @@ public class Log4jThreadFactory implements ThreadFactory {
/**
* Creates a new daemon thread factory.
- *
+ *
* @param threadFactoryName
* The thread factory name.
* @return a new daemon thread factory.
@@ -64,7 +64,7 @@ public class Log4jThreadFactory implements ThreadFactory {
/**
* Constructs an initialized thread factory.
- *
+ *
* @param threadFactoryName
* The thread factory name.
* @param daemon
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java
index e72beb6..11df6e4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java
@@ -79,7 +79,7 @@ public final class NetUtils {
/**
* Converts a URI string or file path to a URI object.
- *
+ *
* @param path the URI string or path
* @return the URI object
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NullOutputStream.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NullOutputStream.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NullOutputStream.java
index 7403215..8fe9008 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NullOutputStream.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NullOutputStream.java
@@ -26,13 +26,13 @@ import java.io.OutputStream;
* This output stream has no destination (file/socket etc.) and all bytes written to it are ignored and lost.
* </p>
* Originally from Apache Commons IO.
- *
+ *
* @since 2.3
*/
public class NullOutputStream extends OutputStream {
private static final NullOutputStream INSTANCE = new NullOutputStream();
-
+
/**
* @deprecated Deprecated in 2.7: use {@link #getInstance()}.
*/
@@ -41,20 +41,20 @@ public class NullOutputStream extends OutputStream {
/**
* Gets the singleton instance.
- *
+ *
* @return the singleton instance.
*/
public static NullOutputStream getInstance() {
return INSTANCE;
}
-
+
private NullOutputStream() {
// do nothing
}
-
+
/**
* Does nothing - output to <code>/dev/null</code>.
- *
+ *
* @param b
* The bytes to write
* @param off
@@ -69,7 +69,7 @@ public class NullOutputStream extends OutputStream {
/**
* Does nothing - output to <code>/dev/null</code>.
- *
+ *
* @param b
* The byte to write
*/
@@ -80,7 +80,7 @@ public class NullOutputStream extends OutputStream {
/**
* Does nothing - output to <code>/dev/null</code>.
- *
+ *
* @param b
* The bytes to write
* @throws IOException
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Patterns.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Patterns.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Patterns.java
index 1177148..5427197 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Patterns.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Patterns.java
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.core.util;
/**
* Pattern strings used throughout Log4j.
- *
+ *
* @see java.util.regex.Pattern
*/
public final class Patterns {
@@ -38,7 +38,7 @@ public final class Patterns {
/**
* Creates a pattern string for {@code separator} surrounded by whitespace.
- *
+ *
* @param separator The separator.
* @return a pattern for {@code separator} surrounded by whitespace.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringBuilderWriter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringBuilderWriter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringBuilderWriter.java
index d366bd6..4dc823c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringBuilderWriter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringBuilderWriter.java
@@ -1,168 +1,168 @@
-/*
- * 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.util;
-
-import java.io.Serializable;
-import java.io.Writer;
-
-/**
- * {@link Writer} implementation that outputs to a {@link StringBuilder}.
- * <p>
- * <strong>NOTE:</strong> This implementation, as an alternative to
- * <code>java.io.StringWriter</code>, provides an <i>un-synchronized</i>
- * (i.e. for use in a single thread) implementation for better performance.
- * For safe usage with multiple {@link Thread}s then
- * <code>java.io.StringWriter</code> should be used.
- *
- * <h3>History</h3>
- * <ol>
- * <li>Copied from Apache Commons IO revision 1681000.</li>
- * <li>Pick up Javadoc updates from revision 1722253.</li>
- * <ol>
- */
-public class StringBuilderWriter extends Writer implements Serializable {
-
- private static final long serialVersionUID = -146927496096066153L;
- private final StringBuilder builder;
-
- /**
- * Constructs a new {@link StringBuilder} instance with default capacity.
- */
- public StringBuilderWriter() {
- this.builder = new StringBuilder();
- }
-
- /**
- * Constructs a new {@link StringBuilder} instance with the specified capacity.
- *
- * @param capacity The initial capacity of the underlying {@link StringBuilder}
- */
- public StringBuilderWriter(final int capacity) {
- this.builder = new StringBuilder(capacity);
- }
-
- /**
- * Constructs a new instance with the specified {@link StringBuilder}.
- *
- * <p>If {@code builder} is null a new instance with default capacity will be created.</p>
- *
- * @param builder The String builder. May be null.
- */
- public StringBuilderWriter(final StringBuilder builder) {
- this.builder = builder != null ? builder : new StringBuilder();
- }
-
- /**
- * Appends a single character to this Writer.
- *
- * @param value The character to append
- * @return This writer instance
- */
- @Override
- public Writer append(final char value) {
- builder.append(value);
- return this;
- }
-
- /**
- * Appends a character sequence to this Writer.
- *
- * @param value The character to append
- * @return This writer instance
- */
- @Override
- public Writer append(final CharSequence value) {
- builder.append(value);
- return this;
- }
-
- /**
- * Appends a portion of a character sequence to the {@link StringBuilder}.
- *
- * @param value The character to append
- * @param start The index of the first character
- * @param end The index of the last character + 1
- * @return This writer instance
- */
- @Override
- public Writer append(final CharSequence value, final int start, final int end) {
- builder.append(value, start, end);
- return this;
- }
-
- /**
- * Closing this writer has no effect.
- */
- @Override
- public void close() {
- // no-op
- }
-
- /**
- * Flushing this writer has no effect.
- */
- @Override
- public void flush() {
- // no-op
- }
-
-
- /**
- * Writes a String to the {@link StringBuilder}.
- *
- * @param value The value to write
- */
- @Override
- public void write(final String value) {
- if (value != null) {
- builder.append(value);
- }
- }
-
- /**
- * Writes a portion of a character array to the {@link StringBuilder}.
- *
- * @param value The value to write
- * @param offset The index of the first character
- * @param length The number of characters to write
- */
- @Override
- public void write(final char[] value, final int offset, final int length) {
- if (value != null) {
- builder.append(value, offset, length);
- }
- }
-
- /**
- * Returns the underlying builder.
- *
- * @return The underlying builder
- */
- public StringBuilder getBuilder() {
- return builder;
- }
-
- /**
- * Returns {@link StringBuilder#toString()}.
- *
- * @return The contents of the String builder.
- */
- @Override
- public String toString() {
- return builder.toString();
- }
-}
+/*
+ * 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.util;
+
+import java.io.Serializable;
+import java.io.Writer;
+
+/**
+ * {@link Writer} implementation that outputs to a {@link StringBuilder}.
+ * <p>
+ * <strong>NOTE:</strong> This implementation, as an alternative to
+ * <code>java.io.StringWriter</code>, provides an <i>un-synchronized</i>
+ * (i.e. for use in a single thread) implementation for better performance.
+ * For safe usage with multiple {@link Thread}s then
+ * <code>java.io.StringWriter</code> should be used.
+ *
+ * <h3>History</h3>
+ * <ol>
+ * <li>Copied from Apache Commons IO revision 1681000.</li>
+ * <li>Pick up Javadoc updates from revision 1722253.</li>
+ * <ol>
+ */
+public class StringBuilderWriter extends Writer implements Serializable {
+
+ private static final long serialVersionUID = -146927496096066153L;
+ private final StringBuilder builder;
+
+ /**
+ * Constructs a new {@link StringBuilder} instance with default capacity.
+ */
+ public StringBuilderWriter() {
+ this.builder = new StringBuilder();
+ }
+
+ /**
+ * Constructs a new {@link StringBuilder} instance with the specified capacity.
+ *
+ * @param capacity The initial capacity of the underlying {@link StringBuilder}
+ */
+ public StringBuilderWriter(final int capacity) {
+ this.builder = new StringBuilder(capacity);
+ }
+
+ /**
+ * Constructs a new instance with the specified {@link StringBuilder}.
+ *
+ * <p>If {@code builder} is null a new instance with default capacity will be created.</p>
+ *
+ * @param builder The String builder. May be null.
+ */
+ public StringBuilderWriter(final StringBuilder builder) {
+ this.builder = builder != null ? builder : new StringBuilder();
+ }
+
+ /**
+ * Appends a single character to this Writer.
+ *
+ * @param value The character to append
+ * @return This writer instance
+ */
+ @Override
+ public Writer append(final char value) {
+ builder.append(value);
+ return this;
+ }
+
+ /**
+ * Appends a character sequence to this Writer.
+ *
+ * @param value The character to append
+ * @return This writer instance
+ */
+ @Override
+ public Writer append(final CharSequence value) {
+ builder.append(value);
+ return this;
+ }
+
+ /**
+ * Appends a portion of a character sequence to the {@link StringBuilder}.
+ *
+ * @param value The character to append
+ * @param start The index of the first character
+ * @param end The index of the last character + 1
+ * @return This writer instance
+ */
+ @Override
+ public Writer append(final CharSequence value, final int start, final int end) {
+ builder.append(value, start, end);
+ return this;
+ }
+
+ /**
+ * Closing this writer has no effect.
+ */
+ @Override
+ public void close() {
+ // no-op
+ }
+
+ /**
+ * Flushing this writer has no effect.
+ */
+ @Override
+ public void flush() {
+ // no-op
+ }
+
+
+ /**
+ * Writes a String to the {@link StringBuilder}.
+ *
+ * @param value The value to write
+ */
+ @Override
+ public void write(final String value) {
+ if (value != null) {
+ builder.append(value);
+ }
+ }
+
+ /**
+ * Writes a portion of a character array to the {@link StringBuilder}.
+ *
+ * @param value The value to write
+ * @param offset The index of the first character
+ * @param length The number of characters to write
+ */
+ @Override
+ public void write(final char[] value, final int offset, final int length) {
+ if (value != null) {
+ builder.append(value, offset, length);
+ }
+ }
+
+ /**
+ * Returns the underlying builder.
+ *
+ * @return The underlying builder
+ */
+ public StringBuilder getBuilder() {
+ return builder;
+ }
+
+ /**
+ * Returns {@link StringBuilder#toString()}.
+ *
+ * @return The contents of the String builder.
+ */
+ @Override
+ public String toString() {
+ return builder.toString();
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
index eb9c328..68255ac 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
@@ -39,13 +39,13 @@ import java.util.Objects;
* @since 2.1
*/
public final class TypeUtil {
-
+
private TypeUtil() {
}
/**
* Gets all declared fields for the given class (including superclasses).
- *
+ *
* @param cls the class to examine
* @return all declared fields for the given class (including superclasses).
* @see Class#getDeclaredFields()
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
index b38d899..31a98ef 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* Manages {@link FileWatcher}s.
- *
+ *
* @see FileWatcher
* @see ConfigurationScheduler
*/
@@ -55,7 +55,7 @@ public class WatchManager extends AbstractLifeCycle {
* This allows you to start, stop, reset and start again a manager, without triggering file modified events if the a
* watched file has changed during the period of time when the manager was stopped.
* </p>
- *
+ *
* @since 2.11.0
*/
public void reset() {
@@ -72,7 +72,7 @@ public class WatchManager extends AbstractLifeCycle {
* This allows you to start, stop, reset and start again a manager, without triggering file modified events if the
* given watched file has changed during the period of time when the manager was stopped.
* </p>
- *
+ *
* @param file
* the file for the monitor to reset.
* @since 2.11.0
@@ -108,7 +108,7 @@ public class WatchManager extends AbstractLifeCycle {
/**
* Gets how often this manager checks for file modifications.
- *
+ *
* @return how often, in seconds, this manager checks for file modifications.
*/
public int getIntervalSeconds() {
@@ -134,7 +134,7 @@ public class WatchManager extends AbstractLifeCycle {
/**
* Unwatches the given file.
- *
+ *
* @param file
* the file to stop watching.
* @since 2.11.0
@@ -146,7 +146,7 @@ public class WatchManager extends AbstractLifeCycle {
/**
* Watches the given file.
- *
+ *
* @param file
* the file to watch.
* @param watcher
@@ -171,7 +171,7 @@ public class WatchManager extends AbstractLifeCycle {
private String millisToString(final long millis) {
return new Date(millis).toString();
}
-
+
private final class WatchRunnable implements Runnable {
// Use a hard class reference here in case a refactoring changes the class name.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/DateParser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/DateParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/DateParser.java
index 16940c6..8d4a359 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/DateParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/DateParser.java
@@ -30,34 +30,34 @@ import java.util.TimeZone;
* <p>
* Warning: Since binary compatible methods may be added to this interface in any
* release, developers are not expected to implement this interface.
- *
+ *
* <p>
* Copied and modified from <a href="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</a>.
* </p>
- *
+ *
* @since Apache Commons Lang 3.2
*/
public interface DateParser {
/**
- * Equivalent to DateFormat.parse(String).
- *
- * See {@link java.text.DateFormat#parse(String)} for more information.
- * @param source A <code>String</code> whose beginning should be parsed.
+ * Equivalent to DateFormat.parse(String).
+ *
+ * See {@link java.text.DateFormat#parse(String)} for more information.
+ * @param source A <code>String</code> whose beginning should be parsed.
* @return A <code>Date</code> parsed from the string
* @throws ParseException if the beginning of the specified string cannot be parsed.
*/
Date parse(String source) throws ParseException;
/**
- * Equivalent to DateFormat.parse(String, ParsePosition).
- *
- * See {@link java.text.DateFormat#parse(String, ParsePosition)} for more information.
- *
+ * Equivalent to DateFormat.parse(String, ParsePosition).
+ *
+ * See {@link java.text.DateFormat#parse(String, ParsePosition)} for more information.
+ *
* @param source A <code>String</code>, part of which should be parsed.
- * @param pos A <code>ParsePosition</code> object with index and error index information
- * as described above.
- * @return A <code>Date</code> parsed from the string. In case of error, returns null.
+ * @param pos A <code>ParsePosition</code> object with index and error index information
+ * as described above.
+ * @return A <code>Date</code> parsed from the string. In case of error, returns null.
* @throws NullPointerException if text or pos is null.
*/
Date parse(String source, ParsePosition pos);
@@ -74,7 +74,7 @@ public interface DateParser {
* @return true, if source has been parsed (pos parsePosition is updated); otherwise false (and pos errorIndex is updated)
* @throws IllegalArgumentException when Calendar has been set to be not lenient, and a parsed field is
* out of range.
- *
+ *
* @since 3.5
*/
boolean parse(String source, ParsePosition pos, Calendar calendar);
@@ -83,7 +83,7 @@ public interface DateParser {
//-----------------------------------------------------------------------
/**
* <p>Gets the pattern used by this parser.</p>
- *
+ *
* @return the pattern, {@link java.text.SimpleDateFormat} compatible
*/
String getPattern();
@@ -92,40 +92,40 @@ public interface DateParser {
* <p>
* Gets the time zone used by this parser.
* </p>
- *
+ *
* <p>
* The default {@link TimeZone} used to create a {@link Date} when the {@link TimeZone} is not specified by
* the format pattern.
* </p>
- *
+ *
* @return the time zone
*/
TimeZone getTimeZone();
/**
* <p>Gets the locale used by this parser.</p>
- *
+ *
* @return the locale
*/
Locale getLocale();
/**
* Parses text from a string to produce a Date.
- *
+ *
* @param source A <code>String</code> whose beginning should be parsed.
* @return a <code>java.util.Date</code> object
* @throws ParseException if the beginning of the specified string cannot be parsed.
- * @see java.text.DateFormat#parseObject(String)
+ * @see java.text.DateFormat#parseObject(String)
*/
Object parseObject(String source) throws ParseException;
/**
* Parses a date/time string according to the given parse position.
- *
+ *
* @param source A <code>String</code> whose beginning should be parsed.
* @param pos the parse position
* @return a <code>java.util.Date</code> object
- * @see java.text.DateFormat#parseObject(String, ParsePosition)
+ * @see java.text.DateFormat#parseObject(String, ParsePosition)
*/
Object parseObject(String source, ParsePosition pos);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/DatePrinter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/DatePrinter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/DatePrinter.java
index 91f5e1a..adcf59e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/DatePrinter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/DatePrinter.java
@@ -23,18 +23,18 @@ import java.util.Locale;
import java.util.TimeZone;
/**
- * DatePrinter is the "missing" interface for the format methods of
+ * DatePrinter is the "missing" interface for the format methods of
* {@link java.text.DateFormat}. You can obtain an object implementing this
* interface by using one of the FastDateFormat factory methods.
* <p>
* Warning: Since binary compatible methods may be added to this interface in any
* release, developers are not expected to implement this interface.
* </p>
- *
+ *
* <p>
* Copied and modified from <a href="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</a>.
* </p>
- *
+ *
* @since Apache Commons Lang 3.2
*/
public interface DatePrinter {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateFormat.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateFormat.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateFormat.java
index db38bd1..0e8f036 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateFormat.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateFormat.java
@@ -29,16 +29,16 @@ import java.util.TimeZone;
* <p>FastDateFormat is a fast and thread-safe version of
* {@link java.text.SimpleDateFormat}.</p>
*
- * <p>To obtain an instance of FastDateFormat, use one of the static factory methods:
- * {@link #getInstance(String, TimeZone, Locale)}, {@link #getDateInstance(int, TimeZone, Locale)},
- * {@link #getTimeInstance(int, TimeZone, Locale)}, or {@link #getDateTimeInstance(int, int, TimeZone, Locale)}
+ * <p>To obtain an instance of FastDateFormat, use one of the static factory methods:
+ * {@link #getInstance(String, TimeZone, Locale)}, {@link #getDateInstance(int, TimeZone, Locale)},
+ * {@link #getTimeInstance(int, TimeZone, Locale)}, or {@link #getDateTimeInstance(int, int, TimeZone, Locale)}
* </p>
- *
+ *
* <p>Since FastDateFormat is thread safe, you can use a static member instance:</p>
* <code>
* private static final FastDateFormat DATE_FORMATTER = FastDateFormat.getDateTimeInstance(FastDateFormat.LONG, FastDateFormat.SHORT);
* </code>
- *
+ *
* <p>This class can be used as a direct replacement to
* {@code SimpleDateFormat} in most formatting and parsing situations.
* This class is especially useful in multi-threaded server environments.
@@ -65,15 +65,15 @@ import java.util.TimeZone;
* interpreted as a number.</i> Starting with Java 1.7 a pattern of 'Y' or
* 'YYY' will be formatted as '2003', while it was '03' in former Java
* versions. FastDateFormat implements the behavior of Java 7.</p>
- *
+ *
* <p>
* Copied and modified from <a href="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</a>.
* </p>
- *
+ *
* @since Apache Commons Lang 2.0
*/
public class FastDateFormat extends Format implements DateParser, DatePrinter {
-
+
/**
* Required for serialization support.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateParser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateParser.java
index 4ba5668..9e5e6ec 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateParser.java
@@ -43,14 +43,14 @@ import java.util.regex.Pattern;
* <p>FastDateParser is a fast and thread-safe version of
* {@link java.text.SimpleDateFormat}.</p>
*
- * <p>To obtain a proxy to a FastDateParser, use {@link FastDateFormat#getInstance(String, TimeZone, Locale)}
+ * <p>To obtain a proxy to a FastDateParser, use {@link FastDateFormat#getInstance(String, TimeZone, Locale)}
* or another variation of the factory methods of {@link FastDateFormat}.</p>
- *
+ *
* <p>Since FastDateParser is thread safe, you can use a static member instance:</p>
* <code>
* private static final DateParser DATE_PARSER = FastDateFormat.getInstance("yyyy-MM-dd");
* </code>
- *
+ *
* <p>This class can be used as a direct replacement for
* <code>SimpleDateFormat</code> in most parsing situations.
* This class is especially useful in multi-threaded server environments.
@@ -66,11 +66,11 @@ import java.util.regex.Pattern;
*
* <p>Timing tests indicate this class is as about as fast as SimpleDateFormat
* in single thread applications and about 25% faster in multi-thread applications.</p>
- *
+ *
* <p>
* Copied and modified from <a href="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</a>.
* </p>
- *
+ *
* @since Apache Commons Lang 3.2
* @see FastDatePrinter
*/
@@ -107,8 +107,8 @@ public class FastDateParser implements DateParser, Serializable {
/**
* <p>Constructs a new FastDateParser.</p>
- *
- * Use {@link FastDateFormat#getInstance(String, TimeZone, Locale)} or another variation of the
+ *
+ * Use {@link FastDateFormat#getInstance(String, TimeZone, Locale)} or another variation of the
* factory methods of {@link FastDateFormat} to get a cached FastDateParser instance.
*
* @param pattern non-null {@link java.text.SimpleDateFormat} compatible
@@ -385,8 +385,8 @@ public class FastDateParser implements DateParser, Serializable {
/**
* This implementation updates the ParsePosition if the parse succeeds.
- * However, it sets the error index to the position before the failed field unlike
- * the method {@link java.text.SimpleDateFormat#parse(String, ParsePosition)} which sets
+ * However, it sets the error index to the position before the failed field unlike
+ * the method {@link java.text.SimpleDateFormat#parse(String, ParsePosition)} which sets
* the error index to after the failed field.
* <p>
* To determine if the parse has succeeded, the caller must check if the current parse position
@@ -409,7 +409,7 @@ public class FastDateParser implements DateParser, Serializable {
* Upon success, the ParsePosition index is updated to indicate how much of the source text was consumed.
* Not all source text needs to be consumed. Upon parse failure, ParsePosition error index is updated to
* the offset of the source text which does not match the supplied format.
- *
+ *
* @param source The text to parse.
* @param pos On input, the position in the source to start parsing, on output, updated position.
* @param calendar The calendar into which to set parsed fields.
@@ -570,7 +570,7 @@ public class FastDateParser implements DateParser, Serializable {
return getLocaleSpecificStrategy(Calendar.ERA, definingCalendar);
case 'H': // Hour in day (0-23)
return HOUR_OF_DAY_STRATEGY;
- case 'K': // Hour in am/pm (0-11)
+ case 'K': // Hour in am/pm (0-11)
return HOUR_STRATEGY;
case 'M':
return width>=3 ?getLocaleSpecificStrategy(Calendar.MONTH, definingCalendar) :NUMBER_MONTH_STRATEGY;
@@ -636,7 +636,7 @@ public class FastDateParser implements DateParser, Serializable {
final ConcurrentMap<Locale, Strategy> cache = getCache(field);
Strategy strategy = cache.get(locale);
if (strategy == null) {
- strategy = field == Calendar.ZONE_OFFSET
+ strategy = field == Calendar.ZONE_OFFSET
? new TimeZoneStrategy(locale)
: new CaseInsensitiveTextStrategy(field, definingCalendar, locale);
final Strategy inCache = cache.putIfAbsent(locale, strategy);
@@ -705,7 +705,7 @@ public class FastDateParser implements DateParser, Serializable {
CaseInsensitiveTextStrategy(final int field, final Calendar definingCalendar, final Locale locale) {
this.field = field;
this.locale = locale;
-
+
final StringBuilder regex = new StringBuilder();
regex.append("((?iu)");
lKeyValues = appendDisplayNames(definingCalendar, locale, field, regex);
@@ -905,9 +905,9 @@ public class FastDateParser implements DateParser, Serializable {
}
}
}
-
+
private static class ISO8601TimeZoneStrategy extends PatternStrategy {
- // Z, +hh, -hh, +hhmm, -hhmm, +hh:mm or -hh:mm
+ // Z, +hh, -hh, +hhmm, -hhmm, +hh:mm or -hh:mm
/**
* Construct a Strategy that parses a TimeZone
@@ -916,7 +916,7 @@ public class FastDateParser implements DateParser, Serializable {
ISO8601TimeZoneStrategy(final String pattern) {
createPattern(pattern);
}
-
+
/**
* {@inheritDoc}
*/
@@ -928,14 +928,14 @@ public class FastDateParser implements DateParser, Serializable {
cal.setTimeZone(TimeZone.getTimeZone("GMT" + value));
}
}
-
+
private static final Strategy ISO_8601_1_STRATEGY = new ISO8601TimeZoneStrategy("(Z|(?:[+-]\\d{2}))");
private static final Strategy ISO_8601_2_STRATEGY = new ISO8601TimeZoneStrategy("(Z|(?:[+-]\\d{2}\\d{2}))");
private static final Strategy ISO_8601_3_STRATEGY = new ISO8601TimeZoneStrategy("(Z|(?:[+-]\\d{2}(?::)\\d{2}))");
/**
* Factory method for ISO8601TimeZoneStrategies.
- *
+ *
* @param tokenLen a token indicating the length of the TimeZone String to be formatted.
* @return a ISO8601TimeZoneStrategy that can format TimeZone String of length {@code tokenLen}. If no such
* strategy exists, an IllegalArgumentException will be thrown.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java
index 4f33b6b..307b16c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java
@@ -37,14 +37,14 @@ import org.apache.logging.log4j.core.util.Throwables;
* <p>FastDatePrinter is a fast and thread-safe version of
* {@link java.text.SimpleDateFormat}.</p>
*
- * <p>To obtain a FastDatePrinter, use {@link FastDateFormat#getInstance(String, TimeZone, Locale)}
+ * <p>To obtain a FastDatePrinter, use {@link FastDateFormat#getInstance(String, TimeZone, Locale)}
* or another variation of the factory methods of {@link FastDateFormat}.</p>
- *
+ *
* <p>Since FastDatePrinter is thread safe, you can use a static member instance:</p>
* <code>
* private static final DatePrinter DATE_PRINTER = FastDateFormat.getInstance("yyyy-MM-dd");
* </code>
- *
+ *
* <p>This class can be used as a direct replacement to
* {@code SimpleDateFormat} in most formatting situations.
* This class is especially useful in multi-threaded server environments.
@@ -63,7 +63,7 @@ import org.apache.logging.log4j.core.util.Throwables;
* ISO 8601 extended format time zones (eg. {@code +08:00} or {@code -11:00}).
* This introduces a minor incompatibility with Java 1.4, but at a gain of
* useful functionality.</p>
- *
+ *
* <p>Starting with JDK7, ISO 8601 support was added using the pattern {@code 'X'}.
* To maintain compatibility, {@code 'ZZ'} will continue to be supported, but using
* one of the {@code 'X'} formats is recommended.
@@ -73,11 +73,11 @@ import org.apache.logging.log4j.core.util.Throwables;
* interpreted as a number.</i> Starting with Java 1.7 a pattern of 'Y' or
* 'YYY' will be formatted as '2003', while it was '03' in former Java
* versions. FastDatePrinter implements the behavior of Java 7.</p>
- *
+ *
* <p>
* Copied and modified from <a href="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</a>.
* </p>
- *
+ *
* @since Apache Commons Lang 3.2
* @see FastDateParser
*/
@@ -143,7 +143,7 @@ public class FastDatePrinter implements DatePrinter, Serializable {
//-----------------------------------------------------------------------
/**
* <p>Constructs a new FastDatePrinter.</p>
- * Use {@link FastDateFormat#getInstance(String, TimeZone, Locale)} or another variation of the
+ * Use {@link FastDateFormat#getInstance(String, TimeZone, Locale)} or another variation of the
* factory methods of {@link FastDateFormat} to get a cached FastDatePrinter instance.
*
* @param pattern {@link java.text.SimpleDateFormat} compatible pattern
@@ -280,9 +280,9 @@ public class FastDatePrinter implements DatePrinter, Serializable {
case 'K': // hour in am/pm (0..11)
rule = selectNumberRule(Calendar.HOUR, tokenLen);
break;
- case 'X': // ISO 8601
+ case 'X': // ISO 8601
rule = Iso8601_Rule.getRule(tokenLen);
- break;
+ break;
case 'z': // time zone (text)
if (tokenLen >= 4) {
rule = new TimeZoneNameRule(mTimeZone, mLocale, TimeZone.LONG);
@@ -607,7 +607,7 @@ public class FastDatePrinter implements DatePrinter, Serializable {
}
final FastDatePrinter other = (FastDatePrinter) obj;
return mPattern.equals(other.mPattern)
- && mTimeZone.equals(other.mTimeZone)
+ && mTimeZone.equals(other.mTimeZone)
&& mLocale.equals(other.mLocale);
}
@@ -1322,7 +1322,7 @@ public class FastDatePrinter implements DatePrinter, Serializable {
TimeZoneNameRule(final TimeZone timeZone, final Locale locale, final int style) {
mLocale = locale;
mStyle = style;
-
+
mStandard = getTimeZoneDisplay(timeZone, false, style, locale);
mDaylight = getTimeZoneDisplay(timeZone, true, style, locale);
}
@@ -1359,7 +1359,7 @@ public class FastDatePrinter implements DatePrinter, Serializable {
private static class TimeZoneNumberRule implements Rule {
static final TimeZoneNumberRule INSTANCE_COLON = new TimeZoneNumberRule(true);
static final TimeZoneNumberRule INSTANCE_NO_COLON = new TimeZoneNumberRule(false);
-
+
final boolean mColon;
/**
@@ -1384,7 +1384,7 @@ public class FastDatePrinter implements DatePrinter, Serializable {
*/
@Override
public void appendTo(final Appendable buffer, final Calendar calendar) throws IOException {
-
+
int offset = calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET);
if (offset < 0) {
@@ -1411,9 +1411,9 @@ public class FastDatePrinter implements DatePrinter, Serializable {
* or {@code +/-HH:MM}.</p>
*/
private static class Iso8601_Rule implements Rule {
-
+
// Sign TwoDigitHours or Z
- static final Iso8601_Rule ISO8601_HOURS = new Iso8601_Rule(3);
+ static final Iso8601_Rule ISO8601_HOURS = new Iso8601_Rule(3);
// Sign TwoDigitHours Minutes or Z
static final Iso8601_Rule ISO8601_HOURS_MINUTES = new Iso8601_Rule(5);
// Sign TwoDigitHours : Minutes or Z
@@ -1435,10 +1435,10 @@ public class FastDatePrinter implements DatePrinter, Serializable {
case 3:
return Iso8601_Rule.ISO8601_HOURS_COLON_MINUTES;
default:
- throw new IllegalArgumentException("invalid number of X");
+ throw new IllegalArgumentException("invalid number of X");
}
- }
-
+ }
+
final int length;
/**
@@ -1468,7 +1468,7 @@ public class FastDatePrinter implements DatePrinter, Serializable {
buffer.append("Z");
return;
}
-
+
if (offset < 0) {
buffer.append('-');
offset = -offset;
@@ -1482,7 +1482,7 @@ public class FastDatePrinter implements DatePrinter, Serializable {
if (length<5) {
return;
}
-
+
if (length==6) {
buffer.append(':');
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FormatCache.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FormatCache.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FormatCache.java
index e146a1d..92f001a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FormatCache.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FormatCache.java
@@ -27,31 +27,31 @@ import java.util.concurrent.ConcurrentMap;
/**
* <p>FormatCache is a cache and factory for {@link Format}s.</p>
- *
+ *
* <p>
* Copied and modified from <a href="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</a>.
* </p>
- *
+ *
* @since Apache Commons Lang 3.0
*/
// TODO: Before making public move from getDateTimeInstance(Integer,...) to int; or some other approach.
abstract class FormatCache<F extends Format> {
-
+
/**
* No date or no time. Used in same parameters as DateFormat.SHORT or DateFormat.LONG
*/
static final int NONE= -1;
-
- private final ConcurrentMap<MultipartKey, F> cInstanceCache
+
+ private final ConcurrentMap<MultipartKey, F> cInstanceCache
= new ConcurrentHashMap<>(7);
-
- private static final ConcurrentMap<MultipartKey, String> cDateTimeInstanceCache
+
+ private static final ConcurrentMap<MultipartKey, String> cDateTimeInstanceCache
= new ConcurrentHashMap<>(7);
/**
* <p>Gets a formatter instance using the default pattern in the
* default timezone and locale.</p>
- *
+ *
* @return a date/time formatter
*/
public F getInstance() {
@@ -61,7 +61,7 @@ abstract class FormatCache<F extends Format> {
/**
* <p>Gets a formatter instance using the specified pattern, time zone
* and locale.</p>
- *
+ *
* @param pattern {@link java.text.SimpleDateFormat} compatible
* pattern, non-null
* @param timeZone the time zone, null means use the default TimeZone
@@ -82,22 +82,22 @@ abstract class FormatCache<F extends Format> {
}
final MultipartKey key = new MultipartKey(pattern, timeZone, locale);
F format = cInstanceCache.get(key);
- if (format == null) {
+ if (format == null) {
format = createInstance(pattern, timeZone, locale);
final F previousValue= cInstanceCache.putIfAbsent(key, format);
if (previousValue != null) {
// another thread snuck in and did the same work
// we should return the instance that is in ConcurrentMap
- format= previousValue;
+ format= previousValue;
}
}
return format;
}
-
+
/**
* <p>Create a format instance using the specified pattern, time zone
* and locale.</p>
- *
+ *
* @param pattern {@link java.text.SimpleDateFormat} compatible pattern, this will not be null.
* @param timeZone time zone, this will not be null.
* @param locale locale, this will not be null.
@@ -106,11 +106,11 @@ abstract class FormatCache<F extends Format> {
* or <code>null</code>
*/
abstract protected F createInstance(String pattern, TimeZone timeZone, Locale locale);
-
+
/**
* <p>Gets a date/time formatter instance using the specified style,
* time zone and locale.</p>
- *
+ *
* @param dateStyle date style: FULL, LONG, MEDIUM, or SHORT, null indicates no date in format
* @param timeStyle time style: FULL, LONG, MEDIUM, or SHORT, null indicates no time in format
* @param timeZone optional time zone, overrides time zone of
@@ -120,7 +120,7 @@ abstract class FormatCache<F extends Format> {
* @throws IllegalArgumentException if the Locale has no date/time
* pattern defined
*/
- // This must remain private, see LANG-884
+ // This must remain private, see LANG-884
private F getDateTimeInstance(final Integer dateStyle, final Integer timeStyle, final TimeZone timeZone, Locale locale) {
if (locale == null) {
locale = Locale.getDefault();
@@ -132,7 +132,7 @@ abstract class FormatCache<F extends Format> {
/**
* <p>Gets a date/time formatter instance using the specified style,
* time zone and locale.</p>
- *
+ *
* @param dateStyle date style: FULL, LONG, MEDIUM, or SHORT
* @param timeStyle time style: FULL, LONG, MEDIUM, or SHORT
* @param timeZone optional time zone, overrides time zone of
@@ -150,7 +150,7 @@ abstract class FormatCache<F extends Format> {
/**
* <p>Gets a date formatter instance using the specified style,
* time zone and locale.</p>
- *
+ *
* @param dateStyle date style: FULL, LONG, MEDIUM, or SHORT
* @param timeZone optional time zone, overrides time zone of
* formatted date, null means use default Locale
@@ -167,7 +167,7 @@ abstract class FormatCache<F extends Format> {
/**
* <p>Gets a time formatter instance using the specified style,
* time zone and locale.</p>
- *
+ *
* @param timeStyle time style: FULL, LONG, MEDIUM, or SHORT
* @param timeZone optional time zone, overrides time zone of
* formatted date, null means use default Locale
@@ -183,7 +183,7 @@ abstract class FormatCache<F extends Format> {
/**
* <p>Gets a date/time format for the specified styles and locale.</p>
- *
+ *
* @param dateStyle date style: FULL, LONG, MEDIUM, or SHORT, null indicates no date in format
* @param timeStyle time style: FULL, LONG, MEDIUM, or SHORT, null indicates no time in format
* @param locale The non-null locale of the desired format
@@ -199,10 +199,10 @@ abstract class FormatCache<F extends Format> {
try {
DateFormat formatter;
if (dateStyle == null) {
- formatter = DateFormat.getTimeInstance(timeStyle.intValue(), locale);
+ formatter = DateFormat.getTimeInstance(timeStyle.intValue(), locale);
}
else if (timeStyle == null) {
- formatter = DateFormat.getDateInstance(dateStyle.intValue(), locale);
+ formatter = DateFormat.getDateInstance(dateStyle.intValue(), locale);
}
else {
formatter = DateFormat.getDateTimeInstance(dateStyle.intValue(), timeStyle.intValue(), locale);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/CustomLevelsTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/CustomLevelsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/CustomLevelsTest.java
index 7bb7297..7a480f3 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/CustomLevelsTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/CustomLevelsTest.java
@@ -36,10 +36,10 @@ import org.junit.Test;
public class CustomLevelsTest {
private static final String CONFIG = "log4j-customLevels.xml";
-
+
@ClassRule
public static LoggerContextRule context = new LoggerContextRule(CONFIG);
-
+
private ListAppender listAppender;
private Level diagLevel;
private Level noticeLevel;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java
index c3cc5b4..0e27cea 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
public class DeadlockTest {
private static final String CONFIG = "log4j-deadlock.xml";
-
+
@ClassRule
public static LoggerContextRule context = new LoggerContextRule(CONFIG);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/LateConfigTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/LateConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/LateConfigTest.java
index 03d1575..0421e18 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/LateConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/LateConfigTest.java
@@ -47,7 +47,7 @@ public class LateConfigTest {
public static void tearDownClass() {
Configurator.shutdown(context);
StatusLogger.getLogger().reset();
- }
+ }
@Test
public void testReconfiguration() throws Exception {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java
index bd5ae3e..3aa0559 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java
@@ -96,7 +96,7 @@ public class LogEventTest {
final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
final ObjectInputStream ois = new FilteredObjectInputStream(bais);
-
+
final LogEvent actual = (LogEvent) ois.readObject();
assertNotEquals("Different event: nanoTime", copy, actual);
assertNotEquals("Different nanoTime", copy.getNanoTime(), actual.getNanoTime());
@@ -123,7 +123,7 @@ public class LogEventTest {
final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
final ObjectInputStream ois = new FilteredObjectInputStream(bais);
-
+
final LogEvent actual = (LogEvent) ois.readObject();
assertEquals("both zero nanoTime", event2, actual);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
index 59fc45f..1b28e85 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
@@ -35,7 +35,7 @@ public class ConsoleAppenderBuilderTest {
/**
* Tests https://issues.apache.org/jira/browse/LOG4J2-1636
- *
+ *
* Tested with Oracle 7 and 8 and IBM Java 8.
*/
@Test
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java
index 8437232..7587bf6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.config.Configurator;
* <p>
* Running from a Windows command line from the root of the project:
* </p>
- *
+ *
* <pre>
* java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.14\jansi-1.14.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderNoAnsiStyleLayoutMain log4j-core/target/test-classes/log4j2-console-style-ansi.xml
* </pre>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java
index 0c2ed98..4cf9b7a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java
@@ -130,7 +130,7 @@ public class FileAppenderPermissionsTest {
}
assertFalse("Appender did not stop", appender.isStarted());
}
-
+
@Test
public void testFileUserGroupAPI() throws Exception {
final File file = new File(DIR, "AppenderTest-" + (1000 + fileIndex) + ".log");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsXmlConfigTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsXmlConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsXmlConfigTest.java
index b041aa6..636c6c5 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsXmlConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsXmlConfigTest.java
@@ -62,5 +62,5 @@ public class FileAppenderPermissionsXmlConfigTest {
Files.getPosixFilePermissions(Paths.get("target/permissions1/AppenderTest-1.log"))));
}
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/Jira739Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/Jira739Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/Jira739Test.java
index f46af07..bfb233e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/Jira739Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/Jira739Test.java
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.config.Configurator;
* <p>
* Running from a Windows command line from the root of the project:
* </p>
- *
+ *
* <pre>
* java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%HOME%\.m2\repository\org\fusesource\jansi\jansi\1.14\jansi-1.14.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderAnsiMessagesMain log4j-core/target/test-classes/log4j2-console.xml
* </pre>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
index 3c6d301..c4d647b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderRemapTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
/**
* Tests that logged strings appear in the file, that the initial file size is the specified specified region length,
* that the file is extended by region length when necessary, and that the file is shrunk to its actual usage when done.
- *
+ *
* @since 2.1
*/
public class MemoryMappedFileAppenderRemapTest {
@@ -65,7 +65,7 @@ public class MemoryMappedFileAppenderRemapTest {
log.warn(new String(text));
assertEquals("grown", 256 * 2, f.length());
-
+
log.warn(new String(text));
assertEquals("grown again", 256 * 3, f.length());
} finally {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
index 277e046..ebab4cd 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderSimpleTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
* Tests that logged strings appear in the file,
* that the default file size is used if not specified
* and that the file is shrunk to its actual usage when done.
- *
+ *
* @since 2.1
*/
public class MemoryMappedFileAppenderSimpleTest {
@@ -54,13 +54,13 @@ public class MemoryMappedFileAppenderSimpleTest {
assertTrue(f.delete());
}
assertTrue(!f.exists());
-
+
final Logger log = LogManager.getLogger();
try {
log.warn("Test log1");
assertTrue(f.exists());
assertEquals("initial length", MemoryMappedFileManager.DEFAULT_REGION_LENGTH, f.length());
-
+
log.warn("Test log2");
assertEquals("not grown", MemoryMappedFileManager.DEFAULT_REGION_LENGTH, f.length());
} finally {
@@ -68,7 +68,7 @@ public class MemoryMappedFileAppenderSimpleTest {
}
final int LINESEP = System.lineSeparator().length();
assertEquals("Shrunk to actual used size", 186 + 2 * LINESEP, f.length());
-
+
String line1, line2, line3;
try (final BufferedReader reader = new BufferedReader(new FileReader(LOGFILE))) {
line1 = reader.readLine();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 a1fe45c..670eafc 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
@@ -43,7 +43,7 @@ public class ScriptAppenderSelectorTest {
@Parameterized.Parameters(name = "{0}")
public static Object[][] getParameters() {
// @formatter:off
- return new Object[][] {
+ return new Object[][] {
{ "log4j-appender-selector-groovy.xml" },
{ "log4j-appender-selector-javascript.xml" },
};
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
index 1dda3aa..dca7dcf 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
@@ -36,7 +36,7 @@ public class JdbcAppenderStringSubstitutionTest {
public static void afterClass() {
System.getProperties().remove(KEY);
}
-
+
@Rule
public final LoggerContextRule rule = new LoggerContextRule("org/apache/logging/log4j/core/appender/db/jdbc/log4j2-jdbc-string-substitution.xml");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java
index 24b8d25..b639b4d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java
@@ -41,7 +41,7 @@ public class JeroMqAppenderTest {
private static final String APPENDER_NAME = "JeroMQAppender";
private static final int DEFAULT_TIMEOUT_MILLIS = 60000;
-
+
@ClassRule
public static LoggerContextRule ctx = new LoggerContextRule("JeroMqAppenderTest.xml");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqTestClient.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqTestClient.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqTestClient.java
index ddd06ab..f35e82a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqTestClient.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqTestClient.java
@@ -1,55 +1,55 @@
-/*
- * 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.appender.mom.jeromq;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-import org.zeromq.ZMQ;
-
-class JeroMqTestClient implements Callable<List<String>> {
-
- private final ZMQ.Context context;
-
- private final String endpoint;
- private final List<String> messages;
- private final int receiveCount;
-
- JeroMqTestClient(final ZMQ.Context context, final String endpoint, final int receiveCount) {
- super();
- this.context = context;
- this.endpoint = endpoint;
- this.receiveCount = receiveCount;
- this.messages = new ArrayList<>(receiveCount);
- }
-
- @Override
- public List<String> call() throws Exception {
- try (ZMQ.Socket subscriber = context.socket(ZMQ.SUB)) {
- subscriber.connect(endpoint);
- subscriber.subscribe(new byte[0]);
- for (int messageNum = 0; messageNum < receiveCount
- && !Thread.currentThread().isInterrupted(); messageNum++) {
- // Use trim to remove the tailing '0' character
- messages.add(subscriber.recvStr(0).trim());
- }
- }
- return messages;
- }
+/*
+ * 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.appender.mom.jeromq;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import org.zeromq.ZMQ;
+
+class JeroMqTestClient implements Callable<List<String>> {
+
+ private final ZMQ.Context context;
+
+ private final String endpoint;
+ private final List<String> messages;
+ private final int receiveCount;
+
+ JeroMqTestClient(final ZMQ.Context context, final String endpoint, final int receiveCount) {
+ super();
+ this.context = context;
+ this.endpoint = endpoint;
+ this.receiveCount = receiveCount;
+ this.messages = new ArrayList<>(receiveCount);
+ }
+
+ @Override
+ public List<String> call() throws Exception {
+ try (ZMQ.Socket subscriber = context.socket(ZMQ.SUB)) {
+ subscriber.connect(endpoint);
+ subscriber.subscribe(new byte[0]);
+ for (int messageNum = 0; messageNum < receiveCount
+ && !Thread.currentThread().isInterrupted(); messageNum++) {
+ // Use trim to remove the tailing '0' character
+ messages.add(subscriber.recvStr(0).trim());
+ }
+ }
+ return messages;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicyTest.java
index a30a0e6..101f8fa 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicyTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* Tests {@link LoggerNameLevelRewritePolicy}.
- *
+ *
* @since 2.4
*/
public class LoggerNameLevelRewritePolicyTest {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
index 3247f82..e360f83 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
@@ -52,7 +52,7 @@ public class MapRewritePolicyTest {
public static void setupClass() {
stringMap.putValue("test1", "one");
stringMap.putValue("test2", "two");
- map = stringMap.toMap();
+ map = stringMap.toMap();
logEvent0 = Log4jLogEvent.newBuilder() //
.setLoggerName("test") //
.setContextData(stringMap) //
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java
index 8bf89e0..9fce567 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicyTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
public class CronTriggeringPolicyTest {
private static final String CRON_EXPRESSION = "0 0 0 * * ?";
-
+
private NullConfiguration configuration;
// TODO Need a CleanRegexFiles("testcmd.\\.log\\..*");
@@ -96,7 +96,7 @@ public class CronTriggeringPolicyTest {
// @formatter:on
}
-
+
/**
* Tests LOG4J2-1474 CronTriggeringPolicy raise exception and fail to rollover log file when evaluateOnStartup is
* true.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/FileSizeTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/FileSizeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/FileSizeTest.java
index 8121ce7..9b9bf45 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/FileSizeTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/FileSizeTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.*;
public class FileSizeTest {
private final static long EXPECTED = 10 * 1024;
-
+
@Test
public void testFileSize() throws Exception {
long value = FileSize.parse("10KB", 0);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteNestedTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteNestedTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteNestedTest.java
index 7d335f0..c1f08a6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteNestedTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteNestedTest.java
@@ -77,7 +77,7 @@ public class RollingAppenderDeleteNestedTest {
System.out.println(file + " (" + file.length() + "B) "
+ FixedDateFormat.create(FixedFormat.ABSOLUTE).format(file.lastModified()));
}
-
+
final List<String> expected = Arrays.asList("my-1.log", "my-2.log", "my-3.log", "my-4.log", "my-5.log");
assertEquals(Arrays.toString(files), expected.size() + 3, files.length);
for (final File file : files) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
index 730e1b2..5a45f01 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
@@ -41,7 +41,7 @@ public class RollingAppenderUncompressedTest {
private static final String DIR = "target/rolling4";
private final Logger logger = LogManager.getLogger(RollingAppenderUncompressedTest.class.getName());
-
+
@ClassRule
public static CleanFolders rule = new CleanFolders(CONFIG);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderReconfigureTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderReconfigureTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderReconfigureTest.java
index 8c4657a..d1112b0 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderReconfigureTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderReconfigureTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
public class RollingFileAppenderReconfigureTest {
@Rule
- public final LoggerContextRule loggerContextRule = new LoggerContextRule("src/test/rolling-file-appender-reconfigure.xml");
-
+ public final LoggerContextRule loggerContextRule = new LoggerContextRule("src/test/rolling-file-appender-reconfigure.xml");
+
@Test
public void testReconfigure() {
loggerContextRule.reconfigure();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderReconfigureUndefinedSystemPropertyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderReconfigureUndefinedSystemPropertyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderReconfigureUndefinedSystemPropertyTest.java
index 31a21b1..88b42d7 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderReconfigureUndefinedSystemPropertyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderReconfigureUndefinedSystemPropertyTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
public class RollingFileAppenderReconfigureUndefinedSystemPropertyTest {
@Rule
- public final LoggerContextRule loggerContextRule = new LoggerContextRule("src/test/rolling-file-appender-reconfigure.original.xml");
-
+ public final LoggerContextRule loggerContextRule = new LoggerContextRule("src/test/rolling-file-appender-reconfigure.original.xml");
+
@Test
public void testReconfigure() {
loggerContextRule.reconfigure();
[04/13] logging-log4j2 git commit: Use final.
Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
index 8af33e7..c259fc2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
@@ -69,7 +69,7 @@ public class RingBufferLogEvent implements LogEvent, ReusableMessage, CharSequen
private int threadPriority;
private long threadId;
- private MutableInstant instant = new MutableInstant();
+ private final MutableInstant instant = new MutableInstant();
private long nanoTime;
private short parameterCount;
private boolean includeLocation;
@@ -281,7 +281,7 @@ public class RingBufferLogEvent implements LogEvent, ReusableMessage, CharSequen
}
@Override
- public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
+ public <S> void forEachParameter(final ParameterConsumer<S> action, final S state) {
if (parameters != null) {
for (short i = 0; i < parameterCount; i++) {
action.accept(parameters[i], i, state);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index 1022f2d..97cebe0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -442,7 +442,7 @@ public class LoggerConfig extends AbstractFilterable {
return reliabilityStrategy;
}
- private void processLogEvent(final LogEvent event, LoggerConfigPredicate predicate) {
+ private void processLogEvent(final LogEvent event, final LoggerConfigPredicate predicate) {
event.setIncludeLocation(isIncludeLocation());
if (predicate.allow(this)) {
callAppenders(event);
@@ -598,19 +598,19 @@ public class LoggerConfig extends AbstractFilterable {
protected enum LoggerConfigPredicate {
ALL() {
@Override
- boolean allow(LoggerConfig config) {
+ boolean allow(final LoggerConfig config) {
return true;
}
},
ASYNCHRONOUS_ONLY() {
@Override
- boolean allow(LoggerConfig config) {
+ boolean allow(final LoggerConfig config) {
return config instanceof AsyncLoggerConfig;
}
},
SYNCHRONOUS_ONLY() {
@Override
- boolean allow(LoggerConfig config) {
+ boolean allow(final LoggerConfig config) {
return !ASYNCHRONOUS_ONLY.allow(config);
}
};
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index 27d8710..b41b8e4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -356,12 +356,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public LoggerComponentBuilder newAsyncLogger(String name) {
+ public LoggerComponentBuilder newAsyncLogger(final String name) {
return new DefaultLoggerComponentBuilder(this, name, null, "AsyncLogger");
}
@Override
- public LoggerComponentBuilder newAsyncLogger(String name, boolean includeLocation) {
+ public LoggerComponentBuilder newAsyncLogger(final String name, final boolean includeLocation) {
return new DefaultLoggerComponentBuilder(this, name, null, "AsyncLogger", includeLocation);
}
@@ -391,7 +391,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public RootLoggerComponentBuilder newAsyncRootLogger(boolean includeLocation) {
+ public RootLoggerComponentBuilder newAsyncRootLogger(final boolean includeLocation) {
return new DefaultRootLoggerComponentBuilder(this, null, "AsyncRoot", includeLocation);
}
@@ -464,12 +464,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public LoggerComponentBuilder newLogger(String name) {
+ public LoggerComponentBuilder newLogger(final String name) {
return new DefaultLoggerComponentBuilder(this, name, null);
}
@Override
- public LoggerComponentBuilder newLogger(String name, boolean includeLocation) {
+ public LoggerComponentBuilder newLogger(final String name, final boolean includeLocation) {
return new DefaultLoggerComponentBuilder(this, name, null, includeLocation);
}
@@ -499,7 +499,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public RootLoggerComponentBuilder newRootLogger(boolean includeLocation) {
+ public RootLoggerComponentBuilder newRootLogger(final boolean includeLocation) {
return new DefaultRootLoggerComponentBuilder(this, null, includeLocation);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
index 4c61d33..5024a21 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
@@ -64,7 +64,7 @@ public abstract class AbstractFilterable extends AbstractLifeCycle implements Fi
return asBuilder();
}
- public B setPropertyArray(Property[] properties) {
+ public B setPropertyArray(final Property[] properties) {
this.propertyArray = properties;
return asBuilder();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java
index 70b548d..a7a7aaa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java
@@ -117,7 +117,7 @@ public class ContextDataFactory {
public static StringMap createContextData(final Map<String, String> context) {
final StringMap contextData = createContextData(context.size());
- for (Entry<String, String> entry : context.entrySet()) {
+ for (final Entry<String, String> entry : context.entrySet()) {
contextData.putValue(entry.getKey(), entry.getValue());
}
return contextData;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/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 6ee9e1c..017a690 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
@@ -85,7 +85,7 @@ public class Log4jLogEvent implements LogEvent {
private String loggerName;
private Message message;
private Throwable thrown;
- private MutableInstant instant = new MutableInstant();
+ private final MutableInstant instant = new MutableInstant();
private ThrowableProxy thrownProxy;
private StringMap contextData = createContextData((List<Property>) null);
private ThreadContext.ContextStack contextStack = ThreadContext.getImmutableStack();
@@ -417,7 +417,7 @@ public class Log4jLogEvent implements LogEvent {
final String threadName, final int threadPriority, final StackTraceElement source,
final long timestampMillis, final int nanoOfMillisecond, final long nanoTime) {
this(loggerName, marker, loggerFQCN, level, message, thrown, thrownProxy, contextData, contextStack, threadId, threadName, threadPriority, source, nanoTime);
- long millis = message instanceof TimestampMessage
+ final long millis = message instanceof TimestampMessage
? ((TimestampMessage) message).getTimestamp()
: timestampMillis;
instant.initFromEpochMilli(millis, nanoOfMillisecond);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java
index c867ce4..3cfcb3d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java
@@ -36,7 +36,7 @@ public final class MementoMessage implements Message, StringBuilderFormattable {
private final String format;
private final Object[] parameters;
- public MementoMessage(String formattedMessage, String format, Object[] parameters) {
+ public MementoMessage(final String formattedMessage, final String format, final Object[] parameters) {
this.formattedMessage = formattedMessage;
this.format = format;
this.parameters = parameters;
@@ -68,7 +68,7 @@ public final class MementoMessage implements Message, StringBuilderFormattable {
}
@Override
- public void formatTo(StringBuilder buffer) {
+ public void formatTo(final StringBuilder buffer) {
buffer.append(formattedMessage);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
index 3e0d388..7b8f671 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
@@ -45,7 +45,7 @@ public class MutableLogEvent implements LogEvent, ReusableMessage, ParameterVisi
private int threadPriority;
private long threadId;
- private MutableInstant instant = new MutableInstant();
+ private final MutableInstant instant = new MutableInstant();
private long nanoTime;
private short parameterCount;
private boolean includeLocation;
@@ -256,7 +256,7 @@ public class MutableLogEvent implements LogEvent, ReusableMessage, ParameterVisi
}
@Override
- public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
+ public <S> void forEachParameter(final ParameterConsumer<S> action, final S state) {
if (parameters != null) {
for (short i = 0; i < parameterCount; i++) {
action.accept(parameters[i], i, state);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java
index dd5cf62..9f4cc17 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java
@@ -98,7 +98,7 @@ public class ReusableLogEventFactory implements LogEventFactory {
*/
public static void release(final LogEvent logEvent) { // LOG4J2-1583
if (logEvent instanceof MutableLogEvent) {
- MutableLogEvent mutableLogEvent = (MutableLogEvent) logEvent;
+ final MutableLogEvent mutableLogEvent = (MutableLogEvent) logEvent;
mutableLogEvent.clear();
mutableLogEvent.reserved = false;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
index c948a0c..1c043af 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
@@ -298,7 +298,7 @@ public class ThrowableProxy implements Serializable {
*
* @param value New value of commonElementCount.
*/
- void setCommonElementCount(int value) {
+ void setCommonElementCount(final int value) {
this.commonElementCount = value;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java
index d86d2bb..f13943a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java
@@ -53,13 +53,13 @@ class ThrowableProxyRenderer {
}
private static void formatCause(final StringBuilder sb, final String prefix, final ThrowableProxy cause,
- final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
formatThrowableProxy(sb, prefix, CAUSED_BY_LABEL, cause, ignorePackages, textRenderer, suffix, lineSeparator);
}
private static void formatThrowableProxy(final StringBuilder sb, final String prefix, final String causeLabel,
final ThrowableProxy throwableProxy, final List<String> ignorePackages,
- final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
if (throwableProxy == null) {
return;
}
@@ -75,7 +75,7 @@ class ThrowableProxyRenderer {
}
private static void formatSuppressed(final StringBuilder sb, final String prefix, final ThrowableProxy[] suppressedProxies,
- final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
if (suppressedProxies == null) {
return;
}
@@ -86,7 +86,7 @@ class ThrowableProxyRenderer {
private static void formatElements(final StringBuilder sb, final String prefix, final int commonCount,
final StackTraceElement[] causedTrace, final ExtendedStackTraceElement[] extStackTrace,
- final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
if (ignorePackages == null || ignorePackages.isEmpty()) {
for (final ExtendedStackTraceElement element : extStackTrace) {
formatEntry(element, sb, prefix, textRenderer, suffix, lineSeparator);
@@ -126,7 +126,7 @@ class ThrowableProxyRenderer {
}
private static void appendSuppressedCount(final StringBuilder sb, final String prefix, final int count,
- final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
textRenderer.render(prefix, sb, "Prefix");
if (count == 1) {
textRenderer.render("\t... ", sb, "Suppressed");
@@ -140,7 +140,7 @@ class ThrowableProxyRenderer {
}
private static void formatEntry(final ExtendedStackTraceElement extStackTraceElement, final StringBuilder sb,
- final String prefix, final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final String prefix, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
textRenderer.render(prefix, sb, "Prefix");
textRenderer.render("\tat ", sb, "At");
extStackTraceElement.renderOn(sb, textRenderer);
@@ -170,7 +170,7 @@ class ThrowableProxyRenderer {
* @param suffix Append this to the end of each stack frame.
* @param lineSeparator The end-of-line separator.
*/
- static void formatExtendedStackTraceTo(ThrowableProxy src, final StringBuilder sb, final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
+ static void formatExtendedStackTraceTo(final ThrowableProxy src, final StringBuilder sb, final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
textRenderer.render(src.getName(), sb, "Name");
textRenderer.render(": ", sb, "NameMessageSeparator");
textRenderer.render(src.getMessage(), sb, "Message");
@@ -193,7 +193,7 @@ class ThrowableProxyRenderer {
* @param lineSeparator The end-of-line separator.
*/
static void formatCauseStackTrace(final ThrowableProxy src, final StringBuilder sb, final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
- ThrowableProxy causeProxy = src.getCauseProxy();
+ final ThrowableProxy causeProxy = src.getCauseProxy();
if (causeProxy != null) {
formatWrapper(sb, causeProxy, ignorePackages, textRenderer, suffix, lineSeparator);
sb.append(WRAPPED_BY_LABEL);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
index d764d55..2e6f652 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
@@ -177,7 +177,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
*
* @return this builder
*/
- public B setAdditionalFields(KeyValuePair[] additionalFields) {
+ public B setAdditionalFields(final KeyValuePair[] additionalFields) {
this.additionalFields = additionalFields;
return asBuilder();
}
@@ -231,7 +231,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
final ResolvableKeyValuePair[] resolvableFields = new ResolvableKeyValuePair[additionalFields.length];
for (int i = 0; i < additionalFields.length; i++) {
- ResolvableKeyValuePair resolvable = resolvableFields[i] = new ResolvableKeyValuePair(additionalFields[i]);
+ final ResolvableKeyValuePair resolvable = resolvableFields[i] = new ResolvableKeyValuePair(additionalFields[i]);
// Validate
if (config == null && resolvable.valueNeedsLookup) {
@@ -271,7 +271,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
protected Object wrapLogEvent(final LogEvent event) {
if (additionalFields.length > 0) {
// Construct map for serialization - note that we are intentionally using original LogEvent
- Map<String, String> additionalFieldsMap = resolveAdditionalFields(event);
+ final Map<String, String> additionalFieldsMap = resolveAdditionalFields(event);
// This class combines LogEvent with AdditionalFields during serialization
return new LogEventWithAdditionalFields(event, additionalFieldsMap);
} else {
@@ -280,13 +280,13 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
}
}
- private Map<String, String> resolveAdditionalFields(LogEvent logEvent) {
+ private Map<String, String> resolveAdditionalFields(final LogEvent logEvent) {
// Note: LinkedHashMap retains order
final Map<String, String> additionalFieldsMap = new LinkedHashMap<>(additionalFields.length);
final StrSubstitutor strSubstitutor = configuration.getStrSubstitutor();
// Go over each field
- for (ResolvableKeyValuePair pair : additionalFields) {
+ for (final ResolvableKeyValuePair pair : additionalFields) {
if (pair.valueNeedsLookup) {
// Resolve value
additionalFieldsMap.put(pair.key, strSubstitutor.replace(logEvent, pair.value));
@@ -316,7 +316,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
private final Object logEvent;
private final Map<String, String> additionalFields;
- public LogEventWithAdditionalFields(Object logEvent, Map<String, String> additionalFields) {
+ public LogEventWithAdditionalFields(final Object logEvent, final Map<String, String> additionalFields) {
this.logEvent = logEvent;
this.additionalFields = additionalFields;
}
@@ -339,7 +339,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
final String value;
final boolean valueNeedsLookup;
- ResolvableKeyValuePair(KeyValuePair pair) {
+ ResolvableKeyValuePair(final KeyValuePair pair) {
this.key = pair.getKey();
this.value = pair.getValue();
this.valueNeedsLookup = AbstractJacksonLayout.valueNeedsLookup(this.value);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
index 607ec43..fbbd597 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
@@ -126,7 +126,7 @@ public final class JsonLayout extends AbstractJacksonLayout {
}
@Override
- public B setAdditionalFields(KeyValuePair[] additionalFields) {
+ public B setAdditionalFields(final KeyValuePair[] additionalFields) {
this.additionalFields = additionalFields;
return asBuilder();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index 57cbb9c..15e176e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -551,9 +551,9 @@ public final class PatternLayout extends AbstractStringLayout {
}
private boolean useAnsiEscapeCodes() {
- PropertiesUtil propertiesUtil = PropertiesUtil.getProperties();
- boolean isPlatformSupportsAnsi = !propertiesUtil.isOsWindows();
- boolean isJansiRequested = !propertiesUtil.getBooleanProperty("log4j.skipJansi", true);
+ final PropertiesUtil propertiesUtil = PropertiesUtil.getProperties();
+ final boolean isPlatformSupportsAnsi = !propertiesUtil.isOsWindows();
+ final boolean isJansiRequested = !propertiesUtil.getBooleanProperty("log4j.skipJansi", true);
return isPlatformSupportsAnsi || isJansiRequested;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
index bd5fb95..f019e84 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
@@ -391,7 +391,7 @@ public final class Rfc5424Layout extends AbstractStringLayout {
if (isStructured) {
if (message instanceof MessageCollectionMessage) {
- for (StructuredDataMessage data : ((StructuredDataCollectionMessage)message)) {
+ for (final StructuredDataMessage data : ((StructuredDataCollectionMessage)message)) {
addStructuredData(sdElements, data);
}
} else {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
index 2a4593d..f01719e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
@@ -158,7 +158,7 @@ public class SslSocketManager extends TcpSocketManager {
private static class SslSocketManagerFactory extends TcpSocketManagerFactory<SslSocketManager, SslFactoryData> {
@Override
- SslSocketManager createManager(final String name, OutputStream os, Socket socket, InetAddress inetAddress,
+ SslSocketManager createManager(final String name, final OutputStream os, final Socket socket, final InetAddress inetAddress,
final SslFactoryData data) {
return new SslSocketManager(name, os, socket, data.sslConfiguration, inetAddress, data.host, data.port,
data.connectTimeoutMillis, data.reconnectDelayMillis, data.immediateFail, data.layout, data.bufferSize,
@@ -172,8 +172,8 @@ public class SslSocketManager extends TcpSocketManager {
}
}
- static Socket createSocket(final String host, int port, int connectTimeoutMillis,
- final SslConfiguration sslConfiguration, SocketOptions socketOptions) throws IOException {
+ static Socket createSocket(final String host, final int port, final int connectTimeoutMillis,
+ final SslConfiguration sslConfiguration, final SocketOptions socketOptions) throws IOException {
final SSLSocketFactory socketFactory = createSslSocketFactory(sslConfiguration);
final SSLSocket socket = (SSLSocket) socketFactory.createSocket();
if (socketOptions != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/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 f5b971d..4988202 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
@@ -221,7 +221,7 @@ public class TcpSocketManager extends AbstractSocketManager {
reconnector = createReconnector();
try {
reconnector.reconnect();
- } catch (IOException reconnEx) {
+ } catch (final IOException reconnEx) {
LOGGER.debug("Cannot reestablish socket connection to {}: {}; starting reconnector thread {}",
config, reconnEx.getLocalizedMessage(), reconnector.getName(), reconnEx);
reconnector.start();
@@ -230,7 +230,7 @@ public class TcpSocketManager extends AbstractSocketManager {
}
try {
writeAndFlush(bytes, offset, length, immediateFlush);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new AppenderLoggingException(
String.format("Error writing to %s after reestablishing connection for %s", getName(),
config),
@@ -460,7 +460,7 @@ public class TcpSocketManager extends AbstractSocketManager {
}
@SuppressWarnings("unchecked")
- M createManager(final String name, OutputStream os, Socket socket, InetAddress inetAddress, final T data) {
+ M createManager(final String name, final OutputStream os, final Socket socket, final InetAddress inetAddress, final T data) {
return (M) new TcpSocketManager(name, os, socket, inetAddress, data.host, data.port,
data.connectTimeoutMillis, data.reconnectDelayMillis, data.immediateFail, data.layout,
data.bufferSize, data.socketOptions);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
index 5855026..27ab29d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
@@ -70,7 +70,7 @@ public class AbstractKeyStoreConfiguration extends StoreConfiguration<KeyStore>
}
try (final InputStream fin = openInputStream(loadLocation)) {
final KeyStore ks = KeyStore.getInstance(this.keyStoreType);
- char[] password = this.getPasswordAsCharArray();
+ final char[] password = this.getPasswordAsCharArray();
try {
ks.load(fin, password);
} finally {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
index d60f82c..da16622 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
@@ -49,7 +49,7 @@ class EnvironmentPasswordProvider implements PasswordProvider {
@Override
public char[] getPassword() {
- String password = System.getenv(passwordEnvironmentVariable);
+ final String password = System.getenv(passwordEnvironmentVariable);
return password == null ? null : password.toCharArray();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
index ff59b00..355a781 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
@@ -65,14 +65,14 @@ class FilePasswordProvider implements PasswordProvider {
byte[] bytes = null;
try {
bytes = Files.readAllBytes(passwordPath);
- ByteBuffer bb = ByteBuffer.wrap(bytes);
- CharBuffer decoded = Charset.defaultCharset().decode(bb);
- char[] result = new char[decoded.limit()];
+ final ByteBuffer bb = ByteBuffer.wrap(bytes);
+ final CharBuffer decoded = Charset.defaultCharset().decode(bb);
+ final char[] result = new char[decoded.limit()];
decoded.get(result, 0, result.length);
decoded.rewind();
decoded.put(new char[result.length]); // erase decoded CharBuffer
return result;
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new IllegalStateException("Could not read password from " + passwordPath + ": " + e, e);
} finally {
if (bytes != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
index 0c9e3ce..ff479be 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
@@ -107,7 +107,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
}
try {
// @formatter:off
- PasswordProvider provider = passwordFile != null
+ final PasswordProvider provider = passwordFile != null
? new FilePasswordProvider(passwordFile)
: passwordEnvironmentVariable != null
? new EnvironmentPasswordProvider(passwordEnvironmentVariable)
@@ -118,7 +118,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
Arrays.fill(password, '\0');
}
return new KeyStoreConfiguration(location, provider, keyStoreType, keyManagerFactoryAlgorithm);
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new StoreConfigurationException("Could not configure KeyStore", ex);
}
}
@@ -166,7 +166,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
public KeyManagerFactory initKeyManagerFactory() throws NoSuchAlgorithmException, UnrecoverableKeyException,
KeyStoreException {
final KeyManagerFactory kmFactory = KeyManagerFactory.getInstance(this.keyManagerFactoryAlgorithm);
- char[] password = this.getPasswordAsCharArray();
+ final char[] password = this.getPasswordAsCharArray();
try {
kmFactory.init(this.getKeyStore(), password);
} finally {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
index 793e6df..f635145 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
@@ -30,7 +30,7 @@ public class StoreConfigurationException extends Exception {
super(message);
}
- public StoreConfigurationException(String message, Exception e) {
+ public StoreConfigurationException(final String message, final Exception e) {
super(message, e);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
index b5c282b..08ddc69 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
@@ -96,7 +96,7 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration {
}
try {
// @formatter:off
- PasswordProvider provider = passwordFile != null
+ final PasswordProvider provider = passwordFile != null
? new FilePasswordProvider(passwordFile)
: passwordEnvironmentVariable != null
? new EnvironmentPasswordProvider(passwordEnvironmentVariable)
@@ -107,7 +107,7 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration {
Arrays.fill(password, '\0');
}
return new TrustStoreConfiguration(location, provider, keyStoreType, trustManagerFactoryAlgorithm);
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new StoreConfigurationException("Could not configure TrustStore", ex);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
index 9bc85ca..703786b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
@@ -184,7 +184,7 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
cachedTime = new AtomicReference<>(fromEpochMillis(System.currentTimeMillis()));
}
- private CachedTime fromEpochMillis(long epochMillis) {
+ private CachedTime fromEpochMillis(final long epochMillis) {
final MutableInstant temp = new MutableInstant();
temp.initFromEpochMilli(epochMillis, 0);
return new CachedTime(temp);
@@ -266,7 +266,7 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
}
public void format(final long epochMilli, final StringBuilder output) {
- MutableInstant instant = getMutableInstant();
+ final MutableInstant instant = getMutableInstant();
instant.initFromEpochMilli(epochMilli, 0);
format(instant, output);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
index c4b9703..330da9f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
@@ -252,7 +252,7 @@ public final class HighlightConverter extends LogEventPatternConverter implement
}
}
- String getLevelStyle(Level level) {
+ String getLevelStyle(final Level level) {
return levelStyles.get(level);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
index 91c11ec..f603b05 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
@@ -276,7 +276,7 @@ public final class PatternParser {
final int begin = i; // position of first real char
int depth = 1; // already inside one level
while (depth > 0 && i < pattern.length()) {
- char c = pattern.charAt(i);
+ final char c = pattern.charAt(i);
if (c == '{') {
depth++;
} else if (c == '}') {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
index d182dc0..847c931 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
@@ -32,7 +32,7 @@ public final class ProcessIdPatternConverter extends LogEventPatternConverter {
private ProcessIdPatternConverter(final String... options) {
super("Process ID", "pid");
final String defaultValue = options.length > 0 ? options[0] : DEFAULT_DEFAULT_VALUE;
- String discoveredPid = ProcessIdUtil.getProcessId();
+ final String discoveredPid = ProcessIdUtil.getProcessId();
pid = discoveredPid.equals(ProcessIdUtil.DEFAULT_PROCESSID) ? defaultValue : discoveredPid;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
index 2e49a96..0c7f451 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
@@ -54,14 +54,14 @@ public class MutableInstant implements Instant, Serializable {
@Override
public long getEpochMillisecond() {
final int millis = nanoOfSecond / NANOS_PER_MILLI;
- long epochMillisecond = epochSecond * MILLIS_PER_SECOND + millis;
+ final long epochMillisecond = epochSecond * MILLIS_PER_SECOND + millis;
return epochMillisecond;
}
@Override
public int getNanoOfMillisecond() {
final int millis = nanoOfSecond / NANOS_PER_MILLI;
- int nanoOfMillisecond = nanoOfSecond - (millis * NANOS_PER_MILLI); // cheaper than nanoOfSecond % NANOS_PER_MILLI
+ final int nanoOfMillisecond = nanoOfSecond - (millis * NANOS_PER_MILLI); // cheaper than nanoOfSecond % NANOS_PER_MILLI
return nanoOfMillisecond;
}
@@ -121,7 +121,7 @@ public class MutableInstant implements Instant, Serializable {
* the second element is the number of nanoseconds, later along the time-line, from the start of the millisecond
*/
public static void instantToMillisAndNanos(final long epochSecond, final int nano, final long[] result) {
- int millis = nano / NANOS_PER_MILLI;
+ final int millis = nano / NANOS_PER_MILLI;
result[0] = epochSecond * MILLIS_PER_SECOND + millis;
result[1] = nano - (millis * NANOS_PER_MILLI); // cheaper than nanoOfSecond % NANOS_PER_MILLI
}
@@ -134,7 +134,7 @@ public class MutableInstant implements Instant, Serializable {
if (!(object instanceof MutableInstant)) {
return false;
}
- MutableInstant other = (MutableInstant) object;
+ final MutableInstant other = (MutableInstant) object;
return epochSecond == other.epochSecond && nanoOfSecond == other.nanoOfSecond;
}
[13/13] logging-log4j2 git commit: Add missing '@Override'
annotations.
Posted by gg...@apache.org.
Add missing '@Override' annotations.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4a4b60ab
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4a4b60ab
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4a4b60ab
Branch: refs/heads/release-2.x
Commit: 4a4b60abbb5b535ef6e1ae0b2d4671e128fad244
Parents: 3097022
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Oct 30 10:53:14 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Oct 30 10:53:14 2018 -0600
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/async/AsyncLoggerConfig.java | 1 +
.../logging/log4j/flume/appender/FlumePersistentAppenderTest.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a4b60ab/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
index 527a74f..61ca41f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
@@ -86,6 +86,7 @@ public class AsyncLoggerConfig extends LoggerConfig {
delegate.setLogEventFactory(getLogEventFactory());
}
+ @Override
protected void log(final LogEvent event, final LoggerConfigPredicate predicate) {
// See LOG4J2-2301
if (predicate == LoggerConfigPredicate.ALL &&
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4a4b60ab/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
index a32dedd..30ae580 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
@@ -351,7 +351,8 @@ public class FlumePersistentAppenderTest {
public void testLogInterrupted() {
final ExecutorService executor = Executors.newSingleThreadExecutor();
executor.execute(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
executor.shutdownNow();
final Logger logger = LogManager.getLogger("EventLogger");
final Marker marker = MarkerManager.getMarker("EVENT");