This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 200f852b45 Update `org.apache.maven.surefire:surefire-junit47` to
version `3.5.0` (#2898)
add f27f6bce68 Clean up `ThreadContextMap` implementations
No new revisions were added by this update.
Summary of changes:
log4j-api-test/pom.xml | 2 +-
.../log4j/test/spi/ThreadContextMapSuite.java | 139 ++++++++++
.../log4j/ThreadContextInheritanceTest.java | 28 --
.../map/StringArrayThreadContextMapTest.java | 287 ---------------------
.../map/UnmodifiableArrayBackedMapTest.java | 6 +-
.../log4j/spi/DefaultThreadContextMapTest.java | 158 +++---------
.../logging/log4j/spi/ThreadContextMapTest.java | 76 ------
log4j-api/pom.xml | 11 +-
.../org/apache/logging/log4j/ThreadContext.java | 5 -
.../internal/map/StringArrayThreadContextMap.java | 199 --------------
.../internal/map/UnmodifiableArrayBackedMap.java | 16 +-
.../org/apache/logging/log4j/spi/CopyOnWrite.java | 2 +
.../CopyOnWriteSortedArrayThreadContextMap.java | 255 ------------------
.../logging/log4j/spi/DefaultThreadContextMap.java | 154 +++++------
.../logging/log4j/spi/NoOpThreadContextMap.java | 16 +-
.../org/apache/logging/log4j/spi/Provider.java | 260 +++++--------------
.../logging/log4j/spi/ThreadContextMapFactory.java | 4 +-
.../async/AbstractAsyncThreadContextTestBase.java | 69 ++---
.../async/AsyncThreadContextCopyOnWriteTest.java | 40 ---
...GarbageFreeSortedArrayThreadContextMapTest.java | 116 +++++++++
.../core/impl/ThreadContextDataInjectorTest.java | 39 ++-
.../{ => core/impl}/ThreadContextTestAccess.java | 7 +-
log4j-core/pom.xml | 7 +
.../GarbageFreeSortedArrayThreadContextMap.java | 7 +-
.../logging/log4j/core/impl/Log4jProvider.java | 119 +++++++++
.../log4j/perf/appender/StringAppender.java | 98 +++++++
.../log4j/perf/jmh/ThreadContextBenchmark.java | 10 +-
.../log4j/perf/jmh/ThreadContextBenchmark2.java | 264 +++++++++++++++++++
.../CopyOnWriteOpenHashMapThreadContextMap.java | 46 ----
.../GarbageFreeOpenHashMapThreadContextMap.java | 1 +
log4j-to-jul/pom.xml | 13 +
.../apache/logging/log4j/tojul/JULProvider.java | 10 +-
log4j-to-slf4j/pom.xml | 7 +
.../org/apache/logging/slf4j/SLF4JProvider.java | 4 +-
.../.2.x.x/2330_add_faster_web_app_context_map.xml | 2 +-
.../modules/ROOT/pages/manual/garbagefree.adoc | 2 +-
.../modules/ROOT/pages/manual/simple-logger.adoc | 12 +-
.../ROOT/pages/manual/systemproperties.adoc | 2 +-
.../modules/ROOT/pages/manual/thread-context.adoc | 20 +-
...xt.adoc => properties-thread-context-core.adoc} | 4 +-
...> properties-thread-context-simple-logger.adoc} | 29 +--
41 files changed, 1069 insertions(+), 1477 deletions(-)
create mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/spi/ThreadContextMapSuite.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/StringArrayThreadContextMapTest.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/spi/ThreadContextMapTest.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/internal/map/StringArrayThreadContextMap.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncThreadContextCopyOnWriteTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/context/internal/GarbageFreeSortedArrayThreadContextMapTest.java
rename log4j-core-test/src/test/java/org/apache/logging/log4j/{ =>
core/impl}/ThreadContextTestAccess.java (80%)
rename {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-core/src/main/java/org/apache/logging/log4j/core/context/internal}/GarbageFreeSortedArrayThreadContextMap.java
(95%)
create mode 100644
log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/appender/StringAppender.java
create mode 100644
log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark2.java
delete mode 100644
log4j-perf-test/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java
copy
src/site/antora/modules/ROOT/partials/manual/systemproperties/{properties-thread-context.adoc
=> properties-thread-context-core.adoc} (95%)
rename
src/site/antora/modules/ROOT/partials/manual/systemproperties/{properties-thread-context.adoc
=> properties-thread-context-simple-logger.adoc} (78%)
