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 21fbb017e823dc1d68ea767bd9e606293a60f3ce Author: Gary Gregory <[email protected]> AuthorDate: Sun Feb 20 07:16:07 2022 -0500 Remove unused imports. Conflicts: log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/XmlLayoutBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java --- log4j-1.2-api/pom.xml | 4 + .../java/org/apache/log4j/RollingFileAppender.java | 8 +- .../main/java/org/apache/log4j/WriterAppender.java | 10 +-- .../org/apache/log4j/bridge/AppenderAdapter.java | 2 - .../org/apache/log4j/bridge/LayoutAdapter.java | 6 +- .../org/apache/log4j/bridge/LogEventAdapter.java | 8 +- .../org/apache/log4j/bridge/LogEventWrapper.java | 8 +- .../apache/log4j/bridge/RewritePolicyWrapper.java | 2 +- .../org/apache/log4j/builders/BuilderManager.java | 10 +-- .../log4j/builders/appender/AppenderBuilder.java | 4 +- .../builders/appender/ConsoleAppenderBuilder.java | 2 - .../builders/appender/SocketAppenderBuilder.java | 2 - .../builders/layout/PatternLayoutBuilder.java | 10 +-- .../org/apache/log4j/helpers/OptionConverter.java | 1 - .../org/apache/log4j/helpers/PatternParser.java | 9 ++- .../java/org/apache/log4j/helpers/QuietWriter.java | 6 +- .../org/apache/log4j/or/jms/MessageRenderer.java | 87 ++++++++++++++++++++++ .../log4j/pattern/Log4j1NdcPatternConverter.java | 4 +- .../org/apache/log4j/rewrite/MapRewritePolicy.java | 6 +- .../log4j/rewrite/PropertyRewritePolicy.java | 10 +-- .../org/apache/log4j/spi/AppenderAttachable.java | 4 +- .../log4j/xml/UnrecognizedElementHandler.java | 3 +- .../src/test/java/org/apache/log4j/LevelTest.java | 5 +- .../test/java/org/apache/log4j/ListAppender.java | 4 +- .../test/java/org/apache/log4j/LogWithMDCTest.java | 11 +-- .../java/org/apache/log4j/LogWithRouteTest.java | 10 ++- .../src/test/java/org/apache/log4j/LoggerTest.java | 17 +++-- .../test/java/org/apache/log4j/LoggingTest.java | 6 +- .../test/java/org/apache/log4j/PriorityTest.java | 6 +- .../apache/log4j/bridge/LogEventWrapperTest.java | 6 +- .../log4j/builders/Log4j2ListAppenderBuilder.java | 4 - .../org/apache/log4j/helpers/DateLayoutTest.java | 11 ++- .../apache/log4j/helpers/UtilLoggingLevelTest.java | 2 +- .../pattern/Log4j1NdcPatternConverterTest.java | 4 +- 34 files changed, 192 insertions(+), 100 deletions(-) diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml index 28518e6..163b6df 100644 --- a/log4j-1.2-api/pom.xml +++ b/log4j-1.2-api/pom.xml @@ -68,6 +68,10 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> + </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core-test</artifactId> <scope>test</scope> diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java b/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java index 964c519..2577b9a 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java @@ -17,14 +17,14 @@ package org.apache.log4j; -import java.io.IOException; -import java.io.Writer; import java.io.File; +import java.io.IOException; import java.io.InterruptedIOException; +import java.io.Writer; -import org.apache.log4j.helpers.OptionConverter; -import org.apache.log4j.helpers.LogLog; import org.apache.log4j.helpers.CountingQuietWriter; +import org.apache.log4j.helpers.LogLog; +import org.apache.log4j.helpers.OptionConverter; import org.apache.log4j.spi.LoggingEvent; /** diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java b/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java index 546ed44..db69696 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java @@ -17,17 +17,17 @@ package org.apache.log4j; -import org.apache.log4j.helpers.QuietWriter; -import org.apache.log4j.spi.ErrorHandler; -import org.apache.log4j.spi.LoggingEvent; -import org.apache.logging.log4j.status.StatusLogger; - import java.io.IOException; import java.io.InterruptedIOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; +import org.apache.log4j.helpers.QuietWriter; +import org.apache.log4j.spi.ErrorHandler; +import org.apache.log4j.spi.LoggingEvent; +import org.apache.logging.log4j.status.StatusLogger; + /** * WriterAppender appends log events to a {@link Writer} or an diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/AppenderAdapter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/AppenderAdapter.java index 3334535..1d36c45 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/AppenderAdapter.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/AppenderAdapter.java @@ -17,8 +17,6 @@ package org.apache.log4j.bridge; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; import org.apache.log4j.Appender; import org.apache.logging.log4j.core.Filter; diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java index 8711f2d..818e1fd 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java @@ -16,13 +16,13 @@ */ package org.apache.log4j.bridge; +import java.util.HashMap; +import java.util.Map; + import org.apache.log4j.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.layout.ByteBufferDestination; -import java.util.HashMap; -import java.util.Map; - /** * Class Description goes here. */ diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java index a2572b2..3fe6a28 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java @@ -16,6 +16,10 @@ */ package org.apache.log4j.bridge; +import java.lang.reflect.Method; +import java.util.Map; +import java.util.Set; + import org.apache.log4j.Category; import org.apache.log4j.Level; import org.apache.log4j.spi.LocationInfo; @@ -27,10 +31,6 @@ import org.apache.logging.log4j.core.util.Throwables; import org.apache.logging.log4j.spi.StandardLevel; import org.apache.logging.log4j.status.StatusLogger; -import java.lang.reflect.Method; -import java.util.Map; -import java.util.Set; - /** * Converts a Log4j 2 LogEvent into the components needed by a Log4j 1.x LoggingEvent. * This class requires Log4j 2. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventWrapper.java b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventWrapper.java index 4ab9db9..91d338a 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventWrapper.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventWrapper.java @@ -16,6 +16,10 @@ */ package org.apache.log4j.bridge; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + import org.apache.log4j.NDC; import org.apache.log4j.helpers.OptionConverter; import org.apache.log4j.spi.LocationInfo; @@ -35,10 +39,6 @@ import org.apache.logging.log4j.util.BiConsumer; import org.apache.logging.log4j.util.ReadOnlyStringMap; import org.apache.logging.log4j.util.TriConsumer; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - /** * Exposes a Log4j 1 logging event as a Log4j 2 LogEvent. */ diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyWrapper.java b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyWrapper.java index e0994e1..2a94481 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyWrapper.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyWrapper.java @@ -16,9 +16,9 @@ */ package org.apache.log4j.bridge; +import org.apache.log4j.rewrite.RewritePolicy; import org.apache.log4j.spi.LoggingEvent; import org.apache.logging.log4j.core.LogEvent; -import org.apache.log4j.rewrite.RewritePolicy; /** * Binds a Log4j 2 RewritePolicy to Log4j 1. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java index d0a8531..2c22216 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java @@ -16,6 +16,11 @@ */ package org.apache.log4j.builders; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Properties; + import org.apache.log4j.Appender; import org.apache.log4j.Layout; import org.apache.log4j.builders.appender.AppenderBuilder; @@ -36,11 +41,6 @@ import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.LoaderUtil; import org.w3c.dom.Element; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.Properties; - /** * */ diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AppenderBuilder.java index ff57bae..4dffaf1 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AppenderBuilder.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AppenderBuilder.java @@ -16,14 +16,14 @@ */ package org.apache.log4j.builders.appender; +import java.util.Properties; + import org.apache.log4j.Appender; import org.apache.log4j.builders.Builder; import org.apache.log4j.config.PropertiesConfiguration; import org.apache.log4j.xml.XmlConfiguration; import org.w3c.dom.Element; -import java.util.Properties; - /** * Define an Appender Builder. */ diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java index 1214452..333807a 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java @@ -24,8 +24,6 @@ import static org.apache.log4j.xml.XmlConfiguration.LAYOUT_TAG; import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG; import static org.apache.log4j.xml.XmlConfiguration.forEachElement; -import java.util.ArrayList; -import java.util.List; import java.util.Properties; import org.apache.log4j.Appender; diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SocketAppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SocketAppenderBuilder.java index a2997e4..116f3b7 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SocketAppenderBuilder.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SocketAppenderBuilder.java @@ -23,8 +23,6 @@ import static org.apache.log4j.xml.XmlConfiguration.LAYOUT_TAG; import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG; import static org.apache.log4j.xml.XmlConfiguration.forEachElement; -import java.util.ArrayList; -import java.util.List; import java.util.Properties; import org.apache.log4j.Appender; diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/PatternLayoutBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/PatternLayoutBuilder.java index dd076ce..4763ab1 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/PatternLayoutBuilder.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/PatternLayoutBuilder.java @@ -16,6 +16,11 @@ */ package org.apache.log4j.builders.layout; +import static org.apache.log4j.builders.BuilderManager.CATEGORY; +import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG; + +import java.util.Properties; + import org.apache.log4j.Layout; import org.apache.log4j.bridge.LayoutWrapper; import org.apache.log4j.builders.AbstractBuilder; @@ -31,11 +36,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import java.util.Properties; - -import static org.apache.log4j.builders.BuilderManager.CATEGORY; -import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG; - /** * Build a Pattern Layout */ diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java index 9888979..424c5c8 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java @@ -28,7 +28,6 @@ import org.apache.log4j.Level; import org.apache.log4j.PropertyConfigurator; import org.apache.log4j.spi.Configurator; import org.apache.log4j.spi.LoggerRepository; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.LoaderUtil; diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/PatternParser.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/PatternParser.java index 0d3ead6..5b5e65d 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/PatternParser.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/PatternParser.java @@ -16,14 +16,15 @@ */ package org.apache.log4j.helpers; -import org.apache.log4j.Layout; -import org.apache.log4j.spi.LoggingEvent; -import org.apache.log4j.spi.LocationInfo; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import java.util.Map; -import java.util.Arrays; + +import org.apache.log4j.Layout; +import org.apache.log4j.spi.LocationInfo; +import org.apache.log4j.spi.LoggingEvent; // Contributors: Nelson Minar <([email protected]> // Igor E. Poteryaev <[email protected]> diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java index 1779019..1b33ff3 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java @@ -17,12 +17,12 @@ package org.apache.log4j.helpers; -import org.apache.log4j.spi.ErrorCode; -import org.apache.log4j.spi.ErrorHandler; - import java.io.FilterWriter; import java.io.Writer; +import org.apache.log4j.spi.ErrorCode; +import org.apache.log4j.spi.ErrorHandler; + /** * QuietWriter does not throw exceptions when things go diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java new file mode 100644 index 0000000..14e1594 --- /dev/null +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java @@ -0,0 +1,87 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.log4j.or.jms; + +import javax.jms.DeliveryMode; +import javax.jms.JMSException; +import javax.jms.Message; + +import org.apache.log4j.or.ObjectRenderer; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.status.StatusLogger; + +/** + * Log4j 1.x JMS Message Renderer + */ +public class MessageRenderer implements ObjectRenderer { + private static final Logger LOGGER = StatusLogger.getLogger(); + + /** + Render a {@link javax.jms.Message}. + */ + @Override + public + String doRender(Object obj) { + if (obj instanceof Message) { + StringBuilder sb = new StringBuilder(); + Message message = (Message) obj; + try { + sb.append("DeliveryMode="); + switch(message.getJMSDeliveryMode()) { + case DeliveryMode.NON_PERSISTENT : + sb.append("NON_PERSISTENT"); + break; + case DeliveryMode.PERSISTENT : + sb.append("PERSISTENT"); + break; + default: sb.append("UNKNOWN"); + } + sb.append(", CorrelationID="); + sb.append(message.getJMSCorrelationID()); + + sb.append(", Destination="); + sb.append(message.getJMSDestination()); + + sb.append(", Expiration="); + sb.append(message.getJMSExpiration()); + + sb.append(", MessageID="); + sb.append(message.getJMSMessageID()); + + sb.append(", Priority="); + sb.append(message.getJMSPriority()); + + sb.append(", Redelivered="); + sb.append(message.getJMSRedelivered()); + + sb.append(", ReplyTo="); + sb.append(message.getJMSReplyTo()); + + sb.append(", Timestamp="); + sb.append(message.getJMSTimestamp()); + + sb.append(", Type="); + sb.append(message.getJMSType()); + + } catch(JMSException e) { + LOGGER.error("Could not parse Message.", e); + } + return sb.toString(); + } + return obj.toString(); + } +} diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java index 7301799..7a53969 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java @@ -16,6 +16,8 @@ */ package org.apache.log4j.pattern; +import java.util.List; + import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.plugins.Plugin; import org.apache.logging.log4j.core.pattern.ConverterKeys; @@ -23,8 +25,6 @@ import org.apache.logging.log4j.core.pattern.LogEventPatternConverter; import org.apache.logging.log4j.core.pattern.PatternConverter; import org.apache.logging.log4j.util.Strings; -import java.util.List; - /** * Returns the event's NDC in a StringBuilder. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java index 4f53583..9cd42a1 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java @@ -16,6 +16,9 @@ */ package org.apache.log4j.rewrite; +import java.util.HashMap; +import java.util.Map; + import org.apache.log4j.bridge.LogEventAdapter; import org.apache.log4j.helpers.OptionConverter; import org.apache.log4j.spi.LocationInfo; @@ -27,9 +30,6 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.SimpleMessage; import org.apache.logging.log4j.util.SortedArrayStringMap; -import java.util.HashMap; -import java.util.Map; - /** * This policy rewrites events where the message of the * original event implements java.util.Map. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java index d320d89..ab9b2b2 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java @@ -16,6 +16,11 @@ */ package org.apache.log4j.rewrite; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; + import org.apache.log4j.bridge.LogEventAdapter; import org.apache.log4j.helpers.OptionConverter; import org.apache.log4j.spi.LocationInfo; @@ -25,11 +30,6 @@ import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.message.SimpleMessage; import org.apache.logging.log4j.util.SortedArrayStringMap; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.StringTokenizer; - /** * This policy rewrites events by adding * a user-specified list of properties to the event. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java index 120cb50..bdc2aa9 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java @@ -17,10 +17,10 @@ package org.apache.log4j.spi; -import org.apache.log4j.Appender; - import java.util.Enumeration; +import org.apache.log4j.Appender; + /** * Interface for attaching appenders to objects. */ diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/UnrecognizedElementHandler.java b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/UnrecognizedElementHandler.java index a943f5f..44c832a 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/UnrecognizedElementHandler.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/UnrecognizedElementHandler.java @@ -16,9 +16,10 @@ */ package org.apache.log4j.xml; -import org.w3c.dom.Element; import java.util.Properties; +import org.w3c.dom.Element; + /** * When implemented by an object configured by DOMConfigurator, * the handle method will be called when an unrecognized child diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LevelTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/LevelTest.java index bb991ad..5f9c673 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/LevelTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LevelTest.java @@ -17,13 +17,14 @@ package org.apache.log4j; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.Locale; import org.apache.log4j.util.SerializationTestHelper; import org.junit.Test; -import static org.junit.Assert.*; - /** * Tests of Level. diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/ListAppender.java b/log4j-1.2-api/src/test/java/org/apache/log4j/ListAppender.java index 83c2758..573d986 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/ListAppender.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/ListAppender.java @@ -16,13 +16,13 @@ */ package org.apache.log4j; -import org.apache.log4j.spi.LoggingEvent; - import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; +import org.apache.log4j.spi.LoggingEvent; + /** * Used to test Log4j 1 support. */ diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java index 0cc7a33..ece2826 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java @@ -16,14 +16,15 @@ */ package org.apache.log4j; -import org.apache.logging.log4j.core.test.junit.LoggerContextRule; -import org.apache.logging.log4j.core.test.appender.ListAppender; -import org.junit.ClassRule; -import org.junit.Test; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.util.List; -import static org.junit.Assert.*; +import org.apache.logging.log4j.core.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; +import org.junit.ClassRule; +import org.junit.Test; /** * Test logging with MDC values. diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java index 2770124..19a4642 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java @@ -16,16 +16,18 @@ */ package org.apache.log4j; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; + import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.test.appender.ListAppender; import org.apache.logging.log4j.core.test.junit.LoggerContextSource; import org.apache.logging.log4j.test.junit.UsingThreadContextMap; import org.junit.jupiter.api.Test; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.*; - /** * Test passing MDC values to the Routing appender. */ diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java index 6a1d1f0..6340301 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java @@ -17,6 +17,17 @@ package org.apache.log4j; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import java.util.Locale; +import java.util.ResourceBundle; + import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; @@ -30,12 +41,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import java.util.List; -import java.util.Locale; -import java.util.ResourceBundle; - -import static org.junit.jupiter.api.Assertions.*; - /** * Used for internal unit testing the Logger class. */ diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java index 2f9d139..e72f3be 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java @@ -16,12 +16,12 @@ */ package org.apache.log4j; -import org.apache.logging.log4j.core.test.junit.LoggerContextSource; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.apache.logging.log4j.core.test.junit.LoggerContextSource; +import org.junit.jupiter.api.Test; + /** * */ diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/PriorityTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/PriorityTest.java index 63321a7..09f6386 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/PriorityTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/PriorityTest.java @@ -17,12 +17,14 @@ package org.apache.log4j; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.Locale; import org.junit.Test; -import static org.junit.Assert.*; - /** * Tests of Priority. * diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/bridge/LogEventWrapperTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/bridge/LogEventWrapperTest.java index af38045..3f599d6 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/bridge/LogEventWrapperTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/bridge/LogEventWrapperTest.java @@ -17,13 +17,13 @@ package org.apache.log4j.bridge; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.log4j.spi.LoggingEvent; import org.apache.logging.log4j.core.LogEvent; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - public class LogEventWrapperTest { @Test diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/builders/Log4j2ListAppenderBuilder.java b/log4j-1.2-api/src/test/java/org/apache/log4j/builders/Log4j2ListAppenderBuilder.java index ccef99b..d7d9021 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/builders/Log4j2ListAppenderBuilder.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/builders/Log4j2ListAppenderBuilder.java @@ -19,13 +19,9 @@ package org.apache.log4j.builders; import static org.apache.log4j.builders.BuilderManager.CATEGORY; import static org.apache.log4j.xml.XmlConfiguration.FILTER_TAG; import static org.apache.log4j.xml.XmlConfiguration.LAYOUT_TAG; -import static org.apache.log4j.xml.XmlConfiguration.NAME_ATTR; import static org.apache.log4j.xml.XmlConfiguration.forEachElement; -import java.util.ArrayList; -import java.util.List; import java.util.Properties; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import org.apache.log4j.Appender; diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java index 0573e78..e650f3d 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java @@ -17,15 +17,14 @@ package org.apache.log4j.helpers; -import org.apache.log4j.Layout; -import org.apache.log4j.LayoutTest; -import org.apache.log4j.spi.LoggingEvent; - import java.text.DateFormat; import java.text.SimpleDateFormat; - -import java.util.TimeZone; import java.util.Calendar; +import java.util.TimeZone; + +import org.apache.log4j.Layout; +import org.apache.log4j.LayoutTest; +import org.apache.log4j.spi.LoggingEvent; /** * Tests {@link DateLayout}. diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/UtilLoggingLevelTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/UtilLoggingLevelTest.java index ad2868b..6ac556a 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/UtilLoggingLevelTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/UtilLoggingLevelTest.java @@ -17,7 +17,7 @@ package org.apache.log4j.helpers; -import junit.framework.*; +import junit.framework.TestCase; /** diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1NdcPatternConverterTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1NdcPatternConverterTest.java index 208bc28..170e7bf 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1NdcPatternConverterTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1NdcPatternConverterTest.java @@ -16,6 +16,8 @@ */ package org.apache.log4j.pattern; +import static org.junit.Assert.assertEquals; + import org.apache.logging.log4j.Level; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.LogEvent; @@ -25,8 +27,6 @@ import org.apache.logging.log4j.message.SimpleMessage; import org.junit.Rule; import org.junit.Test; -import static org.junit.Assert.assertEquals; - public class Log4j1NdcPatternConverterTest { @Rule
