This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push: new 4e70878 #335 Rename JsonTemplateLayout artifact and package. 4e70878 is described below commit 4e70878a6354c3394d47bc0c99f4a41997683082 Author: Volkan Yazıcı <volkan.yaz...@gmail.com> AuthorDate: Tue Aug 25 10:25:51 2020 +0200 #335 Rename JsonTemplateLayout artifact and package. --- log4j-bom/pom.xml | 2 +- .../pom.xml | 12 ++++++------ .../revapi.json | 0 .../layout/template/json}/JsonTemplateLayout.java | 18 +++++++++--------- .../template/json}/JsonTemplateLayoutDefaults.java | 6 +++--- .../template/json}/resolver/EndOfBatchResolver.java | 4 ++-- .../json}/resolver/EndOfBatchResolverFactory.java | 2 +- .../layout/template/json}/resolver/EventResolver.java | 2 +- .../template/json}/resolver/EventResolverContext.java | 10 ++++------ .../json}/resolver/EventResolverFactories.java | 2 +- .../template/json}/resolver/EventResolverFactory.java | 2 +- .../resolver/ExceptionInternalResolverFactory.java | 2 +- .../template/json}/resolver/ExceptionResolver.java | 7 ++++--- .../json}/resolver/ExceptionResolverFactory.java | 2 +- .../json}/resolver/ExceptionRootCauseResolver.java | 7 ++++--- .../resolver/ExceptionRootCauseResolverFactory.java | 2 +- .../layout/template/json}/resolver/LevelResolver.java | 4 ++-- .../template/json}/resolver/LevelResolverFactory.java | 2 +- .../layout/template/json}/resolver/LoggerResolver.java | 4 ++-- .../template/json}/resolver/LoggerResolverFactory.java | 2 +- .../template/json}/resolver/MainMapResolver.java | 4 ++-- .../json}/resolver/MainMapResolverFactory.java | 2 +- .../layout/template/json}/resolver/MapResolver.java | 4 ++-- .../template/json}/resolver/MapResolverFactory.java | 2 +- .../layout/template/json}/resolver/MarkerResolver.java | 4 ++-- .../template/json}/resolver/MarkerResolverFactory.java | 2 +- .../template/json}/resolver/MessageResolver.java | 4 ++-- .../json}/resolver/MessageResolverFactory.java | 2 +- .../template/json}/resolver/PatternResolver.java | 7 ++++--- .../json}/resolver/PatternResolverFactory.java | 2 +- .../layout/template/json}/resolver/SourceResolver.java | 7 ++++--- .../template/json}/resolver/SourceResolverFactory.java | 2 +- .../resolver/StackTraceElementObjectResolver.java | 4 ++-- .../StackTraceElementObjectResolverContext.java | 4 ++-- .../StackTraceElementObjectResolverFactories.java | 2 +- .../StackTraceElementObjectResolverFactory.java | 2 +- .../json}/resolver/StackTraceObjectResolver.java | 4 ++-- .../template/json}/resolver/StackTraceResolver.java | 2 +- .../json}/resolver/StackTraceStringResolver.java | 8 ++++---- .../template/json}/resolver/TemplateResolver.java | 4 ++-- .../json}/resolver/TemplateResolverConfig.java | 4 ++-- .../json}/resolver/TemplateResolverContext.java | 4 ++-- .../json}/resolver/TemplateResolverFactory.java | 2 +- .../template/json}/resolver/TemplateResolvers.java | 8 ++++---- .../json}/resolver/ThreadContextDataResolver.java | 8 ++++---- .../resolver/ThreadContextDataResolverFactory.java | 2 +- .../json}/resolver/ThreadContextStackResolver.java | 4 ++-- .../resolver/ThreadContextStackResolverFactory.java | 2 +- .../layout/template/json}/resolver/ThreadResolver.java | 4 ++-- .../template/json}/resolver/ThreadResolverFactory.java | 2 +- .../template/json}/resolver/TimestampResolver.java | 6 +++--- .../json}/resolver/TimestampResolverFactory.java | 2 +- .../layout/template/json}/util/DummyRecycler.java | 2 +- .../template/json}/util/DummyRecyclerFactory.java | 2 +- .../log4j/layout/template/json}/util/JsonReader.java | 2 +- .../log4j/layout/template/json}/util/JsonWriter.java | 2 +- .../log4j/layout/template/json}/util/MapAccessor.java | 2 +- .../layout/template/json}/util/QueueingRecycler.java | 2 +- .../template/json}/util/QueueingRecyclerFactory.java | 2 +- .../log4j/layout/template/json}/util/Recycler.java | 2 +- .../layout/template/json}/util/RecyclerFactories.java | 2 +- .../layout/template/json}/util/RecyclerFactory.java | 2 +- .../template/json}/util/StringParameterParser.java | 2 +- .../template/json}/util/ThreadLocalRecycler.java | 2 +- .../json}/util/ThreadLocalRecyclerFactory.java | 2 +- .../json}/util/TruncatingBufferedPrintWriter.java | 2 +- .../template/json}/util/TruncatingBufferedWriter.java | 2 +- .../logging/log4j/layout/template/json}/util/Uris.java | 2 +- .../src/main/resources/EcsLayout.json | 0 .../src/main/resources/GelfLayout.json | 0 .../src/main/resources/JsonLayout.json | 0 .../src/main/resources/LogstashJsonEventLayoutV1.json | 0 .../src/main/resources/StackTraceElementLayout.json | 0 .../src/site/manual/index.md | 0 .../src/site/site.xml | 0 .../template/json}/BlackHoleByteBufferDestination.java | 2 +- .../log4j/layout/template/json}/EcsLayoutTest.java | 6 +++--- .../log4j/layout/template/json}/GelfLayoutTest.java | 6 +++--- .../log4j/layout/template/json}/JacksonFixture.java | 2 +- .../log4j/layout/template/json}/JsonLayoutTest.java | 4 ++-- .../json}/JsonTemplateLayoutConcurrentEncodeTest.java | 2 +- .../template/json}/JsonTemplateLayoutGcFreeTest.java | 2 +- .../JsonTemplateLayoutNullEventDelimiterTest.java | 2 +- .../layout/template/json}/JsonTemplateLayoutTest.java | 12 ++++++------ .../layout/template/json}/LayoutComparisonHelpers.java | 4 ++-- .../log4j/layout/template/json}/LogEventFixture.java | 2 +- .../log4j/layout/template/json}/LogstashIT.java | 6 +++--- .../layout/template/json}/util/JsonReaderTest.java | 2 +- .../layout/template/json}/util/JsonWriterTest.java | 4 ++-- .../template/json}/util/RecyclerFactoriesTest.java | 2 +- .../template/json}/util/StringParameterParserTest.java | 12 ++++++------ .../json}/util/TruncatingBufferedWriterTest.java | 2 +- .../log4j/layout/template/json}/util/UrisTest.java | 2 +- .../test/resources/gcFreeJsonTemplateLayoutLogging.xml | 0 .../nullEventDelimitedJsonTemplateLayoutLogging.xml | 0 .../src/test/resources/testJsonTemplateLayout.json | 0 log4j-perf/pom.xml | 4 ++-- .../json}/JsonTemplateLayoutBenchmark.java | 2 +- .../json}/JsonTemplateLayoutBenchmarkReport.java | 6 +++--- .../json}/JsonTemplateLayoutBenchmarkState.java | 8 ++++---- pom.xml | 4 ++-- src/site/asciidoc/manual/json-template-layout.adoc.vm | 18 +++++++++--------- 102 files changed, 181 insertions(+), 179 deletions(-) diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml index 2855747..6bf13cd 100644 --- a/log4j-bom/pom.xml +++ b/log4j-bom/pom.xml @@ -45,7 +45,7 @@ <!-- JSON template layout --> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-layout-json-template</artifactId> + <artifactId>log4j-layout-template-json</artifactId> <version>${project.version}</version> </dependency> <!-- Legacy Log4j 1.2 API --> diff --git a/log4j-layout-json-template/pom.xml b/log4j-layout-template-json/pom.xml similarity index 98% rename from log4j-layout-json-template/pom.xml rename to log4j-layout-template-json/pom.xml index 5dbc8c2..2e1286f 100644 --- a/log4j-layout-json-template/pom.xml +++ b/log4j-layout-template-json/pom.xml @@ -27,7 +27,7 @@ <version>2.14.0-SNAPSHOT</version> </parent> - <artifactId>log4j-layout-json-template</artifactId> + <artifactId>log4j-layout-template-json</artifactId> <name>Apache Log4j Layout for JSON template</name> <description> Apache Log4j Layout for JSON template. @@ -36,8 +36,8 @@ <properties> <log4jParentDir>${basedir}/..</log4jParentDir> <docLabel>Log4j Layout for JSON Template Documentation</docLabel> - <projectDir>/log4j-layout-json-template</projectDir> - <module.name>org.apache.logging.log4j.layout.json.template</module.name> + <projectDir>/log4j-layout-template-json</projectDir> + <module.name>org.apache.logging.log4j.layout.template.json</module.name> </properties> <dependencies> @@ -116,7 +116,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Fragment-Host>org.apache.logging.log4j.layout.json.template</Fragment-Host> + <Fragment-Host>org.apache.logging.log4j.layout.template.json</Fragment-Host> <Export-Package>*</Export-Package> </instructions> </configuration> @@ -344,7 +344,7 @@ </ports> <network> <mode>custom</mode> - <name>log4j-layout-json-template-network</name> + <name>log4j-layout-template-json-network</name> <alias>elasticsearch</alias> </network> <log> @@ -366,7 +366,7 @@ </dependsOn> <network> <mode>custom</mode> - <name>log4j-layout-json-template-network</name> + <name>log4j-layout-template-json-network</name> <alias>logstash</alias> </network> <ports> diff --git a/log4j-layout-json-template/revapi.json b/log4j-layout-template-json/revapi.json similarity index 100% rename from log4j-layout-json-template/revapi.json rename to log4j-layout-template-json/revapi.json diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayout.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java similarity index 97% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayout.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java index 0f3632a..17b9a20 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayout.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; @@ -32,14 +32,14 @@ import org.apache.logging.log4j.core.layout.LockingStringBuilderEncoder; import org.apache.logging.log4j.core.lookup.StrSubstitutor; import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.core.util.StringEncoder; -import org.apache.logging.log4j.layout.json.template.resolver.EventResolverContext; -import org.apache.logging.log4j.layout.json.template.resolver.StackTraceElementObjectResolverContext; -import org.apache.logging.log4j.layout.json.template.resolver.TemplateResolver; -import org.apache.logging.log4j.layout.json.template.resolver.TemplateResolvers; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; -import org.apache.logging.log4j.layout.json.template.util.Recycler; -import org.apache.logging.log4j.layout.json.template.util.RecyclerFactory; -import org.apache.logging.log4j.layout.json.template.util.Uris; +import org.apache.logging.log4j.layout.template.json.resolver.EventResolverContext; +import org.apache.logging.log4j.layout.template.json.resolver.StackTraceElementObjectResolverContext; +import org.apache.logging.log4j.layout.template.json.resolver.TemplateResolver; +import org.apache.logging.log4j.layout.template.json.resolver.TemplateResolvers; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.Recycler; +import org.apache.logging.log4j.layout.template.json.util.RecyclerFactory; +import org.apache.logging.log4j.layout.template.json.util.Uris; import org.apache.logging.log4j.util.Strings; import java.nio.charset.Charset; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutDefaults.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutDefaults.java similarity index 97% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutDefaults.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutDefaults.java index 7c28b9f..9896c1e 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutDefaults.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutDefaults.java @@ -14,10 +14,10 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; -import org.apache.logging.log4j.layout.json.template.util.RecyclerFactories; -import org.apache.logging.log4j.layout.json.template.util.RecyclerFactory; +import org.apache.logging.log4j.layout.template.json.util.RecyclerFactories; +import org.apache.logging.log4j.layout.template.json.util.RecyclerFactory; import org.apache.logging.log4j.util.PropertiesUtil; import java.nio.charset.Charset; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EndOfBatchResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EndOfBatchResolver.java similarity index 91% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EndOfBatchResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EndOfBatchResolver.java index 268df52..4a716c8 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EndOfBatchResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EndOfBatchResolver.java @@ -14,10 +14,10 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; final class EndOfBatchResolver implements EventResolver { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EndOfBatchResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EndOfBatchResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EndOfBatchResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EndOfBatchResolverFactory.java index 0f013a4..f059bbb 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EndOfBatchResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EndOfBatchResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class EndOfBatchResolverFactory implements EventResolverFactory<EndOfBatchResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolver.java similarity index 93% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolver.java index ce21181..8427d6d 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolver.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverContext.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverContext.java similarity index 94% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverContext.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverContext.java index a83b2c9..b1dd8af 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverContext.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverContext.java @@ -14,16 +14,14 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.lookup.StrSubstitutor; -import org.apache.logging.log4j.core.util.KeyValuePair; -import org.apache.logging.log4j.layout.json.template.JsonTemplateLayout; -import org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.EventTemplateAdditionalField; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; -import org.apache.logging.log4j.layout.json.template.util.RecyclerFactory; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout.EventTemplateAdditionalField; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.RecyclerFactory; import java.nio.charset.Charset; import java.util.Map; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverFactories.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactories.java similarity index 97% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverFactories.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactories.java index fc8c6e9..07fe97b 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverFactories.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactories.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactory.java similarity index 93% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactory.java index 3c2f2db..11c236e 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/EventResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionInternalResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionInternalResolverFactory.java similarity index 97% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionInternalResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionInternalResolverFactory.java index b6e5ff8..31b70cf 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionInternalResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionInternalResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; /** * Exception resolver factory. diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionResolver.java similarity index 94% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionResolver.java index 140cc42..4cd9b62 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionResolver.java @@ -14,16 +14,17 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; /** * Exception resolver. * * Note that this resolver is toggled by {@link - * org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.Builder#setStackTraceEnabled(boolean)}. + * JsonTemplateLayout.Builder#setStackTraceEnabled(boolean)}. * * @see ExceptionInternalResolverFactory */ diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionResolverFactory.java index 7ca79b0..89ced7f 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class ExceptionResolverFactory implements EventResolverFactory<ExceptionResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionRootCauseResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionRootCauseResolver.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionRootCauseResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionRootCauseResolver.java index f3d4705..5218284 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionRootCauseResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionRootCauseResolver.java @@ -14,17 +14,18 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.util.Throwables; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; /** * Exception root cause resolver. * * Note that this resolver is toggled by {@link - * org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.Builder#setStackTraceEnabled(boolean)}. + * JsonTemplateLayout.Builder#setStackTraceEnabled(boolean)}. * * @see ExceptionInternalResolverFactory */ diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionRootCauseResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionRootCauseResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionRootCauseResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionRootCauseResolverFactory.java index e511f0d..7dcea5f 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ExceptionRootCauseResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ExceptionRootCauseResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class ExceptionRootCauseResolverFactory implements EventResolverFactory<ExceptionRootCauseResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LevelResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LevelResolver.java similarity index 97% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LevelResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LevelResolver.java index 422e445..89de7e0 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LevelResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LevelResolver.java @@ -14,12 +14,12 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.net.Severity; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; import java.util.Arrays; import java.util.Map; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LevelResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LevelResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LevelResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LevelResolverFactory.java index f5ee519..2e8dc60 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LevelResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LevelResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class LevelResolverFactory implements EventResolverFactory<LevelResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LoggerResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LoggerResolver.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LoggerResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LoggerResolver.java index 66f1f87..6a47531 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LoggerResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LoggerResolver.java @@ -14,10 +14,10 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; /** * Logger resolver. diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LoggerResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LoggerResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LoggerResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LoggerResolverFactory.java index 5539f6e..08b6fb9 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/LoggerResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/LoggerResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class LoggerResolverFactory implements EventResolverFactory<LoggerResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MainMapResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MainMapResolver.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MainMapResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MainMapResolver.java index b12821c..514dd1e 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MainMapResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MainMapResolver.java @@ -14,11 +14,11 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.lookup.MainMapLookup; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; /** * An index-based resolver for the <tt>main()</tt> method arguments. diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MainMapResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MainMapResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MainMapResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MainMapResolverFactory.java index 83b93a1..ee0ab3f 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MainMapResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MainMapResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class MainMapResolverFactory implements EventResolverFactory<MainMapResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MapResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MapResolver.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MapResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MapResolver.java index 21d125c..f26bf86 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MapResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MapResolver.java @@ -14,10 +14,10 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; import org.apache.logging.log4j.message.MapMessage; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.util.IndexedReadOnlyStringMap; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MapResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MapResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MapResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MapResolverFactory.java index df57601..a639719 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MapResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MapResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class MapResolverFactory implements EventResolverFactory<MapResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MarkerResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MarkerResolver.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MarkerResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MarkerResolver.java index 0bef3ff..1448444 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MarkerResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MarkerResolver.java @@ -14,11 +14,11 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; /** * A {@link Marker} resolver. diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MarkerResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MarkerResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MarkerResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MarkerResolverFactory.java index 2d4a2cb..41b2126 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MarkerResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MarkerResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class MarkerResolverFactory implements EventResolverFactory<MarkerResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MessageResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolver.java similarity index 98% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MessageResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolver.java index 53dc7d9..f42dbab 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MessageResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolver.java @@ -14,10 +14,10 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; import org.apache.logging.log4j.message.MapMessage; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.MultiformatMessage; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MessageResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MessageResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolverFactory.java index 4d46bb5..5e2a3db 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/MessageResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class MessageResolverFactory implements EventResolverFactory<MessageResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/PatternResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/PatternResolver.java similarity index 92% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/PatternResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/PatternResolver.java index a18a85d..5bfc4b4 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/PatternResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/PatternResolver.java @@ -14,11 +14,12 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.layout.PatternLayout; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; import org.apache.logging.log4j.util.BiConsumer; import org.apache.logging.log4j.util.Strings; @@ -36,7 +37,7 @@ import java.util.Optional; * </pre> * * The default value of <tt>stackTraceEnabled</tt> is inherited from the parent - * {@link org.apache.logging.log4j.layout.json.template.JsonTemplateLayout}. + * {@link JsonTemplateLayout}. * * <h3>Examples</h3> * diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/PatternResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/PatternResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/PatternResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/PatternResolverFactory.java index e3ddaf9..95c9a95 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/PatternResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/PatternResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class PatternResolverFactory implements EventResolverFactory<PatternResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/SourceResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/SourceResolver.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/SourceResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/SourceResolver.java index 8f857d0..b4e63e3 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/SourceResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/SourceResolver.java @@ -14,16 +14,17 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; /** * Resolver for the {@link StackTraceElement} returned by {@link LogEvent#getSource()}. * * Note that this resolver is toggled by {@link - * org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.Builder#setLocationInfoEnabled(boolean)} + * JsonTemplateLayout.Builder#setLocationInfoEnabled(boolean)} * method. * * <h3>Configuration</h3> diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/SourceResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/SourceResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/SourceResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/SourceResolverFactory.java index 3f1e957..65a78d0 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/SourceResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/SourceResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class SourceResolverFactory implements EventResolverFactory<SourceResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolver.java similarity index 96% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolver.java index 1c8a483..3d70082 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolver.java @@ -14,9 +14,9 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; /** * {@link StackTraceElement} resolver. diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverContext.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverContext.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverContext.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverContext.java index 6e42237..31493fd 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverContext.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverContext.java @@ -14,10 +14,10 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.lookup.StrSubstitutor; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; import java.util.Map; import java.util.Objects; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverFactories.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactories.java similarity index 97% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverFactories.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactories.java index 90af9ab..ff1170c 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverFactories.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactories.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactory.java similarity index 96% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactory.java index a07694c..aa64f1c 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceElementObjectResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class StackTraceElementObjectResolverFactory implements TemplateResolverFactory<StackTraceElement, StackTraceElementObjectResolverContext, StackTraceElementObjectResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceObjectResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceObjectResolver.java similarity index 94% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceObjectResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceObjectResolver.java index 53a9ce4..d20ca37 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceObjectResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceObjectResolver.java @@ -14,9 +14,9 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; final class StackTraceObjectResolver implements StackTraceResolver { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceResolver.java similarity index 93% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceResolver.java index 8275193..824b6da 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceResolver.java @@ -14,6 +14,6 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; interface StackTraceResolver extends TemplateResolver<Throwable> {} diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceStringResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolver.java similarity index 87% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceStringResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolver.java index d744070..725ac1e 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/StackTraceStringResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolver.java @@ -14,11 +14,11 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; -import org.apache.logging.log4j.layout.json.template.util.TruncatingBufferedPrintWriter; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; -import org.apache.logging.log4j.layout.json.template.util.Recycler; +import org.apache.logging.log4j.layout.template.json.util.TruncatingBufferedPrintWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.Recycler; import java.util.function.Supplier; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolver.java similarity index 90% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolver.java index a251075..5db3813 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolver.java @@ -14,9 +14,9 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; @FunctionalInterface public interface TemplateResolver<V> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverConfig.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverConfig.java similarity index 88% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverConfig.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverConfig.java index a83fffa..d181b87 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverConfig.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverConfig.java @@ -14,9 +14,9 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; -import org.apache.logging.log4j.layout.json.template.util.MapAccessor; +import org.apache.logging.log4j.layout.template.json.util.MapAccessor; import java.util.Map; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverContext.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverContext.java similarity index 90% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverContext.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverContext.java index 74687d2..fbb0da4 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverContext.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverContext.java @@ -14,10 +14,10 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.lookup.StrSubstitutor; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; import java.util.Map; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverFactory.java similarity index 93% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverFactory.java index 3e3c8ef..a2c8216 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; interface TemplateResolverFactory<V, C extends TemplateResolverContext<V, C>, R extends TemplateResolver<V>> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolvers.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java similarity index 98% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolvers.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java index a4b1165..3ffa87a 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolvers.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java @@ -14,12 +14,12 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.EventTemplateAdditionalField; -import org.apache.logging.log4j.layout.json.template.util.JsonReader; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout.EventTemplateAdditionalField; +import org.apache.logging.log4j.layout.template.json.util.JsonReader; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; import java.util.ArrayList; import java.util.List; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextDataResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextDataResolver.java similarity index 97% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextDataResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextDataResolver.java index 66efe17..dda41d3 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextDataResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextDataResolver.java @@ -14,12 +14,12 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; -import org.apache.logging.log4j.layout.json.template.util.Recycler; -import org.apache.logging.log4j.layout.json.template.util.RecyclerFactory; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.Recycler; +import org.apache.logging.log4j.layout.template.json.util.RecyclerFactory; import org.apache.logging.log4j.util.ReadOnlyStringMap; import org.apache.logging.log4j.util.TriConsumer; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextDataResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextDataResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextDataResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextDataResolverFactory.java index 3ef164d..05474a3 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextDataResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextDataResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class ThreadContextDataResolverFactory implements EventResolverFactory<ThreadContextDataResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextStackResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextStackResolver.java similarity index 96% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextStackResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextStackResolver.java index 6a9af12..4f4afa3 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextStackResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextStackResolver.java @@ -14,11 +14,11 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; import java.util.Optional; import java.util.regex.Pattern; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextStackResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextStackResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextStackResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextStackResolverFactory.java index 82a5c23..4946f0d 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadContextStackResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadContextStackResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class ThreadContextStackResolverFactory implements EventResolverFactory<ThreadContextStackResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadResolver.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadResolver.java index a316afe..4ea7d80 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadResolver.java @@ -14,10 +14,10 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; /** * Thread resolver. diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadResolverFactory.java index 75df1e3..69d5e91 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/ThreadResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/ThreadResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class ThreadResolverFactory implements EventResolverFactory<ThreadResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TimestampResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TimestampResolver.java similarity index 98% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TimestampResolver.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TimestampResolver.java index 1ea6e56..7049e23 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TimestampResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TimestampResolver.java @@ -14,13 +14,13 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.time.Instant; import org.apache.logging.log4j.core.util.datetime.FastDateFormat; -import org.apache.logging.log4j.layout.json.template.JsonTemplateLayoutDefaults; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayoutDefaults; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; import java.util.Calendar; import java.util.Locale; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TimestampResolverFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TimestampResolverFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TimestampResolverFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TimestampResolverFactory.java index f1547f2..6f4cb6d 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TimestampResolverFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TimestampResolverFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.resolver; +package org.apache.logging.log4j.layout.template.json.resolver; final class TimestampResolverFactory implements EventResolverFactory<TimestampResolver> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/DummyRecycler.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/DummyRecycler.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/DummyRecycler.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/DummyRecycler.java index 2aae11f..8936a8a 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/DummyRecycler.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/DummyRecycler.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import java.util.function.Supplier; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/DummyRecyclerFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/DummyRecyclerFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/DummyRecyclerFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/DummyRecyclerFactory.java index dc3a8a1..d2b6f77 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/DummyRecyclerFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/DummyRecyclerFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/JsonReader.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonReader.java similarity index 99% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/JsonReader.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonReader.java index 1a9f43e..cfc3fdc 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/JsonReader.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonReader.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/JsonWriter.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java similarity index 99% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/JsonWriter.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java index a0dad93..8bfa914 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/JsonWriter.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import org.apache.logging.log4j.util.BiConsumer; import org.apache.logging.log4j.util.IndexedReadOnlyStringMap; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/MapAccessor.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java similarity index 98% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/MapAccessor.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java index a4c140f..cc3ef76 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/MapAccessor.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/MapAccessor.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import java.util.Arrays; import java.util.Map; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/QueueingRecycler.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/QueueingRecycler.java similarity index 96% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/QueueingRecycler.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/QueueingRecycler.java index 5f091bd..b83ae2f 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/QueueingRecycler.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/QueueingRecycler.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import java.util.Queue; import java.util.function.Consumer; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/QueueingRecyclerFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/QueueingRecyclerFactory.java similarity index 96% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/QueueingRecyclerFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/QueueingRecyclerFactory.java index c549522..7ce41d3 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/QueueingRecyclerFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/QueueingRecyclerFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import java.util.Queue; import java.util.function.Consumer; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/Recycler.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Recycler.java similarity index 93% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/Recycler.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Recycler.java index b6a0c89..6e6924b 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/Recycler.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Recycler.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; public interface Recycler<V> { diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactories.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactories.java similarity index 99% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactories.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactories.java index 7564e8d..82b4ef8 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactories.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactories.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.convert.TypeConverter; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactory.java similarity index 94% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactory.java index 3b7737c..195ef4b 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/StringParameterParser.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java similarity index 99% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/StringParameterParser.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java index 018f6b7..9524a19 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/StringParameterParser.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java @@ -1,4 +1,4 @@ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import org.apache.logging.log4j.util.Strings; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/ThreadLocalRecycler.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/ThreadLocalRecycler.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/ThreadLocalRecycler.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/ThreadLocalRecycler.java index 1c58d4f..9978755 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/ThreadLocalRecycler.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/ThreadLocalRecycler.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/ThreadLocalRecyclerFactory.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/ThreadLocalRecyclerFactory.java similarity index 95% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/ThreadLocalRecyclerFactory.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/ThreadLocalRecyclerFactory.java index 8ea6c61..048262c 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/ThreadLocalRecyclerFactory.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/ThreadLocalRecyclerFactory.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedPrintWriter.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedPrintWriter.java similarity index 96% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedPrintWriter.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedPrintWriter.java index 37338e6..8d7cb1e 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedPrintWriter.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedPrintWriter.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import java.io.PrintWriter; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedWriter.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedWriter.java similarity index 98% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedWriter.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedWriter.java index e31f21c..ea50f77 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedWriter.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedWriter.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import java.io.Writer; import java.util.Objects; diff --git a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/Uris.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java similarity index 98% rename from log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/Uris.java rename to log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java index 65cd863..5df1791 100644 --- a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/util/Uris.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.status.StatusLogger; diff --git a/log4j-layout-json-template/src/main/resources/EcsLayout.json b/log4j-layout-template-json/src/main/resources/EcsLayout.json similarity index 100% rename from log4j-layout-json-template/src/main/resources/EcsLayout.json rename to log4j-layout-template-json/src/main/resources/EcsLayout.json diff --git a/log4j-layout-json-template/src/main/resources/GelfLayout.json b/log4j-layout-template-json/src/main/resources/GelfLayout.json similarity index 100% rename from log4j-layout-json-template/src/main/resources/GelfLayout.json rename to log4j-layout-template-json/src/main/resources/GelfLayout.json diff --git a/log4j-layout-json-template/src/main/resources/JsonLayout.json b/log4j-layout-template-json/src/main/resources/JsonLayout.json similarity index 100% rename from log4j-layout-json-template/src/main/resources/JsonLayout.json rename to log4j-layout-template-json/src/main/resources/JsonLayout.json diff --git a/log4j-layout-json-template/src/main/resources/LogstashJsonEventLayoutV1.json b/log4j-layout-template-json/src/main/resources/LogstashJsonEventLayoutV1.json similarity index 100% rename from log4j-layout-json-template/src/main/resources/LogstashJsonEventLayoutV1.json rename to log4j-layout-template-json/src/main/resources/LogstashJsonEventLayoutV1.json diff --git a/log4j-layout-json-template/src/main/resources/StackTraceElementLayout.json b/log4j-layout-template-json/src/main/resources/StackTraceElementLayout.json similarity index 100% rename from log4j-layout-json-template/src/main/resources/StackTraceElementLayout.json rename to log4j-layout-template-json/src/main/resources/StackTraceElementLayout.json diff --git a/log4j-layout-json-template/src/site/manual/index.md b/log4j-layout-template-json/src/site/manual/index.md similarity index 100% rename from log4j-layout-json-template/src/site/manual/index.md rename to log4j-layout-template-json/src/site/manual/index.md diff --git a/log4j-layout-json-template/src/site/site.xml b/log4j-layout-template-json/src/site/site.xml similarity index 100% rename from log4j-layout-json-template/src/site/site.xml rename to log4j-layout-template-json/src/site/site.xml diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/BlackHoleByteBufferDestination.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/BlackHoleByteBufferDestination.java similarity index 96% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/BlackHoleByteBufferDestination.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/BlackHoleByteBufferDestination.java index 01b3d4a..3c0f4fb 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/BlackHoleByteBufferDestination.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/BlackHoleByteBufferDestination.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import org.apache.logging.log4j.core.layout.ByteBufferDestination; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/EcsLayoutTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/EcsLayoutTest.java similarity index 94% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/EcsLayoutTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/EcsLayoutTest.java index 8f5593d..21a87aa 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/EcsLayoutTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/EcsLayoutTest.java @@ -1,10 +1,10 @@ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import co.elastic.logging.log4j2.EcsLayout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.DefaultConfiguration; -import org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.EventTemplateAdditionalField; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout.EventTemplateAdditionalField; import org.assertj.core.api.Assertions; import org.junit.Test; @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import static org.apache.logging.log4j.layout.json.template.LayoutComparisonHelpers.renderUsing; +import static org.apache.logging.log4j.layout.template.json.LayoutComparisonHelpers.renderUsing; public class EcsLayoutTest { diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/GelfLayoutTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/GelfLayoutTest.java similarity index 95% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/GelfLayoutTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/GelfLayoutTest.java index 795546b..03ded3c 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/GelfLayoutTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/GelfLayoutTest.java @@ -1,11 +1,11 @@ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.layout.GelfLayout; import org.apache.logging.log4j.core.time.Instant; -import org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.EventTemplateAdditionalField; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout.EventTemplateAdditionalField; import org.assertj.core.api.Assertions; import org.junit.Test; @@ -14,7 +14,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import static org.apache.logging.log4j.layout.json.template.LayoutComparisonHelpers.renderUsing; +import static org.apache.logging.log4j.layout.template.json.LayoutComparisonHelpers.renderUsing; public class GelfLayoutTest { diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JacksonFixture.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JacksonFixture.java similarity index 95% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JacksonFixture.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JacksonFixture.java index a2ebe6f..bd9e76f 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JacksonFixture.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JacksonFixture.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonLayoutTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonLayoutTest.java similarity index 95% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonLayoutTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonLayoutTest.java index 6c2c64d..30cdfe6 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonLayoutTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonLayoutTest.java @@ -1,4 +1,4 @@ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.Configuration; @@ -11,7 +11,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import static org.apache.logging.log4j.layout.json.template.LayoutComparisonHelpers.renderUsing; +import static org.apache.logging.log4j.layout.template.json.LayoutComparisonHelpers.renderUsing; public class JsonLayoutTest { diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutConcurrentEncodeTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutConcurrentEncodeTest.java similarity index 99% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutConcurrentEncodeTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutConcurrentEncodeTest.java index d17a8be..0603d68 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutConcurrentEncodeTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutConcurrentEncodeTest.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.Configuration; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutGcFreeTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutGcFreeTest.java similarity index 96% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutGcFreeTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutGcFreeTest.java index 76b203e..da6ca86 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutGcFreeTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutGcFreeTest.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import org.apache.logging.log4j.core.GcFreeLoggingTestUtil; import org.junit.Test; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutNullEventDelimiterTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java similarity index 98% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutNullEventDelimiterTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java index 2487b65..73d365c 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutNullEventDelimiterTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutNullEventDelimiterTest.java @@ -1,4 +1,4 @@ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutTest.java similarity index 99% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutTest.java index 8e9e6fe..91d0478 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutTest.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.MappingIterator; @@ -33,11 +33,11 @@ import org.apache.logging.log4j.core.layout.ByteBufferDestination; import org.apache.logging.log4j.core.lookup.MainMapLookup; import org.apache.logging.log4j.core.net.Severity; import org.apache.logging.log4j.core.time.MutableInstant; -import org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.EventTemplateAdditionalField; -import org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.EventTemplateAdditionalFields; -import org.apache.logging.log4j.layout.json.template.util.JsonReader; -import org.apache.logging.log4j.layout.json.template.util.JsonWriter; -import org.apache.logging.log4j.layout.json.template.util.MapAccessor; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout.EventTemplateAdditionalField; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout.EventTemplateAdditionalFields; +import org.apache.logging.log4j.layout.template.json.util.JsonReader; +import org.apache.logging.log4j.layout.template.json.util.JsonWriter; +import org.apache.logging.log4j.layout.template.json.util.MapAccessor; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.ObjectMessage; import org.apache.logging.log4j.message.SimpleMessage; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LayoutComparisonHelpers.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LayoutComparisonHelpers.java similarity index 78% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LayoutComparisonHelpers.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LayoutComparisonHelpers.java index 6f0a6c0..c1a9b37 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LayoutComparisonHelpers.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LayoutComparisonHelpers.java @@ -1,8 +1,8 @@ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.layout.json.template.util.JsonReader; +import org.apache.logging.log4j.layout.template.json.util.JsonReader; import java.util.Map; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogEventFixture.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogEventFixture.java similarity index 99% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogEventFixture.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogEventFixture.java index 1b0975a..408a34d 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogEventFixture.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogEventFixture.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.LogEvent; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogstashIT.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java similarity index 99% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogstashIT.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java index fb70b29..84673ef 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogstashIT.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java @@ -1,4 +1,4 @@ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import co.elastic.logging.log4j2.EcsLayout; import org.apache.http.HttpHost; @@ -11,8 +11,8 @@ import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.layout.GelfLayout; import org.apache.logging.log4j.core.util.NetUtils; -import org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.EventTemplateAdditionalField; -import org.apache.logging.log4j.layout.json.template.util.ThreadLocalRecyclerFactory; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout.EventTemplateAdditionalField; +import org.apache.logging.log4j.layout.template.json.util.ThreadLocalRecyclerFactory; import org.apache.logging.log4j.message.SimpleMessage; import org.apache.logging.log4j.status.StatusLogger; import org.assertj.core.api.Assertions; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/JsonReaderTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/JsonReaderTest.java similarity index 99% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/JsonReaderTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/JsonReaderTest.java index aa4c40e..7c32884 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/JsonReaderTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/JsonReaderTest.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/JsonWriterTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/JsonWriterTest.java similarity index 99% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/JsonWriterTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/JsonWriterTest.java index 99451d3..cde4ccf 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/JsonWriterTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/JsonWriterTest.java @@ -14,10 +14,10 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import org.apache.logging.log4j.core.impl.JdkMapAdapterStringMap; -import org.apache.logging.log4j.layout.json.template.JacksonFixture; +import org.apache.logging.log4j.layout.template.json.JacksonFixture; import org.apache.logging.log4j.util.BiConsumer; import org.apache.logging.log4j.util.IndexedReadOnlyStringMap; import org.apache.logging.log4j.util.SortedArrayStringMap; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactoriesTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactoriesTest.java similarity index 98% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactoriesTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactoriesTest.java index c869413..522aa42 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/RecyclerFactoriesTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactoriesTest.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import org.apache.logging.log4j.core.config.plugins.convert.TypeConverter; import org.apache.logging.log4j.core.config.plugins.convert.TypeConverterRegistry; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/StringParameterParserTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParserTest.java similarity index 97% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/StringParameterParserTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParserTest.java index 5930b99..651f3b1 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/StringParameterParserTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParserTest.java @@ -1,10 +1,10 @@ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; -import org.apache.logging.log4j.layout.json.template.util.StringParameterParser.DoubleQuotedStringValue; -import org.apache.logging.log4j.layout.json.template.util.StringParameterParser.NullValue; -import org.apache.logging.log4j.layout.json.template.util.StringParameterParser.StringValue; -import org.apache.logging.log4j.layout.json.template.util.StringParameterParser.Value; -import org.apache.logging.log4j.layout.json.template.util.StringParameterParser.Values; +import org.apache.logging.log4j.layout.template.json.util.StringParameterParser.DoubleQuotedStringValue; +import org.apache.logging.log4j.layout.template.json.util.StringParameterParser.NullValue; +import org.apache.logging.log4j.layout.template.json.util.StringParameterParser.StringValue; +import org.apache.logging.log4j.layout.template.json.util.StringParameterParser.Value; +import org.apache.logging.log4j.layout.template.json.util.StringParameterParser.Values; import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedWriterTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedWriterTest.java similarity index 99% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedWriterTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedWriterTest.java index 0373e75..4b3d3e0 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/TruncatingBufferedWriterTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/TruncatingBufferedWriterTest.java @@ -1,4 +1,4 @@ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/UrisTest.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/UrisTest.java similarity index 97% rename from log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/UrisTest.java rename to log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/UrisTest.java index 05e679b..7b0d1da 100644 --- a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/util/UrisTest.java +++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/util/UrisTest.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template.util; +package org.apache.logging.log4j.layout.template.json.util; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.status.StatusLogger; diff --git a/log4j-layout-json-template/src/test/resources/gcFreeJsonTemplateLayoutLogging.xml b/log4j-layout-template-json/src/test/resources/gcFreeJsonTemplateLayoutLogging.xml similarity index 100% rename from log4j-layout-json-template/src/test/resources/gcFreeJsonTemplateLayoutLogging.xml rename to log4j-layout-template-json/src/test/resources/gcFreeJsonTemplateLayoutLogging.xml diff --git a/log4j-layout-json-template/src/test/resources/nullEventDelimitedJsonTemplateLayoutLogging.xml b/log4j-layout-template-json/src/test/resources/nullEventDelimitedJsonTemplateLayoutLogging.xml similarity index 100% rename from log4j-layout-json-template/src/test/resources/nullEventDelimitedJsonTemplateLayoutLogging.xml rename to log4j-layout-template-json/src/test/resources/nullEventDelimitedJsonTemplateLayoutLogging.xml diff --git a/log4j-layout-json-template/src/test/resources/testJsonTemplateLayout.json b/log4j-layout-template-json/src/test/resources/testJsonTemplateLayout.json similarity index 100% rename from log4j-layout-json-template/src/test/resources/testJsonTemplateLayout.json rename to log4j-layout-template-json/src/test/resources/testJsonTemplateLayout.json diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml index e635eea..c36524d 100644 --- a/log4j-perf/pom.xml +++ b/log4j-perf/pom.xml @@ -71,12 +71,12 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-layout-json-template</artifactId> + <artifactId>log4j-layout-template-json</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-layout-json-template</artifactId> + <artifactId>log4j-layout-template-json</artifactId> <version>${project.version}</version> <type>test-jar</type> </dependency> diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmark.java similarity index 99% rename from log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmark.java rename to log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmark.java index 5af536b..1099625 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmark.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmarkReport.java b/log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java similarity index 98% rename from log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmarkReport.java rename to log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java index 2c43f0a..5f8dd2c 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmarkReport.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkReport.java @@ -1,6 +1,6 @@ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; -import org.apache.logging.log4j.layout.json.template.util.JsonReader; +import org.apache.logging.log4j.layout.template.json.util.JsonReader; import org.apache.logging.log4j.util.Strings; import java.io.File; @@ -31,7 +31,7 @@ import java.util.stream.Collectors; * <pre> * java \ * -cp log4j-perf/target/benchmarks.jar \ - * org.apache.logging.log4j.layout.json.template.JsonTemplateLayoutBenchmarkReport \ + * org.apache.logging.log4j.layout.template.json.JsonTemplateLayoutBenchmarkReport \ * log4j-perf/target/JsonTemplateLayoutBenchmarkResult.json \ * log4j-perf/target/JsonTemplateLayoutBenchmarkReport.adoc * </pre> diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmarkState.java b/log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkState.java similarity index 96% rename from log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmarkState.java rename to log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkState.java index d9848ae..7b59e08 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/layout/json/template/JsonTemplateLayoutBenchmarkState.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutBenchmarkState.java @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.layout.json.template; +package org.apache.logging.log4j.layout.template.json; import co.elastic.logging.log4j2.EcsLayout; import org.apache.logging.log4j.core.LogEvent; @@ -25,9 +25,9 @@ import org.apache.logging.log4j.core.layout.GelfLayout; import org.apache.logging.log4j.core.layout.JsonLayout; import org.apache.logging.log4j.core.util.KeyValuePair; import org.apache.logging.log4j.core.util.NetUtils; -import org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.EventTemplateAdditionalField; -import org.apache.logging.log4j.layout.json.template.JsonTemplateLayout.EventTemplateAdditionalFields; -import org.apache.logging.log4j.layout.json.template.util.ThreadLocalRecyclerFactory; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout.EventTemplateAdditionalField; +import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout.EventTemplateAdditionalFields; +import org.apache.logging.log4j.layout.template.json.util.ThreadLocalRecyclerFactory; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; diff --git a/pom.xml b/pom.xml index d232bde..9e5247c 100644 --- a/pom.xml +++ b/pom.xml @@ -363,7 +363,7 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-layout-json-template</artifactId> + <artifactId>log4j-layout-template-json</artifactId> <version>${project.version}</version> <type>test-jar</type> </dependency> @@ -1448,7 +1448,7 @@ <module>log4j-api</module> <module>log4j-core-java9</module> <module>log4j-core</module> - <module>log4j-layout-json-template</module> + <module>log4j-layout-template-json</module> <module>log4j-core-its</module> <module>log4j-1.2-api</module> <module>log4j-slf4j-impl</module> diff --git a/src/site/asciidoc/manual/json-template-layout.adoc.vm b/src/site/asciidoc/manual/json-template-layout.adoc.vm index c2da984..1c370ca 100644 --- a/src/site/asciidoc/manual/json-template-layout.adoc.vm +++ b/src/site/asciidoc/manual/json-template-layout.adoc.vm @@ -29,14 +29,14 @@ by the JSON template provided. In a nutshell, it shines with its [#usage] == Usage -Adding `log4j-layout-json-template` artifact to your list of dependencies is +Adding `log4j-layout-template-json` artifact to your list of dependencies is enough to enable access to `JsonTemplateLayout` in your Log4j configuration: [source,xml] ---- <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-layout-json-template</artifactId> + <artifactId>log4j-layout-template-json</artifactId> <version>${Log4jReleaseVersion}</version> </dependency> ---- @@ -321,7 +321,7 @@ parameters: `eventTemplate[Uri]` describes the JSON structure `JsonTemplateLayout` uses to serialize ``LogEvent``s. The default configuration (accessible by `log4j.layout.jsonTemplate.eventTemplate[Uri]` property) is set to -`classpath:EcsLayout.json` provided by the `log4j-layout-json-template` +`classpath:EcsLayout.json` provided by the `log4j-layout-template-json` artifact: [source,json] @@ -375,24 +375,24 @@ artifact: ---- -`log4j-layout-json-template` artifact contains the following predefined event +`log4j-layout-template-json` artifact contains the following predefined event templates: -- https://github.com/apache/logging-log4j2/tree/master/log4j-layout-json-template/src/main/resources/EcsLayout.json[`EcsLayout.json`] +- https://github.com/apache/logging-log4j2/tree/master/log4j-layout-template-json/src/main/resources/EcsLayout.json[`EcsLayout.json`] described by https://www.elastic.co/guide/en/ecs/current/ecs-reference.html[the Elastic Common Schema (ECS) specification] -- https://github.com/apache/logging-log4j2/tree/master/log4j-layout-json-template/src/main/resources/LogstashJsonEventLayoutV1.json[`LogstashJsonEventLayoutV1.json`] +- https://github.com/apache/logging-log4j2/tree/master/log4j-layout-template-json/src/main/resources/LogstashJsonEventLayoutV1.json[`LogstashJsonEventLayoutV1.json`] described in https://github.com/logstash/log4j-jsonevent-layout[Logstash `json_event` pattern for log4j] -- https://github.com/apache/logging-log4j2/tree/master/log4j-layout-json-template/src/main/resources/GelfLayout.json[`GelfLayout.json`] +- https://github.com/apache/logging-log4j2/tree/master/log4j-layout-template-json/src/main/resources/GelfLayout.json[`GelfLayout.json`] described by https://docs.graylog.org/en/3.1/pages/gelf.html#gelf-payload-specification[the Graylog Extended Log Format (GELF) payload specification] with additional `_thread` and `_logger` fields. (Here it is advised to override the obligatory `host` field with a user provided constant via `eventTemplateAdditionalFields` to avoid `hostName` property lookup at runtime, which incurs an extra cost.) -- https://github.com/apache/logging-log4j2/tree/master/log4j-layout-json-template/src/main/resources/JsonLayout.json[`JsonLayout.json`] +- https://github.com/apache/logging-log4j2/tree/master/log4j-layout-template-json/src/main/resources/JsonLayout.json[`JsonLayout.json`] providing the exact JSON structure generated by link:layouts.html#JSONLayout[`JsonLayout`] with the exception of `thrown` field. (`JsonLayout` serializes the `Throwable` as is via Jackson `ObjectMapper`, whereas `JsonLayout.json` template of @@ -1062,7 +1062,7 @@ a! to format ``StackTraceElement``s. The default configuration (accessible by `log4j.layout.jsonTemplate.stackTraceElementTemplate[Uri]` property) is set to `classpath:StackTraceElementLayout.json` provided by the -`log4j-layout-json-template` artifact: +`log4j-layout-template-json` artifact: [source,json] ----