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 2021/07/29 14:28:46 UTC
[logging-log4j2] branch master updated: Remove trailing white
spaces on all lines.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 5edf437 Remove trailing white spaces on all lines.
5edf437 is described below
commit 5edf43758f104affad9842753e66be173fc4d68a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jul 29 10:28:36 2021 -0400
Remove trailing white spaces on all lines.
---
.../log4j/config/Log4j1ConfigurationParser.java | 2 +-
.../org/apache/log4j/helpers/OptionConverter.java | 8 +-
.../main/java/org/apache/log4j/spi/ErrorCode.java | 4 +-
.../test/java/org/apache/log4j/MDCTestCase.java | 4 +-
.../test/java/org/apache/log4j/VelocityTest.java | 6 +-
.../log4j/appserver/jetty/Log4j2Logger.java | 2 +-
.../logging/log4j/core/AbstractLifeCycle.java | 2 +-
.../log4j/core/DefaultLoggerContextAccessor.java | 2 +-
.../org/apache/logging/log4j/core/LogEvent.java | 2 +-
.../apache/logging/log4j/core/LoggerContext.java | 2 +-
.../apache/logging/log4j/core/StringLayout.java | 2 +-
.../org/apache/logging/log4j/core/Version.java | 2 +-
.../log4j/core/appender/AbstractAppender.java | 30 +-
.../log4j/core/appender/AbstractFileAppender.java | 4 +-
.../appender/AbstractOutputStreamAppender.java | 12 +-
.../core/appender/AbstractWriterAppender.java | 8 +-
.../logging/log4j/core/appender/AppenderSet.java | 2 +-
.../core/appender/ConfigurationFactoryData.java | 2 +-
.../logging/log4j/core/appender/FileAppender.java | 6 +-
.../core/appender/MemoryMappedFileAppender.java | 4 +-
.../log4j/core/appender/OutputStreamAppender.java | 8 +-
.../core/appender/RandomAccessFileAppender.java | 4 +-
.../log4j/core/appender/RollingFileAppender.java | 12 +-
.../appender/RollingRandomAccessFileAppender.java | 2 +-
.../log4j/core/appender/SocketAppender.java | 14 +-
.../log4j/core/appender/SyslogAppender.java | 34 +-
.../log4j/core/appender/TlsSyslogFrame.java | 2 +-
.../log4j/core/appender/WriterAppender.java | 6 +-
.../core/appender/db/AbstractDatabaseAppender.java | 2 +-
.../core/appender/db/AbstractDatabaseManager.java | 4 +-
.../log4j/core/appender/nosql/NoSqlAppender.java | 8 +-
.../log4j/core/appender/nosql/NoSqlProvider.java | 4 +-
.../rewrite/LoggerNameLevelRewritePolicy.java | 4 +-
.../core/appender/rewrite/MapRewritePolicy.java | 6 +-
.../appender/rewrite/PropertiesRewritePolicy.java | 2 +-
.../appender/rolling/CronTriggeringPolicy.java | 6 +-
.../appender/rolling/DefaultRolloverStrategy.java | 6 +-
.../rolling/DirectWriteRolloverStrategy.java | 6 +-
.../log4j/core/appender/rolling/FileExtension.java | 2 +-
.../appender/rolling/NoOpTriggeringPolicy.java | 4 +-
.../rolling/TimeBasedTriggeringPolicy.java | 14 +-
.../core/appender/rolling/TriggeringPolicy.java | 2 +-
.../appender/rolling/action/AbstractAction.java | 2 +-
.../rolling/action/AbstractPathAction.java | 20 +-
.../rolling/action/CommonsCompressAction.java | 2 +-
.../appender/rolling/action/CompositeAction.java | 4 +-
.../core/appender/rolling/action/DeleteAction.java | 14 +-
.../appender/rolling/action/DeletingVisitor.java | 6 +-
.../core/appender/rolling/action/Duration.java | 10 +-
.../appender/rolling/action/GzCompressAction.java | 2 +-
.../rolling/action/IfAccumulatedFileCount.java | 8 +-
.../rolling/action/IfAccumulatedFileSize.java | 8 +-
.../log4j/core/appender/rolling/action/IfAll.java | 12 +-
.../log4j/core/appender/rolling/action/IfAny.java | 4 +-
.../core/appender/rolling/action/IfFileName.java | 12 +-
.../appender/rolling/action/IfLastModified.java | 8 +-
.../log4j/core/appender/rolling/action/IfNot.java | 4 +-
.../appender/rolling/action/PathCondition.java | 4 +-
.../rolling/action/PathSortByModificationTime.java | 10 +-
.../rolling/action/PathWithAttributes.java | 4 +-
.../rolling/action/PosixViewAttributeAction.java | 14 +-
.../appender/rolling/action/ScriptCondition.java | 8 +-
.../appender/rolling/action/SortingVisitor.java | 4 +-
.../appender/rolling/action/ZipCompressAction.java | 2 +-
.../core/appender/routing/IdlePurgePolicy.java | 6 +-
.../log4j/core/appender/routing/PurgePolicy.java | 6 +-
.../log4j/core/appender/routing/Routes.java | 14 +-
.../log4j/core/async/AsyncLoggerContext.java | 8 +-
.../core/async/AsyncLoggerContextSelector.java | 2 +-
.../logging/log4j/core/config/AppenderControl.java | 8 +-
.../AwaitUnconditionallyReliabilityStrategy.java | 12 +-
.../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 +-
.../log4j/core/config/ReliabilityStrategy.java | 4 +-
.../core/config/ReliabilityStrategyFactory.java | 2 +-
.../builder/impl/DefaultConfigurationBuilder.java | 2 +-
.../properties/PropertiesConfigurationBuilder.java | 4 +-
.../log4j/core/config/xml/XmlConfiguration.java | 4 +-
.../logging/log4j/core/filter/AbstractFilter.java | 6 +-
.../log4j/core/filter/AbstractFilterable.java | 2 +-
.../logging/log4j/core/filter/BurstFilter.java | 4 +-
.../logging/log4j/core/filter/Filterable.java | 2 +-
.../logging/log4j/core/filter/NeutralFilter.java | 2 +-
.../logging/log4j/core/filter/ScriptFilter.java | 4 +-
.../logging/log4j/core/filter/TimeFilter.java | 2 +-
.../logging/log4j/core/impl/ExtendedClassInfo.java | 2 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 2 +-
.../logging/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 +-
.../logging/log4j/core/jmx/StatusLoggerAdmin.java | 6 +-
.../log4j/core/jmx/StatusLoggerAdminMBean.java | 2 +-
.../log4j/core/layout/MarkerPatternSelector.java | 12 +-
.../log4j/core/layout/ScriptPatternSelector.java | 20 +-
.../logging/log4j/core/layout/SyslogLayout.java | 14 +-
.../logging/log4j/core/lookup/AbstractLookup.java | 4 +-
.../logging/log4j/core/lookup/Base64StrLookup.java | 2 +-
.../log4j/core/lookup/EnvironmentLookup.java | 2 +-
.../logging/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 +-
.../apache/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 +-
.../logging/log4j/core/net/TcpSocketManager.java | 8 +-
.../log4j/core/net/ssl/SslConfiguration.java | 4 +-
.../log4j/core/parser/TextLogEventParser.java | 2 +-
.../pattern/ExtendedThrowablePatternConverter.java | 2 +-
.../log4j/core/pattern/JAnsiTextRenderer.java | 22 +-
.../log4j/core/pattern/PlainTextRenderer.java | 2 +-
.../logging/log4j/core/pattern/TextRenderer.java | 4 +-
.../logging/log4j/core/script/AbstractScript.java | 2 +-
.../log4j/core/selector/JndiContextSelector.java | 8 +-
.../org/apache/logging/log4j/core/time/Clock.java | 2 +-
.../logging/log4j/core/time/ClockFactory.java | 2 +-
.../apache/logging/log4j/core/time/NanoClock.java | 2 +-
.../logging/log4j/core/time/SystemNanoClock.java | 2 +-
.../log4j/core/time/internal/DummyNanoClock.java | 2 +-
.../core/time/internal/format/DateParser.java | 44 +-
.../core/time/internal/format/DatePrinter.java | 6 +-
.../core/time/internal/format/FastDateFormat.java | 22 +-
.../core/time/internal/format/FastDateParser.java | 36 +-
.../core/time/internal/format/FastDatePrinter.java | 40 +-
.../core/time/internal/format/FixedDateFormat.java | 2 +-
.../core/time/internal/format/FormatCache.java | 44 +-
.../apache/logging/log4j/core/tools/Generate.java | 1698 ++++++++++----------
.../apache/logging/log4j/core/util/ArrayUtils.java | 2 +-
.../logging/log4j/core/util/ExecutorServices.java | 2 +-
.../apache/logging/log4j/core/util/FileUtils.java | 6 +-
.../logging/log4j/core/util/FileWatcher.java | 4 +-
.../apache/logging/log4j/core/util/JndiCloser.java | 4 +-
.../log4j/core/util/Log4jThreadFactory.java | 6 +-
.../logging/log4j/core/util/NullOutputStream.java | 16 +-
.../apache/logging/log4j/core/util/Patterns.java | 4 +-
.../log4j/core/util/StringBuilderWriter.java | 14 +-
.../apache/logging/log4j/core/util/TypeUtil.java | 4 +-
.../apache/logging/log4j/core/util/UuidUtil.java | 2 +-
.../apache/logging/log4j/core/LateConfigTest.java | 2 +-
.../apache/logging/log4j/core/LogEventTest.java | 4 +-
.../core/appender/ConsoleAppenderBuilderTest.java | 2 +-
.../ConsoleAppenderDefaultSuppressedThrowable.java | 2 +-
.../logging/log4j/core/appender/Jira739Test.java | 2 +-
.../rewrite/LoggerNameLevelRewritePolicyTest.java | 2 +-
.../appender/rewrite/MapRewritePolicyTest.java | 2 +-
.../log4j/core/appender/rolling/FileSizeTest.java | 2 +-
.../rolling/RollingAppenderDeleteNestedTest.java | 2 +-
.../rolling/RollingAppenderUncompressedTest.java | 2 +-
.../RollingFileAppenderReconfigureTest.java | 4 +-
...nderReconfigureUndefinedSystemPropertyTest.java | 4 +-
.../rolling/action/DummyFileAttributes.java | 2 +-
.../core/appender/rolling/action/IfAllTest.java | 4 +-
.../core/appender/rolling/action/IfAnyTest.java | 4 +-
.../appender/rolling/action/IfFileNameTest.java | 12 +-
.../rolling/action/IfLastModifiedTest.java | 2 +-
.../action/PathSortByModificationTimeTest.java | 12 +-
.../routing/DefaultRouteScriptAppenderTest.java | 2 +-
.../appender/routing/RoutesScriptAppenderTest.java | 4 +-
.../core/async/AsyncLoggerConfigAutoFlushTest.java | 2 +-
.../log4j/core/async/AsyncLoggerConfigTest2.java | 4 +-
.../AsyncLoggerConfigUseAfterShutdownTest.java | 2 +-
.../core/async/AsyncLoggerContextSelectorTest.java | 2 +-
.../log4j/core/async/AsyncLoggerLocationTest.java | 2 +-
.../logging/log4j/core/async/AsyncLoggerTest.java | 4 +-
.../core/async/AsyncLoggerThreadContextTest.java | 4 +-
.../async/AsyncLoggerUseAfterShutdownTest.java | 2 +-
.../log4j/core/async/perftest/PerfTestDriver.java | 6 +-
.../ValidatingPluginWithTypedBuilderTest.java | 4 +-
.../core/filter/DynamicThresholdFilterTest.java | 2 +-
.../log4j/core/filter/LevelRangeFilterTest.java | 2 +-
.../log4j/core/impl/Log4jLogEventNanoTimeTest.java | 4 +-
.../core/impl/NestedLoggingFromToStringTest.java | 2 +-
.../core/impl/ThrowableFormatOptionsTest.java | 2 +-
.../apache/logging/log4j/core/jmx/ServerTest.java | 20 +-
.../logging/log4j/core/layout/HtmlLayoutTest.java | 2 +-
.../lookup/MainInputArgumentsJmxLookupTest.java | 4 +-
.../core/lookup/MainInputArgumentsLookupApp.java | 4 +-
.../core/lookup/MainInputArgumentsMapLookup.java | 2 +-
.../log4j/core/lookup/MarkerLookupConfigTest.java | 2 +-
.../log4j/core/lookup/MarkerLookupTest.java | 2 +-
.../core/pattern/DatePatternConverterTest.java | 2 +-
.../log4j/core/pattern/DisableAnsiTest.java | 2 +-
.../ExtendedThrowablePatternConverterTest.java | 2 +-
.../log4j/core/pattern/NoConsoleNoAnsiTest.java | 2 +-
.../log4j/core/pattern/PatternParserTest2.java | 2 +-
.../internal/format/FastDateParserSDFTest.java | 14 +-
.../time/internal/format/FastDateParserTest.java | 24 +-
.../format/FastDateParser_MoreOrLessTest.java | 24 +-
.../log4j/core/tools/GenerateCustomLoggerTest.java | 2 +-
.../core/tools/GenerateExtendedLoggerTest.java | 6 +-
.../log4j/csv/layout/AbstractCsvLayout.java | 6 +-
.../log4j/csv/layout/CsvParameterLayout.java | 8 +-
.../log4j/csv/layout/CsvLogEventLayoutTest.java | 4 +-
.../logging/log4j/docker/model/Container.java | 2 +-
.../logging/log4j/docker/model/IPAMConfig.java | 6 +-
.../apache/logging/log4j/docker/model/Mount.java | 4 +-
.../logging/log4j/docker/model/PortDefinition.java | 2 +-
.../log4j/flume/appender/FlumeEventFactory.java | 2 +-
.../appender/FlumePersistentAppenderTest.java | 4 +-
.../apache/logging/log4j/io/ByteStreamLogger.java | 4 +-
.../apache/logging/log4j/io/CharStreamLogger.java | 2 +-
.../log4j/io/LoggerBufferedInputStream.java | 8 +-
.../logging/log4j/io/LoggerBufferedReader.java | 14 +-
.../logging/log4j/io/LoggerFilterOutputStream.java | 2 +-
.../logging/log4j/io/LoggerFilterWriter.java | 2 +-
.../apache/logging/log4j/io/LoggerInputStream.java | 2 +-
.../logging/log4j/io/LoggerOutputStream.java | 2 +-
.../apache/logging/log4j/io/LoggerPrintStream.java | 2 +-
.../org/apache/logging/log4j/io/LoggerReader.java | 2 +-
.../org/apache/logging/log4j/io/LoggerWriter.java | 2 +-
.../log4j/io/AbstractLoggerOutputStreamTest.java | 2 +-
.../logging/log4j/io/AbstractStreamTest.java | 2 +-
.../log4j/io/IoBuilderCallerInfoTesting.java | 4 +-
.../LoggerBufferedInputStreamCallerInfoTest.java | 2 +-
.../io/LoggerBufferedReaderCallerInfoTest.java | 2 +-
.../log4j/io/LoggerInputStreamCallerInfoTest.java | 2 +-
.../logging/log4j/io/LoggerInputStreamTest.java | 2 +-
.../log4j/io/LoggerOutputStreamCallerInfoTest.java | 6 +-
.../log4j/io/LoggerPrintStreamCallerInfoTest.java | 30 +-
.../log4j/io/LoggerPrintWriterCallerInfoTest.java | 32 +-
.../log4j/io/LoggerPrintWriterJdbcH2Test.java | 2 +-
.../logging/log4j/io/LoggerPrintWriterTest.java | 2 +-
.../log4j/io/LoggerReaderCallerInfoTest.java | 2 +-
.../apache/logging/log4j/io/LoggerReaderTest.java | 2 +-
.../org/apache/logging/log4j/jcl/Log4jLog.java | 2 +-
.../PoolingDriverConnectionSourceTest.java | 2 +-
.../jdbc/appender/AbstractConnectionSource.java | 2 +-
.../log4j/jdbc/appender/ConnectionSource.java | 2 +-
.../JdbcAppenderStringSubstitutionTest.java | 2 +-
.../log4j/jeromq/appender/JeroMqAppenderTest.java | 2 +-
.../log4j/jeromq/appender/JeroMqTestClient.java | 2 +-
.../logging/log4j/jms/appender/JmsAppender.java | 2 +-
.../ContextStackJsonAttributeConverterTest.java | 2 +-
.../org/apache/logging/log4j/jul/Constants.java | 2 +-
.../logging/log4j/jul/DefaultLevelConverter.java | 2 +-
.../DefaultLevelConverterCustomJulLevelsTest.java | 2 +-
.../appender/DefaultKafkaProducerFactory.java | 2 +-
.../log4j/kafka/appender/KafkaAppender.java | 4 +-
.../log4j/kafka/appender/KafkaProducerFactory.java | 2 +-
.../kafka/builder/ConfigurationBuilderTest.java | 2 +-
.../jackson/layout/AbstractJacksonLayout.java | 2 +-
.../logging/log4j/mongodb3/MongoDb3LevelCodec.java | 2 +-
.../logging/log4j/mongodb3/MongoDb3TestRule.java | 2 +-
.../log4j/osgi/tests/AbstractLoadBundleTest.java | 28 +-
.../log4j/osgi/tests/junit/OsgiTestRule.java | 2 +-
.../log4j/perf/jmh/LoggerConfigBenchmark.java | 4 +-
.../log4j/perf/jmh/PatternLayoutBenchmark.java | 24 +-
.../perf/jmh/PatternLayoutComparisonBenchmark.java | 2 +-
.../log4j/perf/jmh/TextEncoderHelperBenchmark.java | 4 +-
.../perf/jmh/ThreadsafeDateFormatBenchmark.java | 2 +-
.../log4j/plugins/convert/TypeConverters.java | 4 +-
.../logging/log4j/plugins/util/PluginManager.java | 8 +-
.../logging/log4j/plugins/util/ResolverUtil.java | 6 +-
.../logging/log4j/plugins/util/TypeUtil.java | 4 +-
.../plugins/validation/ConstraintValidator.java | 2 +-
.../util/ResolverUtilCustomProtocolTest.java | 2 +-
.../log4j/plugins/util/ResolverUtilTest.java | 16 +-
.../log4j/web/Log4jServletContextListener.java | 2 +-
.../Log4jShutdownOnContextDestroyedListener.java | 4 +-
.../logging/log4j/web/Log4jWebLifeCycle.java | 2 +-
.../log4j/web/appender/ServletAppender.java | 6 +-
.../log4j/web/Log4jServletContextListenerTest.java | 10 +-
...og4jShutdownOnContextDestroyedListenerTest.java | 8 +-
272 files changed, 1687 insertions(+), 1687 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
index 112ab42..ea2834f 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
@@ -47,7 +47,7 @@ import org.apache.logging.log4j.util.Strings;
* Experimental parser for Log4j 1.2 properties configuration files.
*
* This class is not thread-safe.
- *
+ *
* <p>
* From the Log4j 1.2 Javadocs:
* </p>
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
index b74a341..dd6a5de 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
@@ -31,7 +31,7 @@ import java.util.Properties;
* A convenience class to convert property values to specific types.
*/
public class OptionConverter {
-
+
static String DELIM_START = "${";
static char DELIM_STOP = '}';
static int DELIM_START_LEN = 2;
@@ -45,7 +45,7 @@ public class OptionConverter {
new CharMap('\b', '\b'),
new CharMap('\"', '\"'),
new CharMap('\'', '\''),
- new CharMap('\\', '\\')
+ new CharMap('\\', '\\')
};
/**
@@ -413,11 +413,11 @@ public class OptionConverter {
return value;
}
}
-
+
private static class CharMap {
final char key;
final char replacement;
-
+
public CharMap(char key, char replacement) {
this.key = key;
this.replacement = replacement;
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java
index 4010b44..752b077 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java b/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java
index c0e5ba5..97bf1ff 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java
index 99bd5a2..c1165d7 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
public class VelocityTest {
private static LoggerContext context;
-
+
@BeforeClass
public static void setupClass() {
context = LoggerContext.getContext(false);
@@ -44,8 +44,8 @@ private static LoggerContext context;
public static void tearDownClass() {
Configurator.shutdown(context);
StatusLogger.getLogger().reset();
- }
-
+ }
+
@Test
public void testVelocity() {
Velocity.init();
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>
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 43c3c02..c3aea23 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 LifeCycle {
/**
* Gets the status logger.
- *
+ *
* @return the status logger.
*/
protected static org.apache.logging.log4j.Logger getStatusLogger() {
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
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 521a00b..b73e787 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
@@ -43,7 +43,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();
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
index 0141c34..dacfaf9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
@@ -760,7 +760,7 @@ public class LoggerContext extends AbstractLifeCycle
}
}
- private void initApiModule() {
+ private void initApiModule() {
ThreadContextMapFactory.init(); // Or make public and call ThreadContext.init() which calls ThreadContextMapFactory.init().
}
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..355ba6f 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
@@ -25,7 +25,7 @@ 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();
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) {
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 d1c171b..9827424 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;
@@ -94,7 +94,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
}
return layout;
}
-
+
public Layout<? extends Serializable> getOrCreateLayout(final Charset charset) {
if (layout == null) {
return PatternLayout.newBuilder().setCharset(charset).build();
@@ -110,9 +110,9 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
public Configuration getConfiguration() {
return configuration;
}
-
+
}
-
+
private final String name;
private final boolean ignoreExceptions;
private final Layout<? extends Serializable> layout;
@@ -120,7 +120,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.
@@ -181,7 +181,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) {
@@ -191,7 +191,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.
@@ -202,7 +202,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.
*/
@@ -212,7 +212,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Returns the ErrorHandler, if any.
- *
+ *
* @return The ErrorHandler.
*/
@Override
@@ -222,7 +222,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Returns the Layout for the appender.
- *
+ *
* @return The Layout used to format the event.
*/
@Override
@@ -232,7 +232,7 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
/**
* Returns the name of the Appender.
- *
+ *
* @return The name of the Appender.
*/
@Override
@@ -253,7 +253,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
@@ -271,7 +271,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.
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 2ea6997..83ca21e 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;
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 cee9a82..9189af9 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 setImmediateFlush(final boolean immediateFlush) {
this.immediateFlush = immediateFlush;
return asBuilder();
}
-
+
public B setBufferedIo(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
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 0ba5936..6e4d5af 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,7 +49,7 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
/**
* Instantiates.
- *
+ *
* @param name
* The name of the Appender.
* @param layout
@@ -70,7 +70,7 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
* <p>
* Most subclasses will need to override this method.
* </p>
- *
+ *
* @param event
* The LogEvent.
*/
@@ -95,7 +95,7 @@ public abstract class AbstractWriterAppender<M extends WriterManager> extends Ab
/**
* Gets the manager.
- *
+ *
* @return the manager.
*/
public M getManager() {
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 b592738..93cc1fc 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);
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() {
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 7a03673..3610b9d 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
@@ -42,7 +42,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
/**
* Builds FileAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -182,12 +182,12 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
}
}
-
+
@PluginFactory
public static <B extends Builder<B>> B newBuilder() {
return new Builder<B>().asBuilder();
}
-
+
private final String fileName;
private final Advertiser advertiser;
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 b27c9fa..e7f354f 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
@@ -43,7 +43,7 @@ public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender
/**
* Builds RandomAccessFileAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -116,7 +116,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;
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 d15c0fb..1c61a57 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
@@ -56,7 +56,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
@Override
public OutputStreamAppender build() {
-
+
return new OutputStreamAppender(getName(), layout, getFilter(), getManager(target, follow, layout), isIgnoreExceptions(), getPropertyArray());
}
@@ -80,7 +80,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
/**
* Builds instances.
- *
+ *
* @param os
* The OutputStream.
* @param type
@@ -102,7 +102,7 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
/**
* Creates an OutputStreamManager.
- *
+ *
* @param name
* The name of the entity to manage.
* @param data
@@ -119,7 +119,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
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 6e63f71..e03ad26 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
@@ -39,7 +39,7 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender
/**
* Builds RandomAccessFileAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -103,7 +103,7 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender
}
}
-
+
private final String fileName;
private Object advertisement;
private final Advertiser advertiser;
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 5849d79..a719f04 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
@@ -50,7 +50,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
/**
* Builds FileAppender instances.
- *
+ *
* @param <B>
* The type to build
* @since 2.7
@@ -71,11 +71,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
@@ -261,7 +261,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
}
}
-
+
private final String fileName;
private final String filePattern;
private Object advertisement;
@@ -331,7 +331,7 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
/**
* Creates a new Builder.
- *
+ *
* @return a new Builder.
* @since 2.7
*/
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 e24bc9f..dbc20f7 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
@@ -190,7 +190,7 @@ public final class RollingRandomAccessFileAppender extends AbstractOutputStreamA
}
}
-
+
private final String fileName;
private final String filePattern;
private final Object advertisement;
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 ec2041b..8e9de10 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
@@ -61,7 +61,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.
*/
@@ -90,10 +90,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;
@@ -180,13 +180,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.plugins.util.Builder<SocketAppender> {
@@ -221,7 +221,7 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
!bufferedIo || immediateFlush, getAdvertise() ? getConfiguration().getAdvertiser() : null);
}
}
-
+
@PluginFactory
public static Builder newBuilder() {
return new Builder();
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 dec5c5e..777cf1c 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
@@ -53,52 +53,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;
@@ -299,7 +299,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,
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 {
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 1f3b30e..59b8a7d 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
@@ -72,7 +72,7 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
/**
* Builds instances.
- *
+ *
* @param writer
* The OutputStream.
* @param type
@@ -91,7 +91,7 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
/**
* Creates a WriterManager.
- *
+ *
* @param name
* The name of the entity to manage.
* @param data
@@ -108,7 +108,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
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 e6d3d13..62bd192 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
@@ -43,7 +43,7 @@ public abstract class AbstractDatabaseAppender<T extends AbstractDatabaseManager
public static class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B> {
// empty for now.
}
-
+
public static final int DEFAULT_RECONNECT_INTERVAL_MILLIS = 5000;
private final ReadWriteLock lock = new ReentrantReadWriteLock();
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 fd61dfb..870f614 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
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.core.appender.ManagerFactory;
* Manager that allows database appenders to have their configuration reloaded without losing events.
*/
public abstract class AbstractDatabaseManager extends AbstractManager implements Flushable {
-
+
/**
* Implementations should extend this class for passing data between the getManager method and the manager factory
* class.
@@ -62,7 +62,7 @@ public abstract class AbstractDatabaseManager extends AbstractManager implements
/**
* Gets the layout.
- *
+ *
* @return the layout.
*/
public Layout<? extends Serializable> getLayout() {
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 9a22b13..5acf3ef 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
@@ -37,7 +37,7 @@ import java.io.Serializable;
* 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
@@ -47,7 +47,7 @@ public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseM
/**
* Builds ConsoleAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -83,7 +83,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.
@@ -96,7 +96,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
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
*/
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 abc9339..6566245 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.
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 0072d29..72205c4 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.
*/
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 ccd5571..b67dbbe 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.
*/
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 d076249..b101500 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.
*/
@@ -92,7 +92,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.
@@ -108,7 +108,7 @@ public final class CronTriggeringPolicy extends AbstractTriggeringPolicy {
/**
* Creates a ScheduledTriggeringPolicy.
- *
+ *
* @param configuration
* the Configuration.
* @param evaluateOnStartup
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 b375801..7866db0 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
@@ -88,10 +88,10 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy {
public static class Builder implements org.apache.logging.log4j.plugins.util.Builder<DefaultRolloverStrategy> {
@PluginBuilderAttribute("max")
private String max;
-
+
@PluginBuilderAttribute("min")
private String min;
-
+
@PluginBuilderAttribute("fileIndex")
private String fileIndex;
@@ -258,7 +258,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy {
/**
* Defines configuration.
- *
+ *
* @param config The Configuration.
* @return This builder for chaining convenience
*/
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 edd4428..18de6d1 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
@@ -58,7 +58,7 @@ import java.util.zip.Deflater;
public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implements DirectFileRolloverStrategy {
private static final int DEFAULT_MAX_FILES = 7;
-
+
/**
* Builds DirectWriteRolloverStrategy instances.
*/
@@ -179,7 +179,7 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem
/**
* Defines configuration.
- *
+ *
* @param config The Configuration.
* @return This builder for chaining convenience
*/
@@ -307,7 +307,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);
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 2921e6a..e5d6be4 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);
- }
+ }
}
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 6ae08eb..4dd4aa3 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,14 +24,14 @@ import org.apache.logging.log4j.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)
public class NoOpTriggeringPolicy extends AbstractTriggeringPolicy {
public static final NoOpTriggeringPolicy INSTANCE = new NoOpTriggeringPolicy();
-
+
@PluginFactory
public static NoOpTriggeringPolicy createPolicy() {
return INSTANCE;
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 e2bcb09..223e847 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
@@ -31,18 +31,18 @@ import java.util.concurrent.TimeUnit;
@Plugin(name = "TimeBasedTriggeringPolicy", category = Core.CATEGORY_NAME, printObject = true)
public final class TimeBasedTriggeringPolicy extends AbstractTriggeringPolicy {
-
+
public static class Builder implements org.apache.logging.log4j.plugins.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);
@@ -60,17 +60,17 @@ public final class TimeBasedTriggeringPolicy extends AbstractTriggeringPolicy {
public int getMaxRandomDelay() {
return maxRandomDelay;
}
-
+
public Builder setInterval(final int interval){
this.interval = interval;
return this;
}
-
+
public Builder setModulate(final boolean modulate){
this.modulate = modulate;
return this;
}
-
+
public Builder setMaxRandomDelay(final int maxRandomDelay){
this.maxRandomDelay = maxRandomDelay;
return this;
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 */ {
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 4eea0ea..c18163a 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.
*/
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 72e0835..191ec05 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 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() {
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 + ']';
}
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);
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 2d99791..c51c715 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
@@ -112,7 +112,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
*/
@@ -123,7 +123,7 @@ public class DeleteAction extends AbstractPathAction {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.AbstractPathAction#execute(FileVisitor)
*/
@Override
@@ -152,7 +152,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
*/
@@ -164,7 +164,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() {
@@ -178,7 +178,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
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 f0502db..69a59a7 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
@@ -42,7 +42,7 @@ public class DeletingVisitor extends SimpleFileVisitor<Path> {
/**
* 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
@@ -90,7 +90,7 @@ public class DeletingVisitor extends SimpleFileVisitor<Path> {
/**
* Deletes the specified file.
- *
+ *
* @param file the file to delete
* @throws IOException if a problem occurred deleting the file
*/
@@ -101,7 +101,7 @@ public class DeletingVisitor extends SimpleFileVisitor<Path> {
/**
* 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() {
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
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 f8faad2..a196a6c 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
@@ -176,7 +176,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 + ']';
}
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 49878bb..b043ec1 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
@@ -58,7 +58,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)
*/
@@ -77,7 +77,7 @@ public final class IfAccumulatedFileCount implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
*/
@Override
@@ -88,12 +88,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) {
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 82c7798..7c7ce06 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
@@ -59,7 +59,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)
*/
@@ -79,7 +79,7 @@ public final class IfAccumulatedFileSize implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
*/
@Override
@@ -90,12 +90,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) {
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 69a38bf..7db2feb 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);
}
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 c12a252..cff4c02 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);
}
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 109fc36..6cee0fc 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
@@ -79,7 +79,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() {
@@ -92,7 +92,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)
*/
@@ -111,7 +111,7 @@ public final class IfFileName implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
*/
@Override
@@ -124,7 +124,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
@@ -132,7 +132,7 @@ public final class IfFileName implements PathCondition {
* @see FileSystem#getPathMatcher(String)
*/
@PluginFactory
- public static IfFileName createNameCondition(
+ public static IfFileName createNameCondition(
// @formatter:off
@PluginAttribute final String glob,
@PluginAttribute final String regex,
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 a3b1f03..214957e 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
@@ -60,7 +60,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)
*/
@@ -81,7 +81,7 @@ public final class IfLastModified implements PathCondition {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
*/
@Override
@@ -91,13 +91,13 @@ 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 final Duration age,
@PluginElement("PathConditions") final PathCondition... nestedConditions) {
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 9e8e7a5..a05f069 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);
}
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 5308177..c0b9e19 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
@@ -26,7 +26,7 @@ import java.util.Arrays;
* Filter that accepts or rejects a candidate {@code Path} for deletion.
*/
public interface PathCondition {
-
+
/**
* Empty array.
*/
@@ -41,7 +41,7 @@ public interface PathCondition {
static PathCondition[] copy(PathCondition[] source) {
return source == null ? new PathCondition[0] : Arrays.copyOf(source, source.length);
}
-
+
/**
* 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.
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 68c0086..0887860 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(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
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..d698354 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
@@ -41,7 +41,7 @@ public class PathWithAttributes {
/**
* Returns the path.
- *
+ *
* @return the path
*/
public Path getPath() {
@@ -50,7 +50,7 @@ public class PathWithAttributes {
/**
* Returns the attributes.
- *
+ *
* @return the attributes
*/
public BasicFileAttributes getAttributes() {
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 c9a0c8b..0d1791a 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 java.util.Set;
/**
* 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 setMaxDepth(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
*/
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 8052458..2f6a0f6 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:
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 28760de..ba7e00b 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
@@ -42,7 +42,7 @@ public class SortingVisitor extends SimpleFileVisitor<Path> {
/**
* Constructs a new DeletingVisitor.
- *
+ *
* @param basePath used to relativize paths
* @param pathFilters objects that need to confirm whether a file can be deleted
*/
@@ -67,7 +67,7 @@ public class SortingVisitor extends SimpleFileVisitor<Path> {
return super.visitFileFailed(file, ioException);
}
}
-
+
public List<PathWithAttributes> getSortedPaths() {
Collections.sort(collected, sorter);
return collected;
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 + ']';
}
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 30bb1f1..619d175 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.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;
@@ -124,7 +124,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.
*/
@@ -156,7 +156,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;
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 af45a5d..9f773e6 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
@@ -28,9 +28,9 @@ public interface PurgePolicy {
* this method themselves.
*/
void purge();
-
+
/**
- *
+ *
* @param key routed appender key
* @param event
*/
@@ -38,7 +38,7 @@ public interface PurgePolicy {
/**
* Initializes with routing appender
- *
+ *
* @param routingAppender
*/
void initialize(RoutingAppender routingAppender);
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 e2532d8..a7e0813 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
@@ -46,12 +46,12 @@ public final class Routes {
public static class Builder implements org.apache.logging.log4j.plugins.util.Builder<Routes> {
- @PluginConfiguration
+ @PluginConfiguration
private Configuration configuration;
@PluginAttribute
private String pattern;
-
+
@PluginElement("Script")
private AbstractScript patternScript;
@@ -113,7 +113,7 @@ public final class Routes {
this.routes = routes;
return this;
}
-
+
}
private static final Logger LOGGER = StatusLogger.getLogger();
@@ -122,16 +122,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;
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;
}
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() {
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 a4d00d3..e6f1ce8 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) {
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 ce88285..5902a3f 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)
@@ -74,7 +74,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)
*/
@@ -85,7 +85,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)
@@ -97,7 +97,7 @@ public class AwaitUnconditionallyReliabilityStrategy implements ReliabilityStrat
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#afterLogEvent()
*/
@Override
@@ -107,7 +107,7 @@ public class AwaitUnconditionallyReliabilityStrategy implements ReliabilityStrat
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeStopAppenders()
*/
@Override
@@ -117,7 +117,7 @@ public class AwaitUnconditionallyReliabilityStrategy implements ReliabilityStrat
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeStopConfiguration(org.apache.logging.log4j.core
* .config.Configuration)
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 9f508ef..9e225a9 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
@@ -410,7 +410,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.
*/
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 d54a9f0..f9ff875 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() {
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 18838f7..7abef98 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.
*/
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.
*/
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 4777f2f..da08914 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)
@@ -65,7 +65,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)
*/
@@ -76,7 +76,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)
@@ -88,7 +88,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#afterLogEvent()
*/
@Override
@@ -98,7 +98,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeStopAppenders()
*/
@Override
@@ -108,7 +108,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeStopConfiguration(org.apache.logging.log4j.core
* .config.Configuration)
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 75d16c3..1ccb74a 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
@@ -69,7 +69,7 @@ public interface ReliabilityStrategy {
/**
* 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
*/
@@ -87,7 +87,7 @@ public interface ReliabilityStrategy {
/**
* Called before the configuration is stopped.
- *
+ *
* @param configuration the configuration that will be stopped
*/
void beforeStopConfiguration(Configuration configuration);
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
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 4b299a5..83dccac 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
@@ -69,7 +69,7 @@ import org.apache.logging.log4j.core.util.Throwables;
public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implements ConfigurationBuilder<T> {
private static final String INDENT = " ";
-
+
private final Component root = new Component();
private final Component loggers;
private final Component appenders;
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 ef8fd9c..34e816c 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);
}
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 6e689d9..675ee47 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
@@ -174,7 +174,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
@@ -198,7 +198,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);
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 0df9957..102ca72 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.
*/
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 b1d6a3d..c9e3d3e 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
@@ -73,7 +73,7 @@ public abstract class AbstractFilterable extends AbstractLifeCycle implements Fi
* May be null.
*/
private volatile Filter filter;
-
+
private final Property[] propertyArray;
protected AbstractFilterable() {
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 254d967..47b98ca 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
@@ -299,7 +299,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) {
@@ -309,7 +309,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) {
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>
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/NeutralFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/NeutralFilter.java
index 9dd1c30..cfb6425 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/NeutralFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/NeutralFilter.java
@@ -106,5 +106,5 @@ public class NeutralFilter extends AbstractFilter {
final Object p3, final Object p4, final Object p5, final Object p6, final Object p7, final Object p8, final Object p9) {
return Result.NEUTRAL;
}
-
+
}
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 6600ae9..14b7f84 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 onMatch The action to take if a match occurs.
* @param onMismatch 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
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
index 67078af..1198014 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
@@ -67,7 +67,7 @@ public final class TimeFilter extends AbstractFilter {
private final LocalTime endTime;
private final long duration;
-
+
/**
* Timezone.
*/
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 0ab9a8d..820d7ac 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
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 1054786..9f110a2 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
@@ -687,7 +687,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}.
*
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();
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();
}
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
*/
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();
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();
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();
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
*/
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
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 838d407..df10bed 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<>();
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 356be7c..b281377 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
@@ -49,21 +49,21 @@ public class ScriptPatternSelector implements PatternSelector {
*/
public static class Builder implements org.apache.logging.log4j.plugins.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;
@@ -132,7 +132,7 @@ public class ScriptPatternSelector implements PatternSelector {
return this;
}
}
-
+
private final Map<String, PatternFormatter[]> formatterMap = new HashMap<>();
private final Map<String, String> patternMap = new HashMap<>();
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 5e6d51b..001af3f 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.plugins.util.Builder<SyslogLayout> {
-
+
public Builder() {
super();
setCharset(StandardCharsets.UTF_8);
@@ -104,7 +104,7 @@ public final class SyslogLayout extends AbstractStringLayout {
}
}
-
+
@PluginFactory
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 {
/**
* Gets the facility.
- *
+ *
* @return the facility
*/
public Facility getFacility() {
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
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Base64StrLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Base64StrLookup.java
index 6d7b37c..24308cb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Base64StrLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Base64StrLookup.java
@@ -6,7 +6,7 @@ import org.apache.logging.log4j.core.LogEvent;
/**
* Decodes Base64 strings.
- *
+ *
* @since 3.0.0
*/
public class Base64StrLookup extends AbstractLookup {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java
index 5ea8657..f1c2156 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java
@@ -27,7 +27,7 @@ public class EnvironmentLookup extends AbstractLookup {
/**
* Looks up the value of the given environment variable.
- *
+ *
* @param event
* The current LogEvent (ignored by this StrLookup).
* @param key
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 df8d8a4..dbd65c8 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.plugins.Plugin;
/**
* A map-based lookup for main arguments.
- *
+ *
* See {@link #setMainArguments(String[])}.
- *
+ *
* @since 2.4
*/
@Plugin(name = "main", category = StrLookup.CATEGORY)
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 bdf71f2..9e6db5a 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.plugins.Plugin;
/**
* Looks-up markers.
- *
+ *
* @since 2.4
*/
@Plugin(name = "marker", category = StrLookup.CATEGORY)
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);
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
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 036f63c..d169ab7 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;
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);
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)
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 d03f69f..10d33d6 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
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.
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 6f73341..825dff1 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>
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 7d2c154..fad8870 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
@@ -70,7 +70,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Constructs.
- *
+ *
* @param name
* The unique name of this connection.
* @param os
@@ -113,7 +113,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Obtains a TcpSocketManager.
- *
+ *
* @param host
* The host to connect to.
* @param port
@@ -223,7 +223,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
@@ -387,7 +387,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Factory to create a TcpSocketManager.
- *
+ *
* @param <M>
* The manager type.
* @param <T>
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 45b4961..d6772de 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
@@ -68,7 +68,7 @@ public class SslConfiguration {
this.trustStoreConfig.clearSecrets();
}
}
-
+
public SSLSocketFactory getSslSocketFactory() {
return sslContext.getSocketFactory();
}
@@ -221,7 +221,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.
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.
*
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 d078a5e..2dc657f 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.
*/
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 302ad5d..8458403 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
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() {
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
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;
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 9d0a49c..fef98cb 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
@@ -45,7 +45,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>
@@ -54,7 +54,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* <env-entry-type>java.lang.String</env-entry-type>
* </env-entry>
* </pre>
- *
+ *
* </blockquote>
*
* <p>
@@ -67,7 +67,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>
@@ -76,7 +76,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* <env-entry-type>java.lang.String</env-entry-type>
* </env-entry>
* </pre>
- *
+ *
* </blockquote>
*
* <p>
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/Clock.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/Clock.java
index ecf4b38..9ab4a5e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/Clock.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/Clock.java
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.core.time;
/**
* Provides the time stamp used in log events.
- *
+ *
* @since 2.11
*/
public interface Clock {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java
index f076f5a..2adfaf4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java
@@ -30,7 +30,7 @@ import java.util.Map;
/**
* Factory for {@code Clock} objects.
- *
+ *
* @since 2.11
*/
public final class ClockFactory {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/NanoClock.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/NanoClock.java
index e5aef57..0123885 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/NanoClock.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/NanoClock.java
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.core.LogEvent;
/**
* Provides the {@link LogEvent#getNanoTime() high-resolution time stamp} used in log events.
- *
+ *
* @since 2.11
*/
public interface NanoClock {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/SystemNanoClock.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/SystemNanoClock.java
index 50b8a84..048ffa1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/SystemNanoClock.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/SystemNanoClock.java
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.core.time;
/**
* Implementation of the {@code NanoClock} interface that returns the system nano time.
- *
+ *
* @since 2.11
*/
public final class SystemNanoClock implements NanoClock {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/DummyNanoClock.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/DummyNanoClock.java
index 445286e..07bc51b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/DummyNanoClock.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/DummyNanoClock.java
@@ -39,7 +39,7 @@ public final class DummyNanoClock implements NanoClock {
/**
* Returns the constructor value.
- *
+ *
* @return the constructor value
*/
@Override
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/DateParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/DateParser.java
index 5625199..9b59cb2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/DateParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/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);
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/DatePrinter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/DatePrinter.java
index 8f93347..0e4464d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/DatePrinter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/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 {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDateFormat.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDateFormat.java
index 5685884..e7e1d56 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDateFormat.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/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.
*
@@ -86,17 +86,17 @@ public class FastDateFormat extends Format implements DateParser, DatePrinter {
* FULL locale dependent date or time style.
*/
public static final int FULL = DateFormat.FULL;
-
+
/**
* LONG locale dependent date or time style.
*/
public static final int LONG = DateFormat.LONG;
-
+
/**
* MEDIUM locale dependent date or time style.
*/
public static final int MEDIUM = DateFormat.MEDIUM;
-
+
/**
* SHORT locale dependent date or time style.
*/
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDateParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDateParser.java
index 70185b0..344e51c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDateParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/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
*/
@@ -102,8 +102,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
@@ -380,8 +380,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
@@ -404,7 +404,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.
@@ -565,7 +565,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;
@@ -631,7 +631,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);
@@ -700,7 +700,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);
@@ -900,9 +900,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
@@ -911,7 +911,7 @@ public class FastDateParser implements DateParser, Serializable {
ISO8601TimeZoneStrategy(final String pattern) {
createPattern(pattern);
}
-
+
/**
* {@inheritDoc}
*/
@@ -923,14 +923,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.
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDatePrinter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDatePrinter.java
index 2e2a12e..1597f3f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FastDatePrinter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/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);
@@ -592,7 +592,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);
}
@@ -1307,7 +1307,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);
}
@@ -1344,7 +1344,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;
/**
@@ -1369,7 +1369,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) {
@@ -1396,9 +1396,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
@@ -1420,10 +1420,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;
/**
@@ -1453,7 +1453,7 @@ public class FastDatePrinter implements DatePrinter, Serializable {
buffer.append("Z");
return;
}
-
+
if (offset < 0) {
buffer.append('-');
offset = -offset;
@@ -1467,7 +1467,7 @@ public class FastDatePrinter implements DatePrinter, Serializable {
if (length<5) {
return;
}
-
+
if (length==6) {
buffer.append(':');
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java
index a37cdd8..77c015f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java
@@ -302,7 +302,7 @@ public class FixedDateFormat {
/**
* Fixed time zone formats. The enum names are symbols from Java's <a href=
* "https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html">DateTimeFormatter</a>.
- *
+ *
* @see <a href=
* "https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html">DateTimeFormatter</a>
*/
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FormatCache.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FormatCache.java
index a75fa13..eac2b18 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FormatCache.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/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 {
final 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);
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 d53bb85..9459351 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, 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) including the stack trace of the {@link Throwable} <code>t</code> passed as parameter.%n"
- + " *%n"
- + " * @param msgSupplier A function, which when called, produces the desired log message;%n"
- + " * the format depends on the message factory.%n"
- + " * @param t the exception to log, including its stack trace.%n"
- + " * @since Log4j-2.4%n"
- + " */%n"
- + " public void methodName(final Supplier<?> msgSupplier, final Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, msgSupplier, t);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message which is only to be constructed if the logging level is the%n"
- + " * {@code CUSTOM_LEVEL} level with the specified Marker.%n"
- + " *%n"
- + " * @param marker the marker data specific to this log statement%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 Marker marker, final Supplier<?> msgSupplier) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, msgSupplier, (Throwable) null);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters which are only to be constructed if the logging level is the%n"
- + " * {@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 paramSuppliers An array of functions, which when called, produce the desired log"
- + " message parameters.%n"
- + " * @since Log4j-2.4%n"
- + " */%n"
- + " public void methodName(final Marker marker, final String message, final Supplier<?>..."
- + " paramSuppliers) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, paramSuppliers);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message (only to be constructed if the logging level is the {@code CUSTOM_LEVEL}%n"
- + " * level) with the specified Marker and including the stack trace of the {@link Throwable}%n"
+ + " *%n"
+ + " * @param msgSupplier A function, which when called, produces the desired log message;%n"
+ + " * the format depends on the message factory.%n"
+ + " * @param t the exception to log, including its stack trace.%n"
+ + " * @since Log4j-2.4%n"
+ + " */%n"
+ + " public void methodName(final Supplier<?> msgSupplier, final Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, msgSupplier, t);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message which is only to be constructed if the logging level is the%n"
+ + " * {@code CUSTOM_LEVEL} level with the specified Marker.%n"
+ + " *%n"
+ + " * @param marker the marker data specific to this log statement%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 Marker marker, final Supplier<?> msgSupplier) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, msgSupplier, (Throwable) null);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters which are only to be constructed if the logging level is the%n"
+ + " * {@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 paramSuppliers An array of functions, which when called, produce the desired log"
+ + " message parameters.%n"
+ + " * @since Log4j-2.4%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final String message, final Supplier<?>..."
+ + " paramSuppliers) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, message, paramSuppliers);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message (only to be constructed if the logging level is the {@code CUSTOM_LEVEL}%n"
+ + " * level) with the specified Marker and including the stack trace of the {@link Throwable}%n"
+ " * <code>t</code> passed as parameter.%n"
- + " *%n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param msgSupplier A function, which when called, produces the desired log message;%n"
- + " * the format depends on the message factory.%n"
- + " * @param t A Throwable or null.%n"
- + " * @since Log4j-2.4%n"
- + " */%n"
- + " public void methodName(final Marker marker, final Supplier<?> msgSupplier, final Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, msgSupplier, t);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message with parameters which are only to be constructed if the logging level is%n"
- + " * the {@code CUSTOM_LEVEL} level.%n"
- + " *%n"
- + " * @param message the message to log; the format depends on the message factory.%n"
- + " * @param paramSuppliers An array of functions, which when called, produce the desired log"
- + " message parameters.%n"
- + " * @since Log4j-2.4%n"
- + " */%n"
- + " public void methodName(final String message, final Supplier<?>... paramSuppliers) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, paramSuppliers);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message which is only to be constructed if the logging level is the%n"
- + " * {@code CUSTOM_LEVEL} level with the specified Marker. The {@code MessageSupplier} may or may%n"
- + " * not use the {@link MessageFactory} to construct the {@code Message}.%n"
- + " *%n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param msgSupplier A function, which when called, produces the desired log message.%n"
- + " * @since Log4j-2.4%n"
- + " */%n"
- + " public void methodName(final Marker marker, final MessageSupplier msgSupplier) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, 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) with the specified Marker and including the stack trace of the {@link Throwable}%n"
- + " * <code>t</code> passed as parameter. The {@code MessageSupplier} may or may not use the%n"
+ + " *%n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param msgSupplier A function, which when called, produces the desired log message;%n"
+ + " * the format depends on the message factory.%n"
+ + " * @param t A Throwable or null.%n"
+ + " * @since Log4j-2.4%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final Supplier<?> msgSupplier, final Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, msgSupplier, t);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message with parameters which are only to be constructed if the logging level is%n"
+ + " * the {@code CUSTOM_LEVEL} level.%n"
+ + " *%n"
+ + " * @param message the message to log; the format depends on the message factory.%n"
+ + " * @param paramSuppliers An array of functions, which when called, produce the desired log"
+ + " message parameters.%n"
+ + " * @since Log4j-2.4%n"
+ + " */%n"
+ + " public void methodName(final String message, final Supplier<?>... paramSuppliers) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, message, paramSuppliers);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message which is only to be constructed if the logging level is the%n"
+ + " * {@code CUSTOM_LEVEL} level with the specified Marker. The {@code MessageSupplier} may or may%n"
+ + " * not use the {@link MessageFactory} to construct the {@code Message}.%n"
+ + " *%n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param msgSupplier A function, which when called, produces the desired log message.%n"
+ + " * @since Log4j-2.4%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final MessageSupplier msgSupplier) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, 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) with the specified Marker and including the stack trace of the {@link Throwable}%n"
+ + " * <code>t</code> passed as parameter. The {@code MessageSupplier} may or may not use the%n"
+ " * {@link MessageFactory} to construct the {@code Message}.%n"
- + " *%n"
- + " * @param marker the marker data specific to this log statement%n"
- + " * @param msgSupplier A function, which when called, produces the desired log message.%n"
- + " * @param t A Throwable or null.%n"
- + " * @since Log4j-2.4%n"
- + " */%n"
- + " public void methodName(final Marker marker, final MessageSupplier msgSupplier, final "
- + "Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, msgSupplier, t);%n"
- + " }%n"
- + "%n"
- + " /**%n"
- + " * Logs a message which is only to be constructed if the logging level is the%n"
- + " * {@code CUSTOM_LEVEL} level. The {@code MessageSupplier} may or may not use the%n"
+ + " *%n"
+ + " * @param marker the marker data specific to this log statement%n"
+ + " * @param msgSupplier A function, which when called, produces the desired log message.%n"
+ + " * @param t A Throwable or null.%n"
+ + " * @since Log4j-2.4%n"
+ + " */%n"
+ + " public void methodName(final Marker marker, final MessageSupplier msgSupplier, final "
+ + "Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, marker, msgSupplier, t);%n"
+ + " }%n"
+ + "%n"
+ + " /**%n"
+ + " * Logs a message which is only to be constructed if the logging level is the%n"
+ + " * {@code CUSTOM_LEVEL} level. The {@code MessageSupplier} may or may not use the%n"
+ " * {@link MessageFactory} to construct the {@code Message}.%n"
- + " *%n"
- + " * @param msgSupplier A function, which when called, produces the desired log message.%n"
- + " * @since Log4j-2.4%n"
- + " */%n"
- + " public void methodName(final MessageSupplier 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"
+ + " *%n"
+ + " * @param msgSupplier A function, which when called, produces the desired log message.%n"
+ + " * @since Log4j-2.4%n"
+ + " */%n"
+ + " public void methodName(final MessageSupplier 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) including the stack trace of the {@link Throwable} <code>t</code> passed as parameter.%n"
- + " * The {@code MessageSupplier} may or may not use the {@link MessageFactory} to construct the%n"
+ + " * The {@code MessageSupplier} may or may not use the {@link MessageFactory} to construct the%n"
+ " * {@code Message}.%n"
- + " *%n"
- + " * @param msgSupplier A function, which when called, produces the desired log message.%n"
- + " * @param t the exception to log, including its stack trace.%n"
- + " * @since Log4j-2.4%n"
- + " */%n"
- + " public void methodName(final MessageSupplier msgSupplier, final Throwable t) {%n"
- + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, msgSupplier, t);%n"
+ + " *%n"
+ + " * @param msgSupplier A function, which when called, produces the desired log message.%n"
+ + " * @param t the exception to log, including its stack trace.%n"
+ + " * @since Log4j-2.4%n"
+ + " */%n"
+ + " public void methodName(final MessageSupplier msgSupplier, final Throwable t) {%n"
+ + " logger.logIfEnabled(FQCN, CUSTOM_LEVEL, null, msgSupplier, t);%n"
+ " }%n";
//@formatter:on
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ArrayUtils.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ArrayUtils.java
index c71a166..1976278 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ArrayUtils.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ArrayUtils.java
@@ -60,7 +60,7 @@ public class ArrayUtils {
*/
public static boolean isEmpty(final byte[] array) {
return getLength(array) == 0;
- }
+ }
/**
* <p>Removes the element at the specified position from the specified array.
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
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 19bf93d..2c0d7fa 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
@@ -103,7 +103,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.
@@ -122,10 +122,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
*/
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
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..589da71 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
@@ -22,11 +22,11 @@ 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() {
}
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
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 85dd4e4..b445cc0 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,29 +26,29 @@ 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();
-
+
/**
* 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
@@ -63,7 +63,7 @@ public class NullOutputStream extends OutputStream {
/**
* Does nothing - output to <code>/dev/null</code>.
- *
+ *
* @param b
* The byte to write
*/
@@ -74,7 +74,7 @@ public class NullOutputStream extends OutputStream {
/**
* Does nothing - output to <code>/dev/null</code>.
- *
+ *
* @param b
* The bytes to write
* @throws IOException
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.
*/
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..4768f97 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
@@ -5,9 +5,9 @@
* 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.
@@ -27,7 +27,7 @@ import java.io.Writer;
* (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>
@@ -57,7 +57,7 @@ public class StringBuilderWriter extends Writer implements Serializable {
/**
* 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.
@@ -105,7 +105,7 @@ public class StringBuilderWriter extends Writer implements Serializable {
}
/**
- * Closing this writer has no effect.
+ * Closing this writer has no effect.
*/
@Override
public void close() {
@@ -113,7 +113,7 @@ public class StringBuilderWriter extends Writer implements Serializable {
}
/**
- * Flushing this writer has no effect.
+ * Flushing this writer has no effect.
*/
@Override
public void flush() {
@@ -123,7 +123,7 @@ public class StringBuilderWriter extends Writer implements Serializable {
/**
* Writes a String to the {@link StringBuilder}.
- *
+ *
* @param value The value to write
*/
@Override
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()
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java
index 32e619e..cf83095 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java
@@ -64,7 +64,7 @@ public final class UuidUtil {
/**
* Initializes this class
- *
+ *
* @param mac MAC address
* @return Least
*/
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 c3a7087..9439232 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
@@ -45,7 +45,7 @@ public class LateConfigTest {
public static void tearDownClass() {
Configurator.shutdown(context);
StatusLogger.getLogger().reset();
- }
+ }
@Test
public void testReconfiguration() throws Exception {
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 22d35ae..9561f37 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
@@ -98,7 +98,7 @@ public class LogEventTest {
final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
final ObjectInputStream ois = new FilteredObjectInputStream(bais);
-
+
final LogEvent actual = (LogEvent) ois.readObject();
assertNotEquals(copy, actual, "Different event: nanoTime");
assertNotEquals(copy.getNanoTime(), actual.getNanoTime(), "Different nanoTime");
@@ -126,7 +126,7 @@ public class LogEventTest {
final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
final ObjectInputStream ois = new FilteredObjectInputStream(bais);
-
+
final LogEvent actual = (LogEvent) ois.readObject();
assertEquals(event2, actual, "both zero nanoTime");
}
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 44dfb9d..8ff7624 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
@@ -36,7 +36,7 @@ public class ConsoleAppenderBuilderTest {
/**
* Tests https://issues.apache.org/jira/browse/LOG4J2-1636
- *
+ *
* Tested with Oracle 7 and 8 and IBM Java 8.
*/
@Test
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>
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>
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 fedd544..b03d64b 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
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests {@link LoggerNameLevelRewritePolicy}.
- *
+ *
* @since 2.4
*/
public class LoggerNameLevelRewritePolicyTest {
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 dae1eb9..74058da 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) //
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 11f573b..35e2199 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
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.*;
public class FileSizeTest {
private final static long EXPECTED = 10 * 1024;
-
+
@Test
public void testFileSize() {
long value = FileSize.parse("10KB", 0);
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 d71a182..ff6d1d7 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) {
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 b969295..7dd0663 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);
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 413983c..8f9a12a 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();
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 828dbad..6ede72e 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();
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 5ba9429..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
@@ -34,7 +34,7 @@ public class DummyFileAttributes implements BasicFileAttributes {
public boolean isOther;
public long size;
public Object fileKey;
-
+
public DummyFileAttributes() {
}
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 5e85d1c..60d1b90 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
@@ -35,12 +35,12 @@ public class IfAllTest {
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);
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 2a2c7db..46cdf59 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
@@ -35,12 +35,12 @@ public class IfAnyTest {
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);
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 9b0b0db..acc685c 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
@@ -51,7 +51,7 @@ public class IfFileNameTest {
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));
}
@@ -61,7 +61,7 @@ public class IfFileNameTest {
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));
}
@@ -71,7 +71,7 @@ public class IfFileNameTest {
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));
@@ -82,14 +82,14 @@ public class IfFileNameTest {
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
@@ -104,7 +104,7 @@ public class IfFileNameTest {
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));
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 d2072ef..b6f177c 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));
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 60c43a3..3893378 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(1, sorter.compare(path(p1, a1), path(p1, a2)), "same path, 2nd more recent");
assertEquals(1, sorter.compare(path(p1, a1), path(p2, a2)), "path ignored, 2nd more recent");
assertEquals(1, sorter.compare(path(p2, a1), path(p1, a2)), "path ignored, 2nd more recent");
-
+
assertEquals(-1, sorter.compare(path(p1, a2), path(p1, a1)), "same path, 1st more recent");
assertEquals(-1, sorter.compare(path(p1, a2), path(p2, a1)), "path ignored, 1st more recent");
assertEquals(-1, sorter.compare(path(p2, a2), path(p1, a1)), "path ignored, 1st more recent");
-
+
assertEquals(0, sorter.compare(path(p1, a1), path(p1, a1)), "same path, same time");
assertEquals(1, sorter.compare(path(p1, a1), path(p2, a1)), "p2 < p1, same time");
assertEquals(-1, sorter.compare(path(p2, a1), path(p1, a1)), "p2 < p1, same time");
@@ -72,15 +72,15 @@ public class PathSortByModificationTimeTest {
final DummyFileAttributes a2 = new DummyFileAttributes();
a1.lastModified = FileTime.fromMillis(100);
a2.lastModified = FileTime.fromMillis(222);
-
+
assertEquals(-1, sorter.compare(path(p1, a1), path(p1, a2)), "same path, 2nd more recent");
assertEquals(-1, sorter.compare(path(p1, a1), path(p2, a2)), "path ignored, 2nd more recent");
assertEquals(-1, sorter.compare(path(p2, a1), path(p1, a2)), "path ignored, 2nd more recent");
-
+
assertEquals(1, sorter.compare(path(p1, a2), path(p1, a1)), "same path, 1st more recent");
assertEquals(1, sorter.compare(path(p1, a2), path(p2, a1)), "path ignored, 1st more recent");
assertEquals(1, sorter.compare(path(p2, a2), path(p1, a1)), "path ignored, 1st more recent");
-
+
assertEquals(0, sorter.compare(path(p1, a1), path(p1, a1)), "same path, same time");
assertEquals(-1, sorter.compare(path(p1, a1), path(p2, a1)), "p1 < p2, same time");
assertEquals(1, sorter.compare(path(p2, a1), path(p1, a1)), "p1 < p2, same time");
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 25647ab..ce559f9 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
@@ -42,7 +42,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 },
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 a32fb01..f092692 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
@@ -47,7 +47,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 },
@@ -60,7 +60,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;
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 18f2140..71c4df4 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);
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 2a818f6..f7c6b90 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
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 80ca43a..6d039e8 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);
}
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 2cdbb7f..fc0f06b 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
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 6a6fa56..3861720 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,
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 257975d..4359501 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
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 f627c40..b5b4746 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"));
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 8850536..9c1c670 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);
}
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 485bba5..b395e74 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();
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 69e1127..dd86d57 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
@@ -46,7 +46,7 @@ public class ValidatingPluginWithTypedBuilderTest {
@Test
public void testNullDefaultValue() throws Exception {
// @formatter:off
- final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder)
+ final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder)
new PluginBuilder(plugin).
setConfiguration(new NullConfiguration()).
setConfigurationNode(node).build();
@@ -58,7 +58,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).
setConfiguration(new NullConfiguration()).
setConfigurationNode(node).build();
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 6296b77..9b4b9cd 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
@@ -73,7 +73,7 @@ public class DynamicThresholdFilterTest {
assertSame(Filter.Result.ACCEPT, filter.filter(null, Level.DEBUG, null, "some test message", "one", "two", "three"));
ThreadContext.clearMap();
}
-
+
@Test
@LoggerContextSource("log4j2-dynamicfilter.xml")
public void testConfig(final Configuration config) {
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 16362d0..97d8140 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
@@ -53,5 +53,5 @@ public class LevelRangeFilterTest {
assertTrue(filter.isStarted());
assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, (Object) null, (Throwable) null));
}
-
+
}
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 ca436b0..c3723ac 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
@@ -64,7 +64,7 @@ public class Log4jLogEventNanoTimeTest {
Log4jLogEvent.setNanoClock(new DummyNanoClock(DUMMYNANOTIME));
log.info("Use dummy nano clock");
assertTrue(Log4jLogEvent.getNanoClock() instanceof DummyNanoClock, "using SystemNanoClock");
-
+
CoreLoggerContexts.stopLoggerContext(file); // stop async thread
String line1;
@@ -84,7 +84,7 @@ public class Log4jLogEventNanoTimeTest {
assertEquals(line1Parts[0], line1Parts[1]);
final long loggedNanoTime = Long.parseLong(line1Parts[0]);
assertTrue(loggedNanoTime - before < TimeUnit.SECONDS.toNanos(1), "used system nano time");
-
+
final String[] line2Parts = line2.split(" AND ");
assertEquals("Use dummy nano clock", line2Parts[2]);
assertEquals(String.valueOf(DUMMYNANOTIME), line2Parts[0]);
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 2e7246c..877d2cb 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;
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 e94ba4d..4b0a55a 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
@@ -36,7 +36,7 @@ public final class ThrowableFormatOptionsTest {
/**
* Runs a given test comparing against the expected values.
- *
+ *
* @param options
* The list of options to parse.
* @param expectedLines
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 05f331f..e90f943 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
}
}
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 09cc7d7..fd4a56a 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
@@ -246,7 +246,7 @@ public class HtmlLayoutTest {
}
}
}
-
+
private String getDateLine(String logEventString) {
return logEventString.split(System.lineSeparator())[2];
}
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 f1709d5..a3106a1 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 static org.junit.jupiter.api.Assertions.*;
/**
* 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 {
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupApp.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupApp.java
index ddb8b8f..44149a8 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupApp.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupApp.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 MainInputArgumentsLookupApp {
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 cce9d1e..5ce3efb 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 {
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 eb9b69f..eac6099 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
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests {@link MarkerLookup} with a configuration file.
- *
+ *
* @since 2.4
*/
@LoggerContextSource("log4j-marker-lookup.yaml")
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 3d9f855..f55121e 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
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.*;
/**
* Tests {@link MarkerLookup}.
- *
+ *
* @since 2.4
*/
public class MarkerLookupTest {
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 3bb29e6..a9362e3 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
@@ -210,7 +210,7 @@ public class DatePatternConverterTest {
final String expected = "2011-12-30T10:56:35,987";
assertEquals(expected, sb.toString());
}
-
+
@Test
public void testFormatLogEventStringBuilderIso8601TimezoneJST() {
final LogEvent event = new MyLogEvent();
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 5c504e5..596842f 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 {
assertTrue(msgs.get(0).endsWith(EXPECTED),
"Replacement failed - expected ending " + EXPECTED + ", actual " + msgs.get(0));
}
-
+
}
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 d42440e..a204894 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
@@ -153,7 +153,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,
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 b8e2977..0bf979c 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
@@ -55,5 +55,5 @@ public class NoConsoleNoAnsiTest {
assertTrue(msgs.get(0).endsWith(EXPECTED),
"Replacement failed - expected ending " + EXPECTED + ", actual " + msgs.get(0));
}
-
+
}
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 38c7f80..cc2f3ea 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
@@ -71,7 +71,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.
*/
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserSDFTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserSDFTest.java
index b8e02d6..ad34502 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserSDFTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserSDFTest.java
@@ -38,8 +38,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)
@@ -188,9 +188,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) {
@@ -207,12 +207,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);
}
}
@@ -229,6 +229,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);
- }
+ }
}
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java
index 2c1c9a6..abbd654 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java
@@ -43,7 +43,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 {
@@ -347,7 +347,7 @@ public class FastDateParserTest {
}
}
}
-
+
@Test
public void testJpLocales() {
@@ -425,7 +425,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);
@@ -433,7 +433,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
@@ -597,19 +597,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");
@@ -628,8 +628,8 @@ public class FastDateParserTest {
}
private 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);
Expected1806(final TimeZone zone, final String one, final String two, final String three, final boolean hasHalfHourOffset) {
@@ -646,17 +646,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);
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParser_MoreOrLessTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParser_MoreOrLessTest.java
index fa180eb..d2ebba1 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParser_MoreOrLessTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParser_MoreOrLessTest.java
@@ -32,15 +32,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
@@ -55,7 +55,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
@@ -68,9 +68,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());
@@ -78,7 +78,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());
@@ -86,21 +86,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);
@@ -108,7 +108,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());
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 1db24bd..efba921 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
@@ -53,7 +53,7 @@ import static org.junit.jupiter.api.Assertions.*;
public class GenerateCustomLoggerTest {
private static final String TEST_SOURCE = "target/test-classes/org/apache/logging/log4j/core/MyCustomLogger.java";
-
+
@BeforeAll
public static void beforeClass() {
System.setProperty("log4j2.loggerContextFactory", "org.apache.logging.log4j.test.TestLoggerContextFactory");
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 b473b12..fc9ba4b 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
@@ -54,7 +54,7 @@ import static org.junit.jupiter.api.Assertions.*;
public class GenerateExtendedLoggerTest {
private static final String TEST_SOURCE = "target/test-classes/org/apache/logging/log4j/core/MyExtendedLogger.java";
-
+
@BeforeAll
public static void beforeClass() {
System.setProperty("log4j2.loggerContextFactory", "org.apache.logging.log4j.test.TestLoggerContextFactory");
@@ -163,7 +163,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;
@@ -179,7 +179,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++));
diff --git a/log4j-csv/src/main/java/org/apache/logging/log4j/csv/layout/AbstractCsvLayout.java b/log4j-csv/src/main/java/org/apache/logging/log4j/csv/layout/AbstractCsvLayout.java
index f10191d..3584a0a 100644
--- a/log4j-csv/src/main/java/org/apache/logging/log4j/csv/layout/AbstractCsvLayout.java
+++ b/log4j-csv/src/main/java/org/apache/logging/log4j/csv/layout/AbstractCsvLayout.java
@@ -26,9 +26,9 @@ import org.apache.logging.log4j.core.layout.PatternLayout;
/**
* A superclass for Comma-Separated Value (CSV) layouts.
- *
+ *
* Depends on Apache Commons CSV 1.2.
- *
+ *
* @since 2.4
*/
public abstract class AbstractCsvLayout extends AbstractStringLayout {
@@ -69,7 +69,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;
diff --git a/log4j-csv/src/main/java/org/apache/logging/log4j/csv/layout/CsvParameterLayout.java b/log4j-csv/src/main/java/org/apache/logging/log4j/csv/layout/CsvParameterLayout.java
index 816271a..858c691 100644
--- a/log4j-csv/src/main/java/org/apache/logging/log4j/csv/layout/CsvParameterLayout.java
+++ b/log4j-csv/src/main/java/org/apache/logging/log4j/csv/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)
diff --git a/log4j-csv/src/test/java/org/apache/logging/log4j/csv/layout/CsvLogEventLayoutTest.java b/log4j-csv/src/test/java/org/apache/logging/log4j/csv/layout/CsvLogEventLayoutTest.java
index e65e5eb..5d273db 100644
--- a/log4j-csv/src/test/java/org/apache/logging/log4j/csv/layout/CsvLogEventLayoutTest.java
+++ b/log4j-csv/src/test/java/org/apache/logging/log4j/csv/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();
}
diff --git a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/Container.java b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/Container.java
index 2029cf5..2ec2dd4 100644
--- a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/Container.java
+++ b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/Container.java
@@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class Container {
@JsonProperty("Id")
private String id;
-
+
@JsonProperty("Names")
private List<String> names;
diff --git a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/IPAMConfig.java b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/IPAMConfig.java
index 722fe1f..6b6b81b 100644
--- a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/IPAMConfig.java
+++ b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/IPAMConfig.java
@@ -22,13 +22,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
*
*/
public class IPAMConfig {
-
+
@JsonProperty("Subnet")
private String subnet;
-
+
@JsonProperty("IPRange")
private String ipRange;
-
+
@JsonProperty("Gateway")
private String gateway;
diff --git a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/Mount.java b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/Mount.java
index a73c8ac..9e31ff6 100644
--- a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/Mount.java
+++ b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/Mount.java
@@ -22,10 +22,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
*
*/
public class Mount {
-
+
@JsonProperty("Type")
private String type;
-
+
@JsonProperty("Name")
private String name;
diff --git a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/PortDefinition.java b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/PortDefinition.java
index c23bfe9..60269fe 100644
--- a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/PortDefinition.java
+++ b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/model/PortDefinition.java
@@ -25,7 +25,7 @@ public class PortDefinition {
@JsonProperty("IP")
private String ip;
-
+
@JsonProperty("PrivatePort")
private Integer privatePort;
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.
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 9a37493..cd856f2 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();
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);
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 {
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 6122b20..640f51a 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
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.io.internal.InternalInputStream;
import org.apache.logging.log4j.spi.ExtendedLogger;
/**
- *
+ *
* @since 2.1
*/
public class LoggerBufferedInputStream extends BufferedInputStream {
@@ -53,17 +53,17 @@ public class LoggerBufferedInputStream extends BufferedInputStream {
public void close() throws IOException {
stream.close();
}
-
+
@Override
public synchronized int read() throws IOException {
return stream.read();
}
-
+
@Override
public int read(final byte[] b) throws IOException {
return stream.read(b);
}
-
+
@Override
public synchronized int read(final byte[] b, final int off, final int len) throws IOException {
return stream.read(b, off, len);
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 a981ca5..9f15bc1 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
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.io.internal.InternalBufferedReader;
import org.apache.logging.log4j.spi.ExtendedLogger;
/**
- *
+ *
* @since 2.1
*/
public class LoggerBufferedReader extends BufferedReader {
@@ -46,32 +46,32 @@ public class LoggerBufferedReader extends BufferedReader {
super(reader);
this.reader = new InternalBufferedReader(reader, size, logger, fqcn == null ? FQCN : fqcn, level, marker);
}
-
+
@Override
public void close() throws IOException {
reader.close();
}
-
+
@Override
public int read() throws IOException {
return reader.read();
}
-
+
@Override
public int read(final char[] cbuf) throws IOException {
return reader.read(cbuf);
}
-
+
@Override
public int read(final char[] cbuf, final int off, final int len) throws IOException {
return reader.read(cbuf, off, len);
}
-
+
@Override
public int read(final CharBuffer target) throws IOException {
return reader.read(target);
}
-
+
@Override
public String readLine() throws IOException {
return reader.readLine();
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 a103233..4412245 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
@@ -32,7 +32,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 {
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 682e831..ae27292 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
@@ -29,7 +29,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 {
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 8da122b..40a8921 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
@@ -29,7 +29,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 {
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 e1bd658..e516c65 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
@@ -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 LoggerOutputStream extends OutputStream {
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 0489119..5c8979a 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
@@ -35,7 +35,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 {
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 01834ce..6b15766 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
@@ -29,7 +29,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 {
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 29d61fa..a5aaef1 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
@@ -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 writer.
- *
+ *
* @since 2.1
*/
public class LoggerWriter extends Writer {
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();
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 f371a75..64ecaa8 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
@@ -33,7 +33,7 @@ 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";
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 e0e8484..7a0cf29 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
@@ -30,11 +30,11 @@ 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
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();
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();
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());
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];
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");
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');
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');
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 e349e17..47a790d 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
@@ -33,7 +33,7 @@ import org.junit.Ignore;
import org.junit.Test;
public class LoggerPrintWriterJdbcH2Test {
-
+
@ClassRule
public static LoggerContextRule context = new LoggerContextRule("log4j2-jdbc-driver-manager.xml");
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() {
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();
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);
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();
diff --git a/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/dbcp2/appender/PoolingDriverConnectionSourceTest.java b/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/dbcp2/appender/PoolingDriverConnectionSourceTest.java
index 4e8d36d..518de89 100644
--- a/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/dbcp2/appender/PoolingDriverConnectionSourceTest.java
+++ b/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/dbcp2/appender/PoolingDriverConnectionSourceTest.java
@@ -34,7 +34,7 @@ public class PoolingDriverConnectionSourceTest {
source.stop();
}
}
-
+
@Test
public void testH2Properties() throws SQLException {
final Property[] properties = new Property[] {
diff --git a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/AbstractConnectionSource.java b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/AbstractConnectionSource.java
index 0ddeba0..643473a 100644
--- a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/AbstractConnectionSource.java
+++ b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/AbstractConnectionSource.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.jdbc.appender;
import org.apache.logging.log4j.core.AbstractLifeCycle;
public abstract class AbstractConnectionSource extends AbstractLifeCycle implements ConnectionSource {
-
+
// nothing yet
}
diff --git a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ConnectionSource.java b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ConnectionSource.java
index bb9becf..b0962af 100644
--- a/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/ConnectionSource.java
+++ b/log4j-jdbc/src/main/java/org/apache/logging/log4j/jdbc/appender/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.
*
diff --git a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderStringSubstitutionTest.java b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderStringSubstitutionTest.java
index 1a69397..8c71c4e 100644
--- a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderStringSubstitutionTest.java
+++ b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/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/jdbc/appender/log4j2-jdbc-string-substitution.xml");
diff --git a/log4j-jeromq/src/test/java/org/apache/logging/log4j/jeromq/appender/JeroMqAppenderTest.java b/log4j-jeromq/src/test/java/org/apache/logging/log4j/jeromq/appender/JeroMqAppenderTest.java
index 4a17347..2f5724b 100644
--- a/log4j-jeromq/src/test/java/org/apache/logging/log4j/jeromq/appender/JeroMqAppenderTest.java
+++ b/log4j-jeromq/src/test/java/org/apache/logging/log4j/jeromq/appender/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("src/test/resources/JeroMqAppenderTest.xml");
diff --git a/log4j-jeromq/src/test/java/org/apache/logging/log4j/jeromq/appender/JeroMqTestClient.java b/log4j-jeromq/src/test/java/org/apache/logging/log4j/jeromq/appender/JeroMqTestClient.java
index 0746a06..7df7dd2 100644
--- a/log4j-jeromq/src/test/java/org/apache/logging/log4j/jeromq/appender/JeroMqTestClient.java
+++ b/log4j-jeromq/src/test/java/org/apache/logging/log4j/jeromq/appender/JeroMqTestClient.java
@@ -30,7 +30,7 @@ class JeroMqTestClient implements Callable<List<String>> {
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;
diff --git a/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsAppender.java b/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsAppender.java
index 955a367..28e858e 100644
--- a/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsAppender.java
+++ b/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsAppender.java
@@ -48,7 +48,7 @@ public class JmsAppender extends AbstractAppender {
public static class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B>
implements org.apache.logging.log4j.plugins.util.Builder<JmsAppender> {
-
+
public static final int DEFAULT_RECONNECT_INTERVAL_MILLIS = 5000;
@PluginBuilderAttribute
diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/converter/ContextStackJsonAttributeConverterTest.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/converter/ContextStackJsonAttributeConverterTest.java
index 5ebc700..afbd86e 100644
--- a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/converter/ContextStackJsonAttributeConverterTest.java
+++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/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() {
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.
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 {
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 {
diff --git a/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/DefaultKafkaProducerFactory.java b/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/DefaultKafkaProducerFactory.java
index da9ab92..3f8f2e2 100644
--- a/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/DefaultKafkaProducerFactory.java
+++ b/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/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>
diff --git a/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java b/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
index ec5e512..5e6c82c 100644
--- a/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
+++ b/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
@@ -43,7 +43,7 @@ public final class KafkaAppender extends AbstractAppender {
/**
* Builds KafkaAppender instances.
- *
+ *
* @param <B>
* The type to build
*/
@@ -128,7 +128,7 @@ public final class KafkaAppender extends AbstractAppender {
/**
* Creates a builder for a KafkaAppender.
- *
+ *
* @return a builder for a KafkaAppender.
*/
@PluginFactory
diff --git a/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaProducerFactory.java b/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaProducerFactory.java
index 6956323..8309e46 100644
--- a/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaProducerFactory.java
+++ b/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/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>
diff --git a/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationBuilderTest.java b/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationBuilderTest.java
index c35938b..8e7288e 100644
--- a/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationBuilderTest.java
+++ b/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationBuilderTest.java
@@ -117,7 +117,7 @@ public class ConfigurationBuilderTest {
final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
addTestFixtures("config name", builder);
final String xmlConfiguration = builder.toXmlConfiguration();
-
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
dbf.setCoalescing(true);
diff --git a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/layout/AbstractJacksonLayout.java b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/layout/AbstractJacksonLayout.java
index 9dd7c83..d85fdba 100644
--- a/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/layout/AbstractJacksonLayout.java
+++ b/log4j-layout-jackson/src/main/java/org/apache/logging/log4j/jackson/layout/AbstractJacksonLayout.java
@@ -302,7 +302,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
this(config, objectWriter, charset, compact, complete, eventEol, null,
headerSerializer, footerSerializer, includeNullDelimiter, additionalFields);
}
-
+
protected AbstractJacksonLayout(final Configuration config, final ObjectWriter objectWriter, final Charset charset,
final boolean compact, final boolean complete, final boolean eventEol, String endOfLine,
diff --git a/log4j-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDb3LevelCodec.java b/log4j-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDb3LevelCodec.java
index 0ecefcf..3515a02 100644
--- a/log4j-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDb3LevelCodec.java
+++ b/log4j-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDb3LevelCodec.java
@@ -35,7 +35,7 @@ public class MongoDb3LevelCodec implements Codec<Level> {
* @since 2.14.0
*/
public static final MongoDb3LevelCodec INSTANCE = new MongoDb3LevelCodec();
-
+
@Override
public Level decode(final BsonReader reader, final DecoderContext decoderContext) {
return Level.getLevel(reader.readString());
diff --git a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestRule.java b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestRule.java
index 51c2012..59a05ff 100644
--- a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestRule.java
+++ b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestRule.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 MongoDb3TestRule implements TestRule {
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 505732f..0c9f1c9 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
@@ -47,7 +47,7 @@ public abstract class AbstractLoadBundleTest extends AbstractOsgiTest {
final Path corePath = getHere().resolveSibling("log4j-core").resolve("target").resolve(getBundleTestInfo().buildJarFileName("log4j-core"));
return getBundleContext().installBundle(corePath.toUri().toString());
}
-
+
private Bundle getDummyBundle() throws BundleException {
final Path dumyPath = getHere().resolveSibling("log4j-samples").resolve("log4j-samples-configuration").resolve("target").resolve(getBundleTestInfo().buildJarFileName("log4j-samples-configuration"));
return getBundleContext().installBundle(dumyPath.toUri().toString());
@@ -58,7 +58,7 @@ public abstract class AbstractLoadBundleTest extends AbstractOsgiTest {
return getBundleContext().installBundle(apiPath.toUri().toString());
}
-
+
private void log(final Bundle dummy) throws ReflectiveOperationException {
// use reflection to log in the context of the dummy bundle
@@ -102,7 +102,7 @@ public abstract class AbstractLoadBundleTest extends AbstractOsgiTest {
api.start();
plugins.start();
core.start();
- dummy.start();
+ dummy.start();
}
private void stop(final Bundle api, final Bundle plugins, final Bundle core, final Bundle dummy) throws BundleException {
@@ -111,7 +111,7 @@ public abstract class AbstractLoadBundleTest extends AbstractOsgiTest {
plugins.stop();
api.stop();
}
-
+
private void uninstall(final Bundle api, final Bundle plugins, final Bundle core, final Bundle dummy) throws BundleException {
dummy.uninstall();
core.uninstall();
@@ -128,7 +128,7 @@ public abstract class AbstractLoadBundleTest extends AbstractOsgiTest {
final Bundle api = getApiBundle();
final Bundle plugins = getPluginsBundle();
final Bundle core = getCoreBundle();
-
+
Assert.assertEquals("api is not in INSTALLED state", Bundle.INSTALLED, api.getState());
Assert.assertEquals("plugins is not in INSTALLED state", Bundle.INSTALLED, plugins.getState());
Assert.assertEquals("core is not in INSTALLED state", Bundle.INSTALLED, core.getState());
@@ -136,15 +136,15 @@ public abstract class AbstractLoadBundleTest extends AbstractOsgiTest {
api.start();
plugins.start();
core.start();
-
+
Assert.assertEquals("api is not in ACTIVE state", Bundle.ACTIVE, api.getState());
Assert.assertEquals("plugins is not in ACTIVE state", Bundle.ACTIVE, plugins.getState());
- Assert.assertEquals("core is not in ACTIVE state", Bundle.ACTIVE, core.getState());
-
+ Assert.assertEquals("core is not in ACTIVE state", Bundle.ACTIVE, core.getState());
+
core.stop();
plugins.stop();
api.stop();
-
+
Assert.assertEquals("api is not in RESOLVED state", Bundle.RESOLVED, api.getState());
Assert.assertEquals("plugins is not in RESOLVED state", Bundle.RESOLVED, plugins.getState());
Assert.assertEquals("core is not in RESOLVED state", Bundle.RESOLVED, core.getState());
@@ -164,11 +164,11 @@ public abstract class AbstractLoadBundleTest extends AbstractOsgiTest {
Assert.assertEquals("api is not in RESOLVED state", Bundle.RESOLVED, api.getState());
Assert.assertEquals("plugins is not in RESOLVED state", Bundle.RESOLVED, plugins.getState());
Assert.assertEquals("core is not in RESOLVED state", Bundle.RESOLVED, core.getState());
-
+
core.uninstall();
plugins.uninstall();
api.uninstall();
-
+
Assert.assertEquals("api is not in UNINSTALLED state", Bundle.UNINSTALLED, api.getState());
Assert.assertEquals("plugins is not in UNINSTALLED state", Bundle.UNINSTALLED, plugins.getState());
Assert.assertEquals("core is not in UNINSTALLED state", Bundle.UNINSTALLED, core.getState());
@@ -211,7 +211,7 @@ public abstract class AbstractLoadBundleTest extends AbstractOsgiTest {
core.stop();
plugins.stop();
api.stop();
-
+
core.uninstall();
plugins.uninstall();
api.uninstall();
@@ -283,7 +283,7 @@ public abstract class AbstractLoadBundleTest extends AbstractOsgiTest {
/**
- * 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
@@ -297,7 +297,7 @@ public abstract class AbstractLoadBundleTest extends AbstractOsgiTest {
api.start();
plugins.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");
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java
index 4e68368..83251fb 100644
--- a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java
+++ b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java
@@ -58,7 +58,7 @@ public class OsgiTestRule 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);
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 41ef9c8..6cb0732 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.
*/
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java
index 35ded03..bff6021 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java
@@ -60,7 +60,7 @@ public class PatternLayoutBenchmark {
private static final String DEFAULT_ENCODING = CHARSET_DEFAULT.name();
private static final String STRING_SHIFT_JIS = "SHIFT_JIS";
private static final Charset CHARSET_SHIFT_JIS = Charset.forName(STRING_SHIFT_JIS);
-
+
private final PatternLayout PATTERN_M = PatternLayout.newBuilder()
.setPattern((String) "%m%n")
.setPatternSelector(null)
@@ -72,7 +72,7 @@ public class PatternLayoutBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final PatternLayout PATTERN_SPACE = PatternLayout.newBuilder()
.setPattern((String) " ")
.setPatternSelector(null)
@@ -84,7 +84,7 @@ public class PatternLayoutBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final PatternLayout PATTERN_M_C = PatternLayout.newBuilder()
.setPattern((String) "%c %m%n")
.setPatternSelector(null)
@@ -96,7 +96,7 @@ public class PatternLayoutBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final PatternLayout PATTERN_M_C_D = PatternLayout.newBuilder()
.setPattern((String) "%d %c %m%n")
.setPatternSelector(null)
@@ -108,7 +108,7 @@ public class PatternLayoutBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final PatternLayout PATTERN_M_D = PatternLayout.newBuilder()
.setPattern((String) "%d %m%n")
.setPatternSelector(null)
@@ -120,7 +120,7 @@ public class PatternLayoutBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final PatternLayout PATTERN_C = PatternLayout.newBuilder()
.setPattern((String) "%c%n")
.setPatternSelector(null)
@@ -132,7 +132,7 @@ public class PatternLayoutBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final PatternLayout PATTERN_D = PatternLayout.newBuilder()
.setPattern((String) "%d%n")
.setPatternSelector(null)
@@ -144,7 +144,7 @@ public class PatternLayoutBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final PatternLayout PATTERN_M_D_NOSPACE = PatternLayout.newBuilder()
.setPattern((String) "%d%m%n")
.setPatternSelector(null)
@@ -156,7 +156,7 @@ public class PatternLayoutBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final PatternLayout PATTERN_M_C_NOSPACE = PatternLayout.newBuilder()
.setPattern((String) "%c%m%n")
.setPatternSelector(null)
@@ -168,7 +168,7 @@ public class PatternLayoutBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final PatternLayout PATTERN_M_EX = PatternLayout.newBuilder()
.setPattern((String) "%m %ex%n")
.setPatternSelector(null)
@@ -180,7 +180,7 @@ public class PatternLayoutBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final PatternLayout PATTERN_M_D_EX = PatternLayout.newBuilder()
.setPattern((String) "%d %m%ex%n")
.setPatternSelector(null)
@@ -192,7 +192,7 @@ public class PatternLayoutBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final PatternLayout PATTERN_M_C_D_EX = PatternLayout.newBuilder()
.setPattern((String) "%d %c %m%ex%n")
.setPatternSelector(null)
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java
index e863aa3..417930e 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java
@@ -59,7 +59,7 @@ public class PatternLayoutComparisonBenchmark {
final static LogEvent LOG4J2EVENT = createLog4j2Event();
private static final Charset CHARSET_DEFAULT = Charset.defaultCharset();
private static final String LOG4JPATTERN = "%d %5p [%t] %c{1} %X{transactionId} - %m%n";
-
+
private final PatternLayout LOG4J2_PATTERN_LAYOUT = PatternLayout.newBuilder()
.setPattern((String) LOG4JPATTERN)
.setPatternSelector(null)
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java
index ec4a26c..de7250c 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java
@@ -62,7 +62,7 @@ public class TextEncoderHelperBenchmark {
final static LogEvent EVENT = createLogEvent();
private static final Charset CHARSET_DEFAULT = Charset.defaultCharset();
-
+
private final PatternLayout PATTERN_M_C_D = PatternLayout.newBuilder()
.setPattern((String) "%d %c %m%n")
.setPatternSelector(null)
@@ -74,7 +74,7 @@ public class TextEncoderHelperBenchmark {
.setHeader(null)
.setFooter(null)
.build();
-
+
private final Destination destination = new Destination();
class Destination implements ByteBufferDestination {
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 98af16b..1ced359 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
@@ -70,7 +70,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;
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/convert/TypeConverters.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/convert/TypeConverters.java
index ed387d7..914892c 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/convert/TypeConverters.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/convert/TypeConverters.java
@@ -88,7 +88,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@code byte[]}.
- *
+ *
* The supported formats are:
* <ul>
* <li>0x0123456789ABCDEF</li>
@@ -371,7 +371,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
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/PluginManager.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/PluginManager.java
index b6f02f5..6a26cc6 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/PluginManager.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/PluginManager.java
@@ -39,7 +39,7 @@ public class PluginManager {
/**
* Constructs a PluginManager for the plugin category name given.
- *
+ *
* @param category The plugin category name.
*/
public PluginManager(final String category) {
@@ -48,7 +48,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) {
@@ -73,7 +73,7 @@ public class PluginManager {
/**
* Returns the type of a specified plugin.
- *
+ *
* @param name The name of the plugin.
* @return The plugin's type.
*/
@@ -83,7 +83,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() {
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/ResolverUtil.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/ResolverUtil.java
index 81e2347..802cce3 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/ResolverUtil.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/ResolverUtil.java
@@ -107,7 +107,7 @@ public class ResolverUtil {
/**
* Returns the matching resources.
- *
+ *
* @return A Set of URIs that match the criteria.
*/
public Set<URI> getResources() {
@@ -464,7 +464,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.
@@ -473,7 +473,7 @@ public class ResolverUtil {
/**
* Test for a resource.
- *
+ *
* @param resource
* The URI to the resource.
* @return true if the resource matches.
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/TypeUtil.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/TypeUtil.java
index 6adf661..f694d60 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/TypeUtil.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/TypeUtil.java
@@ -36,13 +36,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()
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/validation/ConstraintValidator.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/validation/ConstraintValidator.java
index 2f638a7..47dd24c 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/validation/ConstraintValidator.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/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);
diff --git a/log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/util/ResolverUtilCustomProtocolTest.java b/log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/util/ResolverUtilCustomProtocolTest.java
index 6852711..ecbc838 100644
--- a/log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/util/ResolverUtilCustomProtocolTest.java
+++ b/log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/util/ResolverUtilCustomProtocolTest.java
@@ -41,7 +41,7 @@ public class ResolverUtilCustomProtocolTest {
@Rule
public RuleChain chain = RuleChain.outerRule(new CleanFolders(ResolverUtilTest.WORK_DIR));
-
+
static class NoopURLStreamHandlerFactory implements URLStreamHandlerFactory {
@Override
diff --git a/log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/util/ResolverUtilTest.java b/log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/util/ResolverUtilTest.java
index 10b3cc3..6425591 100644
--- a/log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/util/ResolverUtilTest.java
+++ b/log4j-plugins/src/test/java/org/apache/logging/log4j/plugins/util/ResolverUtilTest.java
@@ -43,7 +43,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");
@@ -186,29 +186,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());
-
+
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 );
+ }
}
static void compile(final File f) throws IOException {
diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
index af756e3..4b8b267 100644
--- a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
+++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
@@ -50,7 +50,7 @@ public class Log4jServletContextListener implements ServletContextListener {
public void contextInitialized(final ServletContextEvent event) {
this.servletContext = event.getServletContext();
LOGGER.debug("Log4jServletContextListener ensuring that Log4j starts up properly.");
-
+
if ("true".equalsIgnoreCase(servletContext.getInitParameter(
Log4jWebSupport.IS_LOG4J_AUTO_SHUTDOWN_DISABLED))) {
throw new IllegalStateException("Do not use " + getClass().getSimpleName() + " when "
diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
index 9bbe9c1..e65dca8 100644
--- a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
+++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
@@ -43,12 +43,12 @@ public class Log4jShutdownOnContextDestroyedListener implements ServletContextLi
@Override
public void contextInitialized(final ServletContextEvent event) {
- LOGGER.debug(Log4jShutdownOnContextDestroyedListener.class.getSimpleName() +
+ LOGGER.debug(Log4jShutdownOnContextDestroyedListener.class.getSimpleName() +
" ensuring that Log4j started up properly.");
servletContext = event.getServletContext();
if (null == servletContext.getAttribute(Log4jWebSupport.SUPPORT_ATTRIBUTE)) {
throw new IllegalStateException(
- "Context did not contain required Log4jWebLifeCycle in the "
+ "Context did not contain required Log4jWebLifeCycle in the "
+ Log4jWebSupport.SUPPORT_ATTRIBUTE + " attribute.");
}
this.initializer = WebLoggerContextUtils.getWebLifeCycle(servletContext);
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.
*
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 e54004c..f7a8bb2 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 {
}
}
-
+
@PluginFactory
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,
Property[] properties) {
diff --git a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java
index 35d662d..ec74bf5 100644
--- a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java
+++ b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java
@@ -91,16 +91,16 @@ public class Log4jServletContextListenerTest {
.willReturn("TRUE");
ensureInitializingFailsWhenAuthShutdownIsEnabled();
}
-
+
private void ensureInitializingFailsWhenAuthShutdownIsEnabled() {
try {
this.listener.contextInitialized(this.event);
fail("Expected a RuntimeException.");
} catch (final RuntimeException e) {
- String expectedMessage =
- "Do not use " + Log4jServletContextListener.class.getSimpleName() + " when "
- + Log4jWebSupport.IS_LOG4J_AUTO_SHUTDOWN_DISABLED + " is true. Please use "
- + Log4jShutdownOnContextDestroyedListener.class.getSimpleName() + " instead of "
+ String expectedMessage =
+ "Do not use " + Log4jServletContextListener.class.getSimpleName() + " when "
+ + Log4jWebSupport.IS_LOG4J_AUTO_SHUTDOWN_DISABLED + " is true. Please use "
+ + Log4jShutdownOnContextDestroyedListener.class.getSimpleName() + " instead of "
+ Log4jServletContextListener.class.getSimpleName() + ".";
assertEquals(expectedMessage, e.getMessage(), "The message is not correct");
diff --git a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
index 5577381..f6eec6f 100644
--- a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
+++ b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
@@ -43,12 +43,12 @@ public class Log4jShutdownOnContextDestroyedListenerTest {
public void setUp(boolean mockInitializer) {
this.listener = new Log4jShutdownOnContextDestroyedListener();
given(event.getServletContext()).willReturn(servletContext);
- if (mockInitializer) {
+ if (mockInitializer) {
given(servletContext.getAttribute(Log4jWebSupport.SUPPORT_ATTRIBUTE))
.willReturn(initializer);
}
}
-
+
@Test
public void testInitAndDestroy() throws Exception {
setUp(true);
@@ -71,11 +71,11 @@ public class Log4jShutdownOnContextDestroyedListenerTest {
then(initializer).should(never()).clearLoggerContext();
then(initializer).should(never()).stop();
}
-
+
@Test
public void whenNoInitializerInContextTheContextInitializedShouldThrowAnException() {
setUp(false);
-
+
assertThrows(IllegalStateException.class, () -> {
this.listener.contextInitialized(this.event);
});