This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from a529d8d #335 Initial import of JsonTemplateLayout from LogstashLayout. new 0dccbdb #335 Replace inline resolver DSL with JSON structure. new 1d47321 #335 Skip unresolvable entries. The 2 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: .../layout/json/template/JsonTemplateLayout.java | 149 ++- .../json/template/JsonTemplateLayoutDefaults.java | 2 +- .../resolver/ContextStackResolverFactory.java | 39 - .../resolver/EndOfBatchResolverFactory.java | 4 +- .../template/resolver/EventResolverContext.java | 10 +- .../template/resolver/EventResolverFactories.java | 4 +- .../resolver/ExceptionInternalResolverFactory.java | 49 +- .../json/template/resolver/ExceptionResolver.java | 23 +- .../resolver/ExceptionResolverFactory.java | 12 +- .../resolver/ExceptionRootCauseResolver.java | 23 +- .../ExceptionRootCauseResolverFactory.java | 6 +- .../json/template/resolver/LevelResolver.java | 85 +- .../template/resolver/LevelResolverFactory.java | 6 +- .../json/template/resolver/LoggerResolver.java | 41 +- .../template/resolver/LoggerResolverFactory.java | 6 +- .../json/template/resolver/MainMapResolver.java | 49 +- .../template/resolver/MainMapResolverFactory.java | 6 +- .../layout/json/template/resolver/MapResolver.java | 41 +- .../json/template/resolver/MapResolverFactory.java | 6 +- .../json/template/resolver/MarkerResolver.java | 32 +- .../template/resolver/MarkerResolverFactory.java | 6 +- .../json/template/resolver/MessageResolver.java | 62 +- .../template/resolver/MessageResolverFactory.java | 6 +- .../json/template/resolver/PatternResolver.java | 30 +- .../template/resolver/PatternResolverFactory.java | 6 +- .../json/template/resolver/SourceResolver.java | 41 +- .../template/resolver/SourceResolverFactory.java | 6 +- .../resolver/StackTraceElementObjectResolver.java | 36 +- .../StackTraceElementObjectResolverFactory.java | 4 +- ...Resolver.java => StackTraceStringResolver.java} | 4 +- ...verFactory.java => TemplateResolverConfig.java} | 10 +- .../template/resolver/TemplateResolverFactory.java | 2 +- .../json/template/resolver/TemplateResolvers.java | 298 +++--- ...esolver.java => ThreadContextDataResolver.java} | 223 ++-- ....java => ThreadContextDataResolverFactory.java} | 18 +- ...solver.java => ThreadContextStackResolver.java} | 65 +- ...java => ThreadContextStackResolverFactory.java} | 18 +- .../json/template/resolver/ThreadResolver.java | 34 +- .../template/resolver/ThreadResolverFactory.java | 6 +- .../json/template/resolver/TimestampResolver.java | 511 +++++----- .../resolver/TimestampResolverFactory.java | 4 +- .../layout/json/template/util/MapAccessor.java | 139 +++ .../src/main/resources/EcsLayout.json | 56 +- .../src/main/resources/GelfLayout.json | 44 +- .../src/main/resources/JsonLayout.json | 95 +- .../main/resources/LogstashJsonEventLayoutV1.json | 65 +- .../main/resources/StackTraceElementLayout.json | 20 +- .../log4j/layout/json/template/EcsLayoutTest.java | 29 +- .../log4j/layout/json/template/GelfLayoutTest.java | 53 +- .../log4j/layout/json/template/JacksonFixture.java | 7 - .../log4j/layout/json/template/JsonLayoutTest.java | 57 +- .../json/template/JsonTemplateLayoutTest.java | 1071 +++++++++++--------- .../json/template/LayoutComparisonHelpers.java | 6 +- .../log4j/layout/json/template/LogstashIT.java | 24 +- .../src/test/resources/testJsonTemplateLayout.json | 79 +- .../template/JsonTemplateLayoutBenchmarkState.java | 31 +- src/site/asciidoc/manual/json-template-layout.adoc | 917 +++++++++++++---- src/site/asciidoc/manual/layouts.adoc | 65 +- src/site/markdown/manual/cloud.md | 32 +- 59 files changed, 3217 insertions(+), 1556 deletions(-) delete mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ContextStackResolverFactory.java rename log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/{StackTraceTextResolver.java => StackTraceStringResolver.java} (93%) copy log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/{TemplateResolverFactory.java => TemplateResolverConfig.java} (79%) rename log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/{ContextDataResolver.java => ThreadContextDataResolver.java} (63%) rename log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/{ContextDataResolverFactory.java => ThreadContextDataResolverFactory.java} (61%) rename log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/{ContextStackResolver.java => ThreadContextStackResolver.java} (64%) copy log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/{TimestampResolverFactory.java => ThreadContextStackResolverFactory.java} (64%) create mode 100644 log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/MapAccessor.java