This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch fix/rebase-on-log4j-api-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 76419ecd45a62ac0785348893c9dfdee61c924b4 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Mon Mar 25 21:35:56 2024 +0100 Adapt `log4j-layout-template-json` to Log4j API 2.x --- .../log4j/layout/template/json/resolver/CaseConverterResolver.java | 2 +- .../layout/template/json/resolver/EventAdditionalFieldInterceptor.java | 2 +- .../logging/log4j/layout/template/json/resolver/TemplateResolvers.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/CaseConverterResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/CaseConverterResolver.java index 7953eb6c2a..0201352722 100644 --- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/CaseConverterResolver.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/CaseConverterResolver.java @@ -19,9 +19,9 @@ package org.apache.logging.log4j.layout.template.json.resolver; import java.util.Locale; import java.util.function.Function; import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.kit.json.JsonReader; import org.apache.logging.log4j.layout.template.json.JsonTemplateLayoutDefaults; import org.apache.logging.log4j.layout.template.json.util.JsonWriter; -import org.apache.logging.log4j.util.JsonReader; /** * Converts the case of string values. diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventAdditionalFieldInterceptor.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventAdditionalFieldInterceptor.java index 8386ae8568..4e4bb462bb 100644 --- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventAdditionalFieldInterceptor.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventAdditionalFieldInterceptor.java @@ -17,11 +17,11 @@ package org.apache.logging.log4j.layout.template.json.resolver; import java.util.Map; +import org.apache.logging.log4j.kit.json.JsonReader; import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout.EventTemplateAdditionalField; import org.apache.logging.log4j.plugins.Namespace; import org.apache.logging.log4j.plugins.Plugin; import org.apache.logging.log4j.plugins.PluginFactory; -import org.apache.logging.log4j.util.JsonReader; /** * Interceptor to add {@link EventTemplateAdditionalField diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java index f951518b64..52be78634e 100644 --- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.apache.logging.log4j.kit.json.JsonReader; import org.apache.logging.log4j.layout.template.json.util.JsonWriter; -import org.apache.logging.log4j.util.JsonReader; /** * Main class for compiling {@link TemplateResolver}s from a template.
