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 <[email protected]> Authored: Tue Oct 30 10:49:49 2018 -0600 Committer: Gary Gregory <[email protected]> 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).
