You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/10/30 03:50:38 UTC
[13/13] logging-log4j2 git commit: Revert "Use final. Remove trailing
spaces."
Revert "Use final. Remove trailing spaces."
This reverts commit a8a7e7c93a5a85eee3c9bf87f8c015d8840d44cc.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1f4c7962
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1f4c7962
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1f4c7962
Branch: refs/heads/release-2.x
Commit: 1f4c7962464547f700d48de6a58fc4c8eb625e29
Parents: a8a7e7c
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Oct 29 21:48:24 2018 -0600
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Oct 29 21:48:24 2018 -0600
----------------------------------------------------------------------
.../java/org/apache/log4j/AppenderSkeleton.java | 26 +-
.../java/org/apache/log4j/ConsoleAppender.java | 2 +-
.../java/org/apache/log4j/SimpleLayout.java | 2 +-
.../log4j/config/Log4j1ConfigurationParser.java | 2 +-
.../java/org/apache/log4j/CategoryTest.java | 2 +-
.../test/java/org/apache/log4j/MDCTestCase.java | 4 +-
.../java/org/apache/log4j/VelocityTest.java | 6 +-
.../config/Log4j1ConfigurationFactoryTest.java | 2 +-
.../org/apache/logging/log4j/LogManager.java | 4 +-
.../java/org/apache/logging/log4j/Marker.java | 18 +-
.../logging/log4j/message/EntryMessage.java | 52 +-
.../logging/log4j/message/ExitMessage.java | 52 +-
.../logging/log4j/message/FlowMessage.java | 78 +-
.../log4j/message/FlowMessageFactory.java | 2 +-
.../logging/log4j/message/FormattedMessage.java | 2 +-
.../log4j/message/FormattedMessageFactory.java | 2 +-
.../logging/log4j/message/LocalizedMessage.java | 8 +-
.../log4j/message/LocalizedMessageFactory.java | 4 +-
.../logging/log4j/message/MapMessage.java | 48 +-
.../logging/log4j/message/MessageFactory2.java | 2 +-
.../log4j/message/MessageFormatMessage.java | 4 +-
.../message/MessageFormatMessageFactory.java | 2 +-
.../log4j/message/ObjectArrayMessage.java | 268 +--
.../message/ParameterizedMessageFactory.java | 2 +-
.../log4j/message/ReusableObjectMessage.java | 4 +-
.../message/ReusableParameterizedMessage.java | 4 +-
.../log4j/message/ReusableSimpleMessage.java | 2 +-
.../log4j/message/SimpleMessageFactory.java | 4 +-
.../log4j/message/StringFormattedMessage.java | 8 +-
.../logging/log4j/message/StringMapMessage.java | 6 +-
.../StructuredDataCollectionMessage.java | 30 +-
.../log4j/message/StructuredDataMessage.java | 12 +-
.../log4j/message/ThreadInformation.java | 2 +-
.../logging/log4j/spi/AbstractLogger.java | 2 +-
.../log4j/spi/AbstractLoggerAdapter.java | 2 +-
.../CopyOnWriteSortedArrayThreadContextMap.java | 6 +-
.../log4j/spi/DefaultThreadContextMap.java | 6 +-
.../GarbageFreeSortedArrayThreadContextMap.java | 4 +-
.../org/apache/logging/log4j/spi/Provider.java | 6 +-
.../apache/logging/log4j/spi/StandardLevel.java | 4 +-
.../log4j/spi/ThreadContextMapFactory.java | 6 +-
.../apache/logging/log4j/status/StatusData.java | 14 +-
.../apache/logging/log4j/util/EnglishEnums.java | 2 +-
.../log4j/util/FilteredObjectInputStream.java | 4 +-
.../apache/logging/log4j/util/LoaderUtil.java | 12 +-
.../logging/log4j/util/LowLevelLogUtil.java | 2 +-
.../logging/log4j/util/ProcessIdUtil.java | 12 +-
.../logging/log4j/util/PropertiesUtil.java | 4 +-
.../log4j/util/PropertyFilePropertySource.java | 2 +-
.../logging/log4j/util/PropertySource.java | 2 +-
.../apache/logging/log4j/util/ProviderUtil.java | 6 +-
.../logging/log4j/util/ReadOnlyStringMap.java | 2 +-
.../log4j/util/SortedArrayStringMap.java | 14 +-
.../logging/log4j/util/StringBuilders.java | 6 +-
.../org/apache/logging/log4j/util/Strings.java | 10 +-
.../logging/log4j/AbstractLoggerTest.java | 12 +-
.../apache/logging/log4j/LogManagerTest.java | 16 +-
.../logging/log4j/LoggerSupplierTest.java | 470 ++---
.../org/apache/logging/log4j/LoggerTest.java | 2 +-
.../org/apache/logging/log4j/MarkerTest.java | 2 +-
.../logging/log4j/ThreadContextHolder.java | 12 +-
.../log4j/junit/SecurityManagerTestRule.java | 6 +-
.../apache/logging/log4j/junit/SerialUtil.java | 2 +-
.../log4j/junit/ThreadContextMapRule.java | 4 +-
.../logging/log4j/junit/ThreadContextRule.java | 6 +-
.../log4j/junit/ThreadContextStackRule.java | 4 +-
.../logging/log4j/message/MapMessageTest.java | 2 +-
.../log4j/message/ObjectArrayMessageTest.java | 80 +-
.../ReusableParameterizedMessageTest.java | 4 +-
.../log4j/spi/DefaultThreadContextMapTest.java | 5 +-
.../logging/log4j/util/CharsetForNameMain.java | 6 +-
...ironmentPropertySourceSecurityManagerIT.java | 4 +-
.../log4j/util/Log4jCharsetsPropertiesTest.java | 8 +-
.../logging/log4j/util/ProcessIdUtilTest.java | 2 +-
.../logging/log4j/util/PropertiesUtilTest.java | 10 +-
...ertyFilePropertySourceSecurityManagerIT.java | 6 +-
.../log4j/util/PropertySourceTokenizerTest.java | 2 +-
.../logging/log4j/util/ProviderUtilTest.java | 6 +-
.../log4j/util/SortedArrayStringMapTest.java | 2 +-
.../logging/log4j/util/StringBuildersTest.java | 18 +-
.../log4j/util/SystemPropertiesMain.java | 9 +-
...opertiesPropertySourceSecurityManagerIT.java | 4 +-
.../SystemPropertiesPropertySourceTest.java | 6 +-
.../log4j/appserver/jetty/Log4j2Logger.java | 2 +-
.../log4j/cassandra/CassandraManager.java | 2 +-
.../logging/log4j/core/SimplePerfTest.java | 2 +-
.../logging/log4j/core/AbstractLifeCycle.java | 2 +-
.../core/DefaultLoggerContextAccessor.java | 2 +-
.../org/apache/logging/log4j/core/LogEvent.java | 2 +-
.../apache/logging/log4j/core/StringLayout.java | 66 +-
.../org/apache/logging/log4j/core/Version.java | 2 +-
.../log4j/core/appender/AbstractAppender.java | 34 +-
.../core/appender/AbstractFileAppender.java | 4 +-
.../appender/AbstractOutputStreamAppender.java | 12 +-
.../core/appender/AbstractWriterAppender.java | 14 +-
.../log4j/core/appender/AppenderSet.java | 2 +-
.../log4j/core/appender/AsyncAppender.java | 4 +-
.../core/appender/ConfigurationFactoryData.java | 2 +-
.../log4j/core/appender/ConsoleAppender.java | 6 +-
.../log4j/core/appender/FailoverAppender.java | 2 +-
.../log4j/core/appender/FileAppender.java | 12 +-
.../core/appender/MemoryMappedFileAppender.java | 4 +-
.../core/appender/OutputStreamAppender.java | 11 +-
.../core/appender/RandomAccessFileAppender.java | 8 +-
.../core/appender/RollingFileAppender.java | 12 +-
.../RollingRandomAccessFileAppender.java | 4 +-
.../log4j/core/appender/SocketAppender.java | 16 +-
.../log4j/core/appender/SyslogAppender.java | 40 +-
.../log4j/core/appender/TlsSyslogFrame.java | 2 +-
.../log4j/core/appender/WriterAppender.java | 13 +-
.../appender/db/AbstractDatabaseAppender.java | 2 +-
.../appender/db/AbstractDatabaseManager.java | 2 +-
.../log4j/core/appender/db/ColumnMapping.java | 28 +-
.../db/jdbc/AbstractConnectionSource.java | 2 +-
.../AbstractDriverManagerConnectionSource.java | 2 +-
.../core/appender/db/jdbc/ColumnConfig.java | 28 +-
.../core/appender/db/jdbc/ConnectionSource.java | 2 +-
.../db/jdbc/DriverManagerConnectionSource.java | 2 +-
.../core/appender/db/jdbc/JdbcAppender.java | 8 +-
.../appender/db/jdbc/JdbcDatabaseManager.java | 14 +-
.../log4j/core/appender/mom/JmsAppender.java | 5 +-
.../mom/kafka/DefaultKafkaProducerFactory.java | 2 +-
.../core/appender/mom/kafka/KafkaAppender.java | 6 +-
.../mom/kafka/KafkaProducerFactory.java | 2 +-
.../core/appender/nosql/NoSqlAppender.java | 16 +-
.../appender/nosql/NoSqlDatabaseManager.java | 4 +-
.../core/appender/nosql/NoSqlProvider.java | 4 +-
.../rewrite/LoggerNameLevelRewritePolicy.java | 4 +-
.../core/appender/rewrite/MapRewritePolicy.java | 6 +-
.../rewrite/PropertiesRewritePolicy.java | 2 +-
.../appender/rolling/CronTriggeringPolicy.java | 6 +-
.../rolling/DefaultRolloverStrategy.java | 8 +-
.../rolling/DirectWriteRolloverStrategy.java | 6 +-
.../core/appender/rolling/FileExtension.java | 2 +-
.../appender/rolling/NoOpTriggeringPolicy.java | 2 +-
.../rolling/RollingRandomAccessFileManager.java | 6 +-
.../rolling/TimeBasedTriggeringPolicy.java | 20 +-
.../core/appender/rolling/TriggeringPolicy.java | 2 +-
.../appender/rolling/action/AbstractAction.java | 2 +-
.../rolling/action/AbstractPathAction.java | 20 +-
.../rolling/action/CommonsCompressAction.java | 2 +-
.../rolling/action/CompositeAction.java | 4 +-
.../appender/rolling/action/DeleteAction.java | 16 +-
.../rolling/action/DeletingVisitor.java | 194 +-
.../core/appender/rolling/action/Duration.java | 10 +-
.../rolling/action/GzCompressAction.java | 2 +-
.../rolling/action/IfAccumulatedFileCount.java | 8 +-
.../rolling/action/IfAccumulatedFileSize.java | 8 +-
.../core/appender/rolling/action/IfAll.java | 12 +-
.../core/appender/rolling/action/IfAny.java | 4 +-
.../appender/rolling/action/IfFileName.java | 16 +-
.../appender/rolling/action/IfLastModified.java | 10 +-
.../core/appender/rolling/action/IfNot.java | 4 +-
.../appender/rolling/action/PathCondition.java | 88 +-
.../action/PathSortByModificationTime.java | 10 +-
.../rolling/action/PathWithAttributes.java | 118 +-
.../action/PosixViewAttributeAction.java | 14 +-
.../rolling/action/ScriptCondition.java | 8 +-
.../appender/rolling/action/SortingVisitor.java | 116 +-
.../rolling/action/ZipCompressAction.java | 2 +-
.../core/appender/routing/IdlePurgePolicy.java | 6 +-
.../core/appender/routing/PurgePolicy.java | 6 +-
.../log4j/core/appender/routing/Routes.java | 16 +-
.../log4j/core/async/AsyncLoggerConfig.java | 3 +-
.../log4j/core/async/AsyncLoggerContext.java | 8 +-
.../core/async/AsyncLoggerContextSelector.java | 2 +-
.../log4j/core/async/RingBufferLogEvent.java | 4 +-
.../log4j/core/config/AppenderControl.java | 8 +-
...AwaitUnconditionallyReliabilityStrategy.java | 12 +-
.../core/config/ConfigurationScheduler.java | 2 +-
.../log4j/core/config/ConfigurationSource.java | 2 +-
.../logging/log4j/core/config/Configurator.java | 2 +-
.../log4j/core/config/CustomLevelConfig.java | 6 +-
.../logging/log4j/core/config/CustomLevels.java | 2 +-
.../log4j/core/config/DefaultConfiguration.java | 4 +-
.../core/config/DefaultReliabilityStrategy.java | 12 +-
.../logging/log4j/core/config/LoggerConfig.java | 8 +-
.../logging/log4j/core/config/Property.java | 2 +-
.../log4j/core/config/ReliabilityStrategy.java | 158 +-
.../core/config/ReliabilityStrategyFactory.java | 2 +-
.../impl/DefaultConfigurationBuilder.java | 14 +-
.../composite/CompositeConfiguration.java | 1 +
.../config/plugins/convert/TypeConverters.java | 4 +-
.../core/config/plugins/util/PluginBuilder.java | 1 +
.../core/config/plugins/util/PluginManager.java | 10 +-
.../core/config/plugins/util/ResolverUtil.java | 6 +-
.../plugins/validation/ConstraintValidator.java | 2 +-
.../plugins/visitors/AbstractPluginVisitor.java | 12 +-
.../PropertiesConfigurationBuilder.java | 4 +-
.../log4j/core/config/xml/XmlConfiguration.java | 4 +-
.../log4j/core/filter/AbstractFilter.java | 6 +-
.../log4j/core/filter/AbstractFilterable.java | 6 +-
.../logging/log4j/core/filter/BurstFilter.java | 4 +-
.../logging/log4j/core/filter/Filterable.java | 2 +-
.../logging/log4j/core/filter/ScriptFilter.java | 4 +-
.../log4j/core/impl/ContextDataFactory.java | 2 +-
.../log4j/core/impl/ExtendedClassInfo.java | 2 +-
.../log4j/core/impl/Log4jContextFactory.java | 1 +
.../logging/log4j/core/impl/Log4jLogEvent.java | 6 +-
.../logging/log4j/core/impl/MementoMessage.java | 4 +-
.../log4j/core/impl/MutableLogEvent.java | 4 +-
.../core/impl/ReusableLogEventFactory.java | 2 +-
.../logging/log4j/core/impl/ThrowableProxy.java | 2 +-
.../log4j/core/impl/ThrowableProxyRenderer.java | 16 +-
.../jackson/ExtendedStackTraceElementMixIn.java | 2 +-
.../logging/log4j/core/jackson/MarkerMixIn.java | 2 +-
.../core/jackson/StackTraceElementMixIn.java | 6 +-
.../log4j/core/jmx/AsyncAppenderAdmin.java | 10 +-
.../log4j/core/jmx/AsyncAppenderAdminMBean.java | 28 +-
.../log4j/core/jmx/ContextSelectorAdmin.java | 4 +-
.../log4j/core/jmx/LoggerContextAdminMBean.java | 28 +-
.../logging/log4j/core/jmx/RingBufferAdmin.java | 10 +-
.../log4j/core/jmx/RingBufferAdminMBean.java | 6 +-
.../log4j/core/jmx/StatusLoggerAdmin.java | 6 +-
.../log4j/core/jmx/StatusLoggerAdminMBean.java | 2 +-
.../log4j/core/layout/AbstractCsvLayout.java | 6 +-
.../core/layout/AbstractJacksonLayout.java | 14 +-
.../log4j/core/layout/CsvParameterLayout.java | 10 +-
.../logging/log4j/core/layout/JsonLayout.java | 2 +-
.../core/layout/MarkerPatternSelector.java | 12 +-
.../log4j/core/layout/PatternLayout.java | 6 +-
.../log4j/core/layout/Rfc5424Layout.java | 2 +-
.../core/layout/ScriptPatternSelector.java | 22 +-
.../logging/log4j/core/layout/SyslogLayout.java | 16 +-
.../logging/log4j/core/layout/XmlLayout.java | 2 +-
.../logging/log4j/core/layout/YamlLayout.java | 2 +-
.../log4j/core/lookup/AbstractLookup.java | 4 +-
.../log4j/core/lookup/MainMapLookup.java | 4 +-
.../logging/log4j/core/lookup/MarkerLookup.java | 2 +-
.../logging/log4j/core/lookup/StrMatcher.java | 2 +-
.../log4j/core/net/AbstractSocketManager.java | 8 +-
.../log4j/core/net/DatagramSocketManager.java | 4 +-
.../apache/logging/log4j/core/net/Facility.java | 48 +-
.../logging/log4j/core/net/JndiManager.java | 4 +-
.../log4j/core/net/MulticastDnsAdvertiser.java | 2 +-
.../apache/logging/log4j/core/net/Priority.java | 2 +-
.../log4j/core/net/Rfc1349TrafficClass.java | 2 +-
.../log4j/core/net/SslSocketManager.java | 8 +-
.../log4j/core/net/TcpSocketManager.java | 18 +-
.../net/ssl/AbstractKeyStoreConfiguration.java | 2 +-
.../net/ssl/EnvironmentPasswordProvider.java | 2 +-
.../core/net/ssl/FilePasswordProvider.java | 8 +-
.../core/net/ssl/KeyStoreConfiguration.java | 6 +-
.../log4j/core/net/ssl/SslConfiguration.java | 6 +-
.../net/ssl/StoreConfigurationException.java | 2 +-
.../core/net/ssl/TrustStoreConfiguration.java | 4 +-
.../log4j/core/parser/TextLogEventParser.java | 2 +-
.../core/pattern/DatePatternConverter.java | 4 +-
.../ExtendedThrowablePatternConverter.java | 2 +-
.../log4j/core/pattern/HighlightConverter.java | 2 +-
.../log4j/core/pattern/JAnsiTextRenderer.java | 22 +-
.../log4j/core/pattern/PatternParser.java | 2 +-
.../log4j/core/pattern/PlainTextRenderer.java | 2 +-
.../core/pattern/ProcessIdPatternConverter.java | 2 +-
.../log4j/core/pattern/TextRenderer.java | 4 +-
.../log4j/core/script/AbstractScript.java | 2 +-
.../core/selector/JndiContextSelector.java | 8 +-
.../logging/log4j/core/time/MutableInstant.java | 8 +-
.../logging/log4j/core/tools/Generate.java | 1698 +++++++++---------
.../log4j/core/tools/picocli/CommandLine.java | 1167 ++++++------
.../logging/log4j/core/util/ClockFactory.java | 8 +-
.../logging/log4j/core/util/DummyNanoClock.java | 2 +-
.../log4j/core/util/ExecutorServices.java | 2 +-
.../logging/log4j/core/util/FileUtils.java | 6 +-
.../logging/log4j/core/util/FileWatcher.java | 4 +-
.../logging/log4j/core/util/JndiCloser.java | 120 +-
.../apache/logging/log4j/core/util/Loader.java | 10 +-
.../log4j/core/util/Log4jThreadFactory.java | 6 +-
.../logging/log4j/core/util/NetUtils.java | 2 +-
.../log4j/core/util/NullOutputStream.java | 16 +-
.../logging/log4j/core/util/Patterns.java | 4 +-
.../log4j/core/util/StringBuilderWriter.java | 336 ++--
.../logging/log4j/core/util/TypeUtil.java | 4 +-
.../logging/log4j/core/util/WatchManager.java | 14 +-
.../log4j/core/util/datetime/DateParser.java | 44 +-
.../log4j/core/util/datetime/DatePrinter.java | 6 +-
.../core/util/datetime/FastDateFormat.java | 16 +-
.../core/util/datetime/FastDateParser.java | 36 +-
.../core/util/datetime/FastDatePrinter.java | 40 +-
.../core/util/datetime/FixedDateFormat.java | 4 +-
.../log4j/core/util/datetime/FormatCache.java | 44 +-
.../logging/log4j/core/CustomLevelsTest.java | 4 +-
.../apache/logging/log4j/core/DeadlockTest.java | 2 +-
.../core/EventParameterMemoryLeakTest.java | 8 +-
.../log4j/core/GarbageCollectionHelper.java | 4 +-
.../logging/log4j/core/LateConfigTest.java | 2 +-
.../apache/logging/log4j/core/LogEventTest.java | 4 +-
...sableParameterizedMessageMemoryLeakTest.java | 8 +-
.../log4j/core/TestPatternConverters.java | 2 +-
.../appender/ConsoleAppenderBuilderTest.java | 4 +-
...nsoleAppenderDefaultSuppressedThrowable.java | 2 +-
.../appender/FileAppenderPermissionsTest.java | 2 +-
.../FileAppenderPermissionsXmlConfigTest.java | 2 +-
.../log4j/core/appender/HangingAppender.java | 2 +-
.../log4j/core/appender/HttpAppenderTest.java | 14 +-
.../log4j/core/appender/Jira739Test.java | 2 +-
.../appender/JsonCompleteFileAppenderTest.java | 9 +-
.../MemoryMappedFileAppenderRemapTest.java | 4 +-
.../MemoryMappedFileAppenderSimpleTest.java | 8 +-
.../appender/ScriptAppenderSelectorTest.java | 2 +-
.../core/appender/SmtpAppenderAsyncTest.java | 4 +-
.../log4j/core/appender/SocketAppenderTest.java | 14 +-
.../SyslogAppenderCustomLayoutTest.java | 2 +-
.../appender/XmlCompleteFileAppenderTest.java | 9 +-
.../core/appender/XmlFileAppenderTest.java | 6 +-
.../db/AbstractDatabaseManagerTest.java | 2 +-
.../jdbc/DriverManagerConnectionSourceTest.java | 6 +-
.../JdbcAppenderMapMessageDataSourceTest.java | 2 +-
.../JdbcAppenderStringSubstitutionTest.java | 8 +-
.../appender/mom/jeromq/JeroMqAppenderTest.java | 2 +-
.../appender/mom/jeromq/JeroMqTestClient.java | 108 +-
.../kafka/KafkaAppenderCloseTimeoutTest.java | 6 +-
.../appender/mom/kafka/KafkaAppenderTest.java | 10 +-
.../LoggerNameLevelRewritePolicyTest.java | 2 +-
.../appender/rewrite/MapRewritePolicyTest.java | 2 +-
.../rolling/CronTriggeringPolicyTest.java | 4 +-
.../core/appender/rolling/FileSizeTest.java | 2 +-
.../RollingAppenderDeleteNestedTest.java | 2 +-
...gAppenderDirectWriteWithReconfigureTest.java | 2 +-
.../RollingAppenderUncompressedTest.java | 2 +-
.../RollingFileAppenderReconfigureTest.java | 4 +-
...rReconfigureUndefinedSystemPropertyTest.java | 4 +-
.../rolling/action/DummyFileAttributes.java | 172 +-
.../core/appender/rolling/action/IfAllTest.java | 108 +-
.../core/appender/rolling/action/IfAnyTest.java | 104 +-
.../appender/rolling/action/IfFileNameTest.java | 262 +--
.../rolling/action/IfLastModifiedTest.java | 2 +-
.../action/PathSortByModificationTimeTest.java | 12 +-
.../rolling/action/SortingVisitorTest.java | 6 +-
.../routing/DefaultRouteScriptAppenderTest.java | 2 +-
.../routing/RoutesScriptAppenderTest.java | 4 +-
.../async/AsyncLoggerConfigAutoFlushTest.java | 2 +-
.../core/async/AsyncLoggerConfigTest2.java | 4 +-
.../core/async/AsyncLoggerConfigTest3.java | 2 +-
.../AsyncLoggerConfigUseAfterShutdownTest.java | 2 +-
.../AsyncLoggerConfigWithAsyncEnabledTest.java | 4 +-
.../async/AsyncLoggerContextSelectorTest.java | 2 +-
.../AsyncLoggerCustomSelectorLocationTest.java | 6 +-
.../core/async/AsyncLoggerLocationTest.java | 2 +-
.../log4j/core/async/AsyncLoggerTest.java | 4 +-
.../async/AsyncLoggerThreadContextTest.java | 4 +-
.../async/AsyncLoggerUseAfterShutdownTest.java | 2 +-
.../log4j/core/async/BlockingAppender.java | 2 +-
.../log4j/core/async/QueueFullAbstractTest.java | 32 +-
...syncLoggerConfigLoggingFromToStringTest.java | 4 +-
.../core/async/RingBufferLogEventTest.java | 12 +-
.../log4j/core/async/perftest/Histogram.java | 10 +-
.../core/async/perftest/PerfTestDriver.java | 6 +-
.../core/config/CompositeConfigurationTest.java | 2 +-
.../log4j/core/config/ConfigurationTest.java | 4 +-
.../log4j/core/config/JiraLog4j2_2134Test.java | 30 +-
.../log4j/core/config/LoggerConfigTest.java | 2 +-
.../core/config/NestedLoggerConfigTest.java | 23 +-
.../util/ResolverUtilCustomProtocolTest.java | 2 +-
.../config/plugins/util/ResolverUtilTest.java | 16 +-
.../ValidatingPluginWithTypedBuilderTest.java | 4 +-
.../core/filter/DynamicThresholdFilterTest.java | 10 +-
.../log4j/core/filter/LevelRangeFilterTest.java | 2 +-
.../log4j/core/impl/FactoryTestStringMap.java | 6 +-
.../core/impl/Log4jLogEventNanoTimeTest.java | 4 +-
.../log4j/core/impl/MutableLogEventTest.java | 16 +-
.../NestedLoggingFromThrowableMessageTest.java | 10 +-
.../impl/NestedLoggingFromToStringTest.java | 2 +-
.../impl/ThreadContextDataInjectorTest.java | 10 +-
.../core/impl/ThrowableFormatOptionsTest.java | 2 +-
.../logging/log4j/core/jmx/ServerTest.java | 20 +-
.../core/layout/CsvLogEventLayoutTest.java | 4 +-
.../log4j/core/layout/GelfLayoutTest.java | 6 +-
.../log4j/core/layout/HtmlLayoutTest.java | 2 +-
.../log4j/core/layout/JsonLayoutTest.java | 20 +-
.../log4j/core/layout/Log4j2_1482_Test.java | 2 +-
.../log4j/core/layout/Log4j2_2195_Test.java | 12 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 8 +-
.../log4j/core/layout/SerializedLayoutTest.java | 4 +-
.../log4j/core/layout/SyslogLayoutTest.java | 2 +-
.../log4j/core/layout/XmlLayoutTest.java | 2 +-
.../lookup/MainInputArgumentsJmxLookupTest.java | 4 +-
.../lookup/MainInputArgumentsLookupTest.java | 4 +-
.../lookup/MainInputArgumentsMapLookup.java | 2 +-
.../core/lookup/MarkerLookupConfigTest.java | 2 +-
.../log4j/core/lookup/MarkerLookupTest.java | 2 +-
.../core/net/mock/MockTcpSyslogServer.java | 4 +-
.../core/net/mock/MockTlsSyslogServer.java | 2 +-
.../core/net/mock/MockUdpSyslogServer.java | 2 +-
.../core/net/ssl/FilePasswordProviderTest.java | 2 +-
.../net/ssl/MemoryPasswordProviderTest.java | 8 +-
.../core/pattern/DatePatternConverterTest.java | 12 +-
.../log4j/core/pattern/DisableAnsiTest.java | 2 +-
.../ExtendedThrowablePatternConverterTest.java | 2 +-
.../core/pattern/HighlightConverterTest.java | 6 +-
.../core/pattern/MdcPatternConverterTest.java | 2 +-
.../pattern/MessagePatternConverterTest.java | 24 +-
.../core/pattern/NdcPatternConverterTest.java | 2 +-
.../log4j/core/pattern/NoConsoleNoAnsiTest.java | 2 +-
.../log4j/core/pattern/PatternParserTest2.java | 2 +-
.../core/pattern/RegexReplacementTest.java | 2 +-
.../log4j/core/time/MutableInstantTest.java | 52 +-
.../core/tools/GenerateCustomLoggerTest.java | 2 +-
.../core/tools/GenerateExtendedLoggerTest.java | 6 +-
.../util/datetime/FastDateParserSDFTest.java | 14 +-
.../core/util/datetime/FastDateParserTest.java | 24 +-
.../datetime/FastDateParser_MoreOrLessTest.java | 24 +-
.../apache/logging/log4j/junit/CleanFiles.java | 2 +-
.../logging/log4j/junit/LoggerContextRule.java | 4 +-
...MutableLogEventWithReusableParamMsgTest.java | 4 +-
.../logging/log4j/test/RuleChainFactory.java | 2 +-
.../log4j/flume/appender/FlumeAppender.java | 2 +-
.../log4j/flume/appender/FlumeEventFactory.java | 2 +-
.../appender/FlumePersistentAppenderTest.java | 7 +-
.../logging/log4j/io/ByteStreamLogger.java | 4 +-
.../logging/log4j/io/CharStreamLogger.java | 2 +-
.../log4j/io/LoggerBufferedInputStream.java | 8 +-
.../logging/log4j/io/LoggerBufferedReader.java | 14 +-
.../log4j/io/LoggerFilterOutputStream.java | 2 +-
.../logging/log4j/io/LoggerFilterWriter.java | 2 +-
.../logging/log4j/io/LoggerInputStream.java | 2 +-
.../logging/log4j/io/LoggerOutputStream.java | 2 +-
.../logging/log4j/io/LoggerPrintStream.java | 2 +-
.../apache/logging/log4j/io/LoggerReader.java | 2 +-
.../apache/logging/log4j/io/LoggerWriter.java | 2 +-
.../io/AbstractLoggerOutputStreamTest.java | 2 +-
.../logging/log4j/io/AbstractStreamTest.java | 118 +-
.../log4j/io/IoBuilderCallerInfoTesting.java | 110 +-
...LoggerBufferedInputStreamCallerInfoTest.java | 2 +-
.../io/LoggerBufferedReaderCallerInfoTest.java | 2 +-
.../io/LoggerInputStreamCallerInfoTest.java | 2 +-
.../logging/log4j/io/LoggerInputStreamTest.java | 2 +-
.../io/LoggerOutputStreamCallerInfoTest.java | 6 +-
.../io/LoggerPrintStreamCallerInfoTest.java | 30 +-
.../io/LoggerPrintWriterCallerInfoTest.java | 32 +-
.../log4j/io/LoggerPrintWriterJdbcH2Test.java | 192 +-
.../logging/log4j/io/LoggerPrintWriterTest.java | 2 +-
.../log4j/io/LoggerReaderCallerInfoTest.java | 2 +-
.../logging/log4j/io/LoggerReaderTest.java | 2 +-
.../org/apache/logging/log4j/jcl/Log4jLog.java | 2 +-
.../db/jdbc/PoolingDriverConnectionSource.java | 4 +-
.../log4j/jmx/gui/ClientGuiJConsolePlugin.java | 2 +
.../appender/db/jpa/JpaDatabaseManager.java | 2 +-
.../converter/InstantAttributeConverter.java | 8 +-
.../db/jpa/AbstractJpaAppenderTest.java | 2 +-
.../ContextStackJsonAttributeConverterTest.java | 2 +-
.../org/apache/logging/log4j/jul/Constants.java | 2 +-
.../log4j/jul/DefaultLevelConverter.java | 2 +-
...efaultLevelConverterCustomJulLevelsTest.java | 2 +-
.../logging/log4j/mongodb2/MongoDbTestRule.java | 4 +-
.../logging/log4j/mongodb3/MongoDbTestRule.java | 4 +-
.../osgi/tests/AbstractLoadBundleTest.java | 50 +-
.../log4j/osgi/tests/junit/OsgiRule.java | 2 +-
.../jmh/FileAppenderThrowableBenchmark.java | 8 +-
.../log4j/perf/jmh/LoggerConfigBenchmark.java | 4 +-
.../perf/jmh/StringBuilderEscapeBenchmark.java | 4 +-
.../perf/jmh/ThreadLocalVsPoolBenchmark.java | 4 +-
.../perf/jmh/ThreadsafeDateFormatBenchmark.java | 2 +-
.../log4j/perf/jmh/TimeFormatBenchmark.java | 18 +-
.../logging/slf4j/Log4jLoggerFactory.java | 2 +-
.../logging/log4j/web/Log4jWebLifeCycle.java | 2 +-
.../log4j/web/appender/ServletAppender.java | 6 +-
457 files changed, 4623 insertions(+), 4597 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java b/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java
index 78417cf..a4c5231 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java
@@ -56,7 +56,7 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler {
}
@Override
- public void addFilter(final Filter newFilter) {
+ public void addFilter(Filter newFilter) {
if(headFilter == null) {
headFilter = tailFilter = newFilter;
} else {
@@ -104,7 +104,7 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler {
return threshold;
}
- public boolean isAsSevereAsThreshold(final Priority priority) {
+ public boolean isAsSevereAsThreshold(Priority priority) {
return ((threshold == null) || priority.isGreaterOrEqual(threshold));
}
@@ -113,7 +113,7 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler {
* @param event The LoggingEvent.
*/
@Override
- public void doAppend(final LoggingEvent event) {
+ public void doAppend(LoggingEvent event) {
}
/**
@@ -122,54 +122,54 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler {
* @since 0.9.0
*/
@Override
- public synchronized void setErrorHandler(final ErrorHandler eh) {
+ public synchronized void setErrorHandler(ErrorHandler eh) {
if (eh != null) {
this.errorHandler = eh;
}
}
@Override
- public void setLayout(final Layout layout) {
+ public void setLayout(Layout layout) {
this.layout = layout;
}
@Override
- public void setName(final String name) {
+ public void setName(String name) {
this.name = name;
}
- public void setThreshold(final Priority threshold) {
+ public void setThreshold(Priority threshold) {
this.threshold = threshold;
}
public static class NoOpErrorHandler implements ErrorHandler {
@Override
- public void setLogger(final Logger logger) {
+ public void setLogger(Logger logger) {
}
@Override
- public void error(final String message, final Exception e, final int errorCode) {
+ public void error(String message, Exception e, int errorCode) {
}
@Override
- public void error(final String message) {
+ public void error(String message) {
}
@Override
- public void error(final String message, final Exception e, final int errorCode, final LoggingEvent event) {
+ public void error(String message, Exception e, int errorCode, LoggingEvent event) {
}
@Override
- public void setAppender(final Appender appender) {
+ public void setAppender(Appender appender) {
}
@Override
- public void setBackupAppender(final Appender appender) {
+ public void setBackupAppender(Appender appender) {
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-1.2-api/src/main/java/org/apache/log4j/ConsoleAppender.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/ConsoleAppender.java b/log4j-1.2-api/src/main/java/org/apache/log4j/ConsoleAppender.java
index 605fac7..0e841c5 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/ConsoleAppender.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/ConsoleAppender.java
@@ -45,7 +45,7 @@ public class ConsoleAppender extends AppenderSkeleton
* {@inheritDoc}
*/
@Override
- protected void append(final LoggingEvent theEvent)
+ protected void append(LoggingEvent theEvent)
{
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-1.2-api/src/main/java/org/apache/log4j/SimpleLayout.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/SimpleLayout.java b/log4j-1.2-api/src/main/java/org/apache/log4j/SimpleLayout.java
index c77b9be..3b2374c 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/SimpleLayout.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/SimpleLayout.java
@@ -29,7 +29,7 @@ public class SimpleLayout extends Layout
* {@inheritDoc}
*/
@Override
- public String format(final LoggingEvent theEvent)
+ public String format(LoggingEvent theEvent)
{
return Strings.EMPTY;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
----------------------------------------------------------------------
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 ea2834f..112ab42 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>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
index 3792325..f671193 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
@@ -65,7 +65,7 @@ public class CategoryTest {
public void before() {
appender.clear();
}
-
+
/**
* Tests Category.forcedLog.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java
----------------------------------------------------------------------
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 97bf1ff..c0e5ba5 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.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java
----------------------------------------------------------------------
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 c1165d7..99bd5a2 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();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
index ebe3e54..8d3e4e2 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
@@ -174,7 +174,7 @@ public class Log4j1ConfigurationFactoryTest {
} finally {
try {
Files.deleteIfExists(tempFilePath);
- } catch (final FileSystemException e) {
+ } catch (FileSystemException e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
index f2fdc72..ecff443 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
@@ -349,7 +349,7 @@ public class LogManager {
* @return a LoggerContext.
*/
protected static LoggerContext getContext(final String fqcn, final ClassLoader loader,
- final boolean currentContext, final URI configLocation, final String name) {
+ final boolean currentContext, URI configLocation, String name) {
try {
return factory.getContext(fqcn, loader, null, currentContext, configLocation, name);
} catch (final IllegalStateException ex) {
@@ -406,7 +406,7 @@ public class LogManager {
}
private static String toLoggerName(final Class<?> cls) {
- final String canonicalName = cls.getCanonicalName();
+ String canonicalName = cls.getCanonicalName();
return canonicalName != null ? canonicalName : cls.getName();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/Marker.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/Marker.java b/log4j-api/src/main/java/org/apache/logging/log4j/Marker.java
index 9cc03dd..784486e 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/Marker.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/Marker.java
@@ -29,7 +29,7 @@ public interface Marker extends Serializable {
/**
* Adds a Marker as a parent to this Marker.
- *
+ *
* @param markers The parent markers to add.
* @return The current Marker object, thus allowing multiple adds to be concatenated.
* @throws IllegalArgumentException if the argument is {@code null}
@@ -48,21 +48,21 @@ public interface Marker extends Serializable {
/**
* Returns the name of this Marker.
- *
+ *
* @return The name of the Marker.
*/
String getName();
/**
* Returns a list of parents of this Marker.
- *
+ *
* @return The parent Markers or {@code null} if this Marker has no parents.
*/
Marker[] getParents();
/**
* Returns a hash code value based on the name of this marker. Markers are equal if they have the same name.
- *
+ *
* @return the computed hash code
* @since 2.4
*/
@@ -71,14 +71,14 @@ public interface Marker extends Serializable {
/**
* Indicates whether this Marker has references to any other Markers.
- *
+ *
* @return {@code true} if the Marker has parent Markers
*/
boolean hasParents();
/**
* Checks whether this Marker is an instance of the specified Marker.
- *
+ *
* @param m The Marker to check.
* @return {@code true} if this Marker or one of its ancestors is the specified Marker, {@code false} otherwise.
* @throws IllegalArgumentException if the argument is {@code null}
@@ -87,7 +87,7 @@ public interface Marker extends Serializable {
/**
* Checks whether this Marker is an instance of the specified Marker.
- *
+ *
* @param name The name of the Marker.
* @return {@code true} if this Marker or one of its ancestors matches the specified name, {@code false} otherwise.
* @throws IllegalArgumentException if the argument is {@code null}
@@ -96,7 +96,7 @@ public interface Marker extends Serializable {
/**
* Removes the specified Marker as a parent of this Marker.
- *
+ *
* @param marker The marker to remove.
* @return {@code true} if the marker was removed.
* @throws IllegalArgumentException if the argument is {@code null}
@@ -105,7 +105,7 @@ public interface Marker extends Serializable {
/**
* Replaces the set of parent Markers with the provided Markers.
- *
+ *
* @param markers The new set of parent Markers or {@code null} to clear the parents.
* @return The current Marker object.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/EntryMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/EntryMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/EntryMessage.java
index fe8bcc1..c00bd4c 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/EntryMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/EntryMessage.java
@@ -1,26 +1,26 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.message;
-
-/**
- * Entry flow messages
- *
- * @since 2.6
- */
-public interface EntryMessage extends FlowMessage {
- // empty
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.message;
+
+/**
+ * Entry flow messages
+ *
+ * @since 2.6
+ */
+public interface EntryMessage extends FlowMessage {
+ // empty
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/ExitMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ExitMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ExitMessage.java
index 9e1f23c..48722f6 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ExitMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ExitMessage.java
@@ -1,26 +1,26 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.message;
-
-/**
- * Exit flow messages
- *
- * @since 2.6
- */
-public interface ExitMessage extends FlowMessage {
- // empty
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.message;
+
+/**
+ * Exit flow messages
+ *
+ * @since 2.6
+ */
+public interface ExitMessage extends FlowMessage {
+ // empty
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessage.java
index d708c30..c6d180d 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessage.java
@@ -1,39 +1,39 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.message;
-
-/**
- * Flow messages
- *
- * @since 2.6
- */
-public interface FlowMessage extends Message {
-
- /**
- * The message text like "Enter" or "Exit" used to prefix the actual Message.
- *
- * @return message text used to prefix the actual Message.
- */
- String getText();
-
- /**
- * The wrapped message
- *
- * @return the wrapped message
- */
- Message getMessage();
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.message;
+
+/**
+ * Flow messages
+ *
+ * @since 2.6
+ */
+public interface FlowMessage extends Message {
+
+ /**
+ * The message text like "Enter" or "Exit" used to prefix the actual Message.
+ *
+ * @return message text used to prefix the actual Message.
+ */
+ String getText();
+
+ /**
+ * The wrapped message
+ *
+ * @return the wrapped message
+ */
+ Message getMessage();
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessageFactory.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessageFactory.java
index d1ca862..56ce7e7 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessageFactory.java
@@ -21,7 +21,7 @@ package org.apache.logging.log4j.message;
* @since 2.6
*/
public interface FlowMessageFactory {
-
+
/**
* Creates a new entry message based on an existing message.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
index 86f8322..a13fd99 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
@@ -43,7 +43,7 @@ public class FormattedMessage implements Message {
private final Throwable throwable;
private Message message;
private final Locale locale;
-
+
/**
* Constructs with a locale, a pattern and a single parameter.
* @param locale The locale
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
index c562c7d..805e24b 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.message;
/**
* Creates {@link FormattedMessage} instances for {@link MessageFactory2} methods (and {@link MessageFactory} by
* extension.)
- *
+ *
* <h4>Note to implementors</h4>
* <p>
* This class implements all {@link MessageFactory2} methods.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
index a1b2e86..caf04f7 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
@@ -153,7 +153,7 @@ public class LocalizedMessage implements Message, LoggerNameAwareMessage {
/**
* Set the name of the Logger.
- *
+ *
* @param name The name of the Logger.
*/
@Override
@@ -163,7 +163,7 @@ public class LocalizedMessage implements Message, LoggerNameAwareMessage {
/**
* Returns the name of the Logger.
- *
+ *
* @return the name of the Logger.
*/
@Override
@@ -173,7 +173,7 @@ public class LocalizedMessage implements Message, LoggerNameAwareMessage {
/**
* Returns the formatted message after looking up the format in the resource bundle.
- *
+ *
* @return The formatted message String.
*/
@Override
@@ -218,7 +218,7 @@ public class LocalizedMessage implements Message, LoggerNameAwareMessage {
/**
* Override this to use a ResourceBundle.Control in Java 6
- *
+ *
* @param rbBaseName The base name of the resource bundle, a fully qualified class name.
* @param resourceBundleLocale The locale to use when formatting the message.
* @param loop If true the key will be treated as a package or class name and a resource bundle will be located
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
index 18ab710..b7e9803 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
@@ -21,7 +21,7 @@ import java.util.ResourceBundle;
/**
* Creates {@link FormattedMessage} instances for {@link MessageFactory2} methods (and {@link MessageFactory} by
* extension.)
- *
+ *
* <h4>Note to implementors</h4>
* <p>
* This class does <em>not</em> implement any {@link MessageFactory2} methods and lets the superclass funnel those calls
@@ -73,7 +73,7 @@ public class LocalizedMessageFactory extends AbstractMessageFactory {
}
return new LocalizedMessage(resourceBundle, key);
}
-
+
/**
* Creates {@link LocalizedMessage} instances.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
index 91f5b3e..38319d2 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
@@ -57,19 +57,19 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
* When set as the format specifier causes the Map to be formatted as XML.
*/
public enum MapFormat {
-
+
/** The map should be formatted as XML. */
XML,
-
+
/** The map should be formatted as JSON. */
JSON,
-
+
/** The map should be formatted the same as documented by java.util.AbstractMap.toString(). */
JAVA;
/**
* Maps a format name to an {@link MapFormat} while ignoring case.
- *
+ *
* @param format a MapFormat name
* @return a MapFormat
*/
@@ -82,7 +82,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
/**
* All {@code MapFormat} names.
- *
+ *
* @return All {@code MapFormat} names.
*/
public static String[] names() {
@@ -101,7 +101,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
/**
* Constructs a new instance.
- *
+ *
* @param initialCapacity the initial capacity.
*/
public MapMessage(final int initialCapacity) {
@@ -212,7 +212,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
* @return The value of the element or null if the key is not present.
*/
public String get(final String key) {
- final Object result = data.getValue(key);
+ Object result = data.getValue(key);
return ParameterFormatter.deepToString(result);
}
@@ -249,7 +249,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
return asString();
}
}
-
+
/**
* Performs the given action for each key-value pair in this data structure
* until all entries have been processed or the action throws an exception.
@@ -300,7 +300,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
public <CV, S> void forEach(final TriConsumer<String, ? super CV, S> action, final S state) {
data.forEach(action, state);
}
-
+
/**
* Formats the Structured data as described in <a href="https://tools.ietf.org/html/rfc5424">RFC 5424</a>.
*
@@ -343,7 +343,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
sb.append(" <Entry key=\"")
.append(data.getKeyAt(i))
.append("\">");
- final int size = sb.length();
+ int size = sb.length();
ParameterFormatter.recursiveDeepToString(data.getValueAt(i), sb, null);
StringBuilders.escapeXml(sb, size);
sb.append("</Entry>\n");
@@ -453,7 +453,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
}
@Override
- public void formatTo(final String[] formats, final StringBuilder buffer) {
+ public void formatTo(String[] formats, StringBuilder buffer) {
format(getFormat(formats), buffer);
}
@@ -485,10 +485,10 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
public Throwable getThrowable() {
return null;
}
-
+
/**
* Default implementation does nothing.
- *
+ *
* @since 2.9
*/
protected void validate(final String key, final boolean value) {
@@ -497,7 +497,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
/**
* Default implementation does nothing.
- *
+ *
* @since 2.9
*/
protected void validate(final String key, final byte value) {
@@ -506,7 +506,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
/**
* Default implementation does nothing.
- *
+ *
* @since 2.9
*/
protected void validate(final String key, final char value) {
@@ -515,7 +515,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
/**
* Default implementation does nothing.
- *
+ *
* @since 2.9
*/
protected void validate(final String key, final double value) {
@@ -524,16 +524,16 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
/**
* Default implementation does nothing.
- *
+ *
* @since 2.9
*/
protected void validate(final String key, final float value) {
// do nothing
}
-
+
/**
* Default implementation does nothing.
- *
+ *
* @since 2.9
*/
protected void validate(final String key, final int value) {
@@ -542,16 +542,16 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
/**
* Default implementation does nothing.
- *
+ *
* @since 2.9
*/
protected void validate(final String key, final long value) {
// do nothing
}
-
+
/**
* Default implementation does nothing.
- *
+ *
* @since 2.9
*/
protected void validate(final String key, final Object value) {
@@ -560,7 +560,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
/**
* Default implementation does nothing.
- *
+ *
* @since 2.9
*/
protected void validate(final String key, final short value) {
@@ -569,7 +569,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiFormatStr
/**
* Default implementation does nothing.
- *
+ *
* @since 2.9
*/
protected void validate(final String key, final String value) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory2.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory2.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory2.java
index b2940c2..33004dd 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory2.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory2.java
@@ -23,7 +23,7 @@ package org.apache.logging.log4j.message;
* @since 2.6
*/
public interface MessageFactory2 extends MessageFactory {
-
+
/**
* Creates a new message for the specified CharSequence.
* @param charSequence the (potentially mutable) CharSequence
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java
index 0a4fac2..b34a72d 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java
@@ -51,7 +51,7 @@ public class MessageFormatMessage implements Message {
/**
* Constructs a message.
- *
+ *
* @param locale the locale for this message format
* @param messagePattern the pattern for this message format
* @param parameters The objects to format
@@ -69,7 +69,7 @@ public class MessageFormatMessage implements Message {
/**
* Constructs a message.
- *
+ *
* @param messagePattern the pattern for this message format
* @param parameters The objects to format
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
index 28a041d..f75e68b 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.message;
/**
* Creates {@link FormattedMessage} instances for {@link MessageFactory2} methods (and {@link MessageFactory} by
* extension.)
- *
+ *
* <h4>Note to implementors</h4>
* <p>
* This class implements all {@link MessageFactory2} methods.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectArrayMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectArrayMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectArrayMessage.java
index f208bf4..dc11a56 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectArrayMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectArrayMessage.java
@@ -1,134 +1,134 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.message;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Arrays;
-
-/**
- * Handles messages that contain an Object[].
- * <p>
- * Created for use with the CSV layout. For example:
- * </p>
- * <p>
- * {@code logger.debug(new ObjectArrayMessage(1, 2, "Bob"));}
- * </p>
- *
- * @since 2.4
- */
-public final class ObjectArrayMessage implements Message {
-
- private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
-
- private static final long serialVersionUID = -5903272448334166185L;
-
- private transient Object[] array;
- private transient String arrayString;
-
- /**
- * Creates the ObjectMessage.
- *
- * @param obj
- * The Object to format.
- */
- public ObjectArrayMessage(final Object... obj) {
- this.array = obj == null ? EMPTY_OBJECT_ARRAY : obj;
- }
-
- private boolean equalObjectsOrStrings(final Object[] left, final Object[] right) {
- return Arrays.equals(left, right) || Arrays.toString(left).equals(Arrays.toString(right));
- }
-
- @Override
- public boolean equals(final Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- final ObjectArrayMessage that = (ObjectArrayMessage) o;
- return array == null ? that.array == null : equalObjectsOrStrings(array, that.array);
- }
-
- /**
- * Returns the object formatted using its toString method.
- *
- * @return the String representation of the object.
- */
- @Override
- public String getFormat() {
- return getFormattedMessage();
- }
-
- /**
- * Returns the formatted object message.
- *
- * @return the formatted object message.
- */
- @Override
- public String getFormattedMessage() {
- // LOG4J2-763: cache formatted string in case obj changes later
- if (arrayString == null) {
- arrayString = Arrays.toString(array);
- }
- return arrayString;
- }
-
- /**
- * Returns the object as if it were a parameter.
- *
- * @return The object.
- */
- @Override
- public Object[] getParameters() {
- return array;
- }
-
- /**
- * Returns null.
- *
- * @return null.
- */
- @Override
- public Throwable getThrowable() {
- return null;
- }
-
- @Override
- public int hashCode() {
- return Arrays.hashCode(array);
- }
-
- private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
- in.defaultReadObject();
- array = (Object[]) in.readObject();
- }
-
- @Override
- public String toString() {
- return getFormattedMessage();
- }
-
- private void writeObject(final ObjectOutputStream out) throws IOException {
- out.defaultWriteObject();
- out.writeObject(array);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.message;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Arrays;
+
+/**
+ * Handles messages that contain an Object[].
+ * <p>
+ * Created for use with the CSV layout. For example:
+ * </p>
+ * <p>
+ * {@code logger.debug(new ObjectArrayMessage(1, 2, "Bob"));}
+ * </p>
+ *
+ * @since 2.4
+ */
+public final class ObjectArrayMessage implements Message {
+
+ private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
+
+ private static final long serialVersionUID = -5903272448334166185L;
+
+ private transient Object[] array;
+ private transient String arrayString;
+
+ /**
+ * Creates the ObjectMessage.
+ *
+ * @param obj
+ * The Object to format.
+ */
+ public ObjectArrayMessage(final Object... obj) {
+ this.array = obj == null ? EMPTY_OBJECT_ARRAY : obj;
+ }
+
+ private boolean equalObjectsOrStrings(final Object[] left, final Object[] right) {
+ return Arrays.equals(left, right) || Arrays.toString(left).equals(Arrays.toString(right));
+ }
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final ObjectArrayMessage that = (ObjectArrayMessage) o;
+ return array == null ? that.array == null : equalObjectsOrStrings(array, that.array);
+ }
+
+ /**
+ * Returns the object formatted using its toString method.
+ *
+ * @return the String representation of the object.
+ */
+ @Override
+ public String getFormat() {
+ return getFormattedMessage();
+ }
+
+ /**
+ * Returns the formatted object message.
+ *
+ * @return the formatted object message.
+ */
+ @Override
+ public String getFormattedMessage() {
+ // LOG4J2-763: cache formatted string in case obj changes later
+ if (arrayString == null) {
+ arrayString = Arrays.toString(array);
+ }
+ return arrayString;
+ }
+
+ /**
+ * Returns the object as if it were a parameter.
+ *
+ * @return The object.
+ */
+ @Override
+ public Object[] getParameters() {
+ return array;
+ }
+
+ /**
+ * Returns null.
+ *
+ * @return null.
+ */
+ @Override
+ public Throwable getThrowable() {
+ return null;
+ }
+
+ @Override
+ public int hashCode() {
+ return Arrays.hashCode(array);
+ }
+
+ private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
+ in.defaultReadObject();
+ array = (Object[]) in.readObject();
+ }
+
+ @Override
+ public String toString() {
+ return getFormattedMessage();
+ }
+
+ private void writeObject(final ObjectOutputStream out) throws IOException {
+ out.defaultWriteObject();
+ out.writeObject(array);
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
index 1a0559d..5878cac 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
@@ -28,7 +28,7 @@ package org.apache.logging.log4j.message;
* <p>
* This class is immutable.
* </p>
- *
+ *
* <h4>Note to implementors</h4>
* <p>
* This class implements all {@link MessageFactory2} methods.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
index 9144223..76917f3 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
@@ -104,7 +104,7 @@ public class ReusableObjectMessage implements ReusableMessage, ParameterVisitabl
// go ahead and allocate the memory now;
// this saves an allocation in the future when this buffer is re-used
if (emptyReplacement.length == 0) {
- final Object[] params = new Object[10]; // Default reusable parameter buffer size
+ Object[] params = new Object[10]; // Default reusable parameter buffer size
params[0] = obj;
return params;
}
@@ -122,7 +122,7 @@ public class ReusableObjectMessage implements ReusableMessage, ParameterVisitabl
}
@Override
- public <S> void forEachParameter(final ParameterConsumer<S> action, final S state) {
+ public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
action.accept(obj, 0, state);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
index c206ab1..c0f5884 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
@@ -109,8 +109,8 @@ public class ReusableParameterizedMessage implements ReusableMessage, ParameterV
}
@Override
- public <S> void forEachParameter(final ParameterConsumer<S> action, final S state) {
- final Object[] parameters = getParams();
+ public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
+ Object[] parameters = getParams();
for (short i = 0; i < argCount; i++) {
action.accept(parameters[i], i, state);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
index de0b975..2a186be 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
@@ -81,7 +81,7 @@ public class ReusableSimpleMessage implements ReusableMessage, CharSequence, Par
}
@Override
- public <S> void forEachParameter(final ParameterConsumer<S> action, final S state) {
+ public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java
index d472ff8..e85b8c0 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java
@@ -29,12 +29,12 @@ package org.apache.logging.log4j.message;
* <p>
* This class is immutable.
* </p>
- *
+ *
* <h4>Note to implementors</h4>
* <p>
* This class implements all {@link MessageFactory2} methods.
* </p>
- *
+ *
* @since 2.5
*/
public final class SimpleMessageFactory extends AbstractMessageFactory {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
index 8b54347..a99e2ef 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* Handles messages that consist of a format string conforming to {@link java.util.Formatter}.
- *
+ *
* <h4>Note to implementors</h4>
* <p>
* This class implements the unrolled args API even though StringFormattedMessage does not. This leaves the room for
@@ -49,10 +49,10 @@ public class StringFormattedMessage implements Message {
private transient String formattedMessage;
private transient Throwable throwable;
private final Locale locale;
-
+
/**
* Constructs a message.
- *
+ *
* @param locale the locale for this message format
* @param messagePattern the pattern for this message format
* @param arguments The objects to format
@@ -69,7 +69,7 @@ public class StringFormattedMessage implements Message {
/**
* Constructs a message.
- *
+ *
* @param messagePattern the pattern for this message format
* @param arguments The objects to format
* @since 2.6
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/StringMapMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringMapMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringMapMessage.java
index 499190e..9d05ce0 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringMapMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringMapMessage.java
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.util.PerformanceSensitive;
/**
* A {@link StringMapMessage} typed to {@link String}-only values. This is like the MapMessage class before 2.9.
- *
+ *
* @since 2.9
*/
@PerformanceSensitive("allocation")
@@ -41,7 +41,7 @@ public class StringMapMessage extends MapMessage<StringMapMessage, String> {
/**
* Constructs a new instance.
- *
+ *
* @param initialCapacity
* the initial capacity.
*/
@@ -51,7 +51,7 @@ public class StringMapMessage extends MapMessage<StringMapMessage, String> {
/**
* Constructs a new instance based on an existing Map.
- *
+ *
* @param map
* The Map.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
index 89ebd92..e58aed3 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
@@ -29,9 +29,9 @@ public class StructuredDataCollectionMessage implements StringBuilderFormattable
MessageCollectionMessage<StructuredDataMessage> {
private static final long serialVersionUID = 5725337076388822924L;
- private final List<StructuredDataMessage> structuredDataMessageList;
+ private List<StructuredDataMessage> structuredDataMessageList;
- public StructuredDataCollectionMessage(final List<StructuredDataMessage> messages) {
+ public StructuredDataCollectionMessage(List<StructuredDataMessage> messages) {
this.structuredDataMessageList = messages;
}
@@ -42,15 +42,15 @@ public class StructuredDataCollectionMessage implements StringBuilderFormattable
@Override
public String getFormattedMessage() {
- final StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder();
formatTo(sb);
return sb.toString();
}
@Override
public String getFormat() {
- final StringBuilder sb = new StringBuilder();
- for (final StructuredDataMessage msg : structuredDataMessageList) {
+ StringBuilder sb = new StringBuilder();
+ for (StructuredDataMessage msg : structuredDataMessageList) {
if (msg.getFormat() != null) {
if (sb.length() > 0) {
sb.append(", ");
@@ -62,27 +62,27 @@ public class StructuredDataCollectionMessage implements StringBuilderFormattable
}
@Override
- public void formatTo(final StringBuilder buffer) {
- for (final StructuredDataMessage msg : structuredDataMessageList) {
+ public void formatTo(StringBuilder buffer) {
+ for (StructuredDataMessage msg : structuredDataMessageList) {
msg.formatTo(buffer);
}
}
@Override
public Object[] getParameters() {
- final List<Object[]> objectList = new ArrayList<>();
+ List<Object[]> objectList = new ArrayList<>();
int count = 0;
- for (final StructuredDataMessage msg : structuredDataMessageList) {
- final Object[] objects = msg.getParameters();
+ for (StructuredDataMessage msg : structuredDataMessageList) {
+ Object[] objects = msg.getParameters();
if (objects != null) {
objectList.add(objects);
count += objects.length;
}
}
- final Object[] objects = new Object[count];
+ Object[] objects = new Object[count];
int index = 0;
- for (final Object[] objs : objectList) {
- for (final Object obj : objs) {
+ for (Object[] objs : objectList) {
+ for (Object obj : objs) {
objects[index++] = obj;
}
}
@@ -91,8 +91,8 @@ public class StructuredDataCollectionMessage implements StringBuilderFormattable
@Override
public Throwable getThrowable() {
- for (final StructuredDataMessage msg : structuredDataMessageList) {
- final Throwable t = msg.getThrowable();
+ for (StructuredDataMessage msg : structuredDataMessageList) {
+ Throwable t = msg.getThrowable();
if (t != null) {
return t;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
index d103aa5..32fa2a5 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
@@ -83,7 +83,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str
this.type = type;
this.maxLength = maxLength;
}
-
+
/**
* Creates a StructuredDataMessage using an ID (max 32 characters), message, type (max 32 characters), and an
* initial map of structured data to include.
@@ -253,7 +253,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str
}
@Override
- public void formatTo(final String[] formats, final StringBuilder buffer) {
+ public void formatTo(String[] formats, StringBuilder buffer) {
asString(getFormat(formats), null, buffer);
}
@@ -355,7 +355,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str
}
}
- private void asXml(final StructuredDataId structuredDataId, final StringBuilder sb) {
+ private void asXml(StructuredDataId structuredDataId, StringBuilder sb) {
sb.append("<StructuredData>\n");
sb.append("<type>").append(type).append("</type>\n");
sb.append("<id>").append(structuredDataId).append("</id>\n");
@@ -386,7 +386,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str
return asString(getFormat(formats), null);
}
- private Format getFormat(final String[] formats) {
+ private Format getFormat(String[] formats) {
if (formats != null && formats.length > 0) {
for (int i = 0; i < formats.length; i++) {
final String format = formats[i];
@@ -468,7 +468,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str
protected void validate(final String key, final char value) {
validateKey(key);
}
-
+
/**
* @since 2.9
*/
@@ -476,7 +476,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str
protected void validate(final String key, final double value) {
validateKey(key);
}
-
+
/**
* @since 2.9
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadInformation.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadInformation.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadInformation.java
index 1a276f3..f3b4080 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadInformation.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadInformation.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.message;
* Interface used to print basic or extended thread information.
*/
public interface ThreadInformation {
-
+
/**
* Formats the thread information into the provided StringBuilder.
* @param sb The StringBuilder.