This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch jee-deletion in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit d39a3d7a3978146ac75fba6a9488f364d9d87469 Merge: 85e091130d b0f21506d1 Author: Volkan Yazıcı <[email protected]> AuthorDate: Mon Nov 20 20:35:23 2023 +0100 Merge remote-tracking branch 'origin/main' into jee-deletion .../src/main/java/org/apache/log4j/Appender.java | 3 - .../java/org/apache/log4j/AppenderSkeleton.java | 38 +- .../java/org/apache/log4j/BasicConfigurator.java | 3 +- .../src/main/java/org/apache/log4j/Category.java | 52 +- .../main/java/org/apache/log4j/CategoryKey.java | 4 +- .../java/org/apache/log4j/ConsoleAppender.java | 4 +- .../org/apache/log4j/DefaultCategoryFactory.java | 3 +- .../org/apache/log4j/DefaultThrowableRenderer.java | 6 +- .../main/java/org/apache/log4j/FileAppender.java | 23 +- .../src/main/java/org/apache/log4j/Hierarchy.java | 74 +- .../src/main/java/org/apache/log4j/Layout.java | 3 +- .../src/main/java/org/apache/log4j/Level.java | 47 +- .../src/main/java/org/apache/log4j/LogManager.java | 38 +- .../src/main/java/org/apache/log4j/Logger.java | 2 - .../src/main/java/org/apache/log4j/MDC.java | 27 +- .../src/main/java/org/apache/log4j/NDC.java | 9 +- .../main/java/org/apache/log4j/PatternLayout.java | 8 +- .../src/main/java/org/apache/log4j/Priority.java | 9 +- .../org/apache/log4j/PropertyConfigurator.java | 147 +- .../java/org/apache/log4j/RenderedMessage.java | 1 - .../java/org/apache/log4j/RollingFileAppender.java | 20 +- .../main/java/org/apache/log4j/SimpleLayout.java | 1 - .../main/java/org/apache/log4j/VectorAppender.java | 1 - .../main/java/org/apache/log4j/WriterAppender.java | 19 +- .../org/apache/log4j/bridge/AppenderAdapter.java | 9 +- .../org/apache/log4j/bridge/LayoutAdapter.java | 1 - .../org/apache/log4j/bridge/LayoutWrapper.java | 2 +- .../org/apache/log4j/bridge/LogEventAdapter.java | 15 +- .../org/apache/log4j/bridge/LogEventWrapper.java | 21 +- .../apache/log4j/bridge/RewritePolicyAdapter.java | 2 - .../apache/log4j/bridge/RewritePolicyWrapper.java | 4 +- .../org/apache/log4j/builders/AbstractBuilder.java | 21 +- .../org/apache/log4j/builders/BuilderManager.java | 63 +- .../java/org/apache/log4j/builders/Parser.java | 1 - .../log4j/builders/appender/AppenderBuilder.java | 11 +- .../builders/appender/AsyncAppenderBuilder.java | 53 +- .../builders/appender/ConsoleAppenderBuilder.java | 51 +- .../appender/DailyRollingFileAppenderBuilder.java | 72 +- .../builders/appender/FileAppenderBuilder.java | 52 +- .../builders/appender/NullAppenderBuilder.java | 15 +- .../builders/appender/RewriteAppenderBuilder.java | 51 +- .../appender/RollingFileAppenderBuilder.java | 75 +- .../builders/appender/SocketAppenderBuilder.java | 125 +- .../builders/appender/SyslogAppenderBuilder.java | 65 +- .../builders/filter/DenyAllFilterBuilder.java | 4 +- .../builders/filter/LevelMatchFilterBuilder.java | 14 +- .../builders/filter/LevelRangeFilterBuilder.java | 24 +- .../builders/filter/StringMatchFilterBuilder.java | 12 +- .../log4j/builders/layout/HtmlLayoutBuilder.java | 13 +- .../builders/layout/PatternLayoutBuilder.java | 12 +- .../log4j/builders/layout/SimpleLayoutBuilder.java | 4 +- .../log4j/builders/layout/TTCCLayoutBuilder.java | 35 +- .../log4j/builders/layout/XmlLayoutBuilder.java | 13 +- .../org/apache/log4j/builders/package-info.java | 6 +- .../apache/log4j/component/helpers/Constants.java | 65 +- .../apache/log4j/config/InputStreamWrapper.java | 1 - .../apache/log4j/config/Log4j1Configuration.java | 4 +- .../log4j/config/Log4j1ConfigurationConverter.java | 47 +- .../log4j/config/Log4j1ConfigurationFactory.java | 4 +- .../log4j/config/Log4j1ConfigurationParser.java | 247 +-- .../log4j/config/PropertiesConfiguration.java | 78 +- .../config/PropertiesConfigurationFactory.java | 5 +- .../org/apache/log4j/config/PropertySetter.java | 25 +- .../log4j/helpers/AbsoluteTimeDateFormat.java | 6 +- .../log4j/helpers/AppenderAttachableImpl.java | 1 - .../java/org/apache/log4j/helpers/BoundedFIFO.java | 3 +- .../apache/log4j/helpers/CountingQuietWriter.java | 2 - .../java/org/apache/log4j/helpers/DateLayout.java | 15 +- .../org/apache/log4j/helpers/FileWatchdog.java | 12 +- .../apache/log4j/helpers/ISO8601DateFormat.java | 85 +- .../main/java/org/apache/log4j/helpers/Loader.java | 6 +- .../main/java/org/apache/log4j/helpers/LogLog.java | 2 +- .../org/apache/log4j/helpers/NullEnumeration.java | 3 +- .../org/apache/log4j/helpers/OptionConverter.java | 89 +- .../org/apache/log4j/helpers/PatternConverter.java | 154 +- .../org/apache/log4j/helpers/PatternParser.java | 402 +++-- .../java/org/apache/log4j/helpers/QuietWriter.java | 9 +- .../org/apache/log4j/helpers/UtilLoggingLevel.java | 38 +- .../org/apache/log4j/jmx/AbstractDynamicMBean.java | 23 +- .../src/main/java/org/apache/log4j/jmx/Agent.java | 5 +- .../org/apache/log4j/jmx/AppenderDynamicMBean.java | 67 +- .../apache/log4j/jmx/HierarchyDynamicMBean.java | 75 +- .../org/apache/log4j/jmx/LayoutDynamicMBean.java | 48 +- .../org/apache/log4j/jmx/LoggerDynamicMBean.java | 60 +- .../java/org/apache/log4j/jmx/MethodUnion.java | 1 - .../apache/log4j/layout/Log4j1SyslogLayout.java | 25 +- .../org/apache/log4j/layout/Log4j1XmlLayout.java | 9 +- .../org/apache/log4j/legacy/core/CategoryUtil.java | 4 +- .../org/apache/log4j/legacy/core/ContextUtil.java | 3 +- .../java/org/apache/log4j/or/DefaultRenderer.java | 3 +- .../java/org/apache/log4j/or/ObjectRenderer.java | 2 +- .../main/java/org/apache/log4j/or/RendererMap.java | 28 +- .../org/apache/log4j/or/ThreadGroupRenderer.java | 7 +- .../org/apache/log4j/or/jms/MessageRenderer.java | 17 +- .../log4j/pattern/Log4j1LevelPatternConverter.java | 1 - .../log4j/pattern/Log4j1MdcPatternConverter.java | 5 +- .../log4j/pattern/Log4j1NdcPatternConverter.java | 7 +- .../org/apache/log4j/pattern/NameAbbreviator.java | 9 +- .../org/apache/log4j/rewrite/MapRewritePolicy.java | 16 +- .../log4j/rewrite/PropertyRewritePolicy.java | 19 +- .../org/apache/log4j/spi/AppenderAttachable.java | 4 - .../main/java/org/apache/log4j/spi/ErrorCode.java | 17 +- .../java/org/apache/log4j/spi/ErrorHandler.java | 2 - .../src/main/java/org/apache/log4j/spi/Filter.java | 2 - .../apache/log4j/spi/HierarchyEventListener.java | 8 +- .../java/org/apache/log4j/spi/LocationInfo.java | 2 +- .../java/org/apache/log4j/spi/LoggerFactory.java | 1 - .../org/apache/log4j/spi/LoggerRepository.java | 1 - .../java/org/apache/log4j/spi/LoggingEvent.java | 96 +- .../main/java/org/apache/log4j/spi/NOPLogger.java | 2 - .../org/apache/log4j/spi/NOPLoggerRepository.java | 1 - .../java/org/apache/log4j/spi/OptionHandler.java | 1 - .../java/org/apache/log4j/spi/RendererSupport.java | 1 - .../main/java/org/apache/log4j/spi/RootLogger.java | 1 - .../org/apache/log4j/spi/ThrowableInformation.java | 1 - .../apache/log4j/varia/FallbackErrorHandler.java | 5 +- .../log4j/varia/ReloadingPropertyConfigurator.java | 5 +- .../java/org/apache/log4j/xml/DOMConfigurator.java | 31 +- .../org/apache/log4j/xml/Log4jEntityResolver.java | 4 +- .../log4j/xml/UnrecognizedElementHandler.java | 1 - .../org/apache/log4j/xml/XmlConfiguration.java | 80 +- .../apache/log4j/xml/XmlConfigurationFactory.java | 5 +- .../apache/log4j/BasicConfigurationFactory.java | 13 +- .../org/apache/log4j/BasicConfiguratorTest.java | 3 +- .../org/apache/log4j/CallerInformationTest.java | 5 +- .../test/java/org/apache/log4j/CategoryTest.java | 54 +- .../java/org/apache/log4j/ConsoleAppenderTest.java | 6 +- .../java/org/apache/log4j/CustomFileAppender.java | 1 - .../java/org/apache/log4j/CustomNoopAppender.java | 1 - .../src/test/java/org/apache/log4j/LayoutTest.java | 14 +- .../src/test/java/org/apache/log4j/LevelTest.java | 22 +- .../test/java/org/apache/log4j/ListAppender.java | 13 +- .../test/java/org/apache/log4j/LogManagerTest.java | 9 +- .../test/java/org/apache/log4j/LogWithMDCTest.java | 7 +- .../java/org/apache/log4j/LogWithRouteTest.java | 9 +- .../java/org/apache/log4j/LoggerJira3410Test.java | 11 +- .../src/test/java/org/apache/log4j/LoggerTest.java | 75 +- .../test/java/org/apache/log4j/LoggingTest.java | 7 +- .../test/java/org/apache/log4j/MDCTestCase.java | 1 - .../src/test/java/org/apache/log4j/NDCTest.java | 1 - .../test/java/org/apache/log4j/PriorityTest.java | 10 +- .../org/apache/log4j/PropertyConfiguratorTest.java | 76 +- .../test/java/org/apache/log4j/VelocityTest.java | 3 +- .../apache/log4j/bridge/LogEventWrapperTest.java | 6 +- .../apache/log4j/builders/BuilderManagerTest.java | 13 +- .../log4j/builders/Log4j2ListAppenderBuilder.java | 36 +- .../builders/layout/PatternLayoutBuilderTest.java | 29 +- .../AbstractLog4j1ConfigurationConverterTest.java | 17 +- .../config/AbstractLog4j1ConfigurationTest.java | 82 +- .../org/apache/log4j/config/AsyncAppenderTest.java | 20 +- .../org/apache/log4j/config/AutoConfigTest.java | 8 +- .../Log4j1ConfigurationConverterHadoopTest.java | 2 - .../Log4j1ConfigurationConverterSparkTest.java | 2 - .../config/Log4j1ConfigurationFactoryTest.java | 22 +- .../log4j/config/MapRewriteAppenderTest.java | 5 +- .../apache/log4j/config/NeutralFilterFixture.java | 1 - .../config/PropertiesConfigurationFactoryTest.java | 9 +- .../log4j/config/PropertiesConfigurationTest.java | 41 +- .../config/PropertiesReconfigurationTest.java | 48 +- .../PropertiesRollingWithPropertiesTest.java | 6 +- .../apache/log4j/config/RewriteAppenderTest.java | 5 +- .../config/SocketAppenderConfigurationTest.java | 17 +- .../org/apache/log4j/config/StartsWithFilter.java | 1 - .../config/SyslogAppenderConfigurationTest.java | 12 +- .../apache/log4j/config/SyslogAppenderTest.java | 8 +- .../org/apache/log4j/config/TestConfigurator.java | 8 +- .../log4j/config/XmlConfigurationFactoryTest.java | 10 +- .../apache/log4j/config/XmlConfigurationTest.java | 8 +- .../log4j/config/XmlReconfigurationTest.java | 9 +- .../log4j/config/XmlRollingWithPropertiesTest.java | 6 +- .../org/apache/log4j/defaultInit/TestCase1.java | 44 +- .../org/apache/log4j/defaultInit/TestCase2.java | 51 +- .../org/apache/log4j/defaultInit/TestCase3.java | 10 +- .../org/apache/log4j/defaultInit/TestCase4.java | 53 +- .../apache/log4j/helpers/BoundedFIFOTestCase.java | 4 +- .../apache/log4j/helpers/CyclicBufferTestCase.java | 6 +- .../org/apache/log4j/helpers/DateLayoutTest.java | 12 +- .../log4j/helpers/OptionConverterLevelTest.java | 21 +- .../log4j/helpers/OptionConverterTestCase.java | 3 - .../log4j/helpers/PatternParserTestCase.java | 2 +- .../apache/log4j/helpers/UtilLoggingLevelTest.java | 11 +- .../log4j/layout/Log4j1SyslogLayoutTest.java | 19 +- .../apache/log4j/layout/Log4j1XmlLayoutTest.java | 31 +- .../apache/log4j/pattern/FormattingInfoTest.java | 1 - .../pattern/Log4j1LevelPatternConverterTest.java | 8 +- .../pattern/Log4j1MdcPatternConverterTest.java | 5 +- .../pattern/Log4j1NdcPatternConverterTest.java | 5 +- .../apache/log4j/pattern/NameAbbreviatorTest.java | 2 - .../org/apache/log4j/spi/LocationInfoTest.java | 3 - .../apache/log4j/spi/ThrowableInformationTest.java | 25 +- .../test/java/org/apache/log4j/util/Compare.java | 20 +- .../java/org/apache/log4j/util/ControlFilter.java | 1 - .../log4j/util/EnhancedJunitTestRunnerFilter.java | 17 +- .../test/java/org/apache/log4j/util/Filter.java | 6 +- .../apache/log4j/util/SerializationTestHelper.java | 16 +- .../java/org/apache/log4j/util/Transformer.java | 7 +- .../java/org/apache/log4j/xml/DOMTestCase.java | 85 +- .../src/test/java/org/apache/log4j/xml/XLevel.java | 13 +- .../logging/log4j/test/ListStatusListener.java | 4 +- .../org/apache/logging/log4j/test/TestLogger.java | 128 +- .../logging/log4j/test/TestLoggerContext.java | 2 - .../log4j/test/TestLoggerContextFactory.java | 17 +- .../logging/log4j/test/ThreadContextHolder.java | 1 - .../log4j/test/ThreadContextUtilityClass.java | 13 +- .../test/junit/AbstractExternalFileCleaner.java | 26 +- .../log4j/test/junit/AbstractFileCleaner.java | 5 +- .../logging/log4j/test/junit/ClassMatchers.java | 14 +- .../logging/log4j/test/junit/CleanFiles.java | 1 - .../log4j/test/junit/CleanUpDirectories.java | 1 - .../logging/log4j/test/junit/CleanUpFiles.java | 1 - .../logging/log4j/test/junit/DirectoryCleaner.java | 7 +- .../log4j/test/junit/ExtensionContextAnchor.java | 5 +- .../logging/log4j/test/junit/FileCleaner.java | 4 +- .../log4j/test/junit/InitializesThreadContext.java | 6 +- .../test/junit/Log4j2LauncherSessionListener.java | 1 - .../logging/log4j/test/junit/SetTestProperty.java | 13 +- .../log4j/test/junit/StatusLoggerExtension.java | 70 +- .../log4j/test/junit/StatusLoggerLevel.java | 1 - .../test/junit/StatusLoggerLevelExtension.java | 3 +- .../logging/log4j/test/junit/TempLoggingDir.java | 11 +- .../log4j/test/junit/TempLoggingDirectory.java | 25 +- .../log4j/test/junit/TestPropertyResolver.java | 19 +- .../log4j/test/junit/TestPropertySource.java | 7 +- .../log4j/test/junit/ThreadContextInitializer.java | 18 +- .../test/junit/ThreadContextMapExtension.java | 4 +- .../log4j/test/junit/ThreadContextRule.java | 1 - .../test/junit/ThreadContextStackExtension.java | 4 +- .../test/junit/TypeBasedParameterResolver.java | 4 +- .../test/junit/URLStreamHandlerFactories.java | 4 +- .../junit/URLStreamHandlerFactoryExtension.java | 8 +- .../log4j/test/junit/UsingAnyThreadContext.java | 3 +- .../log4j/test/junit/UsingStatusListener.java | 14 +- .../log4j/test/junit/UsingTestProperties.java | 14 +- .../log4j/test/junit/UsingThreadContextMap.java | 4 +- .../log4j/test/junit/UsingThreadContextStack.java | 4 +- .../test/junit/UsingURLStreamHandlerFactory.java | 1 - .../apache/logging/log4j/AbstractLoggerTest.java | 311 +++- .../logging/log4j/CloseableThreadContextTest.java | 30 +- .../org/apache/logging/log4j/EventLoggerTest.java | 9 +- .../org/apache/logging/log4j/LambdaLoggerTest.java | 129 +- .../java/org/apache/logging/log4j/LevelTest.java | 5 +- .../org/apache/logging/log4j/LogManagerTest.java | 11 +- .../apache/logging/log4j/LoggerSupplierTest.java | 43 +- .../java/org/apache/logging/log4j/LoggerTest.java | 198 ++- .../java/org/apache/logging/log4j/MarkerTest.java | 11 +- .../logging/log4j/NoopThreadContextTest.java | 5 +- .../log4j/ThreadContextInheritanceTest.java | 4 +- .../org/apache/logging/log4j/TraceLoggingTest.java | 227 ++- .../log4j/internal/DefaultLogBuilderTest.java | 18 +- .../log4j/message/FormattedMessageTest.java | 7 +- .../log4j/message/LocalizedMessageFactoryTest.java | 32 +- .../log4j/message/LocalizedMessageTest.java | 11 +- .../logging/log4j/message/MapMessageTest.java | 169 +- .../log4j/message/MessageFormatMessageTest.java | 7 +- .../log4j/message/MessageFormatsPerfTest.java | 24 +- .../log4j/message/ObjectArrayMessageTest.java | 7 +- .../logging/log4j/message/ObjectMapMessage.java | 3 +- .../logging/log4j/message/ObjectMessageTest.java | 4 +- .../log4j/message/ParameterFormatterTest.java | 34 +- .../log4j/message/ParameterizedMessageTest.java | 24 +- .../log4j/message/ReusableMessageFactoryTest.java | 45 +- .../log4j/message/ReusableObjectMessageTest.java | 10 +- .../message/ReusableParameterizedMessageTest.java | 64 +- .../log4j/message/ReusableSimpleMessageTest.java | 4 +- .../logging/log4j/message/SimpleMessageTest.java | 4 +- .../log4j/message/StringFormattedMessageTest.java | 14 +- .../log4j/message/StructuredDataMessageTest.java | 32 +- .../log4j/message/ThreadDumpMessageTest.java | 19 +- .../logging/log4j/simple/SimpleLoggerTest.java | 5 +- .../log4j/spi/DefaultThreadContextMapTest.java | 5 +- .../log4j/spi/DefaultThreadContextStackTest.java | 19 +- .../logging/log4j/spi/LoggerAdapterTest.java | 26 +- .../log4j/spi/MutableThreadContextStackTest.java | 9 +- .../logging/log4j/spi/RecyclerFactoriesTest.java | 49 +- .../log4j/spi/ThreadLocalRecyclerFactoryTest.java | 13 +- .../log4j/status/StatusConsoleListenerTest.java | 52 +- .../apache/logging/log4j/test/BetterService.java | 3 +- .../org/apache/logging/log4j/test/Service.java | 3 +- .../org/apache/logging/log4j/test/Service1.java | 3 +- .../org/apache/logging/log4j/test/Service2.java | 3 +- .../logging/log4j/test/ThreadContextTest.java | 11 +- .../log4j/test/junit/TempLoggingDirectoryTest.java | 13 +- .../log4j/test/junit/TestPropertySourceTest.java | 4 +- .../org/apache/logging/log4j/util/AssertTest.java | 10 +- .../org/apache/logging/log4j/util/CharsTest.java | 19 +- .../apache/logging/log4j/util/ConstantsTest.java | 4 +- .../log4j/util/EnvironmentPropertySourceTest.java | 10 +- .../apache/logging/log4j/util/LambdaUtilTest.java | 24 +- .../org/apache/logging/log4j/util/LazyTest.java | 93 +- .../util/LegacyPropertiesCompatibilityTest.java | 7 +- .../apache/logging/log4j/util/LoaderUtilTest.java | 11 +- .../log4j/util/Log4jCharsetsPropertiesTest.java | 10 +- .../log4j/util/PropertiesPropertySourceTest.java | 7 +- .../log4j/util/PropertiesUtilOrderTest.java | 22 +- .../logging/log4j/util/PropertiesUtilTest.java | 38 +- .../log4j/util/PropertySourceCamelCaseTest.java | 7 +- .../log4j/util/PropertySourceTokenizerTest.java | 12 +- .../logging/log4j/util/ProviderUtilTest.java | 8 +- .../logging/log4j/util/ServiceLoaderUtilTest.java | 15 +- .../log4j/util/SortedArrayStringMapTest.java | 52 +- .../logging/log4j/util/StackLocatorUtilTest.java | 26 +- .../logging/log4j/util/StringBuildersTest.java | 4 +- .../log4j/util/StringParameterParserTest.java | 315 ++-- .../org/apache/logging/log4j/util/StringsTest.java | 6 +- .../logging/log4j/util/SystemPropertiesMain.java | 4 +- .../util/SystemPropertiesPropertySourceTest.java | 2 - .../org/apache/logging/log4j/util/Unbox1Test.java | 50 +- .../logging/log4j/util/Unbox2ConfigurableTest.java | 11 +- .../logging/log4j/CloseableThreadContext.java | 10 +- .../main/java/org/apache/logging/log4j/Level.java | 6 +- .../java/org/apache/logging/log4j/LogBuilder.java | 82 +- .../java/org/apache/logging/log4j/LogManager.java | 69 +- .../main/java/org/apache/logging/log4j/Logger.java | 523 +++++- .../org/apache/logging/log4j/MarkerManager.java | 5 +- .../org/apache/logging/log4j/ThreadContext.java | 3 +- .../log4j/internal/CopyOnWriteNavigableSet.java | 3 +- .../logging/log4j/internal/DefaultLogBuilder.java | 122 +- .../log4j/internal/DefaultObjectInputFilter.java | 12 +- .../logging/log4j/internal/util/FileUtil.java | 8 +- .../log4j/message/AbstractMessageFactory.java | 3 +- .../log4j/message/AsynchronouslyFormattable.java | 5 +- .../apache/logging/log4j/message/Clearable.java | 1 - .../log4j/message/DefaultFlowMessageFactory.java | 1 - .../logging/log4j/message/FormattedMessage.java | 13 +- .../log4j/message/FormattedMessageFactory.java | 63 +- .../logging/log4j/message/LocalizedMessage.java | 18 +- .../log4j/message/LocalizedMessageFactory.java | 3 +- .../apache/logging/log4j/message/MapMessage.java | 32 +- .../log4j/message/MapMessageJsonFormatter.java | 58 +- .../log4j/message/MessageCollectionMessage.java | 5 +- .../logging/log4j/message/MessageFactory.java | 86 +- .../logging/log4j/message/MessageFactory2.java | 3 +- .../log4j/message/MessageFormatMessage.java | 1 - .../log4j/message/MessageFormatMessageFactory.java | 63 +- .../logging/log4j/message/ObjectArrayMessage.java | 3 +- .../logging/log4j/message/ParameterConsumer.java | 1 - .../logging/log4j/message/ParameterFormatter.java | 65 +- .../logging/log4j/message/ParameterVisitable.java | 1 - .../log4j/message/ParameterizedMessage.java | 14 +- .../log4j/message/ParameterizedMessageFactory.java | 63 +- .../log4j/message/ReusableMessageFactory.java | 82 +- .../message/ReusableParameterizedMessage.java | 79 +- .../log4j/message/ReusableSimpleMessage.java | 3 +- .../logging/log4j/message/SimpleMessage.java | 8 +- .../log4j/message/SimpleMessageFactory.java | 63 +- .../log4j/message/StringFormattedMessage.java | 17 +- .../message/StringFormatterMessageFactory.java | 63 +- .../logging/log4j/message/StringMapMessage.java | 1 - .../message/StructuredDataCollectionMessage.java | 11 +- .../logging/log4j/message/StructuredDataId.java | 28 +- .../log4j/message/StructuredDataMessage.java | 32 +- .../logging/log4j/message/ThreadDumpMessage.java | 16 +- .../logging/log4j/message/ThreadInformation.java | 1 - .../apache/logging/log4j/simple/SimpleLogger.java | 143 +- .../log4j/simple/SimpleLoggerConfiguration.java | 10 +- .../logging/log4j/simple/SimpleLoggerContext.java | 7 +- .../log4j/simple/SimpleLoggerContextFactory.java | 13 +- .../apache/logging/log4j/spi/AbstractLogger.java | 1531 +++++++++++++---- .../logging/log4j/spi/AbstractLoggerAdapter.java | 23 +- .../apache/logging/log4j/spi/AbstractRecycler.java | 1 - .../log4j/spi/CleanableThreadContextMap.java | 3 +- .../org/apache/logging/log4j/spi/CopyOnWrite.java | 3 +- .../CopyOnWriteSortedArrayThreadContextMap.java | 11 +- .../logging/log4j/spi/DefaultThreadContextMap.java | 12 +- .../log4j/spi/DefaultThreadContextStack.java | 3 +- .../logging/log4j/spi/DummyRecyclerFactory.java | 6 +- .../apache/logging/log4j/spi/ExtendedLogger.java | 166 +- .../logging/log4j/spi/ExtendedLoggerWrapper.java | 113 +- .../GarbageFreeSortedArrayThreadContextMap.java | 15 +- .../apache/logging/log4j/spi/LoggerContext.java | 1 - .../logging/log4j/spi/LoggerContextFactory.java | 12 +- .../log4j/spi/LoggerContextShutdownEnabled.java | 2 +- .../apache/logging/log4j/spi/LoggerRegistry.java | 5 +- .../apache/logging/log4j/spi/LoggingSystem.java | 66 +- .../logging/log4j/spi/LoggingSystemProperty.java | 26 +- .../log4j/spi/MutableThreadContextStack.java | 2 +- .../logging/log4j/spi/NoOpThreadContextMap.java | 21 +- .../logging/log4j/spi/ObjectThreadContextMap.java | 3 +- .../logging/log4j/spi/PropertyComponent.java | 1 - .../org/apache/logging/log4j/spi/Provider.java | 24 +- .../logging/log4j/spi/QueueingRecyclerFactory.java | 12 +- .../log4j/spi/ReadOnlyThreadContextMap.java | 1 - .../org/apache/logging/log4j/spi/Recycler.java | 1 - .../logging/log4j/spi/RecyclerFactories.java | 26 +- .../apache/logging/log4j/spi/RecyclerFactory.java | 1 - .../apache/logging/log4j/spi/ThreadContextMap.java | 3 +- .../logging/log4j/spi/ThreadContextMap2.java | 3 +- .../log4j/spi/ThreadLocalRecyclerFactory.java | 12 +- .../log4j/status/StatusConsoleListener.java | 5 +- .../apache/logging/log4j/status/StatusData.java | 16 +- .../logging/log4j/status/StatusListener.java | 1 - .../apache/logging/log4j/status/StatusLogger.java | 118 +- .../log4j/status/StatusLoggerConfiguration.java | 5 +- .../logging/log4j/status/StatusLoggerFactory.java | 10 +- .../java/org/apache/logging/log4j/util/Assert.java | 3 +- .../java/org/apache/logging/log4j/util/Cast.java | 6 +- .../java/org/apache/logging/log4j/util/Chars.java | 3 +- .../org/apache/logging/log4j/util/Constants.java | 20 +- .../log4j/util/ContextAwarePropertySource.java | 14 +- .../apache/logging/log4j/util/EnglishEnums.java | 7 +- .../log4j/util/EnvironmentPropertySource.java | 3 +- .../log4j/util/FilteredObjectInputStream.java | 11 +- .../org/apache/logging/log4j/util/InternalApi.java | 3 +- .../org/apache/logging/log4j/util/JsonReader.java | 70 +- .../org/apache/logging/log4j/util/LambdaUtil.java | 4 +- .../org/apache/logging/log4j/util/LazyUtil.java | 4 +- .../org/apache/logging/log4j/util/LoaderUtil.java | 23 +- .../apache/logging/log4j/util/LowLevelLogUtil.java | 10 +- .../apache/logging/log4j/util/MessageSupplier.java | 3 +- .../util/MultiFormatStringBuilderFormattable.java | 1 - .../org/apache/logging/log4j/util/NameUtil.java | 9 +- .../apache/logging/log4j/util/ProcessIdUtil.java | 2 +- .../log4j/util/PropertiesPropertySource.java | 8 +- .../apache/logging/log4j/util/PropertiesUtil.java | 99 +- .../logging/log4j/util/PropertyEnvironment.java | 16 +- .../log4j/util/PropertyFilePropertySource.java | 7 +- .../apache/logging/log4j/util/PropertySource.java | 13 +- .../apache/logging/log4j/util/QueueFactories.java | 13 +- .../apache/logging/log4j/util/QueueFactory.java | 1 - .../apache/logging/log4j/util/ReflectionUtil.java | 6 +- .../logging/log4j/util/ServiceLoaderUtil.java | 6 +- .../logging/log4j/util/SortedArrayStringMap.java | 7 +- .../apache/logging/log4j/util/StackLocator.java | 51 +- .../logging/log4j/util/StackLocatorUtil.java | 4 +- .../apache/logging/log4j/util/StringBuilders.java | 33 +- .../logging/log4j/util/StringParameterParser.java | 47 +- .../org/apache/logging/log4j/util/Strings.java | 2 +- .../org/apache/logging/log4j/util/Supplier.java | 3 +- .../log4j/util/SystemPropertiesPropertySource.java | 4 +- .../java/org/apache/logging/log4j/util/Timer.java | 33 +- .../java/org/apache/logging/log4j/util/Unbox.java | 18 +- .../log4j/appserver/jetty/Log4j2Logger.java | 1 - .../log4j/appserver/tomcat/TomcatLogger.java | 8 +- .../logging/log4j/cassandra/CassandraAppender.java | 32 +- .../logging/log4j/cassandra/CassandraManager.java | 113 +- .../log4j/cassandra/CassandraAppenderIT.java | 34 +- .../log4j/cassandra/CassandraExtension.java | 31 +- .../logging/log4j/cassandra/CassandraFixture.java | 1 - .../logging/log4j/FilterPerformanceComparison.java | 32 +- .../logging/log4j/PerformanceComparison.java | 9 +- .../org/apache/logging/log4j/PerformanceRun.java | 2 - .../apache/logging/log4j/core/SimplePerfTest.java | 12 +- .../logging/log4j/core/ThreadedPerfTest.java | 14 +- .../apache/logging/log4j/core/ThreadedTest.java | 37 +- .../log4j/core/appender/HttpAppenderTest.java | 217 +-- .../appender/JsonCompleteFileAppenderTest.java | 9 +- .../SecureSocketAppenderSocketOptionsTest.java | 12 +- .../appender/SocketAppenderBufferSizeTest.java | 1 - .../appender/SocketAppenderSocketOptionsTest.java | 26 +- .../log4j/core/appender/SocketAppenderTest.java | 13 +- .../core/appender/XmlCompactFileAppenderTest.java | 11 +- .../XmlCompactFileAppenderValidationTest.java | 6 +- .../XmlCompactFileAsyncAppenderValidationTest.java | 7 +- .../core/appender/XmlCompleteFileAppenderTest.java | 66 +- .../log4j/core/appender/XmlFileAppenderTest.java | 11 +- .../appender/XmlRandomAccessFileAppenderTest.java | 10 +- .../log4j/core/test/AvailablePortFinder.java | 2 - .../test/AvailablePortSystemPropertyTestRule.java | 1 - .../log4j/core/test/BasicConfigurationFactory.java | 4 +- .../log4j/core/test/CoreLoggerContexts.java | 5 +- .../logging/log4j/core/test/ListErrorHandler.java | 4 +- .../log4j/core/test/SystemPropertyTestRule.java | 2 - .../logging/log4j/core/test/TestMarkers.java | 4 +- .../core/test/appender/AlwaysFailAppender.java | 3 +- .../log4j/core/test/appender/BlockingAppender.java | 4 +- .../core/test/appender/EncodingListAppender.java | 6 +- .../log4j/core/test/appender/FailOnceAppender.java | 39 +- .../log4j/core/test/appender/InMemoryAppender.java | 22 +- .../log4j/core/test/appender/ListAppender.java | 9 +- .../rolling/action/DummyFileAttributes.java | 4 +- .../log4j/core/test/categories/Appenders.java | 6 + .../log4j/core/test/categories/AsyncLoggers.java | 3 +- .../log4j/core/test/categories/Configurations.java | 1 + .../log4j/core/test/categories/GarbageFree.java | 3 +- .../log4j/core/test/categories/Layouts.java | 4 + .../core/test/categories/PerformanceTests.java | 3 +- .../log4j/core/test/hamcrest/FileMatchers.java | 17 +- .../log4j/core/test/hamcrest/MapMatchers.java | 8 +- .../log4j/core/test/junit/AllocatePorts.java | 1 - .../core/test/junit/AppenderManagerResolver.java | 17 +- .../log4j/core/test/junit/AppenderResolver.java | 13 +- .../core/test/junit/ConfigurationFactoryType.java | 1 - .../junit/ConfigurationFactoryTypeCallback.java | 3 +- .../core/test/junit/ConfigurationResolver.java | 7 +- .../core/test/junit/ContextSelectorCallback.java | 3 +- .../log4j/core/test/junit/ContextSelectorType.java | 1 - .../core/test/junit/LoggerContextResolver.java | 77 +- .../log4j/core/test/junit/LoggerContextRule.java | 59 +- .../log4j/core/test/junit/LoggerContextSource.java | 1 - .../log4j/core/test/junit/LoggerResolver.java | 5 +- .../logging/log4j/core/test/junit/Named.java | 1 - .../core/test/junit/PortAllocatorCallback.java | 9 +- .../log4j/core/test/junit/TestPropertyLookup.java | 1 - .../log4j/core/test/layout/Log4j2_1482_Test.java | 8 +- .../log4j/core/test/layout/LogEventFixtures.java | 21 +- .../log4j/core/test/net/mock/MockSyslogServer.java | 2 +- .../test/net/mock/MockSyslogServerFactory.java | 9 +- .../core/test/net/mock/MockTlsSyslogServer.java | 16 +- .../core/test/net/mock/MockUdpSyslogServer.java | 1 - .../ssl/LegacyBsdTlsSyslogInputStreamReader.java | 4 +- .../log4j/core/test/net/ssl/TestConstants.java | 18 +- .../test/net/ssl/TlsSyslogInputStreamReader.java | 6 +- .../net/ssl/TlsSyslogInputStreamReaderBase.java | 3 +- .../test/parser/AbstractLogEventParserTest.java | 15 +- .../logging/log4j/core/test/util/Profiler.java | 21 +- .../log4j/core/AppenderRefLevelJsonTest.java | 11 +- .../logging/log4j/core/AppenderRefLevelTest.java | 10 +- .../logging/log4j/core/CollectionLoggingTest.java | 2 - .../apache/logging/log4j/core/CronRolloverApp.java | 3 +- .../log4j/core/CustomLevelsOverrideTest.java | 9 +- .../logging/log4j/core/CustomLevelsTest.java | 9 +- .../log4j/core/CustomLevelsWithFiltersTest.java | 5 +- .../log4j/core/EventParameterMemoryLeakTest.java | 12 +- .../logging/log4j/core/ExtendedLevelTest.java | 9 +- .../log4j/core/FormatterLoggerManualExample.java | 7 +- .../log4j/core/GarbageCollectionHelper.java | 10 +- .../apache/logging/log4j/core/HostNameTest.java | 27 +- .../apache/logging/log4j/core/LateConfigTest.java | 10 +- .../org/apache/logging/log4j/core/LevelTest.java | 52 +- .../apache/logging/log4j/core/Log4j1222Test.java | 14 +- .../logging/log4j/core/LogEventFactoryTest.java | 18 +- .../apache/logging/log4j/core/LogEventTest.java | 16 +- .../apache/logging/log4j/core/LogRolloverTest.java | 7 +- .../log4j/core/LoggerContextPropertiesTest.java | 5 +- .../apache/logging/log4j/core/LoggerDateTest.java | 5 +- .../org/apache/logging/log4j/core/LoggerTest.java | 53 +- .../logging/log4j/core/LoggerUpdateTest.java | 9 +- .../org/apache/logging/log4j/core/LookupTest.java | 8 +- ...rnResolverDoesNotEvaluateThreadContextTest.java | 40 +- .../log4j/core/PropertiesFileConfigTest.java | 7 +- ...ReusableParameterizedMessageMemoryLeakTest.java | 10 +- .../logging/log4j/core/ShutdownDisabledTest.java | 5 +- .../core/ShutdownTimeoutConfigurationTest.java | 5 +- .../logging/log4j/core/StrictXmlConfigTest.java | 5 +- .../logging/log4j/core/TestPatternConverters.java | 4 +- .../log4j/core/ThreadContextTestAccess.java | 5 +- .../logging/log4j/core/TimestampMessageTest.java | 7 +- .../org/apache/logging/log4j/core/XmlEvents.java | 1 - .../appender/AsyncAppenderQueueFullPolicyTest.java | 8 +- .../log4j/core/appender/AsyncAppenderTest.java | 22 +- .../core/appender/ConfigurationTestUtils.java | 1 - .../appender/ConsoleAppenderAnsiMessagesMain.java | 6 +- .../ConsoleAppenderAnsiStyleJira180Main.java | 5 +- .../ConsoleAppenderAnsiStyleJira272Main.java | 4 +- .../ConsoleAppenderAnsiStyleJira319Main.java | 5 +- .../ConsoleAppenderAnsiStyleLayoutMain.java | 9 +- .../ConsoleAppenderAnsiStyleNameLayoutMain.java | 5 +- .../core/appender/ConsoleAppenderBuilderTest.java | 14 +- .../ConsoleAppenderDefaultSuppressedThrowable.java | 10 +- .../ConsoleAppenderHighlightLayoutDefaultMain.java | 5 +- .../ConsoleAppenderHighlightLayoutLogbackMain.java | 5 +- .../ConsoleAppenderHighlightLayoutMain.java | 6 +- .../appender/ConsoleAppenderJAnsiMessageMain.java | 18 +- .../ConsoleAppenderJAnsiXExceptionMain.java | 6 +- ...leAppenderJira1002ShortThrowableLayoutMain.java | 2 - .../ConsoleAppenderNoAnsiStyleLayoutMain.java | 6 +- .../log4j/core/appender/ConsoleAppenderTest.java | 40 +- .../log4j/core/appender/FailoverAppenderTest.java | 11 +- .../core/appender/FileAppenderBuilderTest.java | 4 +- .../core/appender/FileAppenderPermissionsTest.java | 96 +- .../log4j/core/appender/FileAppenderTest.java | 121 +- .../log4j/core/appender/HangingAppender.java | 5 +- .../log4j/core/appender/InMemoryAppenderTest.java | 10 +- .../core/appender/JansiConsoleAppenderJira965.java | 1 - .../logging/log4j/core/appender/Jira739Test.java | 5 +- .../appender/MemoryMappedFileAppenderTest.java | 32 +- .../core/appender/MemoryMappedFileManagerTest.java | 20 +- .../core/appender/OutputStreamAppenderTest.java | 21 +- .../core/appender/OutputStreamManagerTest.java | 21 +- .../log4j/core/appender/ProgressConsoleTest.java | 5 +- .../appender/RandomAccessFileAppenderTest.java | 27 +- .../core/appender/RandomAccessFileManagerTest.java | 31 +- .../core/appender/ReconfigureAppenderTest.java | 60 +- ...ollingRandomAccessFileAppenderRolloverTest.java | 5 +- .../core/appender/SocketAppenderBuilderTest.java | 7 +- .../appender/SyslogAppenderCustomLayoutTest.java | 8 +- .../log4j/core/appender/SyslogAppenderTest.java | 15 +- .../core/appender/SyslogAppenderTestBase.java | 27 +- .../log4j/core/appender/TlsSyslogAppenderTest.java | 20 +- .../log4j/core/appender/TlsSyslogFrameTest.java | 7 +- .../log4j/core/appender/WriterAppenderTest.java | 12 +- .../appender/db/AbstractDatabaseAppenderTest.java | 29 +- .../appender/db/AbstractDatabaseManagerTest.java | 7 +- .../core/appender/nosql/NoSqlAppenderTest.java | 29 +- .../appender/nosql/NoSqlDatabaseManagerTest.java | 178 +- .../rewrite/LoggerNameLevelRewritePolicyTest.java | 66 +- .../appender/rewrite/MapRewritePolicyTest.java | 48 +- .../core/appender/rewrite/RewriteAppenderTest.java | 11 +- .../rolling/AbstractRollingListenerTest.java | 4 +- .../appender/rolling/CronTriggeringPolicyTest.java | 69 +- .../core/appender/rolling/EligibleFilesTest.java | 8 +- .../log4j/core/appender/rolling/FileSizeTest.java | 41 +- .../rolling/OnStartupTriggeringPolicyTest.java | 37 +- .../appender/rolling/PatternProcessorTest.java | 63 +- .../RandomRollingAppenderOnStartupTest.java | 19 +- .../appender/rolling/RollingAppenderCountTest.java | 8 +- .../RollingAppenderCronAndSizeLookupTest.java | 29 +- .../rolling/RollingAppenderCronAndSizeTest.java | 23 +- .../RollingAppenderCronEvery2DirectTest.java | 8 +- .../rolling/RollingAppenderCronEvery2Test.java | 8 +- .../rolling/RollingAppenderCronOnStartupTest.java | 14 +- .../rolling/RollingAppenderCronOnceADayTest.java | 16 +- .../appender/rolling/RollingAppenderCronTest.java | 14 +- .../RollingAppenderCustomDeleteActionTest.java | 11 +- ...RollingAppenderDeleteAccumulatedCount1Test.java | 8 +- ...RollingAppenderDeleteAccumulatedCount2Test.java | 8 +- .../RollingAppenderDeleteAccumulatedSizeTest.java | 8 +- .../rolling/RollingAppenderDeleteMaxDepthTest.java | 5 +- .../rolling/RollingAppenderDeleteNestedTest.java | 8 +- .../rolling/RollingAppenderDirectCronTest.java | 21 +- .../RollingAppenderDirectWrite1906Test.java | 31 +- .../RollingAppenderDirectWriteStartupSizeTest.java | 54 +- ...erDirectWriteTempCompressedFilePatternTest.java | 4 +- .../rolling/RollingAppenderDirectWriteTest.java | 16 +- ...RollingAppenderDirectWriteWithFilenameTest.java | 8 +- ...llingAppenderDirectWriteWithHtmlLayoutTest.java | 48 +- ...lingAppenderDirectWriteWithReconfigureTest.java | 5 +- .../RollingAppenderNoUnconditionalDeleteTest.java | 17 +- .../RollingAppenderOnStartupDirectTest.java | 11 +- .../rolling/RollingAppenderOnStartupTest.java | 16 +- .../rolling/RollingAppenderReconfigureTest.java | 20 +- .../rolling/RollingAppenderRestartTest.java | 28 +- ...RollingAppenderSizeCompressPermissionsTest.java | 21 +- .../rolling/RollingAppenderSizeMaxWidthTest.java | 73 +- .../rolling/RollingAppenderSizeNoCompressTest.java | 20 +- .../appender/rolling/RollingAppenderSizeTest.java | 30 +- .../rolling/RollingAppenderSizeWithTimeTest.java | 5 +- ...llingAppenderTempCompressedFilePatternTest.java | 30 +- .../RollingAppenderTimeAndSizeDirectTest.java | 17 +- .../rolling/RollingAppenderTimeAndSizeTest.java | 19 +- .../appender/rolling/RollingAppenderTimeTest.java | 18 +- .../rolling/RollingAppenderUncompressedTest.java | 10 +- .../rolling/RollingDirectSize3490Test.java | 14 +- .../RollingDirectSizeTimeNewDirectoryTest.java | 11 +- .../rolling/RollingDirectTimeNewDirectoryTest.java | 22 +- .../rolling/RollingFileAppenderAccessTest.java | 13 +- .../RollingFileAppenderInterruptedThreadTest.java | 11 +- .../rolling/RollingFileAppenderLayoutTest.java | 3 +- ...nderReconfigureUndefinedSystemPropertyTest.java | 3 +- .../rolling/RollingFileAppenderUpdateDataTest.java | 13 +- .../appender/rolling/RollingFileManagerTest.java | 3 +- .../appender/rolling/RollingNewDirectoryTest.java | 13 +- ...ingRandomAccessFileManagerHeaderFooterTest.java | 11 +- .../RollingRandomAccessFileManagerTest.java | 184 +- .../RollingRandomAppenderDirectWriteTest.java | 17 +- ...gRandomAppenderDirectWriteWithFilenameTest.java | 8 +- .../appender/rolling/RolloverFilePatternTest.java | 33 +- .../appender/rolling/RolloverWithPaddingTest.java | 15 +- .../rolling/action/AbstractActionTest.java | 23 +- .../rolling/action/Bzip2CompressActionTest.java | 157 +- .../appender/rolling/action/CountingCondition.java | 1 - .../appender/rolling/action/DeleteActionTest.java | 25 +- .../rolling/action/DeletingVisitorTest.java | 18 +- .../core/appender/rolling/action/DurationTest.java | 33 +- .../rolling/action/FileRenameActionTest.java | 9 +- .../core/appender/rolling/action/FileSizeTest.java | 5 +- .../appender/rolling/action/FixedCondition.java | 4 +- .../rolling/action/IfAccumulatedFileCountTest.java | 9 +- .../rolling/action/IfAccumulatedFileSizeTest.java | 9 +- .../core/appender/rolling/action/IfAllTest.java | 5 +- .../core/appender/rolling/action/IfAnyTest.java | 5 +- .../appender/rolling/action/IfFileNameTest.java | 11 +- .../rolling/action/IfLastModifiedTest.java | 17 +- .../core/appender/rolling/action/IfNotTest.java | 9 +- .../appender/rolling/action/PathConditionTest.java | 5 +- .../action/PathSortByModificationTimeTest.java | 6 +- .../rolling/action/SortingVisitorTest.java | 9 +- .../appender/routing/JsonRoutingAppender2Test.java | 5 +- .../appender/routing/JsonRoutingAppenderTest.java | 5 +- .../routing/PropertiesRoutingAppenderTest.java | 7 +- .../appender/routing/RoutingAppender2767Test.java | 7 +- .../RoutingAppenderKeyLookupEvaluationTest.java | 8 +- .../core/appender/routing/RoutingAppenderTest.java | 7 +- .../routing/RoutingAppenderWithPurgingTest.java | 78 +- .../routing/RoutingDefaultAppenderTest.java | 5 +- .../async/AsyncAppenderConfigTest_LOG4J2_2032.java | 14 +- .../async/AsyncAppenderExceptionHandlingTest.java | 26 +- .../async/AsyncLoggerClassLoadDeadlockTest.java | 10 +- .../log4j/core/async/AsyncLoggerConfig4Test.java | 21 +- .../core/async/AsyncLoggerConfigAutoFlushTest.java | 5 +- .../core/async/AsyncLoggerConfigErrorOnFormat.java | 18 +- .../log4j/core/async/AsyncLoggerConfigTest.java | 25 +- .../log4j/core/async/AsyncLoggerConfigTest2.java | 8 +- .../log4j/core/async/AsyncLoggerConfigTest3.java | 12 +- .../AsyncLoggerConfigUseAfterShutdownTest.java | 2 +- .../AsyncLoggerConfigWithAsyncEnabledTest.java | 10 +- ...AsyncLoggerContextSelectorInitialStateTest.java | 4 +- .../core/async/AsyncLoggerContextSelectorTest.java | 7 +- .../log4j/core/async/AsyncLoggerContextTest.java | 7 +- .../AsyncLoggerCustomSelectorLocationTest.java | 14 +- .../core/async/AsyncLoggerDefaultLocationTest.java | 5 +- .../AsyncLoggerEventTranslationExceptionTest.java | 28 +- .../log4j/core/async/AsyncLoggerLocationTest.java | 8 +- .../log4j/core/async/AsyncLoggerNanoTimeTest.java | 8 +- .../logging/log4j/core/async/AsyncLoggerTest.java | 5 +- .../AsyncLoggerTestArgumentFreedOnErrorTest.java | 9 +- .../async/AsyncLoggerTestCachedThreadName.java | 8 +- .../async/AsyncLoggerTestUncachedThreadName.java | 8 +- .../core/async/AsyncLoggerThreadContextTest.java | 9 +- .../async/AsyncLoggerThreadNameStrategyTest.java | 7 +- .../async/AsyncLoggerTimestampMessageTest.java | 8 +- .../async/AsyncLoggerUseAfterShutdownTest.java | 4 +- .../async/AsyncLoggersWithAsyncAppenderTest.java | 5 +- .../AsyncLoggersWithAsyncLoggerConfigTest.java | 7 +- .../async/AsyncQueueFullPolicyFactoryTest.java | 74 +- .../log4j/core/async/AsyncRootReloadTest.java | 1 - .../log4j/core/async/AsyncThreadContextTest.java | 79 +- ...WaitStrategyFactoryConfigGlobalLoggersTest.java | 17 +- .../async/AsyncWaitStrategyFactoryConfigTest.java | 25 +- ...egyFactoryIncorrectConfigGlobalLoggersTest.java | 17 +- .../async/BasicAsyncLoggerContextSelectorTest.java | 6 +- .../logging/log4j/core/async/BlockingAppender.java | 5 +- .../async/DefaultAsyncQueueFullPolicyTest.java | 4 +- .../async/DiscardingAsyncQueueFullPolicyTest.java | 7 +- .../async/GarbageFreeAsyncThreadContextTest.java | 9 +- .../log4j/core/async/Log4j2Jira1688AsyncTest.java | 9 +- .../log4j/core/async/Log4j2Jira1688Test.java | 3 +- .../log4j/core/async/QueueFullAbstractTest.java | 90 +- .../core/async/QueueFullAsyncAppenderTest.java | 7 +- .../core/async/QueueFullAsyncAppenderTest2.java | 1 - ...llAsyncLoggerConfigLoggingFromToStringTest.java | 10 +- ...lAsyncLoggerConfigLoggingFromToStringTest2.java | 5 +- .../core/async/QueueFullAsyncLoggerConfigTest.java | 7 +- .../async/QueueFullAsyncLoggerConfigTest2.java | 2 - ...ueueFullAsyncLoggerLoggingFromToStringTest.java | 12 +- ...eueFullAsyncLoggerLoggingFromToStringTest2.java | 6 +- .../log4j/core/async/QueueFullAsyncLoggerTest.java | 10 +- .../core/async/QueueFullAsyncLoggerTest2.java | 2 - .../core/async/QueueFullAsyncLoggerTest3.java | 22 +- .../log4j/core/async/RingBufferLogEventTest.java | 152 +- .../core/async/perftest/AbstractRunQueue.java | 13 +- .../log4j/core/async/perftest/Histogram.java | 130 +- .../log4j/core/async/perftest/IPerfTestRunner.java | 11 +- .../core/async/perftest/MultiThreadPerfTest.java | 18 +- .../core/async/perftest/NoOpIdleStrategy.java | 4 +- .../log4j/core/async/perftest/PerfTest.java | 32 +- .../log4j/core/async/perftest/PerfTestDriver.java | 55 +- .../async/perftest/PerfTestResultFormatter.java | 50 +- .../core/async/perftest/ResponseTimeTest.java | 110 +- .../log4j/core/async/perftest/RunConversant.java | 3 +- .../log4j/core/async/perftest/RunJCTools.java | 3 - .../log4j/core/async/perftest/RunLog4j1.java | 4 +- .../log4j/core/async/perftest/RunLog4j2.java | 7 +- .../log4j/core/async/perftest/RunLogback.java | 4 +- .../log4j/core/async/perftest/SimplePerfTest.java | 37 +- .../logging/log4j/core/config/AdvertiserTest.java | 13 +- .../core/config/AppenderControlArraySetTest.java | 26 +- .../config/CompositeConfigurationMissingTest.java | 13 +- .../core/config/CompositeConfigurationTest.java | 186 +- .../core/config/ConfigurationFactoryTest.java | 18 +- .../core/config/ConfigurationProcessorTest.java | 31 +- .../log4j/core/config/ConfigurationSourceTest.java | 25 +- .../core/config/ConfiguratorSetLevelTest.java | 8 +- .../log4j/core/config/ConfiguratorTest.java | 25 +- .../log4j/core/config/CustomConfigurationTest.java | 18 +- .../logging/log4j/core/config/FileOutputTest.java | 6 +- .../log4j/core/config/InMemoryAdvertiser.java | 4 +- .../log4j/core/config/JiraLog4j2_2134Test.java | 67 +- .../log4j/core/config/LoggerConfigTest.java | 34 +- .../LoggerContextAwarePostProcessorTest.java | 4 +- .../log4j/core/config/LoggersPluginTest.java | 6 +- .../log4j/core/config/MissingRootLoggerTest.java | 22 +- .../log4j/core/config/MockReliabilityStrategy.java | 29 +- .../core/config/MultipleTriggeringPolicyTest.java | 6 +- .../log4j/core/config/NestedLoggerConfigTest.java | 10 +- .../log4j/core/config/NullConfigurationTest.java | 4 +- .../logging/log4j/core/config/PropertyTest.java | 34 +- .../core/config/ReconfigurationDeadlockTest.java | 42 +- .../log4j/core/config/ReliabilityStrategyTest.java | 10 +- .../log4j/core/config/TestConfigurator.java | 97 +- .../log4j/core/config/TestConfiguratorError.java | 11 +- .../core/config/arbiters/BasicArbiterTest.java | 11 +- .../config/arbiters/EnvironmentArbiterTest.java | 7 +- .../core/config/arbiters/SelectArbiterTest.java | 6 +- .../config/arbiters/SystemPropertyArbiterTest.java | 7 +- .../core/config/plugins/LegacyPluginTest.java | 15 +- .../config/plugins/convert/TypeConvertersTest.java | 308 ++-- .../validators/RequiredValidatorTest.java | 4 +- .../validators/ValidHostValidatorTest.java | 5 +- .../validators/ValidPortValidatorTest.java | 7 +- .../ValidatingPluginWithFailoverTest.java | 10 +- .../ValidatingPluginWithGenericBuilderTest.java | 4 +- ...ngPluginWithGenericSubclassFoo1BuilderTest.java | 4 +- .../ValidatingPluginWithTypedBuilderTest.java | 4 +- .../properties/PropertiesConfigurationTest.java | 19 +- .../core/config/xml/XmlConfigurationPropsTest.java | 17 +- .../core/config/xml/XmlConfigurationSecurity.java | 9 +- .../log4j/core/config/xml/XmlLoggerPropsTest.java | 53 +- .../log4j/core/config/xml/XmlSchemaTest.java | 21 +- .../log4j/core/filter/AbstractFilterTest.java | 17 +- .../log4j/core/filter/AbstractFilterableTest.java | 21 +- .../log4j/core/filter/BurstFilterLogDelayTest.java | 16 +- .../logging/log4j/core/filter/BurstFilterTest.java | 17 +- .../log4j/core/filter/CompositeFilterTest.java | 8 +- .../core/filter/DynamicThresholdFilterTest.java | 31 +- .../log4j/core/filter/LevelRangeFilterTest.java | 14 +- .../logging/log4j/core/filter/MapFilterTest.java | 11 +- .../log4j/core/filter/MarkerFilterTest.java | 10 +- .../filter/MutableThreadContextMapFilterTest.java | 8 +- .../log4j/core/filter/NoMarkerFilterTest.java | 11 +- .../logging/log4j/core/filter/RegexFilterTest.java | 39 +- .../core/filter/StructuredDataFilterTest.java | 12 +- .../core/filter/ThreadContextMapFilterTest.java | 16 +- .../log4j/core/filter/ThresholdFilterTest.java | 4 +- .../logging/log4j/core/filter/TimeFilterTest.java | 169 +- ...taFactoryPropertySetMissingConstructorTest.java | 9 +- .../impl/ContextDataFactoryPropertySetTest.java | 9 +- .../log4j/core/impl/ContextDataFactoryTest.java | 4 +- .../log4j/core/impl/FactoryTestStringMap.java | 4 +- .../FactoryTestStringMapWithoutIntConstructor.java | 32 +- .../core/impl/JdkMapAdapterStringMapTest.java | 36 +- .../log4j/core/impl/Log4jContextFactoryTest.java | 10 +- .../log4j/core/impl/Log4jLogEventNanoTimeTest.java | 6 +- .../logging/log4j/core/impl/Log4jLogEventTest.java | 43 +- .../log4j/core/impl/MutableLogEventTest.java | 38 +- .../NestedLoggingFromThrowableMessageTest.java | 8 +- .../core/impl/NestedLoggingFromToStringTest.java | 48 +- .../core/impl/ReusableLogEventFactoryTest.java | 8 +- .../core/impl/ThreadContextDataInjectorTest.java | 65 +- .../core/impl/ThrowableFormatOptionsTest.java | 179 +- .../log4j/core/impl/ThrowableProxyHelperTest.java | 103 +- .../core/impl/ThrowableProxyRendererTest.java | 10 +- .../log4j/core/impl/ThrowableProxyTest.java | 31 +- .../apache/logging/log4j/core/jmx/ServerTest.java | 5 +- .../core/layout/AbstractStringLayoutTest.java | 16 +- .../ConcurrentLoggingWithGelfLayoutTest.java | 14 +- .../logging/log4j/core/layout/GelfLayout2Test.java | 6 +- .../logging/log4j/core/layout/GelfLayout3Test.java | 9 +- .../core/layout/GelfLayoutPatternSelectorTest.java | 14 +- .../logging/log4j/core/layout/GelfLayoutTest.java | 135 +- .../logging/log4j/core/layout/HtmlLayoutTest.java | 71 +- .../log4j/core/layout/Log4j2_1482_CoreTest.java | 1 - .../log4j/core/layout/Log4j2_2195_Test.java | 11 +- .../core/layout/PatternLayoutLookupDateTest.java | 5 +- .../layout/PatternLayoutMainMapLookupTest.java | 8 +- .../core/layout/PatternLayoutNoLookupDateTest.java | 1 - .../log4j/core/layout/PatternLayoutRepeatTest.java | 1 - .../log4j/core/layout/PatternLayoutTest.java | 514 ++++-- .../log4j/core/layout/PatternSelectorTest.java | 46 +- .../log4j/core/layout/Rfc5424LayoutTest.java | 326 +++- .../core/layout/StringBuilderEncoderTest.java | 37 +- .../log4j/core/layout/SyslogLayoutTest.java | 10 +- .../logging/log4j/core/lookup/CaseLookupTest.java | 5 +- .../log4j/core/lookup/ContextMapLookupTest.java | 38 +- .../logging/log4j/core/lookup/DateLookupTest.java | 11 +- .../log4j/core/lookup/EnvironmentLookupTest.java | 4 +- .../logging/log4j/core/lookup/EventLookupTest.java | 23 +- .../log4j/core/lookup/InterpolatorTest.java | 48 +- .../logging/log4j/core/lookup/Log4jLookupTest.java | 15 +- .../core/lookup/Log4jLookupWithSpacesTest.java | 17 +- .../lookup/MainInputArgumentsJmxLookupTest.java | 5 +- .../core/lookup/MainInputArgumentsLookupApp.java | 5 +- .../core/lookup/MainInputArgumentsMapLookup.java | 1 - .../logging/log4j/core/lookup/MainLookupTest.java | 10 +- .../logging/log4j/core/lookup/MapLookupTest.java | 41 +- .../log4j/core/lookup/MarkerLookupConfigTest.java | 10 +- .../log4j/core/lookup/MarkerLookupTest.java | 17 +- .../log4j/core/lookup/PropertiesLookupTest.java | 5 +- .../core/lookup/ResourceBundleLookupTest.java | 4 +- .../log4j/core/lookup/StrSubstitutorTest.java | 10 +- .../core/lookup/StructuredDataLookupTest.java | 7 +- .../core/lookup/SystemPropertiesLookupTest.java | 4 +- .../message/ExtendedThreadInformationTest.java | 6 +- .../MutableLogEventWithReusableParamMsgTest.java | 13 +- .../logging/log4j/core/net/PriorityTest.java | 4 +- .../core/net/SocketAppenderReconnectTest.java | 103 +- .../net/ssl/EnvironmentPasswordProviderTest.java | 4 +- .../core/net/ssl/FilePasswordProviderTest.java | 5 +- .../core/net/ssl/KeyStoreConfigurationTest.java | 49 +- .../core/net/ssl/MemoryPasswordProviderTest.java | 5 +- .../core/net/ssl/SslConfigurationFactoryTest.java | 14 +- .../log4j/core/net/ssl/SslConfigurationTest.java | 66 +- .../log4j/core/net/ssl/StoreConfigurationTest.java | 4 +- .../log4j/core/net/ssl/TlsSyslogTestUtil.java | 1 - .../core/net/ssl/TrustStoreConfigurationTest.java | 39 +- .../log4j/core/pattern/CallerInformationTest.java | 5 +- .../core/pattern/DatePatternConverterTest.java | 77 +- .../log4j/core/pattern/DisableAnsiTest.java | 11 +- .../core/pattern/DynamicWordAbbreviatorTest.java | 29 +- .../core/pattern/EncodingPatternConverterTest.java | 66 +- .../pattern/EndOfBatchPatternConverterTest.java | 11 +- .../EqualsIgnoreCaseReplacementConverterTest.java | 10 +- .../pattern/EqualsReplacementConverterTest.java | 32 +- .../ExtendedThrowablePatternConverterTest.java | 42 +- .../log4j/core/pattern/ExtendedThrowableTest.java | 5 +- .../log4j/core/pattern/FormattingInfoTest.java | 7 +- .../log4j/core/pattern/HighlightConverterTest.java | 111 +- .../core/pattern/LevelPatternConverterTest.java | 45 +- .../core/pattern/LiteralPatternConverterTest.java | 5 +- .../pattern/LoggerFqcnPatternConverterTest.java | 7 +- .../core/pattern/MapPatternConverterTest.java | 4 +- .../core/pattern/MarkerPatternConverterTest.java | 12 +- .../MarkerSimpleNamePatternConverterTest.java | 12 +- .../log4j/core/pattern/MaxLengthConverterTest.java | 32 +- .../core/pattern/MdcPatternConverterTest.java | 15 +- .../core/pattern/MessageJansiConverterTest.java | 12 +- .../core/pattern/MessagePatternConverterTest.java | 102 +- .../core/pattern/MessageStyledConverterTest.java | 12 +- .../log4j/core/pattern/NameAbbreviatorTest.java | 35 +- .../core/pattern/NanoTimePatternConverterTest.java | 7 +- .../core/pattern/NdcPatternConverterTest.java | 5 +- .../log4j/core/pattern/NoConsoleNoAnsiTest.java | 11 +- .../log4j/core/pattern/PatternParserTest.java | 25 +- .../log4j/core/pattern/PatternParserTest2.java | 15 +- .../pattern/ProcessIdPatternConverterTest.java | 7 +- .../pattern/RegexReplacementConverterTest.java | 18 +- .../log4j/core/pattern/RegexReplacementTest.java | 15 +- .../core/pattern/RepeatPatternConverterTest.java | 15 +- .../pattern/RootThrowablePatternConverterTest.java | 25 +- .../log4j/core/pattern/RootThrowableTest.java | 5 +- .../SequenceNumberPatternConverterTest.java | 7 +- ...quenceNumberPatternConverterZeroPaddedTest.java | 7 +- .../pattern/SimpleLiteralPatternConverterTest.java | 4 +- .../log4j/core/pattern/StyleConverterTest.java | 35 +- .../core/pattern/ThreadIdPatternConverterTest.java | 7 +- .../pattern/ThreadNamePatternConverterTest.java | 7 +- .../ThreadPriorityPatternConverterTest.java | 7 +- .../pattern/ThrowablePatternConverterTest.java | 59 +- .../logging/log4j/core/pattern/ThrowableTest.java | 5 +- .../VariablesNotEmptyReplacementConverterTest.java | 11 +- .../plugins/convert/CoreTypeConvertersTest.java | 9 +- .../core/selector/BasicContextSelectorTest.java | 6 +- .../selector/ClassLoaderContextSelectorTest.java | 8 +- .../log4j/core/selector/TestClassLoader.java | 1 - .../logging/log4j/core/test/LogBuilderTest.java | 15 +- .../logging/log4j/core/time/ClockFactoryTest.java | 21 +- .../log4j/core/time/InstantFormatterTest.java | 42 +- .../log4j/core/time/MutableInstantTest.java | 12 +- .../log4j/core/time/SystemNanoClockTest.java | 6 +- .../core/time/internal/DummyNanoClockTest.java | 5 +- .../log4j/core/time/internal/SystemClockTest.java | 5 +- .../time/internal/format/FixedDateFormatTest.java | 177 +- .../log4j/core/tools/GenerateCustomLoggerTest.java | 39 +- .../core/tools/GenerateExtendedLoggerTest.java | 39 +- .../log4j/core/util/ContextDataProviderTest.java | 6 +- .../log4j/core/util/CronExpressionTest.java | 6 +- .../logging/log4j/core/util/CyclicBufferTest.java | 9 +- .../logging/log4j/core/util/FileUtilsTest.java | 6 +- .../apache/logging/log4j/core/util/InitTest.java | 4 +- .../logging/log4j/core/util/IntegersTest.java | 5 +- .../logging/log4j/core/util/JsonReaderTest.java | 195 +-- .../logging/log4j/core/util/JsonUtilsTest.java | 19 +- .../apache/logging/log4j/core/util/LoaderTest.java | 10 +- .../util/NamedLoggerContextPropertiesTest.java | 7 +- .../logging/log4j/core/util/NetUtilsTest.java | 8 +- .../log4j/core/util/OptionConverterTest.java | 29 +- .../logging/log4j/core/util/ProcessIdUtilTest.java | 4 +- .../core/util/ShutdownCallbackRegistryTest.java | 10 +- .../apache/logging/log4j/core/util/SourceTest.java | 48 +- .../logging/log4j/core/util/ThrowablesTest.java | 4 +- .../log4j/core/util/UnexpectedFormatException.java | 8 +- .../apache/logging/log4j/core/util/UuidTest.java | 37 +- .../logging/log4j/core/util/WatchHttpTest.java | 41 +- .../logging/log4j/core/util/WatchManagerTest.java | 7 +- .../logging/log4j/core/AbstractLifeCycle.java | 2 - .../logging/log4j/core/AbstractLogEvent.java | 1 - .../org/apache/logging/log4j/core/Appender.java | 1 - .../logging/log4j/core/ContextDataInjector.java | 1 - .../java/org/apache/logging/log4j/core/Core.java | 1 - .../log4j/core/DefaultLoggerContextAccessor.java | 1 - .../java/org/apache/logging/log4j/core/Filter.java | 93 +- .../java/org/apache/logging/log4j/core/Layout.java | 1 - .../org/apache/logging/log4j/core/LifeCycle.java | 1 - .../logging/log4j/core/LogEventListener.java | 1 - .../java/org/apache/logging/log4j/core/Logger.java | 240 ++- .../apache/logging/log4j/core/LoggerContext.java | 97 +- .../logging/log4j/core/LoggerContextAccessor.java | 1 - .../org/apache/logging/log4j/core/Version.java | 1 - .../core/annotation/ConditionalOnPropertyKey.java | 3 +- .../core/annotation/OnPropertyKeyCondition.java | 9 +- .../log4j/core/appender/AbstractAppender.java | 16 +- .../log4j/core/appender/AbstractFileAppender.java | 15 +- .../log4j/core/appender/AbstractManager.java | 16 +- .../appender/AbstractOutputStreamAppender.java | 13 +- .../core/appender/AbstractWriterAppender.java | 12 +- .../logging/log4j/core/appender/AppenderSet.java | 6 +- .../logging/log4j/core/appender/AsyncAppender.java | 50 +- .../appender/AsyncAppenderEventDispatcher.java | 19 +- .../core/appender/ConfigurationFactoryData.java | 1 - .../log4j/core/appender/ConsoleAppender.java | 86 +- .../log4j/core/appender/CountingNoOpAppender.java | 3 +- .../log4j/core/appender/DefaultErrorHandler.java | 6 +- .../log4j/core/appender/FailoverAppender.java | 24 +- .../log4j/core/appender/FailoversPlugin.java | 3 +- .../logging/log4j/core/appender/FileAppender.java | 42 +- .../logging/log4j/core/appender/FileManager.java | 100 +- .../logging/log4j/core/appender/HttpAppender.java | 32 +- .../logging/log4j/core/appender/HttpManager.java | 1 - .../core/appender/HttpURLConnectionManager.java | 37 +- .../log4j/core/appender/ManagerRegistry.java | 6 +- .../core/appender/MemoryMappedFileAppender.java | 48 +- .../core/appender/MemoryMappedFileManager.java | 94 +- .../logging/log4j/core/appender/NullAppender.java | 4 +- .../log4j/core/appender/OutputStreamAppender.java | 24 +- .../log4j/core/appender/OutputStreamManager.java | 34 +- .../core/appender/RandomAccessFileAppender.java | 33 +- .../core/appender/RandomAccessFileManager.java | 65 +- .../log4j/core/appender/RollingFileAppender.java | 70 +- .../appender/RollingRandomAccessFileAppender.java | 57 +- .../log4j/core/appender/SocketAppender.java | 97 +- .../log4j/core/appender/SyslogAppender.java | 91 +- .../log4j/core/appender/TlsSyslogFrame.java | 2 - .../log4j/core/appender/WriterAppender.java | 24 +- .../logging/log4j/core/appender/WriterManager.java | 12 +- .../core/appender/db/AbstractDatabaseAppender.java | 24 +- .../core/appender/db/AbstractDatabaseManager.java | 9 +- .../log4j/core/appender/db/ColumnMapping.java | 43 +- .../appender/db/DbAppenderLoggingException.java | 1 - .../appender/nosql/AbstractNoSqlConnection.java | 1 - .../log4j/core/appender/nosql/NoSqlAppender.java | 13 +- .../core/appender/nosql/NoSqlDatabaseManager.java | 43 +- .../rewrite/LoggerNameLevelRewritePolicy.java | 11 +- .../core/appender/rewrite/MapRewritePolicy.java | 4 +- .../appender/rewrite/PropertiesRewritePolicy.java | 12 +- .../core/appender/rewrite/RewriteAppender.java | 23 +- .../log4j/core/appender/rewrite/RewritePolicy.java | 1 - .../appender/rolling/AbstractRolloverStrategy.java | 22 +- .../rolling/CompositeTriggeringPolicy.java | 4 +- .../appender/rolling/CronTriggeringPolicy.java | 14 +- .../appender/rolling/DefaultRolloverStrategy.java | 85 +- .../rolling/DirectWriteRolloverStrategy.java | 61 +- .../log4j/core/appender/rolling/FileExtension.java | 55 +- .../log4j/core/appender/rolling/FileSize.java | 6 +- .../appender/rolling/NoOpTriggeringPolicy.java | 1 - .../rolling/OnStartupTriggeringPolicy.java | 11 +- .../core/appender/rolling/PatternProcessor.java | 36 +- .../core/appender/rolling/RollingFileManager.java | 188 +- .../rolling/RollingRandomAccessFileManager.java | 143 +- .../appender/rolling/RolloverDescriptionImpl.java | 5 +- .../core/appender/rolling/RolloverStrategy.java | 2 +- .../rolling/SizeBasedTriggeringPolicy.java | 2 - .../rolling/TimeBasedTriggeringPolicy.java | 13 +- .../core/appender/rolling/TriggeringPolicy.java | 1 - .../appender/rolling/action/AbstractAction.java | 6 +- .../rolling/action/AbstractPathAction.java | 23 +- .../log4j/core/appender/rolling/action/Action.java | 1 - .../rolling/action/CommonsCompressAction.java | 23 +- .../appender/rolling/action/CompositeAction.java | 4 +- .../core/appender/rolling/action/DeleteAction.java | 22 +- .../appender/rolling/action/DeletingVisitor.java | 5 +- .../core/appender/rolling/action/Duration.java | 18 +- .../appender/rolling/action/FileRenameAction.java | 89 +- .../appender/rolling/action/GzCompressAction.java | 23 +- .../rolling/action/IfAccumulatedFileCount.java | 10 +- .../rolling/action/IfAccumulatedFileSize.java | 12 +- .../log4j/core/appender/rolling/action/IfAll.java | 8 +- .../log4j/core/appender/rolling/action/IfAny.java | 4 +- .../core/appender/rolling/action/IfFileName.java | 7 +- .../appender/rolling/action/IfLastModified.java | 1 - .../log4j/core/appender/rolling/action/IfNot.java | 4 +- .../rolling/action/PathSortByModificationTime.java | 3 +- .../core/appender/rolling/action/PathSorter.java | 4 +- .../rolling/action/PosixViewAttributeAction.java | 40 +- .../appender/rolling/action/SortingVisitor.java | 1 - .../appender/rolling/action/ZipCompressAction.java | 8 +- .../core/appender/routing/IdlePurgePolicy.java | 15 +- .../log4j/core/appender/routing/PurgePolicy.java | 1 - .../log4j/core/appender/routing/Routes.java | 14 +- .../core/appender/routing/RoutingAppender.java | 51 +- .../core/async/ArrayBlockingQueueFactory.java | 1 - .../logging/log4j/core/async/AsyncLogger.java | 235 ++- .../log4j/core/async/AsyncLoggerConfig.java | 55 +- .../AsyncLoggerConfigDefaultExceptionHandler.java | 3 +- .../core/async/AsyncLoggerConfigDisruptor.java | 75 +- .../log4j/core/async/AsyncLoggerContext.java | 30 +- .../core/async/AsyncLoggerContextSelector.java | 9 +- .../async/AsyncLoggerDefaultExceptionHandler.java | 3 +- .../log4j/core/async/AsyncLoggerDisruptor.java | 120 +- .../core/async/AsyncQueueFullMessageUtil.java | 4 +- .../core/async/AsyncQueueFullPolicyFactory.java | 18 +- .../core/async/AsyncWaitStrategyFactoryConfig.java | 1 - .../async/BasicAsyncLoggerContextSelector.java | 1 - .../async/DefaultAsyncWaitStrategyFactory.java | 12 +- .../core/async/DiscardingAsyncQueueFullPolicy.java | 11 +- .../core/async/DisruptorBlockingQueueFactory.java | 6 +- .../logging/log4j/core/async/DisruptorUtil.java | 35 +- .../logging/log4j/core/async/EventRoute.java | 38 +- .../core/async/JCToolsBlockingQueueFactory.java | 14 +- .../core/async/LinkedTransferQueueFactory.java | 1 - .../log4j/core/async/RingBufferLogEvent.java | 31 +- .../core/async/RingBufferLogEventHandler.java | 13 +- .../core/async/RingBufferLogEventTranslator.java | 47 +- .../core/async/ThreadNameCachingStrategy.java | 23 +- .../core/async/TimeoutBlockingWaitStrategy.java | 15 +- .../log4j/core/config/AbstractConfiguration.java | 84 +- .../logging/log4j/core/config/AppenderControl.java | 1 - .../log4j/core/config/AppenderControlArraySet.java | 4 +- .../logging/log4j/core/config/AppendersPlugin.java | 8 +- .../config/AwaitCompletionReliabilityStrategy.java | 26 +- .../AwaitUnconditionallyReliabilityStrategy.java | 28 +- .../logging/log4j/core/config/Configuration.java | 2 - .../config/ConfigurationAwarePostProcessor.java | 1 - .../log4j/core/config/ConfigurationException.java | 1 - .../log4j/core/config/ConfigurationFactory.java | 8 +- .../core/config/ConfigurationFileWatcher.java | 19 +- .../log4j/core/config/ConfigurationProcessor.java | 6 +- .../log4j/core/config/ConfigurationScheduler.java | 27 +- .../log4j/core/config/ConfigurationSource.java | 20 +- .../logging/log4j/core/config/Configurator.java | 128 +- .../log4j/core/config/CronScheduledFuture.java | 1 - .../log4j/core/config/CustomLevelConfig.java | 6 +- .../logging/log4j/core/config/CustomLevels.java | 3 +- .../log4j/core/config/DefaultAdvertiser.java | 4 +- .../log4j/core/config/DefaultConfiguration.java | 4 +- .../core/config/DefaultConfigurationFactory.java | 37 +- .../core/config/DefaultReliabilityStrategy.java | 22 +- .../logging/log4j/core/config/HttpWatcher.java | 25 +- .../core/config/LockingReliabilityStrategy.java | 26 +- .../logging/log4j/core/config/LoggerConfig.java | 81 +- .../config/LoggerContextAwarePostProcessor.java | 1 - .../logging/log4j/core/config/LoggersPlugin.java | 7 +- .../log4j/core/config/PropertiesPlugin.java | 8 +- .../apache/logging/log4j/core/config/Property.java | 1 - .../log4j/core/config/ReliabilityStrategy.java | 23 +- .../core/config/ReliabilityStrategyFactory.java | 18 +- .../logging/log4j/core/config/Scheduled.java | 3 +- .../log4j/core/config/arbiters/ClassArbiter.java | 2 - .../core/config/arbiters/EnvironmentArbiter.java | 1 - .../log4j/core/config/arbiters/SelectArbiter.java | 4 +- .../config/arbiters/SystemPropertyArbiter.java | 1 - .../builder/api/AppenderRefComponentBuilder.java | 3 +- .../log4j/core/config/builder/api/Component.java | 3 +- .../api/CompositeFilterComponentBuilder.java | 3 +- .../config/builder/api/ConfigurationBuilder.java | 10 - .../builder/api/CustomLevelComponentBuilder.java | 4 +- .../config/builder/api/FilterComponentBuilder.java | 4 +- .../builder/api/KeyValuePairComponentBuilder.java | 4 +- .../config/builder/api/LayoutComponentBuilder.java | 4 +- .../config/builder/api/LoggerComponentBuilder.java | 3 +- .../builder/api/PropertyComponentBuilder.java | 4 +- .../builder/api/RootLoggerComponentBuilder.java | 3 +- .../config/builder/api/ScriptComponentBuilder.java | 4 +- .../config/builder/impl/BuiltConfiguration.java | 7 +- .../impl/DefaultAppenderComponentBuilder.java | 4 +- .../impl/DefaultAppenderRefComponentBuilder.java | 5 +- .../DefaultComponentAndConfigurationBuilder.java | 16 +- .../builder/impl/DefaultComponentBuilder.java | 6 +- .../DefaultCompositeFilterComponentBuilder.java | 7 +- .../builder/impl/DefaultConfigurationBuilder.java | 44 +- .../impl/DefaultCustomLevelComponentBuilder.java | 4 +- .../impl/DefaultFilterComponentBuilder.java | 7 +- .../impl/DefaultKeyValuePairComponentBuilder.java | 6 +- .../impl/DefaultLayoutComponentBuilder.java | 3 +- .../impl/DefaultLoggerComponentBuilder.java | 26 +- .../impl/DefaultPropertyComponentBuilder.java | 4 +- .../impl/DefaultRootLoggerComponentBuilder.java | 23 +- .../impl/DefaultScriptComponentBuilder.java | 7 +- .../impl/DefaultScriptFileComponentBuilder.java | 4 +- .../config/composite/CompositeConfiguration.java | 28 +- .../config/composite/DefaultMergeStrategy.java | 45 +- .../log4j/core/config/jason/JsonConfiguration.java | 21 +- .../log4j/core/config/json/JsonConfiguration.java | 21 +- .../core/config/json/JsonConfigurationFactory.java | 10 +- .../log4j/core/config/plugins/PluginAliases.java | 1 - .../log4j/core/config/plugins/PluginAttribute.java | 2 - .../config/plugins/PluginBuilderAttribute.java | 1 - .../core/config/plugins/PluginBuilderFactory.java | 1 - .../core/config/plugins/PluginConfiguration.java | 1 - .../log4j/core/config/plugins/PluginElement.java | 1 - .../log4j/core/config/plugins/PluginFactory.java | 1 - .../core/config/plugins/PluginLoggerContext.java | 1 - .../log4j/core/config/plugins/PluginNode.java | 1 - .../log4j/core/config/plugins/PluginValue.java | 1 - .../config/plugins/convert/CoreTypeConverters.java | 14 +- .../core/config/plugins/convert/HexConverter.java | 3 +- ...acyAnnotationFactoryResolversPostProcessor.java | 6 +- .../util/LegacyPluginAttributeFactoryResolver.java | 11 +- ...egacyPluginBuilderAttributeFactoryResolver.java | 11 +- .../util/LegacyPluginNodeFactoryResolver.java | 1 - .../config/plugins/util/PluginAliasesProvider.java | 1 - .../plugins/util/PluginAttributeNameProvider.java | 1 - .../util/PluginBuilderAttributeNameProvider.java | 1 - .../util/PluginConfigurationFactoryResolver.java | 4 +- .../plugins/util/PluginElementNameProvider.java | 1 - .../util/PluginLoggerContextFactoryResolver.java | 4 +- .../plugins/util/PluginValueNameProvider.java | 1 - .../config/properties/PropertiesConfiguration.java | 6 +- .../properties/PropertiesConfigurationBuilder.java | 71 +- .../properties/PropertiesConfigurationFactory.java | 4 +- .../core/config/status/StatusConfiguration.java | 6 +- .../log4j/core/config/xml/XmlConfiguration.java | 38 +- .../log4j/core/config/yaml/YamlConfiguration.java | 3 +- .../core/config/yaml/YamlConfigurationFactory.java | 13 +- .../logging/log4j/core/filter/AbstractFilter.java | 141 +- .../log4j/core/filter/AbstractFilterable.java | 5 +- .../logging/log4j/core/filter/BurstFilter.java | 148 +- .../logging/log4j/core/filter/CompositeFilter.java | 140 +- .../logging/log4j/core/filter/DenyAllFilter.java | 142 +- .../log4j/core/filter/DynamicThresholdFilter.java | 161 +- .../log4j/core/filter/LevelMatchFilter.java | 142 +- .../log4j/core/filter/LevelRangeFilter.java | 144 +- .../logging/log4j/core/filter/MapFilter.java | 134 +- .../logging/log4j/core/filter/MarkerFilter.java | 139 +- .../core/filter/MutableThreadContextMapFilter.java | 182 +- .../logging/log4j/core/filter/NeutralFilter.java | 128 +- .../logging/log4j/core/filter/NoMarkerFilter.java | 146 +- .../logging/log4j/core/filter/RegexFilter.java | 25 +- .../log4j/core/filter/StringMatchFilter.java | 163 +- .../log4j/core/filter/StructuredDataFilter.java | 9 +- .../log4j/core/filter/ThreadContextMapFilter.java | 158 +- .../logging/log4j/core/filter/ThresholdFilter.java | 139 +- .../logging/log4j/core/filter/TimeFilter.java | 186 +- .../logging/log4j/core/impl/ContextAnchor.java | 3 +- .../log4j/core/impl/ContextDataFactory.java | 6 +- .../logging/log4j/core/impl/DefaultBundle.java | 16 +- .../log4j/core/impl/DefaultLogEventFactory.java | 27 +- .../logging/log4j/core/impl/ExtendedClassInfo.java | 1 - .../log4j/core/impl/ExtendedStackTraceElement.java | 40 +- .../log4j/core/impl/JdkMapAdapterStringMap.java | 4 +- .../log4j/core/impl/Log4jContextFactory.java | 116 +- .../logging/log4j/core/impl/Log4jLogEvent.java | 53 +- .../logging/log4j/core/impl/Log4jPropertyKey.java | 318 ++-- .../logging/log4j/core/impl/LogEventFactory.java | 11 +- .../logging/log4j/core/impl/MementoLogEvent.java | 50 +- .../logging/log4j/core/impl/MementoMessage.java | 10 +- .../logging/log4j/core/impl/MutableLogEvent.java | 13 +- .../log4j/core/impl/ReusableLogEventFactory.java | 34 +- .../log4j/core/impl/SystemPropertyBundle.java | 7 +- .../log4j/core/impl/ThreadContextDataInjector.java | 20 +- .../log4j/core/impl/ThreadContextDataProvider.java | 3 +- .../log4j/core/impl/ThrowableFormatOptions.java | 44 +- .../logging/log4j/core/impl/ThrowableProxy.java | 81 +- .../log4j/core/impl/ThrowableProxyHelper.java | 5 +- .../log4j/core/impl/ThrowableProxyRenderer.java | 157 +- .../logging/log4j/core/jmx/AppenderAdmin.java | 2 - .../logging/log4j/core/jmx/AppenderAdminMBean.java | 1 - .../logging/log4j/core/jmx/AsyncAppenderAdmin.java | 2 - .../log4j/core/jmx/ContextSelectorAdmin.java | 2 - .../logging/log4j/core/jmx/LoggerConfigAdmin.java | 2 - .../log4j/core/jmx/LoggerConfigAdminMBean.java | 1 - .../logging/log4j/core/jmx/LoggerContextAdmin.java | 16 +- .../log4j/core/jmx/LoggerContextAdminMBean.java | 2 - .../logging/log4j/core/jmx/RingBufferAdmin.java | 8 +- .../org/apache/logging/log4j/core/jmx/Server.java | 63 +- .../logging/log4j/core/jmx/StatusLoggerAdmin.java | 13 +- .../log4j/core/jmx/StatusLoggerAdminMBean.java | 2 - .../logging/log4j/core/layout/AbstractLayout.java | 8 +- .../log4j/core/layout/AbstractStringLayout.java | 33 +- .../log4j/core/layout/ByteBufferDestination.java | 2 - .../core/layout/ByteBufferDestinationHelper.java | 7 +- .../logging/log4j/core/layout/GelfLayout.java | 70 +- .../logging/log4j/core/layout/HtmlLayout.java | 63 +- .../log4j/core/layout/LevelPatternSelector.java | 32 +- .../core/layout/LockingStringBuilderEncoder.java | 10 +- .../logging/log4j/core/layout/LoggerFields.java | 14 +- .../log4j/core/layout/MarkerPatternSelector.java | 30 +- .../logging/log4j/core/layout/PatternLayout.java | 82 +- .../logging/log4j/core/layout/PatternMatch.java | 1 - .../logging/log4j/core/layout/Rfc5424Layout.java | 112 +- .../log4j/core/layout/StringBuilderEncoder.java | 5 +- .../logging/log4j/core/layout/SyslogLayout.java | 3 +- .../log4j/core/layout/TextEncoderHelper.java | 67 +- .../log4j/core/layout/internal/IncludeChecker.java | 1 + .../log4j/core/layout/internal/ListChecker.java | 1 - .../logging/log4j/core/lookup/AbstractLookup.java | 1 - .../logging/log4j/core/lookup/Base64StrLookup.java | 2 - .../core/lookup/ConfigurationStrSubstitutor.java | 3 +- .../logging/log4j/core/lookup/DateLookup.java | 1 - .../logging/log4j/core/lookup/Interpolator.java | 41 +- .../logging/log4j/core/lookup/JavaLookup.java | 29 +- .../lookup/JmxRuntimeInputArgumentsLookup.java | 1 - .../logging/log4j/core/lookup/Log4jLookup.java | 5 +- .../apache/logging/log4j/core/lookup/Lookup.java | 4 +- .../logging/log4j/core/lookup/LowerLookup.java | 4 +- .../logging/log4j/core/lookup/MainMapLookup.java | 2 - .../logging/log4j/core/lookup/MapLookup.java | 2 - .../logging/log4j/core/lookup/MarkerLookup.java | 1 - .../log4j/core/lookup/PropertiesLookup.java | 6 +- .../log4j/core/lookup/ResourceBundleLookup.java | 1 - .../log4j/core/lookup/RuntimeStrSubstitutor.java | 3 +- .../logging/log4j/core/lookup/StrMatcher.java | 16 +- .../logging/log4j/core/lookup/StrSubstitutor.java | 155 +- .../logging/log4j/core/lookup/UpperLookup.java | 4 +- .../core/message/ExtendedThreadInfoFactory.java | 9 +- .../core/message/ExtendedThreadInformation.java | 18 +- .../log4j/core/net/AbstractSocketManager.java | 13 +- .../apache/logging/log4j/core/net/Advertiser.java | 1 + .../log4j/core/net/DatagramOutputStream.java | 3 +- .../log4j/core/net/DatagramSocketManager.java | 23 +- .../apache/logging/log4j/core/net/Facility.java | 1 - .../log4j/core/net/MulticastDnsAdvertiser.java | 19 +- .../log4j/core/net/Rfc1349TrafficClass.java | 6 +- .../logging/log4j/core/net/SocketAddress.java | 2 - .../logging/log4j/core/net/SocketOptions.java | 1 - .../core/net/SocketPerformancePreferences.java | 2 - .../logging/log4j/core/net/SslSocketManager.java | 154 +- .../logging/log4j/core/net/TcpSocketManager.java | 121 +- .../log4j/core/net/UrlConnectionFactory.java | 30 +- .../net/ssl/AbstractKeyStoreConfiguration.java | 21 +- .../core/net/ssl/EnvironmentPasswordProvider.java | 4 +- .../log4j/core/net/ssl/FilePasswordProvider.java | 8 +- .../log4j/core/net/ssl/KeyStoreConfiguration.java | 50 +- .../log4j/core/net/ssl/LaxHostnameVerifier.java | 6 +- .../log4j/core/net/ssl/SslConfiguration.java | 48 +- .../core/net/ssl/SslConfigurationDefaults.java | 1 - .../core/net/ssl/SslConfigurationFactory.java | 30 +- .../log4j/core/net/ssl/StoreConfiguration.java | 1 - .../core/net/ssl/TrustStoreConfiguration.java | 37 +- .../core/parser/AbstractJacksonLogEventParser.java | 3 +- .../core/pattern/AbstractPatternConverter.java | 1 - .../core/pattern/AbstractStyleNameConverter.java | 18 +- .../logging/log4j/core/pattern/AnsiEscape.java | 14 +- .../log4j/core/pattern/CachedDateFormat.java | 33 +- .../core/pattern/ClassNamePatternConverter.java | 6 +- .../log4j/core/pattern/DatePatternConverter.java | 5 +- .../log4j/core/pattern/DynamicWordAbbreviator.java | 4 +- .../core/pattern/EncodingPatternConverter.java | 19 +- .../core/pattern/EndOfBatchPatternConverter.java | 8 +- .../pattern/EqualsBaseReplacementConverter.java | 11 +- .../EqualsIgnoreCaseReplacementConverter.java | 10 +- .../core/pattern/EqualsReplacementConverter.java | 10 +- .../pattern/ExtendedThrowablePatternConverter.java | 11 +- .../core/pattern/FileDatePatternConverter.java | 4 +- .../core/pattern/FileLocationPatternConverter.java | 6 +- .../logging/log4j/core/pattern/FormattingInfo.java | 17 +- .../core/pattern/FullLocationPatternConverter.java | 6 +- .../log4j/core/pattern/HighlightConverter.java | 36 +- .../log4j/core/pattern/HtmlTextRenderer.java | 1 - .../core/pattern/IntegerPatternConverter.java | 3 +- .../log4j/core/pattern/JAnsiTextRenderer.java | 78 +- .../log4j/core/pattern/LevelPatternConverter.java | 5 +- .../core/pattern/LineLocationPatternConverter.java | 8 +- .../pattern/LineSeparatorPatternConverter.java | 2 +- .../core/pattern/LiteralPatternConverter.java | 2 - .../core/pattern/LogEventPatternConverter.java | 1 - .../core/pattern/LoggerFqcnPatternConverter.java | 8 +- .../log4j/core/pattern/LoggerPatternConverter.java | 9 +- .../log4j/core/pattern/MapPatternConverter.java | 3 +- .../log4j/core/pattern/MarkerPatternConverter.java | 2 +- .../pattern/MarkerSimpleNamePatternConverter.java | 2 +- .../log4j/core/pattern/MaxLengthConverter.java | 11 +- .../log4j/core/pattern/MdcPatternConverter.java | 9 +- .../core/pattern/MessagePatternConverter.java | 31 +- .../pattern/MethodLocationPatternConverter.java | 5 +- .../log4j/core/pattern/NameAbbreviator.java | 22 +- .../log4j/core/pattern/NamePatternConverter.java | 1 - .../core/pattern/NanoTimePatternConverter.java | 2 +- .../log4j/core/pattern/NdcPatternConverter.java | 5 +- .../logging/log4j/core/pattern/NotANumber.java | 3 +- .../log4j/core/pattern/PatternFormatter.java | 2 +- .../logging/log4j/core/pattern/PatternParser.java | 340 ++-- .../log4j/core/pattern/PlainTextRenderer.java | 3 +- .../core/pattern/ProcessIdPatternConverter.java | 2 +- .../log4j/core/pattern/RegexReplacement.java | 5 +- .../core/pattern/RegexReplacementConverter.java | 8 +- .../core/pattern/RelativeTimePatternConverter.java | 3 +- .../log4j/core/pattern/RepeatPatternConverter.java | 4 +- .../pattern/RootThrowablePatternConverter.java | 5 +- .../pattern/SequenceNumberPatternConverter.java | 6 +- .../pattern/SimpleLiteralPatternConverter.java | 1 - .../logging/log4j/core/pattern/StyleConverter.java | 6 +- .../logging/log4j/core/pattern/TextRenderer.java | 1 - .../core/pattern/ThreadIdPatternConverter.java | 8 +- .../core/pattern/ThreadNamePatternConverter.java | 8 +- .../pattern/ThreadPriorityPatternConverter.java | 8 +- .../core/pattern/ThrowablePatternConverter.java | 47 +- .../log4j/core/pattern/UuidPatternConverter.java | 3 +- .../VariablesNotEmptyReplacementConverter.java | 19 +- .../logging/log4j/core/script/ScriptBindings.java | 5 +- .../log4j/core/script/ScriptConditional.java | 1 - .../logging/log4j/core/script/ScriptManager.java | 2 - .../log4j/core/selector/BasicContextSelector.java | 12 +- .../core/selector/ClassLoaderContextSelector.java | 33 +- .../log4j/core/selector/ContextSelector.java | 22 +- .../log4j/core/selector/CoreContextSelectors.java | 9 +- .../log4j/core/selector/NamedContextSelector.java | 1 - .../logging/log4j/core/time/ClockFactory.java | 8 +- .../logging/log4j/core/time/InstantFormatter.java | 111 +- .../logging/log4j/core/time/MutableInstant.java | 69 +- .../logging/log4j/core/time/SystemNanoClock.java | 1 - .../log4j/core/time/internal/CachedClock.java | 17 +- .../core/time/internal/CoarseCachedClock.java | 1 - .../log4j/core/time/internal/DummyNanoClock.java | 1 - .../log4j/core/time/internal/SystemClock.java | 5 +- .../core/time/internal/SystemMillisClock.java | 1 - .../core/time/internal/format/DatePrinter.java | 3 +- .../core/time/internal/format/FastDateFormat.java | 36 +- .../core/time/internal/format/FastDatePrinter.java | 335 ++-- .../core/time/internal/format/FixedDateFormat.java | 77 +- .../log4j/core/time/internal/format/Format.java | 3 +- .../core/time/internal/format/FormatCache.java | 42 +- .../core/tools/BasicCommandLineArguments.java | 6 +- .../apache/logging/log4j/core/tools/Generate.java | 54 +- .../log4j/core/tools/picocli/CommandLine.java | 1808 ++++++++++++++------ .../logging/log4j/core/util/AbstractWatcher.java | 16 +- .../apache/logging/log4j/core/util/ArrayUtils.java | 1 - .../log4j/core/util/AuthorizationProvider.java | 1 - .../core/util/BasicAuthorizationProvider.java | 13 +- .../apache/logging/log4j/core/util/Booleans.java | 4 +- .../logging/log4j/core/util/CloseShieldWriter.java | 2 - .../org/apache/logging/log4j/core/util/Closer.java | 1 - .../apache/logging/log4j/core/util/Constants.java | 26 +- .../log4j/core/util/ContextDataProvider.java | 1 - .../logging/log4j/core/util/CronExpression.java | 121 +- .../core/util/DefaultShutdownCallbackRegistry.java | 12 +- .../logging/log4j/core/util/ExecutorServices.java | 14 +- .../log4j/core/util/ExtensionLanguageMapping.java | 34 +- .../apache/logging/log4j/core/util/FileUtils.java | 40 +- .../apache/logging/log4j/core/util/Integers.java | 3 +- .../apache/logging/log4j/core/util/JsonUtils.java | 20 +- .../logging/log4j/core/util/KeyValuePair.java | 1 - .../org/apache/logging/log4j/core/util/Loader.java | 11 +- .../logging/log4j/core/util/Log4jThread.java | 1 - .../log4j/core/util/Log4jThreadFactory.java | 1 - .../apache/logging/log4j/core/util/NetUtils.java | 8 +- .../log4j/core/util/ObjectArrayIterator.java | 9 +- .../logging/log4j/core/util/OptionConverter.java | 77 +- .../apache/logging/log4j/core/util/Patterns.java | 3 +- .../logging/log4j/core/util/ProcessIdUtil.java | 5 +- .../logging/log4j/core/util/SecretKeyProvider.java | 2 - .../org/apache/logging/log4j/core/util/Source.java | 9 +- .../log4j/core/util/StringBuilderWriter.java | 1 - .../apache/logging/log4j/core/util/Throwables.java | 10 +- .../apache/logging/log4j/core/util/Transform.java | 100 +- .../apache/logging/log4j/core/util/TypeUtil.java | 13 +- .../apache/logging/log4j/core/util/UuidUtil.java | 9 +- .../logging/log4j/core/util/WatchManager.java | 47 +- .../apache/logging/log4j/core/util/Watcher.java | 4 +- .../logging/log4j/core/util/WatcherFactory.java | 36 +- .../log4j/core/util/WrappedFileWatcher.java | 22 +- .../format => util/datetime}/DatePrinter.java | 20 +- .../log4j/core/util/datetime/FastDateFormat.java | 64 +- .../internal/format => util/datetime}/Format.java | 8 +- .../core/util/internal/HttpInputStreamUtil.java | 32 +- .../core/util/internal/LastModifiedSource.java | 1 - .../logging/log4j/core/util/internal/Status.java | 6 +- .../logging/log4j/couchdb/CouchDbConnection.java | 6 +- .../logging/log4j/couchdb/CouchDbProvider.java | 23 +- .../log4j/csv/layout/AbstractCsvLayout.java | 33 +- .../log4j/csv/layout/CsvLogEventLayout.java | 23 +- .../log4j/csv/layout/CsvParameterLayout.java | 23 +- .../CsvJsonParameterLayoutFileAppenderTest.java | 5 +- .../log4j/csv/layout/CsvLogEventLayoutTest.java | 26 +- .../csv/layout/CsvParameterLayoutAllAsyncTest.java | 4 +- .../log4j/csv/layout/CsvParameterLayoutTest.java | 40 +- .../apache/logging/log4j/docker/DockerLookup.java | 13 +- .../logging/log4j/docker/model/Container.java | 3 +- .../log4j/docker/model/NetworkSettings.java | 4 +- .../apache/logging/log4j/flume/appender/Agent.java | 3 +- .../logging/log4j/flume/appender/BatchEvent.java | 1 - .../log4j/flume/appender/FlumeAppender.java | 124 +- .../log4j/flume/appender/FlumeAvroManager.java | 81 +- .../log4j/flume/appender/FlumeEmbeddedManager.java | 45 +- .../logging/log4j/flume/appender/FlumeEvent.java | 25 +- .../log4j/flume/appender/FlumeEventFactory.java | 10 +- .../flume/appender/FlumePersistentManager.java | 170 +- .../log4j/flume/appender/Log4jEventSource.java | 1 - .../log4j/flume/appender/FlumeAppenderTest.java | 376 +++- .../flume/appender/FlumeEmbeddedAgentTest.java | 41 +- .../flume/appender/FlumeEmbeddedAppenderTest.java | 53 +- .../appender/FlumePersistentAppenderTest.java | 56 +- .../log4j/flume/appender/FlumePersistentPerf.java | 20 +- .../logging/log4j/flume/test/FlumeKeyProvider.java | 7 +- .../gctests/GcFreeAsynchronousLoggingTest.java | 7 +- .../log4j/gctests/GcFreeLoggingTestUtil.java | 50 +- .../gctests/JsonTemplateLayoutGcFreeTest.java | 5 +- .../apache/logging/log4j/io/ByteStreamLogger.java | 26 +- .../apache/logging/log4j/io/CharStreamLogger.java | 31 +- .../org/apache/logging/log4j/io/IoBuilder.java | 22 +- .../log4j/io/LoggerBufferedInputStream.java | 25 +- .../logging/log4j/io/LoggerBufferedReader.java | 20 +- .../logging/log4j/io/LoggerFilterOutputStream.java | 13 +- .../logging/log4j/io/LoggerFilterWriter.java | 5 +- .../apache/logging/log4j/io/LoggerInputStream.java | 10 +- .../logging/log4j/io/LoggerOutputStream.java | 9 +- .../apache/logging/log4j/io/LoggerPrintStream.java | 24 +- .../apache/logging/log4j/io/LoggerPrintWriter.java | 18 +- .../org/apache/logging/log4j/io/LoggerReader.java | 9 +- .../org/apache/logging/log4j/io/LoggerWriter.java | 1 - .../io/internal/InternalBufferedInputStream.java | 21 +- .../log4j/io/internal/InternalBufferedReader.java | 18 +- .../io/internal/InternalFilterOutputStream.java | 10 +- .../log4j/io/internal/InternalFilterWriter.java | 5 +- .../log4j/io/internal/InternalInputStream.java | 10 +- .../log4j/io/internal/InternalLoggerReader.java | 9 +- .../log4j/io/internal/InternalOutputStream.java | 9 +- .../log4j/io/internal/InternalPrintStream.java | 40 +- .../log4j/io/internal/InternalPrintWriter.java | 18 +- .../logging/log4j/io/internal/InternalReader.java | 9 +- .../logging/log4j/io/internal/InternalWriter.java | 1 - .../log4j/io/AbstractLoggerOutputStreamTest.java | 16 +- .../logging/log4j/io/AbstractLoggerWriterTest.java | 12 +- .../logging/log4j/io/AbstractStreamTest.java | 15 +- .../log4j/io/IoBuilderCallerInfoTesting.java | 6 +- .../org/apache/logging/log4j/io/IoBuilderTest.java | 13 +- .../LoggerBufferedInputStreamCallerInfoTest.java | 4 +- .../log4j/io/LoggerBufferedInputStreamTest.java | 9 +- .../io/LoggerBufferedReaderCallerInfoTest.java | 4 +- .../logging/log4j/io/LoggerBufferedReaderTest.java | 8 +- .../log4j/io/LoggerFilterOutputStreamTest.java | 8 +- .../logging/log4j/io/LoggerFilterWriterTest.java | 7 +- .../log4j/io/LoggerInputStreamCallerInfoTest.java | 7 +- .../logging/log4j/io/LoggerInputStreamTest.java | 11 +- .../log4j/io/LoggerOutputStreamCallerInfoTest.java | 4 +- .../logging/log4j/io/LoggerOutputStreamTest.java | 6 +- .../log4j/io/LoggerPrintStreamCallerInfoTest.java | 5 +- .../logging/log4j/io/LoggerPrintStreamTest.java | 13 +- .../log4j/io/LoggerPrintWriterCallerInfoTest.java | 5 +- .../log4j/io/LoggerPrintWriterJdbcH2Test.java | 1 - .../logging/log4j/io/LoggerPrintWriterTest.java | 10 +- .../log4j/io/LoggerReaderCallerInfoTest.java | 7 +- .../apache/logging/log4j/io/LoggerReaderTest.java | 11 +- .../apache/logging/log4j/io/LoggerWriterTest.java | 5 +- .../org/apache/logging/log4j/jcl/LogAdapter.java | 8 +- .../apache/logging/log4j/jcl/LogFactoryImpl.java | 6 +- .../logging/log4j/jcl/CallerInformationTest.java | 5 +- .../org/apache/logging/log4j/jcl/LoggerTest.java | 12 +- .../appender/PoolableConnectionFactoryConfig.java | 78 +- .../appender/PoolingDriverConnectionSource.java | 57 +- .../PoolingDriverConnectionSourceTest.java | 81 +- .../AbstractDriverManagerConnectionSource.java | 26 +- .../logging/log4j/jdbc/appender/ColumnConfig.java | 18 +- .../log4j/jdbc/appender/ConnectionSource.java | 1 - .../jdbc/appender/DataSourceConnectionSource.java | 2 - .../appender/DriverManagerConnectionSource.java | 21 +- .../appender/FactoryMethodConnectionSource.java | 13 +- .../logging/log4j/jdbc/appender/JdbcAppender.java | 32 +- .../log4j/jdbc/appender/JdbcDatabaseManager.java | 277 ++- .../log4j/jdbc/appender/internal/JndiUtil.java | 9 +- .../log4j/jdbc/convert/DateTypeConverter.java | 11 +- .../AbstractJdbcAppenderDataSourceTest.java | 33 +- .../AbstractJdbcAppenderFactoryMethodTest.java | 47 +- .../log4j/jdbc/appender/ColumnConfigTest.java | 120 +- .../appender/DataSourceConnectionSourceTest.java | 32 +- .../DriverManagerH2ConnectionSourceTest.java | 23 +- .../FactoryMethodConnectionSourceTest.java | 38 +- .../JdbcAppenderColumnMappingLiteralTest.java | 25 +- .../JdbcAppenderColumnMappingPatternTest.java | 31 +- .../appender/JdbcAppenderH2DataSourceTest.java | 3 +- .../appender/JdbcAppenderH2FactoryMethodTest.java | 15 +- .../appender/JdbcAppenderHsqldbDataSourceTest.java | 24 +- .../JdbcAppenderHsqldbFactoryMethodTest.java | 30 +- .../JdbcAppenderMapMessageDataSourceTest.java | 29 +- .../JdbcAppenderStringSubstitutionTest.java | 7 +- .../log4j/jdbc/appender/JdbcH2TestHelper.java | 4 +- .../logging/log4j/jdbc/appender/JdbcRule.java | 10 +- .../log4j/jdbc/convert/DateTypeConverterTest.java | 7 +- .../log4j/jeromq/appender/JeroMqAppender.java | 118 +- .../log4j/jeromq/appender/JeroMqManager.java | 143 +- .../log4j/jeromq/appender/JeroMqAppenderTest.java | 33 +- .../log4j/jeromq/appender/JeroMqTestClient.java | 6 +- .../logging/log4j/jndi/test/junit/JndiRule.java | 3 - .../apache/logging/log4j/jndi/JndiManagerTest.java | 11 +- .../routing/RoutingAppenderWithJndiTest.java | 38 +- .../log4j/jndi/lookup/InterpolatorTest.java | 40 +- .../log4j/jndi/lookup/JndiDisabledLookupTest.java | 5 +- .../logging/log4j/jndi/lookup/JndiExploit.java | 8 +- .../logging/log4j/jndi/lookup/JndiLookupTest.java | 5 +- .../jndi/lookup/JndiRestrictedLookupTest.java | 33 +- .../org/apache/logging/log4j/jndi/JndiManager.java | 42 +- .../logging/log4j/jndi/internal/JndiCloser.java | 4 +- .../logging/log4j/jndi/lookup/JndiLookup.java | 6 +- .../log4j/jndi/selector/JndiContextSelector.java | 13 +- .../logging/log4j/jpl/Log4jSystemLogger.java | 1 - .../log4j/jpl/Log4jSystemLoggerAdapter.java | 8 +- .../logging/log4j/jpl/Log4jSystemLoggerFinder.java | 3 +- .../logging/log4j/jpl/Log4jSystemLoggerTest.java | 17 +- .../logging/log4j/jul/AbstractLoggerAdapter.java | 9 +- .../org/apache/logging/log4j/jul/ApiLogger.java | 72 +- .../apache/logging/log4j/jul/ApiLoggerAdapter.java | 1 - .../logging/log4j/jul/CoreLoggerAdapter.java | 1 - .../logging/log4j/jul/DefaultLevelConverter.java | 2 - .../apache/logging/log4j/jul/JulPropertyKey.java | 4 - .../apache/logging/log4j/jul/LevelTranslator.java | 5 +- .../logging/log4j/jul/Log4jBridgeHandler.java | 86 +- .../org/apache/logging/log4j/jul/LogManager.java | 7 +- .../org/apache/logging/log4j/jul/NoOpLogger.java | 185 +- .../logging/log4j/jul/test/AbstractLoggerTest.java | 15 +- .../logging/log4j/jul/test/ApiLoggerTest.java | 11 +- .../log4j/jul/test/AsyncLoggerThreadsTest.java | 10 +- .../test/BracketInNotInterpolatedMessageTest.java | 17 +- .../log4j/jul/test/CallerInformationTest.java | 8 +- .../logging/log4j/jul/test/CoreLoggerTest.java | 12 +- .../log4j/jul/test/JavaLevelTranslatorTest.java | 31 +- .../logging/log4j/jul/test/ListAppender.java | 9 +- .../log4j/jul/test/Log4jBridgeHandlerTest.java | 269 +-- .../log4j/jul/test/Log4jLevelTranslatorTest.java | 30 +- .../appender/DefaultKafkaProducerFactory.java | 2 - .../log4j/kafka/appender/KafkaAppender.java | 39 +- .../logging/log4j/kafka/appender/KafkaManager.java | 69 +- .../log4j/kafka/appender/KafkaProducerFactory.java | 2 - .../appender/KafkaAppenderCloseTimeoutTest.java | 55 +- .../log4j/kafka/appender/KafkaAppenderTest.java | 47 +- .../KafkaManagerProducerThreadLeakTest.java | 11 +- .../kafka/builder/ConfigurationAssemblerTest.java | 24 +- .../kafka/builder/ConfigurationBuilderTest.java | 116 +- .../kafka/builder/CustomConfigurationFactory.java | 39 +- .../logging/log4j/kubernetes/ContainerUtil.java | 34 +- .../log4j/kubernetes/KubernetesClientBuilder.java | 2 +- .../kubernetes/KubernetesClientProperties.java | 5 +- .../logging/log4j/kubernetes/KubernetesLookup.java | 37 +- .../log4j/kubernetes/KubernetesLookupTest.java | 25 +- .../jackson/json/JsonSetupContextInitializer.java | 14 +- .../log4j/jackson/json/Log4jJsonModule.java | 6 +- .../log4j/jackson/json/Log4jJsonObjectMapper.java | 10 +- .../jackson/json/layout/JsonJacksonFactory.java | 12 +- .../log4j/jackson/json/layout/JsonLayout.java | 109 +- .../jackson/json/parser/JsonLogEventParser.java | 1 - .../jackson/json/JacksonIssue429MyNamesTest.java | 25 +- .../log4j/jackson/json/JacksonIssue429Test.java | 12 +- .../log4j/jackson/json/LevelMixInJsonTest.java | 1 - .../log4j/jackson/json/MarkerMixInJsonTest.java | 1 - .../json/StackTraceElementJsonMixInTest.java | 21 +- .../ConcurrentLoggingWithJsonLayoutTest.java | 8 +- .../jackson/json/layout/JsonLayoutMillisTest.java | 12 +- .../log4j/jackson/json/layout/JsonLayoutTest.java | 122 +- .../json/layout/ThrowableProxyJsonTest.java | 2 - .../json/parser/JsonLogEventParserTest.java | 93 +- .../jackson/xml/AbstractLogEventXmlMixIn.java | 22 +- .../xml/ContextDataAsEntryListXmlSerializer.java | 1 - .../xml/ExtendedStackTraceElementXmlMixIn.java | 19 +- .../logging/log4j/jackson/xml/InstantXmlMixIn.java | 7 +- .../log4j/jackson/xml/Log4jXmlObjectMapper.java | 1 - .../xml/LogEventWithContextListXmlMixIn.java | 13 +- .../logging/log4j/jackson/xml/MarkerXmlMixIn.java | 23 +- .../jackson/xml/StackTraceElementXmlMixIn.java | 7 +- ...rowableProxyWithStacktraceAsStringXmlMixIn.java | 1 - .../ThrowableProxyWithoutStacktraceXmlMixIn.java | 1 - .../log4j/jackson/xml/ThrowableProxyXmlMixIn.java | 1 - .../logging/log4j/jackson/xml/XmlMapEntry.java | 3 +- .../jackson/xml/XmlSetupContextInitializer.java | 14 +- .../jackson/xml/layout/Log4jXmlPrettyPrinter.java | 4 +- .../log4j/jackson/xml/layout/XmlLayout.java | 69 +- .../jackson/xml/parser/XmlLogEventParser.java | 1 - .../log4j/jackson/xml/LevelMixInXmlTest.java | 4 +- .../log4j/jackson/xml/MarkerMixInXmlTest.java | 1 - .../jackson/xml/StackTraceElementXmlMixInTest.java | 23 +- .../layout/ConcurrentLoggingWithXmlLayoutTest.java | 9 +- .../jackson/xml/layout/ThrowableProxyXmlTest.java | 2 - .../log4j/jackson/xml/layout/XmlLayoutTest.java | 76 +- .../jackson/xml/parser/XmlLogEventParserTest.java | 94 +- .../log4j/jackson/yaml/Log4jYamlModule.java | 4 +- .../log4j/jackson/yaml/Log4jYamlObjectMapper.java | 6 +- .../jackson/yaml/YamlSetupContextInitializer.java | 15 +- .../log4j/jackson/yaml/layout/YamlLayout.java | 96 +- .../jackson/yaml/parser/YamlLogEventParser.java | 1 - .../log4j/jackson/yaml/LevelMixInYamlTest.java | 1 - .../log4j/jackson/yaml/MarkerMixInYamlTest.java | 1 - .../yaml/StackTraceElementYamlMixInTest.java | 17 +- .../ConcurrentLoggingWithYamlLayoutTest.java | 7 +- .../log4j/jackson/yaml/layout/YamlLayoutTest.java | 53 +- .../yaml/parser/YamlLogEventParserTest.java | 85 +- .../log4j/jackson/AbstractJacksonFactory.java | 33 +- .../log4j/jackson/AbstractJacksonLayout.java | 70 +- .../log4j/jackson/AbstractLogEventMixIn.java | 13 +- .../ContextDataAsEntryListDeserializer.java | 14 +- .../jackson/ContextDataAsEntryListSerializer.java | 10 +- .../log4j/jackson/ContextDataDeserializer.java | 17 +- .../log4j/jackson/ContextDataSerializer.java | 10 +- .../jackson/ExtendedStackTraceElementMixIn.java | 11 +- .../apache/logging/log4j/jackson/InstantMixIn.java | 8 +- .../apache/logging/log4j/jackson/LevelMixIn.java | 3 +- .../log4j/jackson/ListOfMapEntryDeserializer.java | 20 +- .../log4j/jackson/ListOfMapEntrySerializer.java | 10 +- .../Log4jStackTraceElementDeserializer.java | 22 +- .../logging/log4j/jackson/LogEventJsonMixIn.java | 6 +- .../jackson/LogEventWithContextListMixIn.java | 20 +- .../org/apache/logging/log4j/jackson/MapEntry.java | 5 +- .../apache/logging/log4j/jackson/MarkerMixIn.java | 23 +- .../logging/log4j/jackson/MessageSerializer.java | 8 +- .../MutableThreadContextStackDeserializer.java | 16 +- .../log4j/jackson/ObjectMessageSerializer.java | 9 +- .../log4j/jackson/SetupContextInitializer.java | 15 +- .../log4j/jackson/SimpleMessageDeserializer.java | 4 +- .../log4j/jackson/StackTraceElementConstants.java | 1 - .../log4j/jackson/StackTraceElementMixIn.java | 7 +- .../logging/log4j/jackson/ThrowableProxyMixIn.java | 1 - .../ThrowableProxyWithStacktraceAsStringMixIn.java | 1 - .../ThrowableProxyWithoutStacktraceMixIn.java | 1 - .../jackson/layout/AbstractJacksonLayout.java | 71 +- .../log4j/jackson/AbstractMarkerMixInTest.java | 5 +- .../logging/log4j/jackson/LevelMixInTest.java | 10 +- .../log4j/jackson/ThrowableProxyJacksonTest.java | 8 +- .../layout/template/json/LogEventFixture.java | 17 +- .../log4j/layout/template/json/EcsLayoutTest.java | 43 +- .../log4j/layout/template/json/GcpLayoutTest.java | 79 +- .../log4j/layout/template/json/GelfLayoutTest.java | 41 +- .../log4j/layout/template/json/JacksonFixture.java | 1 - .../log4j/layout/template/json/JsonLayoutTest.java | 24 +- .../JsonTemplateLayoutAdditionalFieldTest.java | 34 +- .../JsonTemplateLayoutConcurrentEncodeTest.java | 82 +- .../JsonTemplateLayoutNullEventDelimiterTest.java | 14 +- .../template/json/JsonTemplateLayoutTest.java | 870 ++++------ .../log4j/layout/template/json/LogstashIT.java | 272 ++- .../log4j/layout/template/json/TestHelpers.java | 30 +- .../json/ThreadLocalRecyclerNestedLoggingTest.java | 13 +- .../json/resolver/CaseConverterResolverTest.java | 97 +- .../json/resolver/CounterResolverTest.java | 73 +- .../template/json/resolver/LevelResolverTest.java | 23 +- .../template/json/resolver/MarkerResolverTest.java | 40 +- .../json/resolver/MessageResolverTest.java | 112 +- .../resolver/ReadOnlyStringMapResolverTest.java | 177 +- .../resolver/StackTraceStringResolverTest.java | 323 ++-- .../json/resolver/TimestampResolverTest.java | 21 +- .../json/util/CharSequencePointerTest.java | 41 +- .../layout/template/json/util/JsonWriterTest.java | 544 +++--- .../json/util/TruncatingBufferedWriterTest.java | 68 +- .../log4j/layout/template/json/util/UrisTest.java | 6 +- .../layout/template/json/JsonTemplateLayout.java | 118 +- .../template/json/JsonTemplateLayoutDefaults.java | 79 +- .../json/resolver/CaseConverterResolver.java | 46 +- .../resolver/CaseConverterResolverFactory.java | 8 +- .../template/json/resolver/CounterResolver.java | 51 +- .../json/resolver/CounterResolverFactory.java | 8 +- .../template/json/resolver/EndOfBatchResolver.java | 5 +- .../json/resolver/EndOfBatchResolverFactory.java | 8 +- .../resolver/EventAdditionalFieldInterceptor.java | 27 +- .../json/resolver/EventResolverContext.java | 13 +- .../json/resolver/EventResolverFactory.java | 5 +- .../json/resolver/EventResolverInterceptor.java | 5 +- .../resolver/EventResolverStringSubstitutor.java | 5 +- .../resolver/EventRootObjectKeyInterceptor.java | 13 +- .../template/json/resolver/ExceptionResolver.java | 117 +- .../json/resolver/ExceptionResolverFactory.java | 8 +- .../json/resolver/ExceptionRootCauseResolver.java | 5 +- .../ExceptionRootCauseResolverFactory.java | 8 +- .../template/json/resolver/LevelResolver.java | 46 +- .../json/resolver/LevelResolverFactory.java | 5 +- .../template/json/resolver/LoggerResolver.java | 26 +- .../json/resolver/LoggerResolverFactory.java | 5 +- .../template/json/resolver/MainMapResolver.java | 15 +- .../json/resolver/MainMapResolverFactory.java | 5 +- .../layout/template/json/resolver/MapResolver.java | 5 +- .../template/json/resolver/MapResolverFactory.java | 5 +- .../template/json/resolver/MarkerResolver.java | 9 +- .../json/resolver/MarkerResolverFactory.java | 5 +- .../json/resolver/MessageParameterResolver.java | 24 +- .../resolver/MessageParameterResolverFactory.java | 8 +- .../template/json/resolver/MessageResolver.java | 39 +- .../json/resolver/MessageResolverFactory.java | 5 +- .../template/json/resolver/PatternResolver.java | 14 +- .../json/resolver/PatternResolverFactory.java | 5 +- .../json/resolver/ReadOnlyStringMapResolver.java | 99 +- .../template/json/resolver/SourceResolver.java | 57 +- .../json/resolver/SourceResolverFactory.java | 5 +- .../json/resolver/StackTraceElementResolver.java | 8 +- .../resolver/StackTraceElementResolverContext.java | 12 +- .../resolver/StackTraceElementResolverFactory.java | 7 +- ...StackTraceElementResolverStringSubstitutor.java | 8 +- .../json/resolver/StackTraceObjectResolver.java | 11 +- .../json/resolver/StackTraceStringResolver.java | 131 +- .../template/json/resolver/TemplateResolver.java | 1 - .../json/resolver/TemplateResolverConfig.java | 15 +- .../json/resolver/TemplateResolverContext.java | 2 - .../json/resolver/TemplateResolverFactory.java | 1 - .../json/resolver/TemplateResolverInterceptor.java | 1 - .../TemplateResolverStringSubstitutor.java | 1 - .../template/json/resolver/TemplateResolvers.java | 135 +- .../json/resolver/ThreadContextDataResolver.java | 5 +- .../resolver/ThreadContextDataResolverFactory.java | 8 +- .../json/resolver/ThreadContextStackResolver.java | 12 +- .../ThreadContextStackResolverFactory.java | 8 +- .../template/json/resolver/ThreadResolver.java | 35 +- .../json/resolver/ThreadResolverFactory.java | 5 +- .../template/json/resolver/TimestampResolver.java | 229 +-- .../json/resolver/TimestampResolverFactory.java | 5 +- .../template/json/util/CharSequencePointer.java | 7 +- .../layout/template/json/util/JsonWriter.java | 106 +- .../layout/template/json/util/MapAccessor.java | 7 +- .../json/util/TruncatingBufferedPrintWriter.java | 8 +- .../json/util/TruncatingBufferedWriter.java | 9 +- .../log4j/layout/template/json/util/Uris.java | 37 +- .../layout/template/json/util/package-info.java | 5 + .../logging/log4j/mongodb3/MongoDb3Connection.java | 27 +- .../log4j/mongodb3/MongoDb3DocumentObject.java | 1 - .../mongodb3/MongoDb3DocumentObjectCodec.java | 6 +- .../logging/log4j/mongodb3/MongoDb3LevelCodec.java | 1 - .../logging/log4j/mongodb3/MongoDb3Provider.java | 80 +- .../mongodb3/MongoDb3AdditionalFieldsTest.java | 6 +- .../log4j/mongodb3/MongoDb3AuthFailureTest.java | 6 +- .../logging/log4j/mongodb3/MongoDb3Resolver.java | 32 +- .../log4j/mongodb3/MongoDb3ResolverTest.java | 5 +- .../logging/log4j/mongodb3/MongoDb3Test.java | 7 +- .../log4j/mongodb3/MongoDb3TestConstants.java | 1 - .../logging/log4j/mongodb3/UsingMongoDb3.java | 15 +- .../logging/log4j/mongodb4/MongoDb4Connection.java | 34 +- .../log4j/mongodb4/MongoDb4DocumentObject.java | 1 - .../mongodb4/MongoDb4DocumentObjectCodec.java | 6 +- .../logging/log4j/mongodb4/MongoDb4LevelCodec.java | 1 - .../logging/log4j/mongodb4/MongoDb4Provider.java | 11 +- .../mongodb4/MongoDb4AdditionalFieldsTest.java | 6 +- .../log4j/mongodb4/MongoDb4AuthFailureTest.java | 6 +- .../logging/log4j/mongodb4/MongoDb4Resolver.java | 35 +- .../log4j/mongodb4/MongoDb4ResolverTest.java | 5 +- .../logging/log4j/mongodb4/MongoDb4Test.java | 8 +- .../log4j/mongodb4/MongoDb4TestConstants.java | 1 - .../logging/log4j/mongodb4/UsingMongoDb4.java | 15 +- .../log4j/osgi/tests/AbstractLoadBundleTest.java | 35 +- .../logging/log4j/osgi/tests/AbstractOsgiTest.java | 1 - .../logging/log4j/osgi/tests/CoreOsgiTest.java | 13 +- .../log4j/osgi/tests/CustomConfiguration.java | 8 +- .../osgi/tests/CustomConfigurationFactory.java | 4 +- .../logging/log4j/osgi/tests/JULProviderTest.java | 14 +- .../log4j/osgi/tests/SLF4JProviderTest.java | 14 +- .../tests/equinox/EquinoxLoadApiBundleTest.java | 1 - .../osgi/tests/felix/FelixLoadApiBundleTest.java | 1 - .../log4j/osgi/tests/junit/OsgiTestRule.java | 1 - .../json/BlackHoleByteBufferDestination.java | 2 - .../template/json/JsonTemplateLayoutBenchmark.java | 122 +- .../json/JsonTemplateLayoutBenchmarkReport.java | 92 +- .../json/JsonTemplateLayoutBenchmarkState.java | 63 +- .../log4j/message/ParameterFormatterBenchmark.java | 37 +- ...bstractStringLayoutStringEncodingBenchmark.java | 32 +- .../perf/jmh/AnnotationVsMarkerInterface.java | 1 - .../perf/jmh/AsyncAppenderLog4j1Benchmark.java | 20 +- .../jmh/AsyncAppenderLog4j1LocationBenchmark.java | 1 - .../perf/jmh/AsyncAppenderLog4j2Benchmark.java | 77 +- .../jmh/AsyncAppenderLog4j2LocationBenchmark.java | 2 - .../perf/jmh/AsyncAppenderLogbackBenchmark.java | 59 +- .../jmh/AsyncAppenderLogbackLocationBenchmark.java | 7 +- .../log4j/perf/jmh/AsyncLoggersBenchmark.java | 134 +- .../perf/jmh/AsyncLoggersLocationBenchmark.java | 6 +- .../logging/log4j/perf/jmh/ClocksBenchmark.java | 24 +- .../log4j/perf/jmh/CollectionsBenchmark.java | 4 +- .../jmh/ConcurrentAsyncLoggerToFileBenchmark.java | 20 +- .../perf/jmh/ConfiguratorInitializeBenchmark.java | 25 +- .../log4j/perf/jmh/DateTimeFormatBenchmark.java | 23 +- .../log4j/perf/jmh/FileAppenderBenchmark.java | 15 +- .../perf/jmh/FileAppenderParamsBenchmark.java | 16 +- .../perf/jmh/FileAppenderThrowableBenchmark.java | 102 +- .../jmh/FileAppenderWithLocationBenchmark.java | 7 +- .../log4j/perf/jmh/FormatterLoggerBenchmark.java | 1 - .../log4j/perf/jmh/GelfLayoutBenchmark.java | 2 - .../log4j/perf/jmh/JdbcAppenderBenchmark.java | 9 +- .../jmh/Log4j2AppenderComparisonBenchmark.java | 39 +- .../log4j/perf/jmh/Log4jLogEventBenchmark.java | 3 +- .../perf/jmh/LogBuilderMarkerFilterBenchmark.java | 2 - .../log4j/perf/jmh/LoggerConfigBenchmark.java | 5 +- .../log4j/perf/jmh/LoggingDisabledBenchmark.java | 29 +- .../logging/log4j/perf/jmh/MDCFilterBenchmark.java | 1 - .../log4j/perf/jmh/MemoryHandlerJULBenchmark.java | 86 +- .../jmh/MemoryHandlerJULLocationBenchmark.java | 1 - .../perf/jmh/NamePatternConverterBenchmark.java | 17 +- .../logging/log4j/perf/jmh/NanotimeBenchmark.java | 7 +- .../logging/log4j/perf/jmh/OutputBenchmark.java | 4 +- .../perf/jmh/ParameterizedMessageBenchmark.java | 12 +- .../jmh/ParameterizedMessageInliningBenchmark.java | 35 +- .../log4j/perf/jmh/PatternLayoutBenchmark.java | 8 +- .../perf/jmh/PatternLayoutComparisonBenchmark.java | 21 +- .../log4j/perf/jmh/ReflectionBenchmark.java | 17 +- .../logging/log4j/perf/jmh/SimpleBenchmark.java | 10 +- .../perf/jmh/SortedArrayVsHashMapBenchmark.java | 9 +- .../logging/log4j/perf/jmh/StackWalkBenchmark.java | 22 +- .../perf/jmh/StringBuilderEscapeBenchmark.java | 1 - .../log4j/perf/jmh/StringEncodingBenchmark.java | 16 +- .../log4j/perf/jmh/TextEncoderHelperBenchmark.java | 113 +- .../log4j/perf/jmh/ThreadContextBenchmark.java | 22 +- .../ThreadLocalVsConcurrentHashMapBenchmark.java | 1 - .../log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java | 22 +- .../perf/jmh/ThreadsafeDateFormatBenchmark.java | 15 +- .../log4j/perf/jmh/TimeFormatBenchmark.java | 3 +- .../logging/log4j/perf/jmh/UnboxBenchmark.java | 1 - .../log4j/perf/jmh/UuidGeneratorBenchmark.java | 1 - .../logging/log4j/perf/jmh/VarargsBenchmark.java | 75 +- .../logging/log4j/perf/nogc/AbstractLogger.java | 1 - .../logging/log4j/perf/nogc/ClassicLogger.java | 8 +- .../logging/log4j/perf/nogc/DemoAppender.java | 1 - .../apache/logging/log4j/perf/nogc/NoGcLayout.java | 8 +- .../apache/logging/log4j/perf/nogc/NoGcLogger.java | 2 - .../logging/log4j/perf/nogc/NoGcMessage.java | 4 +- .../perf/nogc/NoGcMessagePatternConverter.java | 12 +- .../logging/log4j/perf/nogc/OpenHashStringMap.java | 52 +- .../log4j/perf/nogc/ParameterizedMessage.java | 38 +- .../org/apache/logging/log4j/perf/nogc/Test.java | 20 +- .../log4j/perf/util/BenchmarkMessageParams.java | 6 +- .../logging/log4j/perf/util/DemoAppender.java | 1 - .../logging/log4j/perf/util/NoOpJULHandler.java | 6 +- .../logging/log4j/perf/util/NoOpLog4jAppender.java | 5 +- .../log4j/perf/util/NoOpLogbackAppender.java | 3 +- .../logging/log4j/perf/util/StackDriver.java | 6 +- .../GarbageFreeOpenHashMapThreadContextMap.java | 10 +- .../log4j/plugin/processor/PluginProcessor.java | 61 +- .../AbstractPluginWithGenericBuilder.java | 3 +- .../log4j/plugins/test/validation/FakePlugin.java | 5 +- .../log4j/plugins/test/validation/HostAndPort.java | 9 +- .../PluginWithGenericSubclassFoo1Builder.java | 2 - .../plugins/test/validation/ValidatingPlugin.java | 1 - .../ValidatingPluginWithGenericBuilder.java | 4 +- .../ValidatingPluginWithTypedBuilder.java | 4 +- .../test/validation/di/AnotherSingletonBean.java | 3 +- .../log4j/plugins/test/validation/di/BaseBean.java | 3 +- .../log4j/plugins/test/validation/di/BetaBean.java | 3 +- .../test/validation/di/CustomQualifier.java | 4 +- .../plugins/test/validation/di/CustomScope.java | 4 +- .../plugins/test/validation/di/GammaBean.java | 3 +- .../plugins/test/validation/di/PrototypeBean.java | 3 +- .../plugins/test/validation/di/SingletonBean.java | 3 +- .../plugin/processor/PluginProcessorTest.java | 12 +- .../condition/OnMissingBindingConditionTest.java | 12 +- .../plugins/condition/OnPropertyConditionTest.java | 4 +- .../plugins/convert/TypeConverterRegistryTest.java | 30 +- .../di/CircularDependencyExceptionTest.java | 4 +- .../di/ConfigurableInstanceFactoryTest.java | 97 +- .../log4j/plugins/di/ConstructorInjectionTest.java | 9 +- .../logging/log4j/plugins/di/CustomScopeTest.java | 15 +- .../log4j/plugins/di/FieldInjectionTest.java | 7 +- .../log4j/plugins/di/InstanceFactoryTest.java | 5 +- .../apache/logging/log4j/plugins/di/KeyTest.java | 17 +- .../apache/logging/log4j/plugins/di/KeysTest.java | 20 +- .../log4j/plugins/di/MethodInjectionTest.java | 4 +- .../log4j/plugins/di/QualifierInjectionTest.java | 47 +- .../log4j/plugins/processor/PluginCacheTest.java | 8 +- .../log4j/plugins/util/AnnotationUtilTest.java | 79 +- .../apache/logging/log4j/plugins/Configurable.java | 2 - .../org/apache/logging/log4j/plugins/Factory.java | 3 +- .../apache/logging/log4j/plugins/FactoryType.java | 3 +- .../org/apache/logging/log4j/plugins/Inject.java | 3 +- .../org/apache/logging/log4j/plugins/Named.java | 3 +- .../apache/logging/log4j/plugins/Namespace.java | 9 +- .../org/apache/logging/log4j/plugins/Node.java | 7 +- .../org/apache/logging/log4j/plugins/Ordered.java | 2 +- .../org/apache/logging/log4j/plugins/Plugin.java | 2 - .../logging/log4j/plugins/PluginAliases.java | 1 - .../logging/log4j/plugins/PluginAttribute.java | 2 - .../log4j/plugins/PluginBuilderAttribute.java | 1 - .../logging/log4j/plugins/PluginElement.java | 1 - .../apache/logging/log4j/plugins/PluginValue.java | 1 - .../logging/log4j/plugins/QualifierType.java | 3 +- .../apache/logging/log4j/plugins/ScopeType.java | 3 +- .../apache/logging/log4j/plugins/Singleton.java | 5 +- .../logging/log4j/plugins/SingletonFactory.java | 5 +- .../logging/log4j/plugins/condition/Condition.java | 1 - .../log4j/plugins/condition/ConditionContext.java | 4 +- .../condition/ConditionalOnMissingBinding.java | 4 +- .../plugins/condition/ConditionalOnProperty.java | 2 +- .../condition/OnMissingBindingCondition.java | 1 - .../plugins/condition/OnPropertyCondition.java | 27 +- .../log4j/plugins/convert/TypeConverter.java | 8 +- .../plugins/convert/TypeConverterFactory.java | 22 +- .../log4j/plugins/convert/TypeConverters.java | 4 +- .../apache/logging/log4j/plugins/di/Binding.java | 1 - .../plugins/di/ConfigurableInstanceFactory.java | 4 +- .../org/apache/logging/log4j/plugins/di/DI.java | 7 +- .../log4j/plugins/di/DefaultInstanceFactory.java | 69 +- .../logging/log4j/plugins/di/InstanceFactory.java | 10 +- .../org/apache/logging/log4j/plugins/di/Key.java | 23 +- .../org/apache/logging/log4j/plugins/di/Keys.java | 29 +- .../resolver/AbstractAttributeFactoryResolver.java | 8 +- .../di/resolver/AbstractPluginFactoryResolver.java | 1 - .../GenericFactoryResolversPostProcessor.java | 3 +- .../di/resolver/OptionalFactoryResolver.java | 8 +- ...ginAnnotationFactoryResolversPostProcessor.java | 6 +- .../resolver/PluginAttributeFactoryResolver.java | 11 +- .../PluginBuilderAttributeFactoryResolver.java | 11 +- .../di/resolver/PluginElementFactoryResolver.java | 12 +- .../di/resolver/PluginListFactoryResolver.java | 4 +- .../PluginListSupplierFactoryResolver.java | 9 +- .../di/resolver/PluginMapFactoryResolver.java | 4 +- .../resolver/PluginMapSupplierFactoryResolver.java | 13 +- .../resolver/PluginNamespaceFactoryResolver.java | 4 +- .../di/resolver/PluginOptionalFactoryResolver.java | 10 +- .../PluginOptionalSupplierFactoryResolver.java | 12 +- .../di/resolver/PluginSetFactoryResolver.java | 4 +- .../resolver/PluginSetSupplierFactoryResolver.java | 9 +- .../di/resolver/PluginStreamFactoryResolver.java | 4 +- .../PluginStreamPluginTypeFactoryResolver.java | 1 - .../PluginStreamSupplierFactoryResolver.java | 9 +- .../di/resolver/PluginTypeFactoryResolver.java | 4 +- .../di/resolver/PluginValueFactoryResolver.java | 15 +- .../logging/log4j/plugins/di/resolver/Plugins.java | 16 +- .../di/resolver/SupplierFactoryResolver.java | 4 +- .../ConfigurableInstanceFactoryPostProcessor.java | 4 +- .../log4j/plugins/di/spi/DependencyChains.java | 1 - .../log4j/plugins/di/spi/FactoryResolver.java | 1 - .../di/spi/FactoryResolversPostProcessor.java | 1 - .../log4j/plugins/di/spi/InjectionPoint.java | 7 +- .../log4j/plugins/di/spi/ResolvableKey.java | 4 +- .../apache/logging/log4j/plugins/di/spi/Scope.java | 1 - .../log4j/plugins/di/spi/SingletonScope.java | 1 - .../log4j/plugins/internal/util/BeanUtils.java | 40 +- .../log4j/plugins/internal/util/BindingMap.java | 1 - .../plugins/internal/util/HierarchicalMap.java | 1 - .../logging/log4j/plugins/model/PluginCache.java | 3 +- .../logging/log4j/plugins/model/PluginEntry.java | 45 +- .../log4j/plugins/model/PluginNamespace.java | 2 - .../log4j/plugins/model/PluginRegistry.java | 33 +- .../logging/log4j/plugins/model/PluginService.java | 9 +- .../logging/log4j/plugins/model/PluginType.java | 21 +- .../log4j/plugins/name/CategoryNameProvider.java | 1 - .../plugins/name/NamedQualifierNameProvider.java | 4 +- .../log4j/plugins/name/PluginAliasesProvider.java | 1 - .../plugins/name/PluginAttributeNameProvider.java | 1 - .../name/PluginBuilderAttributeNameProvider.java | 1 - .../plugins/name/PluginElementNameProvider.java | 1 - .../log4j/plugins/name/PluginNameProvider.java | 1 - .../plugins/name/PluginValueNameProvider.java | 1 - .../logging/log4j/plugins/util/AnnotationUtil.java | 23 +- .../log4j/plugins/util/OrderedComparator.java | 1 - .../logging/log4j/plugins/util/TypeUtil.java | 32 +- .../validation/ConstraintValidationException.java | 5 +- .../plugins/validation/constraints/Required.java | 1 - .../validation/constraints/RequiredClass.java | 1 - .../validation/constraints/RequiredProperty.java | 1 - .../plugins/validation/constraints/ValidHost.java | 1 - .../plugins/validation/constraints/ValidPort.java | 1 - .../validators/RequiredPropertyValidator.java | 5 +- .../validation/validators/RequiredValidator.java | 1 - .../validation/validators/ValidHostValidator.java | 1 - .../logging/log4j/script/AbstractScript.java | 1 - .../apache/logging/log4j/script/ScriptFile.java | 24 +- .../logging/log4j/script/ScriptManagerImpl.java | 36 +- .../apache/logging/log4j/script/ScriptPlugin.java | 3 +- .../logging/log4j/script/ScriptPropertyKey.java | 6 +- .../org/apache/logging/log4j/script/ScriptRef.java | 7 +- .../apache/logging/log4j/script/ScriptsPlugin.java | 3 +- .../script/appender/ScriptAppenderSelector.java | 11 +- .../appender/rolling/action/ScriptCondition.java | 8 +- .../logging/log4j/script/filter/ScriptFilter.java | 23 +- .../log4j/script/layout/ScriptPatternSelector.java | 35 +- .../appender/ScriptAppenderSelectorTest.java | 11 +- .../RollingAppenderDeleteScriptFri13thTest.java | 14 +- .../rolling/RollingAppenderDeleteScriptTest.java | 10 +- .../rolling/action/ScriptConditionTest.java | 16 +- .../routing/DefaultRouteScriptAppenderTest.java | 19 +- .../appender/routing/RoutesScriptAppenderTest.java | 24 +- .../log4j/script/config/TestConfigurator.java | 56 +- .../script/config/arbiter/ScriptArbiterTest.java | 6 +- .../config/builder/ConfigurationAssemblerTest.java | 25 +- .../config/builder/ConfigurationBuilderTest.java | 97 +- .../config/builder/CustomConfigurationFactory.java | 35 +- .../script/filter/AbstractScriptFilterTest.java | 9 +- .../filter/ScriptFileFilterPropertiesTest.java | 3 +- .../log4j/script/filter/ScriptFileFilterTest.java | 3 +- .../log4j/script/filter/ScriptFilterTest.java | 3 +- .../log4j/script/filter/ScriptRefFilterTest.java | 3 +- .../log4j/script/layout/PatternSelectorTest.java | 39 +- .../apache/logging/slf4j/EventDataConverter.java | 9 +- .../java/org/apache/logging/slf4j/Log4jLogger.java | 28 +- .../apache/logging/slf4j/Log4jLoggerFactory.java | 5 +- .../org/apache/logging/slf4j/Log4jMDCAdapter.java | 1 - .../java/org/apache/logging/slf4j/Log4jMarker.java | 3 +- .../apache/logging/slf4j/Log4jMarkerFactory.java | 7 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 3 +- .../main/java/org/slf4j/impl/StaticMDCBinder.java | 3 +- .../logging/other/pkg/LoggerContextAnchorTest.java | 8 +- .../logging/slf4j/CallerInformationTest.java | 5 +- .../org/apache/logging/slf4j/CustomFlatMarker.java | 1 - .../org/apache/logging/slf4j/Log4j1222Test.java | 14 +- .../logging/slf4j/Log4j2_1482_Slf4jTest.java | 1 - .../org/apache/logging/slf4j/Log4jMarkerTest.java | 1 - .../apache/logging/slf4j/LoggerContextTest.java | 5 +- .../java/org/apache/logging/slf4j/LoggerTest.java | 37 +- .../java/org/apache/logging/slf4j/MarkerTest.java | 34 +- .../org/apache/logging/slf4j/OptionalTest.java | 7 +- .../org/apache/logging/slf4j/OverflowTest.java | 5 +- .../apache/logging/slf4j/Log4jEventBuilder.java | 5 +- .../java/org/apache/logging/slf4j/Log4jLogger.java | 29 +- .../apache/logging/slf4j/Log4jLoggerFactory.java | 5 +- .../org/apache/logging/slf4j/Log4jMDCAdapter.java | 4 +- .../java/org/apache/logging/slf4j/Log4jMarker.java | 3 +- .../apache/logging/slf4j/Log4jMarkerFactory.java | 7 +- .../apache/logging/slf4j/SLF4JServiceProvider.java | 2 - .../logging/other/pkg/LoggerContextAnchorTest.java | 8 +- .../logging/slf4j/CallerInformationTest.java | 7 +- .../org/apache/logging/slf4j/CustomFlatMarker.java | 1 - .../org/apache/logging/slf4j/Log4j1222Test.java | 14 +- .../logging/slf4j/Log4j2_1482_Slf4jTest.java | 1 - .../logging/slf4j/Log4jEventBuilderTest.java | 9 +- .../apache/logging/slf4j/Log4jMDCAdapterTest.java | 6 +- .../org/apache/logging/slf4j/Log4jMarkerTest.java | 1 - .../apache/logging/slf4j/LoggerContextTest.java | 5 +- .../java/org/apache/logging/slf4j/LoggerTest.java | 38 +- .../java/org/apache/logging/slf4j/MarkerTest.java | 34 +- .../org/apache/logging/slf4j/OverflowTest.java | 5 +- .../spring/boot/Log4j2SpringBootLoggingSystem.java | 37 +- .../logging/log4j/spring/boot/SpringLookup.java | 6 +- .../log4j/spring/boot/SpringProfileArbiter.java | 5 +- .../log4j/spring/boot/SpringPropertySource.java | 2 +- .../spring/boot/Log4j2SpringBootInitTest.java | 10 +- .../boot/Log4j2SpringBootLoggingSystemTest.java | 20 +- .../log4j/spring/boot/SpringLookupTest.java | 12 +- .../log4j/spring/boot/SpringProfileTest.java | 8 +- .../cloud/config/client/WatchEventManager.java | 6 +- .../config/client/Log4j2EventListenerTest.java | 26 +- .../cloud/config/client/SpringConfiguration.java | 3 +- .../org/apache/logging/log4j/tojul/JULLogger.java | 147 +- .../logging/log4j/tojul/JULLoggerContext.java | 5 +- .../log4j/tojul/JULLoggerContextFactory.java | 17 +- .../logging/log4j/tojul/LazyLog4jLogRecord.java | 1 - .../logging/log4j/tojul/test/LoggerTest.java | 41 +- .../org/apache/logging/slf4j/MDCContextMap.java | 3 +- .../org/apache/logging/slf4j/SLF4JLogBuilder.java | 32 +- .../java/org/apache/logging/slf4j/SLF4JLogger.java | 150 +- .../apache/logging/slf4j/SLF4JLoggerContext.java | 4 +- .../logging/slf4j/SLF4JLoggerContextFactory.java | 17 +- .../logging/slf4j/CallerInformationTest.java | 5 +- .../apache/logging/slf4j/Log4j2Jira1688Test.java | 2 - .../org/apache/logging/slf4j/LogBuilderTest.java | 22 +- .../java/org/apache/logging/slf4j/LoggerTest.java | 47 +- .../java/org/apache/logging/slf4j/TestUtil.java | 6 +- pom.xml | 2 +- 2091 files changed, 30784 insertions(+), 23596 deletions(-) diff --cc log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java index 5952131c38,d7ba32afb2..47cf5c3f9c --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java @@@ -101,10 -99,16 +98,12 @@@ public class PropertiesUtilOrderTest assertTrue(contextProperties.hasProperty(TestProperty.CONFIG_TEST1)); // Context environment properties should override system-wide environment definition. assertEquals("500", contextProperties.getStringProperty(LoggingSystemProperty.STATUS_MAX_ENTRIES)); - // System property value should be recognized. - assertEquals("false", util.getStringProperty(TestProperty.JNDI_JMS, "true")); // Context system property should override Context property from file. - assertEquals("org.apache.CustomMergeStrategy", contextProperties.getStringProperty(TestProperty.CONFIG_MERGE_STRATEGY)); + assertEquals( + "org.apache.CustomMergeStrategy", + contextProperties.getStringProperty(TestProperty.CONFIG_MERGE_STRATEGY)); // Recognize system-wide environment variable. assertEquals("200", util.getStringProperty(LoggingSystemProperty.STATUS_MAX_ENTRIES)); - // Context properties in file should override system-wide system property. - assertEquals("true", contextProperties.getStringProperty(TestProperty.JNDI_JMS, "false")); // System-wide system property should be used when no other value is available. assertEquals("true", contextProperties.getStringProperty(LoggingSystemProperty.IS_WEBAPP)); // Context property in file should override system-wide property in file. diff --cc log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/categories/Appenders.java index f727278436,665eb6a691..c9b83868c8 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/categories/Appenders.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/categories/Appenders.java @@@ -21,10 -21,22 +21,16 @@@ package org.apache.logging.log4j.core.t */ public interface Appenders { interface AsyncConversant {} + interface AsyncJcTools {} + interface Cassandra {} + interface CouchDb {} + - interface Jms {} - - interface Jpa {} - interface Kafka {} + interface MongoDb {} + - interface Smtp {} - interface ZeroMq {} } diff --cc log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java index c34035c93b,c6b5f32eab..61da437b6b --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java @@@ -120,16 -120,16 +120,16 @@@ public class Interpolator extends Abstr break; case LOOKUP_KEY_JVMRUNARGS: // java.lang.VerifyError: org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup - LOGGER.warn( - "JMX runtime input lookup class is not available because this JRE does not support JMX. " + - "JMX lookups will not be available, continuing configuration. Ignoring " + t); + LOGGER.warn("JMX runtime input lookup class is not available because this JRE does not support JMX. " + + "JMX lookups will not be available, continuing configuration. Ignoring " + t); break; case LOOKUP_KEY_WEB: - LOGGER.info("Log4j appears to be running in a Servlet environment, but there's no `log4j-jakarta-web` module " + - "available. If you want better web container support, please add the `log4j-jakarta-web` JAR to your " + - "web archive or server lib directory."); - LOGGER.info("Log4j appears to be running in a Servlet environment, but there's no log4j-web module " - + "available. If you want better web container support, please add the log4j-web JAR to your " ++ LOGGER.info("Log4j appears to be running in a Servlet environment, but there's no `log4j-jakarta-web` module " ++ + "available. If you want better web container support, please add the `log4j-jakarta-web` JAR to your " + + "web archive or server lib directory."); break; - case LOOKUP_KEY_DOCKER: case LOOKUP_KEY_SPRING: + case LOOKUP_KEY_DOCKER: + case LOOKUP_KEY_SPRING: break; case LOOKUP_KEY_KUBERNETES: if (t instanceof NoClassDefFoundError) {
