This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 2322f197df No need to nest.
new 5c9dc350ae Add minimal checkstyle check
new 65a31eadf9 Fix recent formatting problems
new bfff3d7a73 Fix CI configuration
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build.yml | 4 +
.github/workflows/codeql-analysis.yml | 2 +
.github/workflows/log4j-kafka-test.yml | 2 +
.../src/main/java/org/apache/log4j/Category.java | 20 +-
.../src/main/java/org/apache/log4j/Hierarchy.java | 29 +-
.../org/apache/log4j/PropertyConfigurator.java | 28 +-
.../org/apache/log4j/builders/BuilderManager.java | 10 +-
.../log4j/config/PropertiesConfiguration.java | 26 +-
.../org/apache/log4j/helpers/OptionConverter.java | 43 +-
.../org/apache/log4j/xml/Log4jEntityResolver.java | 17 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 9 +-
.../test/java/org/apache/log4j/CategoryTest.java | 27 +-
.../apache/log4j/config/XmlConfigurationTest.java | 16 +-
.../apache/logging/log4j/test/TestProperties.java | 1 -
.../log4j/test/ThreadContextUtilityClass.java | 10 +-
.../logging/log4j/test/junit/SetTestProperty.java | 9 +-
.../log4j/test/junit/TestPropertySource.java | 1 -
.../logging/log4j/NoopThreadContextTest.java | 4 +-
.../log4j/message/FormattedMessageTest.java | 14 +-
.../log4j/message/MessageFormatMessageTest.java | 5 +-
.../log4j/spi/DefaultThreadContextMapTest.java | 10 +-
.../log4j/status/StatusConsoleListenerTest.java | 6 +-
.../log4j/test/junit/TestPropertySourceTest.java | 2 +-
.../org/apache/logging/log4j/util/CharsTest.java | 4 +-
.../log4j/util/EnvironmentPropertySourceTest.java | 6 +-
.../log4j/util/PropertiesUtilOrderTest.java | 10 +-
.../logging/log4j/util/PropertiesUtilTest.java | 13 +-
.../logging/log4j/util/ProviderUtilTest.java | 8 +-
.../logging/log4j/util/ServiceLoaderUtilTest.java | 8 +-
.../log4j/util/SortedArrayStringMapTest.java | 4 +-
.../logging/log4j/util/StackLocatorUtilTest.java | 6 +-
log4j-api/src/main/java/module-info.java | 2 +-
.../java/org/apache/logging/log4j/LogManager.java | 4 +-
.../org/apache/logging/log4j/MarkerManager.java | 6 +-
.../org/apache/logging/log4j/ThreadContext.java | 17 +-
.../logging/log4j/internal/DefaultLogBuilder.java | 2 +-
.../apache/logging/log4j/message/MapMessage.java | 18 +-
.../log4j/message/MapMessageJsonFormatter.java | 10 +-
.../logging/log4j/message/ObjectMessage.java | 6 +-
.../logging/log4j/message/ParameterFormatter.java | 4 +-
.../log4j/message/ParameterizedMessage.java | 6 +-
.../logging/log4j/message/StructuredDataId.java | 624 ++++++++++-----------
.../logging/log4j/message/ThreadDumpMessage.java | 10 +-
.../apache/logging/log4j/simple/SimpleLogger.java | 12 +-
.../logging/log4j/simple/SimpleLoggerContext.java | 12 +-
.../apache/logging/log4j/spi/AbstractLogger.java | 30 +-
.../CopyOnWriteSortedArrayThreadContextMap.java | 10 +-
.../logging/log4j/spi/DefaultThreadContextMap.java | 12 +-
.../log4j/spi/DefaultThreadContextStack.java | 10 +-
.../GarbageFreeSortedArrayThreadContextMap.java | 10 +-
.../apache/logging/log4j/spi/LoggingSystem.java | 23 +-
.../apache/logging/log4j/spi/ThreadContextMap.java | 4 +-
.../logging/log4j/status/SimpleLoggerFactory.java | 4 +-
.../log4j/status/StatusConsoleListener.java | 8 +-
.../apache/logging/log4j/status/StatusLogger.java | 28 +-
.../org/apache/logging/log4j/util/Activator.java | 14 +-
.../java/org/apache/logging/log4j/util/Cast.java | 1 -
.../apache/logging/log4j/util/EnglishEnums.java | 2 +-
.../org/apache/logging/log4j/util/InternalApi.java | 1 -
.../java/org/apache/logging/log4j/util/Lazy.java | 1 -
.../org/apache/logging/log4j/util/LazyUtil.java | 1 -
.../org/apache/logging/log4j/util/LoaderUtil.java | 2 +-
.../apache/logging/log4j/util/LowLevelLogUtil.java | 5 +-
.../apache/logging/log4j/util/MessageSupplier.java | 1 -
.../logging/log4j/util/PropertyEnvironment.java | 1 -
.../logging/log4j/util/ServiceLoaderUtil.java | 9 +-
.../apache/logging/log4j/util/ServiceRegistry.java | 1 -
.../org/apache/logging/log4j/util/Strings.java | 12 +-
.../org/apache/logging/log4j/util/Supplier.java | 1 -
.../log4j/util/SystemPropertiesPropertySource.java | 134 ++---
.../org/apache/logging/log4j/util/TimeUnit.java | 1 -
.../appender/SocketAppenderSocketOptionsTest.java | 6 +-
.../log4j/core/test/junit/AllocatePorts.java | 5 +-
.../core/test/junit/ConfigurationResolver.java | 1 -
.../core/test/junit/ContextSelectorCallback.java | 1 -
.../core/test/junit/LoggerContextResolver.java | 9 +-
.../core/test/junit/PortAllocatorCallback.java | 5 +-
.../logging/log4j/core/test/util/Profiler.java | 2 +-
.../rolling/RollingAppenderOnStartupTest.java | 16 +-
.../async/AsyncQueueFullPolicyFactoryTest.java | 4 +-
.../log4j/core/async/AsyncThreadContextTest.java | 14 +-
...WaitStrategyFactoryConfigGlobalLoggersTest.java | 3 +-
.../validators/RequiredValidatorTest.java | 4 +-
.../validators/ValidHostValidatorTest.java | 4 +-
.../validators/ValidPortValidatorTest.java | 4 +-
.../ValidatingPluginWithFailoverTest.java | 4 +-
.../ValidatingPluginWithGenericBuilderTest.java | 4 +-
...ngPluginWithGenericSubclassFoo1BuilderTest.java | 4 +-
.../ValidatingPluginWithTypedBuilderTest.java | 4 +-
.../core/impl/ThreadContextDataInjectorTest.java | 6 +-
.../logging/log4j/core/layout/GelfLayoutTest.java | 17 +-
.../logging/log4j/core/layout/HtmlLayoutTest.java | 24 +-
.../log4j/core/layout/PatternLayoutTest.java | 8 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 14 +-
.../log4j/core/layout/SyslogLayoutTest.java | 6 +-
.../core/pattern/DatePatternConverterTest.java | 16 +-
.../log4j/core/time/InstantFormatterTest.java | 6 +-
.../java/org/apache/logging/log4j/core/Core.java | 1 -
.../apache/logging/log4j/core/LoggerContext.java | 32 +-
.../log4j/core/appender/ConsoleAppender.java | 24 +-
.../log4j/core/appender/SyslogAppender.java | 8 +-
.../logging/log4j/core/async/AsyncLogger.java | 9 +-
.../core/async/AsyncQueueFullPolicyFactory.java | 2 +-
.../async/DefaultAsyncWaitStrategyFactory.java | 13 +-
.../log4j/core/config/AbstractConfiguration.java | 42 +-
.../logging/log4j/core/config/AppenderControl.java | 4 +-
.../log4j/core/config/AppenderControlArraySet.java | 6 +-
.../AwaitUnconditionallyReliabilityStrategy.java | 7 +-
.../log4j/core/config/ConfigurationFactory.java | 6 +-
.../logging/log4j/core/config/Configurator.java | 12 +-
.../core/config/DefaultConfigurationFactory.java | 21 +-
.../logging/log4j/core/config/LoggerConfig.java | 12 +-
.../config/builder/api/ConfigurationBuilder.java | 8 +-
.../config/builder/impl/BuiltConfiguration.java | 10 +-
.../config/composite/DefaultMergeStrategy.java | 10 +-
.../log4j/core/config/jason/JsonConfiguration.java | 19 +-
.../log4j/core/config/json/JsonConfiguration.java | 23 +-
.../plugins/visit/PluginAttributeVisitor.java | 17 +-
.../plugins/visit/PluginConfigurationVisitor.java | 7 +-
.../plugins/visit/PluginLoggerContextVisitor.java | 9 +-
.../properties/PropertiesConfigurationBuilder.java | 13 +-
.../log4j/core/config/xml/XmlConfiguration.java | 32 +-
.../log4j/core/filter/DynamicThresholdFilter.java | 14 +-
.../logging/log4j/core/filter/MapFilter.java | 14 +-
.../log4j/core/impl/ContextDataFactory.java | 10 +-
.../core/impl/ContextDataInjectorFactory.java | 2 +-
.../logging/log4j/core/impl/DefaultBundle.java | 9 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 16 +-
.../logging/log4j/core/impl/MutableLogEvent.java | 12 +-
.../log4j/core/layout/AbstractStringLayout.java | 8 +-
.../logging/log4j/core/layout/PatternLayout.java | 14 +-
.../logging/log4j/core/layout/Rfc5424Layout.java | 26 +-
.../lookup/JmxRuntimeInputArgumentsLookup.java | 8 +-
.../core/message/ExtendedThreadInformation.java | 6 +-
.../log4j/core/net/UrlConnectionFactory.java | 20 +-
.../apache/logging/log4j/core/osgi/Activator.java | 9 +-
.../logging/log4j/core/pattern/AnsiEscape.java | 6 +-
.../pattern/EqualsBaseReplacementConverter.java | 4 +-
.../log4j/core/pattern/HighlightConverter.java | 14 +-
.../pattern/LineSeparatorPatternConverter.java | 2 +-
.../log4j/core/pattern/MdcPatternConverter.java | 4 +-
.../core/pattern/MessagePatternConverter.java | 10 +-
.../log4j/core/pattern/NameAbbreviator.java | 6 +-
.../logging/log4j/core/pattern/PatternParser.java | 36 +-
.../core/pattern/RelativeTimePatternConverter.java | 4 +-
.../log4j/core/pattern/RepeatPatternConverter.java | 2 +-
.../log4j/core/selector/BasicContextSelector.java | 234 ++++----
.../core/selector/ClassLoaderContextSelector.java | 20 +-
.../logging/log4j/core/time/InstantFormatter.java | 10 +-
.../logging/log4j/core/time/MutableInstant.java | 4 +-
.../log4j/core/time/internal/CachedClock.java | 4 +-
.../core/time/internal/CoarseCachedClock.java | 4 +-
.../core/util/BasicAuthorizationProvider.java | 8 +-
.../org/apache/logging/log4j/core/util/Loader.java | 8 +-
.../logging/log4j/core/util/OptionConverter.java | 12 +-
.../apache/logging/log4j/core/util/Watcher.java | 4 +-
.../logging/log4j/core/util/WatcherFactory.java | 10 +-
.../logging/log4j/couchdb/CouchDbProvider.java | 6 +-
.../log4j/csv/layout/CsvLogEventLayoutTest.java | 8 +-
.../apache/logging/log4j/docker/DockerLookup.java | 15 +-
.../log4j/flume/appender/FlumeAppender.java | 8 +-
.../log4j/flume/appender/FlumeEmbeddedManager.java | 580 +++++++++----------
.../org/apache/logging/log4j/io/IoBuilder.java | 16 +-
.../logging/log4j/web/Log4jWebInitializerImpl.java | 27 +-
.../log4j/jeromq/appender/JeroMqManager.java | 9 +-
.../logging/log4j/jpa/appender/JpaAppender.java | 6 +-
.../ContextDataJsonAttributeConverter.java | 21 +-
.../jpa/appender/AbstractJpaAppenderTest.java | 14 +-
.../log4j/jpl/Log4jSystemLoggerAdapter.java | 7 +-
.../logging/log4j/jul/AbstractLoggerAdapter.java | 4 +-
.../org/apache/logging/log4j/jul/LogManager.java | 10 +-
.../log4j/kafka/appender/KafkaAppender.java | 1 -
.../logging/log4j/kafka/appender/KafkaManager.java | 1 -
.../appender/KafkaAppenderCloseTimeoutTest.java | 1 -
.../log4j/kafka/appender/KafkaAppenderTest.java | 3 +-
.../KafkaManagerProducerThreadLeakTest.java | 2 +-
.../kubernetes/KubernetesClientProperties.java | 7 +-
.../logging/log4j/kubernetes/KubernetesLookup.java | 25 +-
.../log4j/jackson/json/layout/JsonLayoutTest.java | 52 +-
.../log4j/jackson/xml/layout/XmlLayoutTest.java | 15 +-
.../log4j/jackson/yaml/layout/YamlLayoutTest.java | 8 +-
.../template/json/JsonTemplateLayoutTest.java | 57 +-
.../template/json/JsonTemplateLayoutDefaults.java | 10 +-
.../layout/template/json/util/JsonWriter.java | 10 +-
.../logging/log4j/mongodb3/MongoDb3Provider.java | 19 +-
.../logging/log4j/mongodb3/MongoDb3TestRule.java | 1 -
.../logging/log4j/mongodb4/MongoDb4TestRule.java | 3 +-
.../perf/jmh/AnnotationVsMarkerInterface.java | 7 +-
.../log4j/perf/jmh/JdbcAppenderBenchmark.java | 1 -
.../log4j/perf/jmh/JpaAppenderBenchmark.java | 1 -
.../log4j/perf/jmh/ReflectionBenchmark.java | 8 +-
.../perf/jmh/SortedArrayVsHashMapBenchmark.java | 1 -
.../logging/log4j/perf/nogc/OpenHashStringMap.java | 24 +-
.../log4j/plugin/processor/PluginProcessor.java | 45 +-
.../plugin/processor/PluginProcessorTest.java | 1 -
.../plugins/condition/OnPropertyConditionTest.java | 1 -
.../logging/log4j/plugins/di/InjectorTest.java | 31 +-
.../log4j/plugins/processor/PluginCacheTest.java | 9 +-
.../util/ResolverUtilCustomProtocolTest.java | 9 +-
.../log4j/plugins/util/ResolverUtilTest.java | 21 +-
.../org/apache/logging/log4j/plugins/Node.java | 6 +-
.../org/apache/logging/log4j/plugins/Plugin.java | 10 +-
.../log4j/plugins/convert/TypeConverter.java | 1 -
.../logging/log4j/plugins/di/BindingMap.java | 5 +-
.../logging/log4j/plugins/di/DefaultInjector.java | 57 +-
.../org/apache/logging/log4j/plugins/di/Key.java | 15 +-
.../org/apache/logging/log4j/plugins/di/Keys.java | 25 +-
.../logging/log4j/plugins/model/PluginCache.java | 1 -
.../logging/log4j/plugins/model/PluginEntry.java | 5 +-
.../log4j/plugins/model/PluginNamespace.java | 13 +-
.../log4j/plugins/model/PluginRegistry.java | 25 +-
.../logging/log4j/plugins/model/PluginType.java | 2 +-
.../logging/log4j/plugins/osgi/Activator.java | 9 +-
.../plugins/visit/PluginAttributeVisitor.java | 17 +-
.../log4j/plugins/visit/PluginElementVisitor.java | 21 +-
.../log4j/plugins/visit/PluginNodeVisitor.java | 7 +-
.../log4j/plugins/visit/PluginValueVisitor.java | 15 +-
log4j-samples/log4j-samples-configuration/pom.xml | 1 +
.../log4j/configuration/CustomConfiguration.java | 4 +-
log4j-samples/log4j-samples-flume-embedded/pom.xml | 1 +
log4j-samples/log4j-samples-flume-remote/pom.xml | 1 +
.../log4j-samples-loggerProperties/pom.xml | 1 +
log4j-samples/pom.xml | 1 +
.../config/builder/ConfigurationAssemblerTest.java | 6 +-
.../config/builder/ConfigurationBuilderTest.java | 4 +-
.../config/builder/CustomConfigurationFactory.java | 4 +-
.../java/org/apache/logging/slf4j/Log4jLogger.java | 10 +-
.../java/org/apache/logging/slf4j/Log4jLogger.java | 2 +-
.../apache/logging/slf4j/Log4jLoggerFactory.java | 4 +-
.../java/org/apache/logging/slf4j/Log4jMarker.java | 74 +--
.../apache/logging/slf4j/Log4jMarkerFactory.java | 2 +-
.../logging/other/pkg/LoggerContextAnchorTest.java | 6 +-
.../logging/slf4j/CallerInformationTest.java | 4 +-
.../org/apache/logging/slf4j/CustomFlatMarker.java | 1 -
.../org/apache/logging/slf4j/Log4j1222Test.java | 40 +-
.../logging/slf4j/Log4j2_1482_Slf4jTest.java | 25 +-
.../logging/slf4j/Log4jEventBuilderTest.java | 4 +-
.../apache/logging/slf4j/Log4jMDCAdapterTest.java | 4 +-
.../org/apache/logging/slf4j/Log4jMarkerTest.java | 24 +-
.../apache/logging/slf4j/LoggerContextTest.java | 4 +-
.../java/org/apache/logging/slf4j/LoggerTest.java | 8 +-
.../java/org/apache/logging/slf4j/MarkerTest.java | 290 +++++-----
.../org/apache/logging/slf4j/OverflowTest.java | 4 +-
.../org/apache/logging/slf4j/SerializeTest.java | 6 +-
.../logging/log4j/smtp/appender/SmtpManager.java | 1 -
.../spring/boot/Log4j2SpringBootLoggingSystem.java | 30 +-
.../log4j-spring-cloud-config-samples/pom.xml | 1 +
.../log4j/tojul/JULLoggerContextFactory.java | 4 +-
.../logging/log4j/tojul/LazyLog4jLogRecord.java | 4 +-
.../org/apache/logging/slf4j/MDCContextMap.java | 6 +-
.../logging/log4j/web/Log4jWebInitializerImpl.java | 28 +-
pom.xml | 40 ++
252 files changed, 2251 insertions(+), 2262 deletions(-)
