This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 807e8452344c283e231f24048cfde9a46730e8ec Author: Gary Gregory <[email protected]> AuthorDate: Sat Feb 5 08:36:28 2022 -0500 Remove unused constants. Conflicts: log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/DenyAllFilterBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/SimpleLayoutBuilder.java --- .../org/apache/log4j/builders/filter/DenyAllFilterBuilder.java | 8 ++------ .../org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java | 3 --- .../org/apache/log4j/builders/layout/SimpleLayoutBuilder.java | 8 ++------ 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/DenyAllFilterBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/DenyAllFilterBuilder.java index f15d6e5..e0b28b5 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/DenyAllFilterBuilder.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/DenyAllFilterBuilder.java @@ -16,26 +16,22 @@ */ package org.apache.log4j.builders.filter; +import static org.apache.log4j.builders.BuilderManager.CATEGORY; + import org.apache.log4j.bridge.FilterWrapper; import org.apache.log4j.config.PropertiesConfiguration; import org.apache.log4j.spi.Filter; import org.apache.log4j.xml.XmlConfiguration; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.plugins.Plugin; import org.apache.logging.log4j.core.filter.DenyAllFilter; -import org.apache.logging.log4j.status.StatusLogger; import org.w3c.dom.Element; -import static org.apache.log4j.builders.BuilderManager.CATEGORY; - /** * Build a Pattern Layout */ @Plugin(name = "org.apache.log4j.varia.DenyAllFilter", category = CATEGORY) public class DenyAllFilterBuilder implements FilterBuilder { - private static final Logger LOGGER = StatusLogger.getLogger(); - @Override public Filter parseFilter(Element filterElement, XmlConfiguration config) { return new FilterWrapper(DenyAllFilter.newBuilder().build()); diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java index 218ae46..f7c1ce4 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java @@ -24,10 +24,8 @@ import org.apache.log4j.config.PropertiesConfiguration; import org.apache.log4j.spi.Filter; import org.apache.log4j.xml.XmlConfiguration; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.plugins.Plugin; import org.apache.logging.log4j.core.filter.LevelMatchFilter; -import org.apache.logging.log4j.status.StatusLogger; import org.w3c.dom.Element; import java.util.Properties; @@ -42,7 +40,6 @@ import static org.apache.log4j.xml.XmlConfiguration.VALUE_ATTR; @Plugin(name = "org.apache.log4j.varia.LevelMatchFilter", category = CATEGORY) public class LevelMatchFilterBuilder extends AbstractBuilder implements FilterBuilder { - private static final Logger LOGGER = StatusLogger.getLogger(); private static final String LEVEL = "LevelToMatch"; private static final String ACCEPT_ON_MATCH = "AcceptOnMatch"; diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/SimpleLayoutBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/SimpleLayoutBuilder.java index d35beba..906f02a 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/SimpleLayoutBuilder.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/SimpleLayoutBuilder.java @@ -16,28 +16,24 @@ */ package org.apache.log4j.builders.layout; +import static org.apache.log4j.builders.BuilderManager.CATEGORY; + import org.apache.log4j.Layout; import org.apache.log4j.bridge.LayoutWrapper; import org.apache.log4j.config.PropertiesConfiguration; import org.apache.log4j.xml.XmlConfiguration; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.plugins.Plugin; import org.apache.logging.log4j.core.layout.PatternLayout; -import org.apache.logging.log4j.status.StatusLogger; import org.w3c.dom.Element; import java.util.Properties; -import static org.apache.log4j.builders.BuilderManager.CATEGORY; - /** * Build a Pattern Layout */ @Plugin(name = "org.apache.log4j.SimpleLayout", category = CATEGORY) public class SimpleLayoutBuilder implements LayoutBuilder { - private static final Logger LOGGER = StatusLogger.getLogger(); - @Override public Layout parseLayout(Element layoutElement, XmlConfiguration config) { return new LayoutWrapper(PatternLayout.newBuilder()
