This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch feature/log4j-sdk
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 68e22a7428 Revert changes to methods used by Spring Boot
add 1bbcf8b156 Replace `PropertiesUtil` with `PropertyEnvironment`
add 4ed5c1871f Fix Javadoc
add 39642b94a7 Add support for `Locale`, `TimeZone` and `ZoneId`
add d74dd97d56 Replace `JsonTemplateLayoutDefaults` with properties class
add d25aaf8bb3 Apply suggestions from review #2396
add d61ad26095 Rename `Resources` to `Log4jStaticResources`
add de4261030b Refactor property names
add 5ac1629aaa Remove redundant `e.getMessage()` in logs/exceptions
add 397ef10263 Validate properties in constructor
No new revisions were added by this update.
Summary of changes:
.../apache/log4j/config/Log4j1Configuration.java | 4 +-
.../config/PropertiesConfigurationFactory.java | 21 +-
.../org/apache/log4j/helpers/OptionConverter.java | 2 +
.../apache/log4j/xml/XmlConfigurationFactory.java | 21 +-
.../org/apache/log4j/config/AutoConfigTest.java | 9 +-
.../log4j/config/MapRewriteAppenderTest.java | 5 +-
.../config/PropertiesConfigurationFactoryTest.java | 6 +-
.../PropertiesRollingWithPropertiesTest.java | 8 +-
.../apache/log4j/config/RewriteAppenderTest.java | 8 +-
.../apache/log4j/config/SyslogAppenderTest.java | 6 +-
.../log4j/config/XmlConfigurationFactoryTest.java | 6 +-
.../log4j/config/XmlRollingWithPropertiesTest.java | 8 +-
.../log4j/test/junit/InitializesThreadContext.java | 2 +-
.../log4j/test/junit/Log4jStaticResources.java | 55 +++
.../apache/logging/log4j/test/junit/Resources.java | 30 --
.../log4j/test/junit/TestPropertySource.java | 10 +-
.../log4j/test/junit/UsingThreadContextMap.java | 2 +-
.../apache/logging/log4j/AbstractLoggerTest.java | 4 +-
.../java/org/apache/logging/log4j/LoggerTest.java | 4 +-
.../java/org/apache/logging/log4j/MarkerTest.java | 4 +-
.../apache/logging/log4j/spi/LoggerContext.java | 11 -
.../org/apache/logging/log4j/spi/Provider.java | 21 +
.../apache/logging/log4j/util/PropertiesUtil.java | 30 ++
.../apache/logging/log4j/util/PropertySource.java | 84 ++++
.../async/logger/AsyncLoggerConfigDelegate.java | 45 --
.../async/logger/AsyncLoggerConfigDisruptor.java | 50 ++-
...java => AsyncLoggerConfigExceptionHandler.java} | 8 +-
.../log4j/async/logger/AsyncLoggerContext.java | 4 +-
.../log4j/async/logger/AsyncLoggerDisruptor.java | 41 +-
...ndler.java => AsyncLoggerExceptionHandler.java} | 6 +-
.../log4j/async/logger/AsyncLoggerProperties.java | 60 +++
.../AbstractAsyncExceptionHandler.java | 4 +-
.../AsyncLoggerConfigDefaultExceptionHandler.java | 8 +-
.../logger/internal/AsyncLoggerDefaultBundle.java | 101 +++++
.../AsyncLoggerDefaultExceptionHandler.java | 8 +-
...> AsyncLoggerInstanceFactoryPostProcessor.java} | 4 +-
.../internal/DefaultAsyncWaitStrategyFactory.java | 72 ++--
.../log4j/async/logger/internal/DefaultBundle.java | 67 ---
.../log4j/async/logger/internal/DisruptorUtil.java | 114 -----
.../internal/TimeoutBlockingWaitStrategy.java | 1 +
.../logger/AsyncLoggerConfigErrorOnFormat.java | 8 +-
.../AsyncLoggerEventTranslationExceptionTest.java | 11 +-
.../AsyncLoggerTestArgumentFreedOnErrorTest.java | 8 +-
.../log4j/async/logger/AsyncThreadContextTest.java | 17 +-
.../async/logger/QueueFullAsyncLogger2Test.java | 4 +-
.../async/logger/QueueFullAsyncLogger3Test.java | 18 +-
.../logger/QueueFullAsyncLoggerConfig2Test.java | 4 +-
...lAsyncLoggerConfigLoggingFromToString2Test.java | 4 +-
...llAsyncLoggerConfigLoggingFromToStringTest.java | 6 +-
.../logger/QueueFullAsyncLoggerConfigTest.java | 4 +-
...ueueFullAsyncLoggerLoggingFromToStringTest.java | 4 +-
.../async/logger/QueueFullAsyncLoggerTest.java | 4 +-
.../log4j/core/test/BasicConfigurationFactory.java | 4 +-
.../logging/log4j/core/test/TestConstants.java | 127 ++++++
.../log4j/core/test/junit/Log4jExtension.java | 12 +-
.../log4j/core/EventParameterMemoryLeakTest.java | 8 +-
.../apache/logging/log4j/core/Log4j1222Test.java | 6 +-
.../log4j/core/appender/ConsoleAppenderTest.java | 6 +-
.../async/AsyncAppenderConfigTest_LOG4J2_2032.java | 15 +-
.../async/AsyncQueueFullPolicyFactoryTest.java | 96 ++---
.../logging/log4j/core/config/AdvertiserTest.java | 6 +-
.../config/CompositeConfigurationMissingTest.java | 8 +-
.../log4j/core/config/ReliabilityStrategyTest.java | 8 +-
.../log4j/core/config/TestConfigurator.java | 6 +-
.../log4j/core/config/TestConfiguratorError.java | 4 +-
.../core/config/xml/XmlConfigurationPropsTest.java | 8 +-
.../filter/MutableThreadContextMapFilterTest.java | 11 +-
...taFactoryPropertySetMissingConstructorTest.java | 7 +-
.../impl/ContextDataFactoryPropertySetTest.java | 7 +-
.../logging/log4j/core/impl/TestPropertyKeys.java} | 6 +-
.../log4j/core/net/UrlConnectionFactoryTest.java | 18 +-
.../core/net/ssl/FilePasswordProviderTest.java | 11 +-
.../core/net/ssl/SslConfigurationFactoryTest.java | 44 +-
.../log4j/core/pattern/StyleConverterTest.java | 6 +-
.../log4j/core/util/ContextDataProviderTest.java | 4 +-
.../util/NamedLoggerContextPropertiesTest.java | 6 +-
.../logging/log4j/core/util/WatchHttpTest.java | 4 +-
.../MutableThreadContextMapFilterTest.xml | 3 +-
.../apache/logging/log4j/core/LoggerContext.java | 34 +-
.../core/annotation/ConditionalOnPropertyKey.java | 38 --
.../core/annotation/OnPropertyKeyCondition.java | 51 ---
.../log4j/core/annotation/package-info.java | 22 -
.../logging/log4j/core/appender/AsyncAppender.java | 4 +-
.../log4j/core/appender/ConsoleAppender.java | 39 +-
.../core/async/AsyncQueueFullPolicyFactory.java | 70 ++--
.../log4j/core/config/AbstractConfiguration.java | 12 +-
.../AwaitUnconditionallyReliabilityStrategy.java | 12 +-
.../logging/log4j/core/config/Configuration.java | 6 +-
.../log4j/core/config/ConfigurationFactory.java | 27 +-
.../log4j/core/config/ConfigurationSource.java | 12 +-
.../log4j/core/config/DefaultConfiguration.java | 4 +-
.../core/config/DefaultConfigurationFactory.java | 40 +-
.../logging/log4j/core/config/HttpWatcher.java | 6 +-
.../log4j/core/config/NullConfiguration.java | 4 +-
.../core/config/ReliabilityStrategyFactory.java | 9 +-
.../config/builder/impl/BuiltConfiguration.java | 4 +-
.../core/filter/MutableThreadContextMapFilter.java | 6 +-
.../log4j/core/impl/ContextDataFactory.java | 23 +-
.../core/impl/ContextDataInjectorFactory.java | 13 +-
.../{DefaultBundle.java => CoreDefaultBundle.java} | 14 +-
.../impl/CoreInstanceFactoryPostProcessor.java | 97 +++++
.../logging/log4j/core/impl/CoreProperties.java | 208 ++++++++++
.../log4j/core/impl/Log4jContextFactory.java | 10 +-
.../impl/Log4jInstanceFactoryPostProcessor.java | 37 --
.../logging/log4j/core/impl/Log4jPropertyKey.java | 457 ---------------------
.../logging/log4j/core/impl/Log4jProvider.java | 19 +
.../log4j/core/impl/SystemPropertyBundle.java | 117 ------
.../log4j/core/layout/AbstractStringLayout.java | 11 +-
.../logging/log4j/core/layout/PatternLayout.java | 16 +-
.../log4j/core/net/UrlConnectionFactory.java | 15 +-
.../log4j/core/net/ssl/FilePasswordProvider.java | 9 +-
.../log4j/core/net/ssl/KeyStoreConfiguration.java | 15 +-
.../core/net/ssl/SslConfigurationFactory.java | 85 ++--
.../core/net/ssl/TrustStoreConfiguration.java | 17 +-
.../logging/log4j/core/time/ClockFactory.java | 12 +-
.../log4j/core/time/internal/SystemClock.java | 11 +-
.../log4j/core/util/AuthorizationProvider.java | 18 +-
.../core/util/BasicAuthorizationProvider.java | 30 +-
.../apache/logging/log4j/core/util/Constants.java | 77 +---
.../org/apache/logging/log4j/core/util/Loader.java | 12 +-
.../logging/log4j/core/util/OptionConverter.java | 4 +-
.../apache/logging/log4j/core/util/UuidUtil.java | 11 +-
.../core/util/internal/HttpInputStreamUtil.java | 2 +-
.../csv/layout/CsvParameterLayoutAllAsyncTest.java | 15 +-
.../apache/logging/log4j/docker/DockerLookup.java | 5 +-
.../log4j/flume/appender/FlumeEmbeddedManager.java | 4 +-
.../flume/appender/FlumeEmbeddedAgentTest.java | 6 +-
.../flume/appender/FlumeEmbeddedAppenderTest.java | 6 +-
.../appender/FlumePersistentAppenderTest.java | 6 +-
.../log4j/flume/appender/FlumePersistentPerf.java | 6 +-
log4j-gc-test/pom.xml | 5 +
.../log4j/gctests/GcFreeAsyncLoggingTest.java | 16 +-
.../log4j/gctests/GcFreeLoggingTestUtil.java | 23 +-
.../gctests/GcFreeMixedSyncAsyncLoggingTest.java | 4 +-
.../gctests/GcFreeSynchronousLoggingTest.java | 4 +-
.../gctests/JsonTemplateLayoutGcFreeTest.java | 4 +-
.../jctools/JCToolsRecyclerFactoryProvider.java | 3 +-
.../jdbc/appender/DataSourceConnectionSource.java | 3 +-
.../log4j/jdbc/appender/internal/JndiUtil.java | 4 +
.../AbstractJdbcAppenderDataSourceTest.java | 3 +-
.../appender/DataSourceConnectionSourceTest.java | 3 +-
.../JdbcAppenderMapMessageDataSourceTest.java | 3 +-
.../routing/RoutingAppenderWithJndiTest.java | 3 +-
.../log4j/jndi/lookup/InterpolatorTest.java | 5 +-
.../logging/log4j/jndi/lookup/JndiLookupTest.java | 3 +-
.../jndi/lookup/JndiRestrictedLookupTest.java | 3 +-
.../org/apache/logging/log4j/jndi/JndiManager.java | 11 +-
.../apache/logging/log4j/jndi/JndiProperties.java | 12 +-
.../logging/log4j/jndi/lookup/JndiLookup.java | 5 +-
.../log4j/jndi/selector/JndiContextSelector.java | 2 +-
log4j-jul/pom.xml | 2 +-
.../apache/logging/log4j/jul/JulProperties.java | 16 +-
.../apache/logging/log4j/jul/JulPropertyKey.java | 72 ----
.../apache/logging/log4j/jul/LevelConverter.java | 2 +-
.../apache/logging/log4j/jul/LevelTranslator.java | 12 +-
.../org/apache/logging/log4j/jul/LogManager.java | 15 +-
.../logging/log4j/jul/test/ApiLoggerTest.java | 9 +-
.../log4j/jul/test/AsyncLoggerThreadsTest.java | 12 +-
.../logging/log4j/jul/test/JulTestProperties.java | 9 +-
.../logging/log4j/kit/env/Log4jProperty.java | 10 +
.../PropertiesUtilPropertyEnvironment.java | 4 +-
.../kit/env/support/BasicPropertyEnvironment.java | 72 +++-
.../logging/log4j/kit/recycler/RecyclerKeys.java | 25 +-
.../PropertiesUtilPropertyEnvironmentTest.java | 2 +-
.../env/support/BasicPropertyEnvironmentTest.java | 69 +++-
.../kubernetes/KubernetesClientProperties.java | 71 ++--
.../JsonTemplateLayoutAdditionalFieldTest.java | 4 +-
.../template/json/JsonTemplateLayoutTest.java | 5 +-
.../log4j/layout/template/json/TestHelpers.java | 3 +
.../resolver/StackTraceStringResolverTest.java | 6 +-
.../layout/template/json/JsonTemplateLayout.java | 85 +++-
.../template/json/JsonTemplateLayoutDefaults.java | 114 -----
.../json/JsonTemplateLayoutProperties.java | 66 +++
.../json/resolver/CaseConverterResolver.java | 4 +-
.../json/resolver/EventResolverContext.java | 6 +
.../template/json/resolver/ExceptionResolver.java | 9 +-
.../resolver/StackTraceElementResolverContext.java | 17 +
.../json/resolver/TemplateResolverConfig.java | 13 +-
.../json/resolver/TemplateResolverContext.java | 3 +
.../template/json/resolver/TemplateResolvers.java | 2 +-
.../template/json/resolver/TimestampResolver.java | 12 +-
log4j-perf-test/pom.xml | 4 +
.../log4j/perf/jmh/AsyncLoggersBenchmark.java | 10 +-
.../perf/jmh/AsyncLoggersLocationBenchmark.java | 2 +-
.../jmh/ConcurrentAsyncLoggerToFileBenchmark.java | 22 +-
.../perf/jmh/FileAppenderThrowableBenchmark.java | 15 +-
.../log4j/perf/jmh/JdbcAppenderBenchmark.java | 6 +-
.../log4j/perf/jmh/ThreadContextBenchmark.java | 6 +-
.../GarbageFreeOpenHashMapThreadContextMap.java | 11 +-
.../plugins/condition/OnPropertyConditionTest.java | 8 +-
log4j-plugins/pom.xml | 4 +
.../log4j/plugins/condition/ConditionContext.java | 5 +-
.../plugins/di/ConfigurableInstanceFactory.java | 2 +-
.../log4j/plugins/di/DefaultInstanceFactory.java | 5 +-
.../validators/RequiredPropertyValidator.java | 4 +-
.../logging/log4j/script/ScriptManagerImpl.java | 7 +-
.../logging/log4j/script/ScriptProperties.java | 11 +-
.../logging/log4j/script/ScriptPropertyKey.java | 80 ----
.../script/factory/ScriptManagerFactoryImpl.java | 9 +-
.../apache/logging/log4j/script/TestConstants.java | 9 +-
.../appender/ScriptAppenderSelectorTest.java | 6 +-
.../RollingAppenderDeleteScriptFri13thTest.java | 5 +-
.../rolling/RollingAppenderDeleteScriptTest.java | 5 +-
.../rolling/action/ScriptConditionTest.java | 6 +-
.../routing/DefaultRouteScriptAppenderTest.java | 5 +-
.../appender/routing/RoutesScriptAppenderTest.java | 5 +-
.../log4j/script/config/TestConfigurator.java | 6 +-
.../script/config/arbiter/ScriptArbiterTest.java | 6 +-
.../config/builder/ConfigurationAssemblerTest.java | 17 +-
.../filter/ScriptFileFilterPropertiesTest.java | 6 +-
.../log4j/script/filter/ScriptFileFilterTest.java | 6 +-
.../log4j/script/filter/ScriptFilterTest.java | 6 +-
.../log4j/script/filter/ScriptRefFilterTest.java | 6 +-
.../log4j/script/layout/PatternSelectorTest.java | 6 +-
214 files changed, 2162 insertions(+), 2294 deletions(-)
create mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Log4jStaticResources.java
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Resources.java
delete mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLoggerConfigDelegate.java
copy
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{AsyncLoggerConfigDefaultExceptionHandler.java
=> AsyncLoggerConfigExceptionHandler.java} (75%)
copy
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{AsyncLoggerDefaultExceptionHandler.java
=> AsyncLoggerExceptionHandler.java} (78%)
create mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLoggerProperties.java
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{ =>
internal}/AbstractAsyncExceptionHandler.java (95%)
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{ =>
internal}/AsyncLoggerConfigDefaultExceptionHandler.java (77%)
create mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/AsyncLoggerDefaultBundle.java
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{ =>
internal}/AsyncLoggerDefaultExceptionHandler.java (77%)
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/{InstanceFactoryPostProcessor.java
=> AsyncLoggerInstanceFactoryPostProcessor.java} (89%)
delete mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/DefaultBundle.java
delete mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/DisruptorUtil.java
create mode 100644
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/TestConstants.java
copy
log4j-core-test/src/{main/java/org/apache/logging/log4j/core/test/categories/PerformanceTests.java
=> test/java/org/apache/logging/log4j/core/impl/TestPropertyKeys.java} (82%)
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/ConditionalOnPropertyKey.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/OnPropertyKeyCondition.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/package-info.java
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/{DefaultBundle.java
=> CoreDefaultBundle.java} (92%)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/CoreInstanceFactoryPostProcessor.java
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/CoreProperties.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jInstanceFactoryPostProcessor.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jPropertyKey.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/SystemPropertyBundle.java
copy log4j-1.2-api/src/main/java/org/apache/log4j/spi/OptionHandler.java =>
log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/JndiProperties.java (75%)
copy
log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/LayoutBuilder.java
=> log4j-jul/src/main/java/org/apache/logging/log4j/jul/JulProperties.java (70%)
delete mode 100644
log4j-jul/src/main/java/org/apache/logging/log4j/jul/JulPropertyKey.java
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/net/Advertiser.java =>
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/JulTestProperties.java
(80%)
copy log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessage.java
=>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/RecyclerKeys.java
(62%)
delete mode 100644
log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutDefaults.java
create mode 100644
log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutProperties.java
copy
log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceResolver.java
=>
log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptProperties.java
(77%)
delete mode 100644
log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptPropertyKey.java
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/net/Advertiser.java =>
log4j-script/src/test/java/org/apache/logging/log4j/script/TestConstants.java
(80%)
