From ac10d2549a32e5d5bcdbf81458e6d0dc83fe36ca Mon Sep 17 00:00:00 2001 From: Henning Schmiedehausen Date: Sun, 11 Aug 2013 18:05:11 -0700 Subject: [PATCH] convert Appender to not use Generics --- .../apache/logging/log4j/util/PropertiesUtil.java | 1 - .../org/apache/logging/log4j/core/Appender.java | 4 +- .../java/org/apache/logging/log4j/core/Logger.java | 6 +- .../log4j/core/appender/AbstractAppender.java | 12 +- .../appender/AbstractOutputStreamAppender.java | 4 +- .../logging/log4j/core/appender/AsyncAppender.java | 21 +- .../log4j/core/appender/ConsoleAppender.java | 19 +- .../log4j/core/appender/FailoverAppender.java | 13 +- .../logging/log4j/core/appender/FileAppender.java | 15 +- .../logging/log4j/core/appender/FileManager.java | 9 +- .../log4j/core/appender/JMSQueueAppender.java | 15 +- .../log4j/core/appender/JMSTopicAppender.java | 15 +- .../log4j/core/appender/OutputStreamManager.java | 2 +- .../core/appender/RandomAccessFileAppender.java | 15 +- .../core/appender/RandomAccessFileManager.java | 9 +- .../log4j/core/appender/RollingFileAppender.java | 15 +- .../appender/RollingRandomAccessFileAppender.java | 15 +- .../logging/log4j/core/appender/SMTPAppender.java | 15 +- .../log4j/core/appender/SocketAppender.java | 17 +- .../log4j/core/appender/SyslogAppender.java | 11 +- .../core/appender/db/AbstractDatabaseAppender.java | 2 +- .../core/appender/rewrite/RewriteAppender.java | 13 +- .../core/appender/rolling/RollingFileManager.java | 9 +- .../rolling/RollingRandomAccessFileManager.java | 9 +- .../core/appender/routing/RoutingAppender.java | 34 +- .../logging/log4j/core/config/AppenderControl.java | 12 +- .../log4j/core/config/BaseConfiguration.java | 24 +- .../logging/log4j/core/config/Configuration.java | 4 +- .../log4j/core/config/ConfigurationFactory.java | 4 +- .../log4j/core/config/DefaultConfiguration.java | 2 +- .../log4j/core/config/JSONConfiguration.java | 2 +- .../logging/log4j/core/config/LoggerConfig.java | 41 +- .../org/apache/logging/log4j/core/config/Node.java | 6 +- .../log4j/core/config/XMLConfiguration.java | 2 +- .../log4j/core/config/plugins/AppendersPlugin.java | 15 +- .../log4j/core/config/plugins/PluginManager.java | 38 +- .../logging/log4j/core/jmx/AppenderAdmin.java | 4 +- .../org/apache/logging/log4j/core/jmx/Server.java | 4 +- .../logging/log4j/core/lookup/Interpolator.java | 6 +- .../log4j/core/net/AbstractSocketManager.java | 9 +- .../log4j/core/net/DatagramSocketManager.java | 17 +- .../log4j/core/net/MulticastDNSAdvertiser.java | 4 +- .../logging/log4j/core/net/TCPSocketManager.java | 21 +- .../logging/log4j/core/pattern/PatternParser.java | 4 +- .../core/selector/ClassLoaderContextSelector.java | 14 +- .../logging/dumbster/smtp/SimpleSmtpServer.java | 554 ++++++++++----------- .../apache/logging/dumbster/smtp/SmtpMessage.java | 312 ++++++------ .../apache/logging/log4j/ReflectionComparison.java | 9 +- .../logging/log4j/core/AppenderRefLevelTest.java | 11 +- .../apache/logging/log4j/core/FileConfigTest.java | 2 +- .../logging/log4j/core/LogEventFactoryTest.java | 7 +- .../org/apache/logging/log4j/core/LoggerTest.java | 15 +- .../logging/log4j/core/LoggerUpdateTest.java | 15 +- .../logging/log4j/core/ShutdownDisabledTest.java | 3 +- .../logging/log4j/core/StrictXMLConfigTest.java | 7 +- .../core/appender/AsyncAppenderNoLocationTest.java | 7 +- .../log4j/core/appender/AsyncAppenderTest.java | 7 +- .../log4j/core/appender/ConsoleAppenderTest.java | 2 +- .../log4j/core/appender/FailoverAppenderTest.java | 9 +- .../log4j/core/appender/FileAppenderTest.java | 2 +- .../core/appender/OutputStreamAppenderTest.java | 2 +- .../log4j/core/appender/SMTPAppenderTest.java | 2 +- .../log4j/core/appender/SocketAppenderTest.java | 6 +- .../log4j/core/appender/SyslogAppenderTest.java | 6 +- .../appender/db/jdbc/AbstractJdbcAppenderTest.java | 4 +- .../appender/db/jpa/AbstractJpaAppenderTest.java | 4 +- .../core/appender/rewrite/RewriteAppenderTest.java | 11 +- .../appender/routing/JSONRoutingAppender2Test.java | 7 +- .../appender/routing/JSONRoutingAppenderTest.java | 7 +- .../core/appender/routing/RoutingAppenderTest.java | 7 +- .../routing/RoutingAppenderWithJndiTest.java | 32 +- .../routing/RoutingDefaultAppenderTest.java | 7 +- .../log4j/core/config/BaseConfigurationTest.java | 6 +- .../log4j/core/config/TestConfigurator.java | 24 +- .../log4j/core/config/XMLConfigurationTest.java | 8 +- .../log4j/core/config/XMLLoggerPropsTest.java | 7 +- .../logging/log4j/core/filter/BurstFilterTest.java | 7 +- .../logging/log4j/core/filter/MapFilterTest.java | 5 +- .../logging/log4j/core/layout/HTMLLayoutTest.java | 2 +- .../log4j/core/layout/RFC5424LayoutTest.java | 8 +- .../log4j/core/layout/SerializedLayoutTest.java | 2 +- .../log4j/core/layout/SyslogLayoutTest.java | 2 +- .../logging/log4j/core/layout/XMLLayoutTest.java | 2 +- .../log4j/core/net/AbstractSocketServerTest.java | 26 +- .../log4j/core/net/JMSQueueAppenderTest.java | 2 +- .../log4j/core/net/JMSQueueFailoverTest.java | 7 +- .../logging/log4j/core/net/JMSQueueTest.java | 8 +- .../log4j/core/net/JMSTopicFailoverTest.java | 7 +- .../logging/log4j/core/net/JMSTopicTest.java | 22 +- .../log4j/core/pattern/ExtendedThrowableTest.java | 10 +- .../log4j/core/pattern/RegexReplacementTest.java | 11 +- .../log4j/core/pattern/RootThrowableTest.java | 7 +- .../log4j/core/pattern/StyleConverterTest.java | 7 +- .../logging/log4j/core/pattern/ThrowableTest.java | 7 +- .../apache/logging/log4j/core/util/Compare.java | 8 +- .../apache/logging/log4j/core/util/Profiler.java | 6 +- .../log4j/test/appender/AlwaysFailAppender.java | 8 +- .../log4j/test/appender/FailOnceAppender.java | 7 +- .../log4j/test/appender/InMemoryAppender.java | 6 +- .../logging/log4j/test/appender/ListAppender.java | 14 +- .../log4j/flume/appender/FlumeAppender.java | 15 +- .../flume/appender/FlumePersistentManager.java | 6 +- .../log4j/flume/appender/FlumeAppenderTest.java | 8 +- .../apache/logging/log4j/jcl/LogFactoryImpl.java | 2 +- .../org/apache/logging/log4j/jcl/LoggerTest.java | 7 +- .../java/org/apache/logging/slf4j/LoggerTest.java | 3 + .../src/main/java/org/apache/log4j/Category.java | 6 +- .../src/main/java/org/apache/log4j/LogManager.java | 5 +- .../src/main/java/org/apache/log4j/NDC.java | 1 + .../org/apache/log4j/helpers/NullEnumeration.java | 1 + .../org/apache/log4j/spi/LoggerRepository.java | 2 + .../java/org/apache/log4j/xml/DOMConfigurator.java | 3 +- .../test/java/org/apache/log4j/CategoryTest.java | 4 +- .../src/test/java/org/apache/log4j/LoggerTest.java | 32 +- .../test/java/org/apache/log4j/LoggingTest.java | 3 +- pom.xml | 48 +- .../logging/log4j/samples/app/LogEventFactory.java | 4 +- .../java/org/slf4j/helpers/EventDataConverter.java | 6 +- .../java/org/slf4j/helpers/Log4jMDCAdapter.java | 2 +- .../java/org/apache/logging/slf4j/LoggerTest.java | 13 +- .../org/apache/logging/slf4j/OptionalTest.java | 13 +- .../logging/log4j/taglib/CatchingTagTest.java | 7 +- .../apache/logging/log4j/taglib/EntryTagTest.java | 7 +- .../apache/logging/log4j/taglib/ExitTagTest.java | 7 +- .../log4j/taglib/LoggingMessageTagSupportTest.java | 7 +- 125 files changed, 1015 insertions(+), 1023 deletions(-) diff --git a/api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java b/api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java index e08115e..500405f 100644 --- a/api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java +++ b/api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java @@ -18,7 +18,6 @@ package org.apache.logging.log4j.util; import java.io.IOException; import java.io.InputStream; -import java.net.URL; import java.util.Properties; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/logging/log4j/core/Appender.java b/core/src/main/java/org/apache/logging/log4j/core/Appender.java index 0f5c348..d750c89 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/Appender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/Appender.java @@ -23,7 +23,7 @@ import java.io.Serializable; * * @param The {@link Layout}'s {@link Serializable} type. */ -public interface Appender extends LifeCycle { +public interface Appender extends LifeCycle { /** * Log in Appender specific way. When appropriate, @@ -47,7 +47,7 @@ public interface Appender extends LifeCycle { * * @return the Layout for the Appender or null if none is configured. */ - Layout getLayout(); + Layout getLayout(); /** * Some appenders need to propagate exceptions back to the application. When {@code ignoreExceptions} is diff --git a/core/src/main/java/org/apache/logging/log4j/core/Logger.java b/core/src/main/java/org/apache/logging/log4j/core/Logger.java index 41fb2f1..271b215 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/Logger.java +++ b/core/src/main/java/org/apache/logging/log4j/core/Logger.java @@ -139,7 +139,7 @@ public class Logger extends AbstractLogger { * This method is not exposed through the public API and is used primarily for unit testing. * @param appender The Appender to add to the Logger. */ - public void addAppender(final Appender appender) { + public void addAppender(final Appender appender) { config.config.addLoggerAppender(this, appender); } @@ -147,7 +147,7 @@ public class Logger extends AbstractLogger { * This method is not exposed through the public API and is used primarily for unit testing. * @param appender The Appender to remove from the Logger. */ - public void removeAppender(final Appender appender) { + public void removeAppender(final Appender appender) { config.loggerConfig.removeAppender(appender.getName()); } @@ -155,7 +155,7 @@ public class Logger extends AbstractLogger { * This method is not exposed through the public API and is used primarily for unit testing. * @return A Map containing the Appender's name as the key and the Appender as the value. */ - public Map> getAppenders() { + public Map getAppenders() { return config.loggerConfig.getAppenders(); } diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java index bad994b..0712a4c 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java @@ -34,8 +34,8 @@ import org.apache.logging.log4j.status.StatusLogger; * * @param The {@link Layout}'s {@link Serializable} type. */ -public abstract class AbstractAppender extends AbstractFilterable - implements Appender { +public abstract class AbstractAppender extends AbstractFilterable + implements Appender { /** * Allow subclasses access to the status logger without creating another instance. */ @@ -45,7 +45,7 @@ public abstract class AbstractAppender extends AbstractF private ErrorHandler handler = new DefaultErrorHandler(this); - private final Layout layout; + private final Layout layout; private final String name; @@ -69,7 +69,7 @@ public abstract class AbstractAppender extends AbstractF * @param filter The Filter to associate with the Appender. * @param layout The layout to use to format the event. */ - protected AbstractAppender(final String name, final Filter filter, final Layout layout) { + protected AbstractAppender(final String name, final Filter filter, final Layout layout) { this(name, filter, layout, true); } @@ -81,7 +81,7 @@ public abstract class AbstractAppender extends AbstractF * @param ignoreExceptions If true, exceptions will be logged and suppressed. If false errors will be * logged and then passed to the application. */ - protected AbstractAppender(final String name, final Filter filter, final Layout layout, + protected AbstractAppender(final String name, final Filter filter, final Layout layout, final boolean ignoreExceptions) { super(filter); this.name = name; @@ -130,7 +130,7 @@ public abstract class AbstractAppender extends AbstractF * @return The Layout used to format the event. */ @Override - public Layout getLayout() { + public Layout getLayout() { return layout; } diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java index c0fad26..c6179a5 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java @@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.LogEvent; * * @param The {@link Layout}'s {@link Serializable} type. */ -public abstract class AbstractOutputStreamAppender extends AbstractAppender { +public abstract class AbstractOutputStreamAppender extends AbstractAppender { /** * Immediate flush means that the underlying writer or output stream @@ -57,7 +57,7 @@ public abstract class AbstractOutputStreamAppender exten * @param layout The layout to format the message. * @param manager The OutputStreamManager. */ - protected AbstractOutputStreamAppender(final String name, final Layout layout, final Filter filter, + protected AbstractOutputStreamAppender(final String name, final Layout layout, final Filter filter, final boolean ignoreExceptions, final boolean immediateFlush, final OutputStreamManager manager) { super(name, filter, layout, ignoreExceptions); diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java index 6884b75..bdb0607 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java @@ -48,7 +48,7 @@ import org.apache.logging.log4j.core.impl.Log4jLogEvent; * @param The {@link org.apache.logging.log4j.core.Layout}'s {@link Serializable} type. */ @Plugin(name = "Async", category = "Core", elementType = "appender", printObject = true) -public final class AsyncAppender extends AbstractAppender { +public final class AsyncAppender extends AbstractAppender { private static final int DEFAULT_QUEUE_SIZE = 128; private static final String SHUTDOWN = "Shutdown"; @@ -59,7 +59,7 @@ public final class AsyncAppender extends AbstractAppende private final AppenderRef[] appenderRefs; private final String errorRef; private final boolean includeLocation; - private AppenderControl errorAppender; + private AppenderControl errorAppender; private AsyncThread thread; private static final AtomicLong threadSequence = new AtomicLong(1); @@ -78,10 +78,9 @@ public final class AsyncAppender extends AbstractAppende } @Override - @SuppressWarnings("unchecked") public void start() { - final Map> map = config.getAppenders(); - final List> appenders = new ArrayList>(); + final Map map = config.getAppenders(); + final List appenders = new ArrayList(); for (final AppenderRef appenderRef : appenderRefs) { if (map.containsKey(appenderRef.getRef())) { appenders.add(new AppenderControl(map.get(appenderRef.getRef()), appenderRef.getLevel(), @@ -167,7 +166,7 @@ public final class AsyncAppender extends AbstractAppende * @return The AsyncAppender. */ @PluginFactory - public static AsyncAppender createAppender( + public static AsyncAppender createAppender( @PluginElement("appender-ref") final AppenderRef[] appenderRefs, @PluginAttr("error-ref") final String errorRef, @PluginAttr("blocking") final String blocking, @@ -190,7 +189,7 @@ public final class AsyncAppender extends AbstractAppende final boolean isIncludeLocation = Boolean.parseBoolean(includeLocation); final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true); - return new AsyncAppender(name, filter, appenderRefs, errorRef, + return new AsyncAppender(name, filter, appenderRefs, errorRef, queueSize, isBlocking, ignoreExceptions, config, isIncludeLocation); } @@ -200,10 +199,10 @@ public final class AsyncAppender extends AbstractAppende private class AsyncThread extends Thread { private volatile boolean shutdown = false; - private final List> appenders; + private final List appenders; private final BlockingQueue queue; - public AsyncThread(final List> appenders, final BlockingQueue queue) { + public AsyncThread(final List appenders, final BlockingQueue queue) { this.appenders = appenders; this.queue = queue; setDaemon(true); @@ -227,7 +226,7 @@ public final class AsyncAppender extends AbstractAppende final Log4jLogEvent event = Log4jLogEvent.deserialize(s); event.setEndOfBatch(queue.isEmpty()); boolean success = false; - for (final AppenderControl control : appenders) { + for (final AppenderControl control : appenders) { try { control.callAppender(event); success = true; @@ -250,7 +249,7 @@ public final class AsyncAppender extends AbstractAppende if (s instanceof Log4jLogEvent) { final Log4jLogEvent event = Log4jLogEvent.deserialize(s); event.setEndOfBatch(queue.isEmpty()); - for (final AppenderControl control : appenders) { + for (final AppenderControl control : appenders) { control.callAppender(event); } } diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java index 155204d..83ab5af 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java @@ -48,7 +48,7 @@ import org.apache.logging.log4j.util.PropertiesUtil; * @param The {@link Layout}'s {@link Serializable} type. */ @Plugin(name = "Console", category = "Core", elementType = "appender", printObject = true) -public final class ConsoleAppender extends AbstractOutputStreamAppender { +public final class ConsoleAppender extends AbstractOutputStreamAppender { private static ConsoleManagerFactory factory = new ConsoleManagerFactory(); @@ -62,7 +62,7 @@ public final class ConsoleAppender extends AbstractOutpu SYSTEM_ERR } - private ConsoleAppender(final String name, final Layout layout, final Filter filter, + private ConsoleAppender(final String name, final Layout layout, final Filter filter, final OutputStreamManager manager, final boolean ignoreExceptions) { super(name, layout, filter, ignoreExceptions, true, manager); @@ -81,7 +81,7 @@ public final class ConsoleAppender extends AbstractOutpu * @return The ConsoleAppender. */ @PluginFactory - public static ConsoleAppender createAppender(@PluginElement("layout") Layout layout, + public static ConsoleAppender createAppender(@PluginElement("layout") Layout layout, @PluginElement("filters") final Filter filter, @PluginAttr("target") final String t, @PluginAttr("name") final String name, @@ -92,18 +92,15 @@ public final class ConsoleAppender extends AbstractOutpu return null; } if (layout == null) { - @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) - final - Layout l = (Layout) PatternLayout.createLayout(null, null, null, null, null); - layout = l; + layout = PatternLayout.createLayout(null, null, null, null, null); } final boolean isFollow = Boolean.parseBoolean(follow); final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true); final Target target = t == null ? Target.SYSTEM_OUT : Target.valueOf(t); - return new ConsoleAppender(name, layout, filter, getManager(isFollow, target, layout), ignoreExceptions); + return new ConsoleAppender(name, layout, filter, getManager(isFollow, target, layout), ignoreExceptions); } - private static OutputStreamManager getManager(final boolean follow, final Target target, final Layout layout) { + private static OutputStreamManager getManager(final boolean follow, final Target target, final Layout layout) { final String type = target.name(); final OutputStream os = getOutputStream(follow, target); return OutputStreamManager.getManager(target.name() + "." + follow, new FactoryData(os, type, layout), factory); @@ -217,14 +214,14 @@ public final class ConsoleAppender extends AbstractOutpu private static class FactoryData { private final OutputStream os; private final String type; - private final Layout layout; + private final Layout layout; /** * Constructor. * @param os The OutputStream. * @param type The name of the target. */ - public FactoryData(final OutputStream os, final String type, final Layout layout) { + public FactoryData(final OutputStream os, final String type, final Layout layout) { this.os = os; this.type = type; this.layout = layout; diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java index 13b333f..1ca491b 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java @@ -43,7 +43,7 @@ import org.apache.logging.log4j.core.helpers.Constants; * @param The {@link org.apache.logging.log4j.core.Layout}'s {@link Serializable} type. */ @Plugin(name = "Failover", category = "Core", elementType = "appender", printObject = true) -public final class FailoverAppender extends AbstractAppender { +public final class FailoverAppender extends AbstractAppender { private static final int DEFAULT_INTERVAL_SECONDS = 60; @@ -53,9 +53,9 @@ public final class FailoverAppender extends AbstractAppe private final Configuration config; - private AppenderControl primary; + private AppenderControl primary; - private final List> failoverAppenders = new ArrayList>(); + private final List failoverAppenders = new ArrayList(); private final long intervalMillis; @@ -74,9 +74,8 @@ public final class FailoverAppender extends AbstractAppe @Override - @SuppressWarnings("unchecked") public void start() { - final Map> map = config.getAppenders(); + final Map map = config.getAppenders(); int errors = 0; if (map.containsKey(primaryRef)) { primary = new AppenderControl(map.get(primaryRef), null, null); @@ -187,7 +186,7 @@ public final class FailoverAppender extends AbstractAppe * @return The FailoverAppender that was created. */ @PluginFactory - public static FailoverAppender createAppender(@PluginAttr("name") final String name, + public static FailoverAppender createAppender(@PluginAttr("name") final String name, @PluginAttr("primary") final String primary, @PluginElement("failovers") final String[] failovers, @PluginAttr("retryInterval") final String retryIntervalString, @@ -218,6 +217,6 @@ public final class FailoverAppender extends AbstractAppe final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true); - return new FailoverAppender(name, filter, primary, failovers, retryIntervalMillis, config, ignoreExceptions); + return new FailoverAppender(name, filter, primary, failovers, retryIntervalMillis, config, ignoreExceptions); } } diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java index 126a772..69993c3 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java @@ -38,13 +38,13 @@ import org.apache.logging.log4j.core.net.Advertiser; * @param The {@link Layout}'s {@link Serializable} type. */ @Plugin(name = "File", category = "Core", elementType = "appender", printObject = true) -public final class FileAppender extends AbstractOutputStreamAppender { +public final class FileAppender extends AbstractOutputStreamAppender { private final String fileName; private final Advertiser advertiser; private Object advertisement; - private FileAppender(final String name, final Layout layout, final Filter filter, final FileManager manager, + private FileAppender(final String name, final Layout layout, final Filter filter, final FileManager manager, final String filename, final boolean ignoreExceptions, final boolean immediateFlush, final Advertiser advertiser) { super(name, layout, filter, ignoreExceptions, immediateFlush, manager); @@ -97,14 +97,14 @@ public final class FileAppender extends AbstractOutputSt * @return The FileAppender. */ @PluginFactory - public static FileAppender createAppender(@PluginAttr("fileName") final String fileName, + public static FileAppender createAppender(@PluginAttr("fileName") final String fileName, @PluginAttr("append") final String append, @PluginAttr("locking") final String locking, @PluginAttr("name") final String name, @PluginAttr("immediateFlush") final String immediateFlush, @PluginAttr("ignoreExceptions") final String ignore, @PluginAttr("bufferedIO") final String bufferedIO, - @PluginElement("layout") Layout layout, + @PluginElement("layout") Layout layout, @PluginElement("filters") final Filter filter, @PluginAttr("advertise") final String advertise, @PluginAttr("advertiseURI") final String advertiseURI, @@ -133,10 +133,7 @@ public final class FileAppender extends AbstractOutputSt return null; } if (layout == null) { - @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) - final - Layout l = (Layout) PatternLayout.createLayout(null, null, null, null, null); - layout = l; + layout = PatternLayout.createLayout(null, null, null, null, null); } final FileManager manager = FileManager.getFileManager(fileName, isAppend, isLocking, isBuffered, advertiseURI, @@ -146,7 +143,7 @@ public final class FileAppender extends AbstractOutputSt } - return new FileAppender(name, layout, filter, manager, fileName, ignoreExceptions, isFlush, + return new FileAppender(name, layout, filter, manager, fileName, ignoreExceptions, isFlush, isAdvertise ? config.getAdvertiser() : null); } } diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java b/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java index 7adb24a..37e7379 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java @@ -22,6 +22,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.io.Serializable; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; import java.util.HashMap; @@ -42,7 +43,7 @@ public class FileManager extends OutputStreamManager { private final String advertiseURI; protected FileManager(final String fileName, final OutputStream os, final boolean append, final boolean locking, - final String advertiseURI, final Layout layout) { + final String advertiseURI, final Layout layout) { super(os, fileName, layout); this.isAppend = append; this.isLocking = locking; @@ -61,7 +62,7 @@ public class FileManager extends OutputStreamManager { */ public static FileManager getFileManager(final String fileName, final boolean append, boolean locking, final boolean bufferedIO, final String advertiseURI, - final Layout layout) { + final Layout layout) { if (locking && bufferedIO) { locking = false; @@ -142,7 +143,7 @@ public class FileManager extends OutputStreamManager { private final boolean locking; private final boolean bufferedIO; private final String advertiseURI; - private final Layout layout; + private final Layout layout; /** * Constructor. @@ -152,7 +153,7 @@ public class FileManager extends OutputStreamManager { * @param advertiseURI the URI to use when advertising the file */ public FactoryData(final boolean append, final boolean locking, final boolean bufferedIO, - final String advertiseURI, final Layout layout) { + final String advertiseURI, final Layout layout) { this.append = append; this.locking = locking; this.bufferedIO = bufferedIO; diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java index 68a6b2a..9e211f7 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java @@ -35,11 +35,11 @@ import org.apache.logging.log4j.core.net.JMSQueueManager; * @param The {@link Layout}'s {@link Serializable} type. */ @Plugin(name = "JMSQueue", category = "Core", elementType = "appender", printObject = true) -public final class JMSQueueAppender extends AbstractAppender { +public final class JMSQueueAppender extends AbstractAppender { private final JMSQueueManager manager; - private JMSQueueAppender(final String name, final Filter filter, final Layout layout, + private JMSQueueAppender(final String name, final Filter filter, final Layout layout, final JMSQueueManager manager, final boolean ignoreExceptions) { super(name, filter, layout, ignoreExceptions); this.manager = manager; @@ -80,7 +80,7 @@ public final class JMSQueueAppender extends AbstractAppe * @return The JMSQueueAppender. */ @PluginFactory - public static JMSQueueAppender createAppender( + public static JMSQueueAppender createAppender( @PluginAttr("name") final String name, @PluginAttr("factoryName") final String factoryName, @PluginAttr("providerURL") final String providerURL, @@ -91,7 +91,7 @@ public final class JMSQueueAppender extends AbstractAppe @PluginAttr("queueBindingName") final String queueBindingName, @PluginAttr("userName") final String userName, @PluginAttr("password") final String password, - @PluginElement("layout") Layout layout, + @PluginElement("layout") Layout layout, @PluginElement("filter") final Filter filter, @PluginAttr("ignoreExceptions") final String ignore) { if (name == null) { @@ -105,11 +105,8 @@ public final class JMSQueueAppender extends AbstractAppe return null; } if (layout == null) { - @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) - final - Layout l = (Layout) SerializedLayout.createLayout(); - layout = l; + layout = SerializedLayout.createLayout(); } - return new JMSQueueAppender(name, filter, layout, manager, ignoreExceptions); + return new JMSQueueAppender(name, filter, layout, manager, ignoreExceptions); } } diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java index 6624e30..3ba7a28 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java @@ -35,11 +35,11 @@ import org.apache.logging.log4j.core.net.JMSTopicManager; * @param The {@link Layout}'s {@link Serializable} type. */ @Plugin(name = "JMSTopic", category = "Core", elementType = "appender", printObject = true) -public final class JMSTopicAppender extends AbstractAppender { +public final class JMSTopicAppender extends AbstractAppender { private final JMSTopicManager manager; - private JMSTopicAppender(final String name, final Filter filter, final Layout layout, + private JMSTopicAppender(final String name, final Filter filter, final Layout layout, final JMSTopicManager manager, final boolean ignoreExceptions) { super(name, filter, layout, ignoreExceptions); this.manager = manager; @@ -80,7 +80,7 @@ public final class JMSTopicAppender extends AbstractAppe * @return The JMSTopicAppender. */ @PluginFactory - public static JMSTopicAppender createAppender( + public static JMSTopicAppender createAppender( @PluginAttr("name") final String name, @PluginAttr("factoryName") final String factoryName, @PluginAttr("providerURL") final String providerURL, @@ -91,7 +91,7 @@ public final class JMSTopicAppender extends AbstractAppe @PluginAttr("topicBindingName") final String topicBindingName, @PluginAttr("userName") final String userName, @PluginAttr("password") final String password, - @PluginElement("layout") Layout layout, + @PluginElement("layout") Layout layout, @PluginElement("filters") final Filter filter, @PluginAttr("ignoreExceptions") final String ignore) { @@ -106,11 +106,8 @@ public final class JMSTopicAppender extends AbstractAppe return null; } if (layout == null) { - @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) - final - Layout l = (Layout) SerializedLayout.createLayout(); - layout = l; + layout = SerializedLayout.createLayout(); } - return new JMSTopicAppender(name, filter, layout, manager, ignoreExceptions); + return new JMSTopicAppender(name, filter, layout, manager, ignoreExceptions); } } diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java b/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java index 7ead83e..0a150df 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java @@ -32,7 +32,7 @@ public class OutputStreamManager extends AbstractManager { private final byte[] footer; private final byte[] header; - protected OutputStreamManager(final OutputStream os, final String streamName, final Layout layout) { + protected OutputStreamManager(final OutputStream os, final String streamName, final Layout layout) { super(streamName); this.os = os; if (layout != null) { diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java index 0a25f13..afa0ad4 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java @@ -39,13 +39,13 @@ import org.apache.logging.log4j.core.net.Advertiser; * @param The {@link Layout}'s {@link Serializable} type. */ @Plugin(name = "RandomAccessFile", category = "Core", elementType = "appender", printObject = true) -public final class RandomAccessFileAppender extends AbstractOutputStreamAppender { +public final class RandomAccessFileAppender extends AbstractOutputStreamAppender { private final String fileName; private Object advertisement; private final Advertiser advertiser; - private RandomAccessFileAppender(final String name, final Layout layout, final Filter filter, + private RandomAccessFileAppender(final String name, final Layout layout, final Filter filter, final RandomAccessFileManager manager, final String filename, final boolean ignoreExceptions, final boolean immediateFlush, final Advertiser advertiser) { super(name, layout, filter, ignoreExceptions, immediateFlush, manager); @@ -121,13 +121,13 @@ public final class RandomAccessFileAppender extends Abst * @return The FileAppender. */ @PluginFactory - public static RandomAccessFileAppender createAppender( + public static RandomAccessFileAppender createAppender( @PluginAttr("fileName") final String fileName, @PluginAttr("append") final String append, @PluginAttr("name") final String name, @PluginAttr("immediateFlush") final String immediateFlush, @PluginAttr("ignoreExceptions") final String ignore, - @PluginElement("layout") Layout layout, + @PluginElement("layout") Layout layout, @PluginElement("filters") final Filter filter, @PluginAttr("advertise") final String advertise, @PluginAttr("advertiseURI") final String advertiseURI, @@ -149,10 +149,7 @@ public final class RandomAccessFileAppender extends Abst return null; } if (layout == null) { - @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) - final - Layout l = (Layout) PatternLayout.createLayout(null, null, null, null, null); - layout = l; + layout = PatternLayout.createLayout(null, null, null, null, null); } final RandomAccessFileManager manager = RandomAccessFileManager.getFileManager( fileName, isAppend, isFlush, advertiseURI, layout @@ -161,7 +158,7 @@ public final class RandomAccessFileAppender extends Abst return null; } - return new RandomAccessFileAppender( + return new RandomAccessFileAppender( name, layout, filter, manager, fileName, ignoreExceptions, isFlush, isAdvertise ? config.getAdvertiser() : null ); diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java b/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java index 2bdf793..da49d13 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java @@ -20,6 +20,7 @@ import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.io.RandomAccessFile; +import java.io.Serializable; import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; @@ -45,7 +46,7 @@ public class RandomAccessFileManager extends OutputStreamManager { protected RandomAccessFileManager(final RandomAccessFile file, final String fileName, final OutputStream os, final boolean immediateFlush, final String advertiseURI, - final Layout layout) { + final Layout layout) { super(os, fileName, layout); this.isImmediateFlush = immediateFlush; this.randomAccessFile = file; @@ -70,7 +71,7 @@ public class RandomAccessFileManager extends OutputStreamManager { */ public static RandomAccessFileManager getFileManager(final String fileName, final boolean append, final boolean isFlush, - final String advertiseURI, final Layout layout) { + final String advertiseURI, final Layout layout) { return (RandomAccessFileManager) getManager(fileName, new FactoryData(append, isFlush, advertiseURI, layout), FACTORY); } @@ -168,7 +169,7 @@ public class RandomAccessFileManager extends OutputStreamManager { private final boolean append; private final boolean immediateFlush; private final String advertiseURI; - private final Layout layout; + private final Layout layout; /** * Constructor. @@ -176,7 +177,7 @@ public class RandomAccessFileManager extends OutputStreamManager { * @param append Append status. */ public FactoryData(final boolean append, final boolean immediateFlush, - final String advertiseURI, final Layout layout) { + final String advertiseURI, final Layout layout) { this.append = append; this.immediateFlush = immediateFlush; this.advertiseURI = advertiseURI; diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java index 590e353..cc12109 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java @@ -43,7 +43,7 @@ import org.apache.logging.log4j.core.net.Advertiser; * @param The {@link Layout}'s {@link Serializable} type. */ @Plugin(name = "RollingFile", category = "Core", elementType = "appender", printObject = true) -public final class RollingFileAppender extends AbstractOutputStreamAppender { +public final class RollingFileAppender extends AbstractOutputStreamAppender { private final String fileName; private final String filePattern; @@ -51,7 +51,7 @@ public final class RollingFileAppender extends AbstractO private final Advertiser advertiser; - private RollingFileAppender(final String name, final Layout layout, final Filter filter, + private RollingFileAppender(final String name, final Layout layout, final Filter filter, final RollingFileManager manager, final String fileName, final String filePattern, final boolean ignoreExceptions, final boolean immediateFlush, final Advertiser advertiser) { @@ -124,7 +124,7 @@ public final class RollingFileAppender extends AbstractO * @return A RollingFileAppender. */ @PluginFactory - public static RollingFileAppender createAppender( + public static RollingFileAppender createAppender( @PluginAttr("fileName") final String fileName, @PluginAttr("filePattern") final String filePattern, @PluginAttr("append") final String append, @@ -133,7 +133,7 @@ public final class RollingFileAppender extends AbstractO @PluginAttr("immediateFlush") final String immediateFlush, @PluginElement("policy") final TriggeringPolicy policy, @PluginElement("strategy") RolloverStrategy strategy, - @PluginElement("layout") Layout layout, + @PluginElement("layout") Layout layout, @PluginElement("filter") final Filter filter, @PluginAttr("ignoreExceptions") final String ignore, @PluginAttr("advertise") final String advertise, @@ -170,10 +170,7 @@ public final class RollingFileAppender extends AbstractO } if (layout == null) { - @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) - final - Layout l = (Layout) PatternLayout.createLayout(null, null, null, null, null); - layout = l; + layout = PatternLayout.createLayout(null, null, null, null, null); } final RollingFileManager manager = RollingFileManager.getFileManager(fileName, filePattern, isAppend, @@ -182,7 +179,7 @@ public final class RollingFileAppender extends AbstractO return null; } - return new RollingFileAppender(name, layout, filter, manager, fileName, filePattern, + return new RollingFileAppender(name, layout, filter, manager, fileName, filePattern, ignoreExceptions, isFlush, isAdvertise ? config.getAdvertiser() : null); } } diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java index 2d01172..56bcdfe 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java @@ -45,14 +45,14 @@ import org.apache.logging.log4j.core.net.Advertiser; * @param The {@link Layout}'s {@link Serializable} type. */ @Plugin(name = "RollingRandomAccessFile", category = "Core", elementType = "appender", printObject = true) -public final class RollingRandomAccessFileAppender extends AbstractOutputStreamAppender { +public final class RollingRandomAccessFileAppender extends AbstractOutputStreamAppender { private final String fileName; private final String filePattern; private Object advertisement; private final Advertiser advertiser; - private RollingRandomAccessFileAppender(final String name, final Layout layout, + private RollingRandomAccessFileAppender(final String name, final Layout layout, final Filter filter, final RollingFileManager manager, final String fileName, final String filePattern, final boolean ignoreExceptions, final boolean immediateFlush, final Advertiser advertiser) { @@ -143,7 +143,7 @@ public final class RollingRandomAccessFileAppender exten * @return A RollingRandomAccessFileAppender. */ @PluginFactory - public static RollingRandomAccessFileAppender createAppender( + public static RollingRandomAccessFileAppender createAppender( @PluginAttr("fileName") final String fileName, @PluginAttr("filePattern") final String filePattern, @PluginAttr("append") final String append, @@ -151,7 +151,7 @@ public final class RollingRandomAccessFileAppender exten @PluginAttr("immediateFlush") final String immediateFlush, @PluginElement("policy") final TriggeringPolicy policy, @PluginElement("strategy") RolloverStrategy strategy, - @PluginElement("layout") Layout layout, + @PluginElement("layout") Layout layout, @PluginElement("filter") final Filter filter, @PluginAttr("ignoreExceptions") final String ignore, @PluginAttr("advertise") final String advertise, @@ -191,10 +191,7 @@ public final class RollingRandomAccessFileAppender exten } if (layout == null) { - @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) - final - Layout l = (Layout) PatternLayout.createLayout(null, null, null, null, null); - layout = l; + layout = PatternLayout.createLayout(null, null, null, null, null); } @@ -204,7 +201,7 @@ public final class RollingRandomAccessFileAppender exten return null; } - return new RollingRandomAccessFileAppender(name, layout, filter, manager, + return new RollingRandomAccessFileAppender(name, layout, filter, manager, fileName, filePattern, ignoreExceptions, isFlush, isAdvertise ? config.getAdvertiser() : null); } diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java index db36edd..3a265e2 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java @@ -52,14 +52,14 @@ import org.apache.logging.log4j.core.net.SMTPManager; * @param The {@link Layout}'s {@link Serializable} type. */ @Plugin(name = "SMTP", category = "Core", elementType = "appender", printObject = true) -public final class SMTPAppender extends AbstractAppender { +public final class SMTPAppender extends AbstractAppender { private static final int DEFAULT_BUFFER_SIZE = 512; /** The SMTP Manager */ protected final SMTPManager manager; - private SMTPAppender(final String name, final Filter filter, final Layout layout, final SMTPManager manager, + private SMTPAppender(final String name, final Filter filter, final Layout layout, final SMTPManager manager, final boolean ignoreExceptions) { super(name, filter, layout, ignoreExceptions); this.manager = manager; @@ -106,7 +106,7 @@ public final class SMTPAppender extends AbstractAppender * @return The SMTPAppender. */ @PluginFactory - public static SMTPAppender createAppender(@PluginAttr("name") final String name, + public static SMTPAppender createAppender(@PluginAttr("name") final String name, @PluginAttr("to") final String to, @PluginAttr("cc") final String cc, @PluginAttr("bcc") final String bcc, @@ -120,7 +120,7 @@ public final class SMTPAppender extends AbstractAppender @PluginAttr("smtpPassword") final String smtpPassword, @PluginAttr("smtpDebug") final String smtpDebug, @PluginAttr("bufferSize") final String bufferSizeNum, - @PluginElement("layout") Layout layout, + @PluginElement("layout") Layout layout, @PluginElement("filter") Filter filter, @PluginAttr("ignoreExceptions") final String ignore) { if (name == null) { @@ -134,10 +134,7 @@ public final class SMTPAppender extends AbstractAppender final int bufferSize = bufferSizeNum == null ? DEFAULT_BUFFER_SIZE : Integer.valueOf(bufferSizeNum); if (layout == null) { - @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) - final - Layout l = (Layout) HTMLLayout.createLayout(null, null, null, null, null, null); - layout = l; + layout = HTMLLayout.createLayout(null, null, null, null, null, null); } if (filter == null) { filter = ThresholdFilter.createFilter(null, null, null); @@ -149,7 +146,7 @@ public final class SMTPAppender extends AbstractAppender return null; } - return new SMTPAppender(name, filter, layout, manager, ignoreExceptions); + return new SMTPAppender(name, filter, layout, manager, ignoreExceptions); } /** diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java index 9dd7420..704a267 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java @@ -43,11 +43,11 @@ import org.apache.logging.log4j.util.EnglishEnums; * @param The {@link Layout}'s {@link Serializable} type. */ @Plugin(name = "Socket", category = "Core", elementType = "appender", printObject = true) -public class SocketAppender extends AbstractOutputStreamAppender { +public class SocketAppender extends AbstractOutputStreamAppender { private Object advertisement; private final Advertiser advertiser; - protected SocketAppender(final String name, final Layout layout, final Filter filter, + protected SocketAppender(final String name, final Layout layout, final Filter filter, final AbstractSocketManager manager, final boolean ignoreExceptions, final boolean immediateFlush, final Advertiser advertiser) { super(name, layout, filter, ignoreExceptions, immediateFlush, manager); @@ -88,7 +88,7 @@ public class SocketAppender extends AbstractOutputStream * @return A SocketAppender. */ @PluginFactory - public static SocketAppender createAppender(@PluginAttr("host") final String host, + public static SocketAppender createAppender(@PluginAttr("host") final String host, @PluginAttr("port") final String portNum, @PluginAttr("protocol") final String protocol, @PluginAttr("reconnectionDelay") final String delay, @@ -96,7 +96,7 @@ public class SocketAppender extends AbstractOutputStream @PluginAttr("name") final String name, @PluginAttr("immediateFlush") final String immediateFlush, @PluginAttr("ignoreExceptions") final String ignore, - @PluginElement("layout") Layout layout, + @PluginElement("layout") Layout layout, @PluginElement("filters") final Filter filter, @PluginAttr("advertise") final String advertise, @PluginConfiguration final Configuration config) { @@ -108,10 +108,7 @@ public class SocketAppender extends AbstractOutputStream final int reconnectDelay = AbstractAppender.parseInt(delay, 0); final int port = AbstractAppender.parseInt(portNum, 0); if (layout == null) { - @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) - final - Layout l = (Layout) SerializedLayout.createLayout(); - layout = l; + layout = SerializedLayout.createLayout(); } if (name == null) { @@ -129,13 +126,13 @@ public class SocketAppender extends AbstractOutputStream return null; } - return new SocketAppender(name, layout, filter, manager, ignoreExceptions, isFlush, + return new SocketAppender(name, layout, filter, manager, ignoreExceptions, isFlush, isAdvertise ? config.getAdvertiser() : null); } protected static AbstractSocketManager createSocketManager(final Protocol p, final String host, final int port, final int delay, final boolean immediateFail, - final Layout layout) { + final Layout layout) { switch (p) { case TCP: return TCPSocketManager.getSocketManager(host, port, delay, immediateFail, layout); diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java index 05d1779..1ede69c 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java @@ -41,11 +41,11 @@ import org.apache.logging.log4j.util.EnglishEnums; * @param The {@link Layout}'s {@link Serializable} type. */ @Plugin(name = "Syslog", category = "Core", elementType = "appender", printObject = true) -public class SyslogAppender extends SocketAppender { +public class SyslogAppender extends SocketAppender { private static final String RFC5424 = "RFC5424"; - protected SyslogAppender(final String name, final Layout layout, final Filter filter, + protected SyslogAppender(final String name, final Layout layout, final Filter filter, final boolean ignoreExceptions, final boolean immediateFlush, final AbstractSocketManager manager, final Advertiser advertiser) { super(name, layout, filter, manager, ignoreExceptions, immediateFlush, advertiser); @@ -90,7 +90,7 @@ public class SyslogAppender extends SocketAppender { * @return A SyslogAppender. */ @PluginFactory - public static SyslogAppender createAppender(@PluginAttr("host") final String host, + public static SyslogAppender createAppender(@PluginAttr("host") final String host, @PluginAttr("port") final String portNum, @PluginAttr("protocol") final String protocol, @PluginAttr("reconnectionDelay") final String delay, @@ -126,8 +126,7 @@ public class SyslogAppender extends SocketAppender { final boolean fail = Booleans.parseBoolean(immediateFail, true); final int port = AbstractAppender.parseInt(portNum, 0); final boolean isAdvertise = Boolean.parseBoolean(advertise); - @SuppressWarnings("unchecked") - final Layout layout = (Layout) (RFC5424.equalsIgnoreCase(format) ? + final Layout layout = (RFC5424.equalsIgnoreCase(format) ? RFC5424Layout.createLayout(facility, id, ein, includeMDC, mdcId, mdcPrefix, eventPrefix, includeNL, escapeNL, appName, msgId, excludes, includes, required, exceptionPattern, loggerFields, config) : SyslogLayout.createLayout(facility, includeNL, escapeNL, charsetName)); @@ -142,7 +141,7 @@ public class SyslogAppender extends SocketAppender { return null; } - return new SyslogAppender(name, layout, filter, ignoreExceptions, isFlush, manager, + return new SyslogAppender(name, layout, filter, ignoreExceptions, isFlush, manager, isAdvertise ? config.getAdvertiser() : null); } } diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java index 984d175..5ac93ad 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java @@ -35,7 +35,7 @@ import org.apache.logging.log4j.core.appender.AppenderLoggingException; * * @param Specifies which type of {@link AbstractDatabaseManager} this Appender requires. */ -public abstract class AbstractDatabaseAppender extends AbstractAppender { +public abstract class AbstractDatabaseAppender extends AbstractAppender { private final ReadWriteLock lock = new ReentrantReadWriteLock(); private final Lock readLock = lock.readLock(); private final Lock writeLock = lock.writeLock(); diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java index 82d1700..7e044a9 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java @@ -41,7 +41,7 @@ import org.apache.logging.log4j.core.helpers.Booleans; * @param The {@link org.apache.logging.log4j.core.Layout}'s {@link Serializable} type. */ @Plugin(name = "Rewrite", category = "Core", elementType = "appender", printObject = true) -public final class RewriteAppender extends AbstractAppender { +public final class RewriteAppender extends AbstractAppender { private final Configuration config; private final ConcurrentMap appenders = new ConcurrentHashMap(); private final RewritePolicy rewritePolicy; @@ -57,15 +57,14 @@ public final class RewriteAppender extends AbstractAppen } @Override - @SuppressWarnings("unchecked") public void start() { - final Map> map = config.getAppenders(); + final Map map = config.getAppenders(); for (final AppenderRef ref : appenderRefs) { final String name = ref.getRef(); final Appender appender = map.get(name); if (appender != null) { - final Filter filter = appender instanceof AbstractAppender ? - ((AbstractAppender) appender).getFilter() : null; + final Filter filter = appender instanceof AbstractAppender ? + ((AbstractAppender) appender).getFilter() : null; appenders.put(name, new AppenderControl(appender, ref.getLevel(), filter)); } else { LOGGER.error("Appender " + ref + " cannot be located. Reference ignored"); @@ -106,7 +105,7 @@ public final class RewriteAppender extends AbstractAppen * @return The created RewriteAppender. */ @PluginFactory - public static RewriteAppender createAppender(@PluginAttr("name") final String name, + public static RewriteAppender createAppender(@PluginAttr("name") final String name, @PluginAttr("ignoreExceptions") final String ignore, @PluginElement("appender-ref") final AppenderRef[] appenderRefs, @PluginConfiguration final Configuration config, @@ -122,6 +121,6 @@ public final class RewriteAppender extends AbstractAppen LOGGER.error("No appender references defined for RewriteAppender"); return null; } - return new RewriteAppender(name, filter, ignoreExceptions, appenderRefs, rewritePolicy, config); + return new RewriteAppender(name, filter, ignoreExceptions, appenderRefs, rewritePolicy, config); } } diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java index 4468a81..9f2c4d4 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java @@ -22,6 +22,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.io.Serializable; import java.util.concurrent.Semaphore; import org.apache.logging.log4j.core.Layout; @@ -47,7 +48,7 @@ public class RollingFileManager extends FileManager { protected RollingFileManager(final String fileName, final String pattern, final OutputStream os, final boolean append, final long size, final long time, final TriggeringPolicy policy, - final RolloverStrategy strategy, final String advertiseURI, final Layout layout) { + final RolloverStrategy strategy, final String advertiseURI, final Layout layout) { super(fileName, os, append, false, advertiseURI, layout); this.size = size; this.initialTime = time; @@ -72,7 +73,7 @@ public class RollingFileManager extends FileManager { public static RollingFileManager getFileManager(final String fileName, final String pattern, final boolean append, final boolean bufferedIO, final TriggeringPolicy policy, final RolloverStrategy strategy, final String advertiseURI, - final Layout layout) { + final Layout layout) { return (RollingFileManager) getManager(fileName, new FactoryData(pattern, append, bufferedIO, policy, strategy, advertiseURI, layout), factory); @@ -237,7 +238,7 @@ public class RollingFileManager extends FileManager { private final TriggeringPolicy policy; private final RolloverStrategy strategy; private final String advertiseURI; - private final Layout layout; + private final Layout layout; /** * Create the data for the factory. @@ -249,7 +250,7 @@ public class RollingFileManager extends FileManager { */ public FactoryData(final String pattern, final boolean append, final boolean bufferedIO, final TriggeringPolicy policy, final RolloverStrategy strategy, final String advertiseURI, - final Layout layout) { + final Layout layout) { this.pattern = pattern; this.append = append; this.bufferedIO = bufferedIO; diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java index 4ba289e..e4d34fe 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java @@ -20,6 +20,7 @@ import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.io.RandomAccessFile; +import java.io.Serializable; import java.nio.ByteBuffer; import org.apache.logging.log4j.core.Layout; @@ -45,7 +46,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager { final String pattern, final OutputStream os, final boolean append, final boolean immediateFlush, final long size, final long time, final TriggeringPolicy policy, final RolloverStrategy strategy, - final String advertiseURI, final Layout layout) { + final String advertiseURI, final Layout layout) { super(fileName, pattern, os, append, size, time, policy, strategy, advertiseURI, layout); this.isImmediateFlush = immediateFlush; this.randomAccessFile = raf; @@ -57,7 +58,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager { public static RollingRandomAccessFileManager getRollingRandomAccessFileManager(final String fileName, final String filePattern, final boolean isAppend, final boolean immediateFlush, final TriggeringPolicy policy, - final RolloverStrategy strategy, final String advertiseURI, final Layout layout) { + final RolloverStrategy strategy, final String advertiseURI, final Layout layout) { return (RollingRandomAccessFileManager) getManager(fileName, new FactoryData(filePattern, isAppend, immediateFlush, policy, strategy, advertiseURI, layout), FACTORY); } @@ -185,7 +186,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager { private final TriggeringPolicy policy; private final RolloverStrategy strategy; private final String advertiseURI; - private final Layout layout; + private final Layout layout; /** * Create the data for the factory. @@ -196,7 +197,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager { */ public FactoryData(final String pattern, final boolean append, final boolean immediateFlush, final TriggeringPolicy policy, final RolloverStrategy strategy, final String advertiseURI, - final Layout layout) { + final Layout layout) { this.pattern = pattern; this.append = append; this.immediateFlush = immediateFlush; diff --git a/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java b/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java index 4ce76d0..2a85c0a 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java +++ b/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java @@ -47,13 +47,13 @@ import org.apache.logging.log4j.core.helpers.Booleans; * @param The {@link org.apache.logging.log4j.core.Layout}'s {@link Serializable} type. */ @Plugin(name = "Routing", category = "Core", elementType = "appender", printObject = true) -public final class RoutingAppender extends AbstractAppender { +public final class RoutingAppender extends AbstractAppender { private static final String DEFAULT_KEY = "ROUTING_APPENDER_DEFAULT"; private final Routes routes; private final Route defaultRoute; private final Configuration config; - private final ConcurrentMap> appenders = - new ConcurrentHashMap>(); + private final ConcurrentMap appenders = + new ConcurrentHashMap(); private final RewritePolicy rewritePolicy; private RoutingAppender(final String name, final Filter filter, final boolean ignoreExceptions, final Routes routes, @@ -76,13 +76,12 @@ public final class RoutingAppender extends AbstractAppen } @Override - @SuppressWarnings("unchecked") public void start() { - final Map> map = config.getAppenders(); + final Map map = config.getAppenders(); // Register all the static routes. for (final Route route : routes.getRoutes()) { if (route.getAppenderRef() != null) { - final Appender appender = map.get(route.getAppenderRef()); + final Appender appender = map.get(route.getAppenderRef()); if (appender != null) { final String key = route == defaultRoute ? DEFAULT_KEY : route.getKey(); appenders.put(key, new AppenderControl(appender, null, null)); @@ -97,8 +96,8 @@ public final class RoutingAppender extends AbstractAppen @Override public void stop() { super.stop(); - final Map> map = config.getAppenders(); - for (final Map.Entry> entry : appenders.entrySet()) { + final Map map = config.getAppenders(); + for (final Map.Entry entry : appenders.entrySet()) { final String name = entry.getValue().getAppender().getName(); if (!map.containsKey(name)) { entry.getValue().getAppender().stop(); @@ -112,14 +111,14 @@ public final class RoutingAppender extends AbstractAppen event = rewritePolicy.rewrite(event); } final String key = config.getSubst().replace(event, routes.getPattern()); - final AppenderControl control = getControl(key, event); + final AppenderControl control = getControl(key, event); if (control != null) { control.callAppender(event); } } - private synchronized AppenderControl getControl(final String key, final LogEvent event) { - AppenderControl control = appenders.get(key); + private synchronized AppenderControl getControl(final String key, final LogEvent event) { + AppenderControl control = appenders.get(key); if (control != null) { return control; } @@ -138,26 +137,25 @@ public final class RoutingAppender extends AbstractAppen } } if (route != null) { - final Appender app = createAppender(route, event); + final Appender app = createAppender(route, event); if (app == null) { return null; } - control = new AppenderControl(app, null, null); + control = new AppenderControl(app, null, null); appenders.put(key, control); } return control; } - private Appender createAppender(final Route route, final LogEvent event) { + private Appender createAppender(final Route route, final LogEvent event) { final Node routeNode = route.getNode(); for (final Node node : routeNode.getChildren()) { if (node.getType().getElementName().equals("appender")) { final Node appNode = new Node(node); config.createConfiguration(appNode, event); if (appNode.getObject() instanceof Appender) { - @SuppressWarnings("unchecked") - final Appender app = (Appender) appNode.getObject(); + final Appender app = (Appender) appNode.getObject(); app.start(); return app; } @@ -182,7 +180,7 @@ public final class RoutingAppender extends AbstractAppen * @return The RoutingAppender */ @PluginFactory - public static RoutingAppender createAppender(@PluginAttr("name") final String name, + public static RoutingAppender createAppender(@PluginAttr("name") final String name, @PluginAttr("ignoreExceptions") final String ignore, @PluginElement("routes") final Routes routes, @PluginConfiguration final Configuration config, @@ -198,6 +196,6 @@ public final class RoutingAppender extends AbstractAppen LOGGER.error("No routes defined for RoutingAppender"); return null; } - return new RoutingAppender(name, filter, ignoreExceptions, routes, rewritePolicy, config); + return new RoutingAppender(name, filter, ignoreExceptions, routes, rewritePolicy, config); } } diff --git a/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java b/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java index f220c20..611ec2e 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java +++ b/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java @@ -16,8 +16,6 @@ */ package org.apache.logging.log4j.core.config; -import java.io.Serializable; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; @@ -30,11 +28,11 @@ import org.apache.logging.log4j.core.filter.Filterable; * Wraps an {@link Appender} with details an appender implementation shouldn't need to know about. * @param The appender's Serializable type. */ -public class AppenderControl extends AbstractFilterable { +public class AppenderControl extends AbstractFilterable { - private final ThreadLocal> recursive = new ThreadLocal>(); + private final ThreadLocal recursive = new ThreadLocal(); - private final Appender appender; + private final Appender appender; private final Level level; @@ -46,7 +44,7 @@ public class AppenderControl extends AbstractFilterable * @param level the Level to filter on. * @param filter the Filter(s) to apply. */ - public AppenderControl(final Appender appender, final Level level, final Filter filter) { + public AppenderControl(final Appender appender, final Level level, final Filter filter) { super(filter); this.appender = appender; this.level = level; @@ -58,7 +56,7 @@ public class AppenderControl extends AbstractFilterable * Returns the Appender. * @return the Appender. */ - public Appender getAppender() { + public Appender getAppender() { return appender; } diff --git a/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java b/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java index d73deda..70263eb 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java +++ b/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java @@ -93,7 +93,7 @@ public class BaseConfiguration extends AbstractFilterable implements Configurati private String name; - private ConcurrentMap> appenders = new ConcurrentHashMap>(); + private ConcurrentMap appenders = new ConcurrentHashMap(); private ConcurrentMap loggers = new ConcurrentHashMap(); @@ -205,7 +205,7 @@ public class BaseConfiguration extends AbstractFilterable implements Configurati subst.setVariableResolver(new Interpolator(lookup)); } if (child.getName().equalsIgnoreCase("appenders")) { - appenders = (ConcurrentMap>) child.getObject(); + appenders = (ConcurrentMap) child.getObject(); } else if (child.getObject() instanceof Filter) { addFilter((Filter) child.getObject()); } else if (child.getName().equalsIgnoreCase("loggers")) { @@ -253,7 +253,7 @@ public class BaseConfiguration extends AbstractFilterable implements Configurati final Layout layout = PatternLayout.createLayout("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n", null, null, null, null); - final Appender appender = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", + final Appender appender = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true"); appender.start(); addAppender(appender); @@ -314,7 +314,7 @@ public class BaseConfiguration extends AbstractFilterable implements Configurati * @param name The name of the Appender. * @return the Appender with the specified name or null if the Appender cannot be located. */ - public Appender getAppender(final String name) { + public Appender getAppender(final String name) { return appenders.get(name); } @@ -323,7 +323,7 @@ public class BaseConfiguration extends AbstractFilterable implements Configurati * @return A Map containing each Appender's name and the Appender object. */ @Override - public Map> getAppenders() { + public Map getAppenders() { return appenders; } @@ -371,7 +371,7 @@ public class BaseConfiguration extends AbstractFilterable implements Configurati */ @Override public synchronized void addLoggerAppender(final org.apache.logging.log4j.core.Logger logger, - final Appender appender) { + final Appender appender) { final String name = logger.getName(); appenders.putIfAbsent(appender.getName(), appender); final LoggerConfig lc = getLoggerConfig(name); @@ -534,7 +534,7 @@ public class BaseConfiguration extends AbstractFilterable implements Configurati @Override public void createConfiguration(final Node node, final LogEvent event) { - final PluginType type = node.getType(); + final PluginType type = node.getType(); if (type != null && type.isDeferChildren()) { node.setObject(createPluginObject(type, node, event)); } else { @@ -567,9 +567,9 @@ public class BaseConfiguration extends AbstractFilterable implements Configurati * @return the instantiate method or null if there is none by that * description. */ - private Object createPluginObject(final PluginType type, final Node node, final LogEvent event) + private Object createPluginObject(final PluginType type, final Node node, final LogEvent event) { - final Class clazz = type.getPluginClass(); + final Class clazz = type.getPluginClass(); if (Map.class.isAssignableFrom(clazz)) { try { @@ -612,7 +612,7 @@ public class BaseConfiguration extends AbstractFilterable implements Configurati } final Annotation[][] parmArray = factoryMethod.getParameterAnnotations(); - final Class[] parmClasses = factoryMethod.getParameterTypes(); + final Class[] parmClasses = factoryMethod.getParameterTypes(); if (parmArray.length != parmClasses.length) { LOGGER.error("Number of parameter annotations does not equal the number of paramters"); } @@ -674,7 +674,7 @@ public class BaseConfiguration extends AbstractFilterable implements Configurati sb.append(name).append("={"); boolean first = true; for (final Node child : children) { - final PluginType childType = child.getType(); + final PluginType childType = child.getType(); if (elem.value().equalsIgnoreCase(childType.getElementName()) || parmClass.isAssignableFrom(childType.getPluginClass())) { used.add(child); @@ -718,7 +718,7 @@ public class BaseConfiguration extends AbstractFilterable implements Configurati final Class parmClass = parmClasses[index]; boolean present = false; for (final Node child : children) { - final PluginType childType = child.getType(); + final PluginType childType = child.getType(); if (elem.value().equals(childType.getElementName()) || parmClass.isAssignableFrom(childType.getPluginClass())) { sb.append(child.getName()).append("(").append(child.toString()).append(")"); diff --git a/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java b/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java index 2ca5934..754d8bb 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java +++ b/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java @@ -52,11 +52,11 @@ public interface Configuration extends Filterable { * Returns a Map containing all the Appenders and their name. * @return A Map containing each Appender's name and the Appender object. */ - Map> getAppenders(); + Map getAppenders(); Map getLoggers(); - void addLoggerAppender(Logger logger, Appender appender); + void addLoggerAppender(Logger logger, Appender appender); void addLoggerFilter(Logger logger, Filter filter); diff --git a/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java b/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java index d5c9a3d..501ec2e 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java +++ b/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java @@ -107,9 +107,9 @@ public abstract class ConfigurationFactory { } final PluginManager manager = new PluginManager("ConfigurationFactory"); manager.collectPlugins(); - final Map plugins = manager.getPlugins(); + final Map> plugins = manager.getPlugins(); final Set ordered = new TreeSet(); - for (final PluginType type : plugins.values()) { + for (final PluginType type : plugins.values()) { try { @SuppressWarnings("unchecked") final Class clazz = (Class)type.getPluginClass(); diff --git a/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java b/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java index 9e10cb3..54f5ed5 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java +++ b/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java @@ -50,7 +50,7 @@ public class DefaultConfiguration extends BaseConfiguration { setName(DEFAULT_NAME); final Layout layout = PatternLayout.createLayout("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n", null, null, null, null); - final Appender appender = + final Appender appender = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true"); appender.start(); addAppender(appender); diff --git a/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.java b/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.java index aa45ceb..0370e04 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.java +++ b/core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.java @@ -132,7 +132,7 @@ public class JSONConfiguration extends BaseConfiguration implements Reconfigurab if (advertiserString != null) { @SuppressWarnings("unchecked") - final PluginType type = getPluginManager().getPluginType(advertiserString); + final PluginType type = (PluginType) getPluginManager().getPluginType(advertiserString); if (type != null) { final Class clazz = type.getPluginClass(); diff --git a/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java index 46cd7b3..b987786 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java +++ b/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java @@ -16,18 +16,6 @@ */ package org.apache.logging.log4j.core.config; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicInteger; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -54,6 +42,17 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.PropertiesUtil; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; + /** * Logger object that is created via configuration. */ @@ -66,7 +65,7 @@ public class LoggerConfig extends AbstractFilterable { private static LogEventFactory LOG_EVENT_FACTORY = null; private List appenderRefs = new ArrayList(); - private final Map> appenders = new ConcurrentHashMap>(); + private final Map appenders = new ConcurrentHashMap(); private final String name; private LogEventFactory logEventFactory; private Level level; @@ -186,9 +185,9 @@ public class LoggerConfig extends AbstractFilterable { * @param level The Level to use. * @param filter A Filter for the Appender reference. */ - public void addAppender(final Appender appender, final Level level, + public void addAppender(final Appender appender, final Level level, final Filter filter) { - appenders.put(appender.getName(), new AppenderControl(appender, level, + appenders.put(appender.getName(), new AppenderControl(appender, level, filter)); } @@ -210,9 +209,9 @@ public class LoggerConfig extends AbstractFilterable { * @return a Map with the Appender name as the key and the Appender as the * value. */ - public Map> getAppenders() { - final Map> map = new HashMap>(); - for (final Map.Entry> entry : appenders + public Map getAppenders() { + final Map map = new HashMap(); + for (final Map.Entry entry : appenders .entrySet()) { map.put(entry.getKey(), entry.getValue().getAppender()); } @@ -224,10 +223,10 @@ public class LoggerConfig extends AbstractFilterable { */ protected void clearAppenders() { waitForCompletion(); - final Collection> controls = appenders.values(); - final Iterator> iterator = controls.iterator(); + final Collection controls = appenders.values(); + final Iterator iterator = controls.iterator(); while (iterator.hasNext()) { - final AppenderControl ctl = iterator.next(); + final AppenderControl ctl = iterator.next(); iterator.remove(); cleanupFilter(ctl); } diff --git a/core/src/main/java/org/apache/logging/log4j/core/config/Node.java b/core/src/main/java/org/apache/logging/log4j/core/config/Node.java index 4989796..4c9faac 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/config/Node.java +++ b/core/src/main/java/org/apache/logging/log4j/core/config/Node.java @@ -31,7 +31,7 @@ public class Node { private final Node parent; private final String name; private String value; - private final PluginType type; + private final PluginType type; private final Map attributes = new HashMap(); private final List children = new ArrayList(); private Object object; @@ -45,7 +45,7 @@ public class Node { * @param name the node's name. * @param type The Plugin Type associated with the node. */ - public Node(final Node parent, final String name, final PluginType type) { + public Node(final Node parent, final String name, final PluginType type) { this.parent = parent; this.name = name; this.type = type; @@ -109,7 +109,7 @@ public class Node { return object; } - public PluginType getType() { + public PluginType getType() { return type; } diff --git a/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java b/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java index b8e5b63..301d00f 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java +++ b/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java @@ -164,7 +164,7 @@ public class XMLConfiguration extends BaseConfiguration implements Reconfigurabl if (advertiserString != null) { @SuppressWarnings("unchecked") - final PluginType type = getPluginManager().getPluginType(advertiserString); + final PluginType type = (PluginType) getPluginManager().getPluginType(advertiserString); if (type != null) { final Class clazz = type.getPluginClass(); diff --git a/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java b/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java index 8e16562..8156e05 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java +++ b/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java @@ -16,12 +16,11 @@ */ package org.apache.logging.log4j.core.config.plugins; -import java.io.Serializable; +import org.apache.logging.log4j.core.Appender; + import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.logging.log4j.core.Appender; - /** * An Appender container. */ @@ -37,12 +36,12 @@ public final class AppendersPlugin { * @return The Appender Map. */ @PluginFactory - public static ConcurrentMap> createAppenders( - @PluginElement("appenders") final Appender[] appenders) { - final ConcurrentMap> map = - new ConcurrentHashMap>(); + public static ConcurrentMap createAppenders( + @PluginElement("appenders") final Appender[] appenders) { + final ConcurrentMap map = + new ConcurrentHashMap(); - for (final Appender appender : appenders) { + for (final Appender appender : appenders) { map.put(appender.getName(), appender); } diff --git a/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java b/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java index 181e484..ff7175f 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java +++ b/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java @@ -44,8 +44,8 @@ public class PluginManager { private static final long NANOS_PER_SECOND = 1000000000L; - private static ConcurrentMap> pluginTypeMap = - new ConcurrentHashMap>(); + private static ConcurrentMap>> pluginTypeMap = + new ConcurrentHashMap>>(); private static final CopyOnWriteArrayList PACKAGES = new CopyOnWriteArrayList(); private static final String PATH = "org/apache/logging/log4j/core/config/plugins/"; @@ -56,7 +56,7 @@ public class PluginManager { private static String rootDir; - private Map plugins = new HashMap(); + private Map> plugins = new HashMap>(); private final String type; private final Class clazz; @@ -110,7 +110,7 @@ public class PluginManager { * @param name The name of the plugin. * @return The plugin's type. */ - public PluginType getPluginType(final String name) { + public PluginType getPluginType(final String name) { return plugins.get(name.toLowerCase()); } @@ -118,7 +118,7 @@ public class PluginManager { * Returns all the matching plugins. * @return A Map containing the name of the plugin and its type. */ - public Map getPlugins() { + public Map> getPlugins() { return plugins; } @@ -135,7 +135,7 @@ public class PluginManager { * @param pkgs A comma separated list of package names to scan for plugins. If * null the default Log4j package name will be used. */ - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void collectPlugins(boolean preLoad, final String pkgs) { if (pluginTypeMap.containsKey(type)) { plugins = pluginTypeMap.get(type); @@ -148,7 +148,7 @@ public class PluginManager { resolver.setClassLoader(loader); } if (preLoad) { - final ConcurrentMap> map = decode(loader); + final ConcurrentMap>> map = decode(loader); if (map != null) { pluginTypeMap = map; plugins = map.get(type); @@ -176,9 +176,9 @@ public class PluginManager { final Plugin plugin = clazz.getAnnotation(Plugin.class); final String pluginType = plugin.category(); if (!pluginTypeMap.containsKey(pluginType)) { - pluginTypeMap.putIfAbsent(pluginType, new ConcurrentHashMap()); + pluginTypeMap.putIfAbsent(pluginType, new ConcurrentHashMap>()); } - final Map map = pluginTypeMap.get(pluginType); + final Map> map = pluginTypeMap.get(pluginType); final String type = plugin.elementType().equals(Plugin.EMPTY) ? plugin.name() : plugin.elementType(); map.put(plugin.name().toLowerCase(), new PluginType(clazz, type, plugin.printObject(), plugin.deferChildren())); @@ -196,8 +196,8 @@ public class PluginManager { LOGGER.debug(sb.toString()); } - @SuppressWarnings("unchecked") - private static ConcurrentMap> decode(final ClassLoader loader) { + @SuppressWarnings({ "unchecked", "rawtypes" }) + private static ConcurrentMap>> decode(final ClassLoader loader) { Enumeration resources; try { resources = loader.getResources(PATH + FILENAME); @@ -205,8 +205,8 @@ public class PluginManager { LOGGER.warn("Unable to preload plugins", ioe); return null; } - final ConcurrentMap> map = - new ConcurrentHashMap>(); + final ConcurrentMap>> map = + new ConcurrentHashMap>>(); while (resources.hasMoreElements()) { DataInputStream dis = null; try { @@ -219,9 +219,9 @@ public class PluginManager { for (int j = 0; j < count; ++j) { final String type = dis.readUTF(); final int entries = dis.readInt(); - ConcurrentMap types = map.get(type); + ConcurrentMap> types = map.get(type); if (types == null) { - types = new ConcurrentHashMap(count); + types = new ConcurrentHashMap>(count); } for (int i = 0; i < entries; ++i) { final String key = dis.readUTF(); @@ -248,7 +248,7 @@ public class PluginManager { return map.size() == 0 ? null : map; } - private static void encode(final ConcurrentMap> map) { + private static void encode(final ConcurrentMap>> map) { final String fileName = rootDir + PATH + FILENAME; DataOutputStream dos = null; try { @@ -258,12 +258,12 @@ public class PluginManager { final BufferedOutputStream bos = new BufferedOutputStream(fos); dos = new DataOutputStream(bos); dos.writeInt(map.size()); - for (final Map.Entry> outer : map.entrySet()) { + for (final Map.Entry>> outer : map.entrySet()) { dos.writeUTF(outer.getKey()); dos.writeInt(outer.getValue().size()); - for (final Map.Entry entry : outer.getValue().entrySet()) { + for (final Map.Entry> entry : outer.getValue().entrySet()) { dos.writeUTF(entry.getKey()); - final PluginType pt = entry.getValue(); + final PluginType pt = entry.getValue(); dos.writeUTF(pt.getPluginClass().getName()); dos.writeUTF(pt.getElementName()); dos.writeBoolean(pt.isObjectPrintable()); diff --git a/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java b/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java index 1c82703..57b8efd 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java +++ b/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java @@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.helpers.Assert; public class AppenderAdmin implements AppenderAdminMBean { private final String contextName; - private final Appender appender; + private final Appender appender; private final ObjectName objectName; /** @@ -37,7 +37,7 @@ public class AppenderAdmin implements AppenderAdminMBean { * @param contextName used in the {@code ObjectName} for this mbean * @param appender the instrumented object */ - public AppenderAdmin(final String contextName, final Appender appender) { + public AppenderAdmin(final String contextName, final Appender appender) { // super(executor); // no notifications for now this.contextName = Assert.isNotNull(contextName, "contextName"); this.appender = Assert.isNotNull(appender, "appender"); diff --git a/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java b/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java index 5089804..2cc1451 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java +++ b/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java @@ -240,9 +240,9 @@ public final class Server { InstanceAlreadyExistsException, MBeanRegistrationException, NotCompliantMBeanException { - final Map> map = ctx.getConfiguration().getAppenders(); + final Map map = ctx.getConfiguration().getAppenders(); for (final String name : map.keySet()) { - final Appender appender = map.get(name); + final Appender appender = map.get(name); final AppenderAdmin mbean = new AppenderAdmin(ctx.getName(), appender); mbs.registerMBean(mbean, mbean.getObjectName()); } diff --git a/core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java b/core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java index 2f605fa..1c6b68b 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java +++ b/core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java @@ -43,11 +43,11 @@ public class Interpolator implements StrLookup { this.defaultLookup = defaultLookup == null ? new MapLookup(new HashMap()) : defaultLookup; final PluginManager manager = new PluginManager("Lookup"); manager.collectPlugins(); - final Map plugins = manager.getPlugins(); + final Map> plugins = manager.getPlugins(); - for (final Map.Entry entry : plugins.entrySet()) { + for (final Map.Entry> entry : plugins.entrySet()) { @SuppressWarnings("unchecked") - final Class clazz = entry.getValue().getPluginClass(); + final Class clazz = (Class) entry.getValue().getPluginClass(); try { lookups.put(entry.getKey(), clazz.newInstance()); } catch (final Exception ex) { diff --git a/core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java b/core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java index c368612..bedb990 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java +++ b/core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java @@ -16,14 +16,15 @@ */ package org.apache.logging.log4j.core.net; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.appender.OutputStreamManager; + import java.io.OutputStream; +import java.io.Serializable; import java.net.InetAddress; import java.util.HashMap; import java.util.Map; -import org.apache.logging.log4j.core.Layout; -import org.apache.logging.log4j.core.appender.OutputStreamManager; - /** * Abstract base class for managing sockets. */ @@ -51,7 +52,7 @@ public abstract class AbstractSocketManager extends OutputStreamManager { * @param port The target port number. */ public AbstractSocketManager(final String name, final OutputStream os, final InetAddress addr, final String host, - final int port, final Layout layout) { + final int port, final Layout layout) { super(os, name, layout); this.address = addr; this.host = host; diff --git a/core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java b/core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java index 0c25e09..a1e084a 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java +++ b/core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java @@ -16,16 +16,17 @@ */ package org.apache.logging.log4j.core.net; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.appender.ManagerFactory; +import org.apache.logging.log4j.core.helpers.Strings; + import java.io.OutputStream; +import java.io.Serializable; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.HashMap; import java.util.Map; -import org.apache.logging.log4j.core.Layout; -import org.apache.logging.log4j.core.appender.ManagerFactory; -import org.apache.logging.log4j.core.helpers.Strings; - /** * Socket Manager for UDP connections. */ @@ -43,7 +44,7 @@ public class DatagramSocketManager extends AbstractSocketManager { * @param layout The layout */ protected DatagramSocketManager(final String name, final OutputStream os, final InetAddress address, final String host, - final int port, final Layout layout) { + final int port, final Layout layout) { super(name, os, address, host, port, layout); } @@ -54,7 +55,7 @@ public class DatagramSocketManager extends AbstractSocketManager { * @param layout The layout. * @return A DatagramSocketManager. */ - public static DatagramSocketManager getSocketManager(final String host, final int port, final Layout layout) { + public static DatagramSocketManager getSocketManager(final String host, final int port, final Layout layout) { if (Strings.isEmpty(host)) { throw new IllegalArgumentException("A host name is required"); } @@ -87,9 +88,9 @@ public class DatagramSocketManager extends AbstractSocketManager { private static class FactoryData { private final String host; private final int port; - private final Layout layout; + private final Layout layout; - public FactoryData(final String host, final int port, final Layout layout) { + public FactoryData(final String host, final int port, final Layout layout) { this.host = host; this.port = port; this.layout = layout; diff --git a/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java b/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java index d8338e0..604a8d8 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java +++ b/core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java @@ -167,7 +167,7 @@ public class MulticastDNSAdvertiser implements Advertiser { //version 1 uses a hashtable final Hashtable hashtableProperties = new Hashtable(properties); try { - final Class[] args = new Class[6]; + final Class[] args = new Class[6]; args[0] = String.class; args[1] = String.class; args[2] = int.class; @@ -197,7 +197,7 @@ public class MulticastDNSAdvertiser implements Advertiser { private Object buildServiceInfoVersion3(final String zone, final int port, final String name, final Map properties) { try { - final Class[] args = new Class[6]; + final Class[] args = new Class[6]; args[0] = String.class; //zone/type args[1] = String.class; //display name args[2] = int.class; //port diff --git a/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java b/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java index 4cd15ae..50c211c 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java +++ b/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java @@ -16,9 +16,16 @@ */ package org.apache.logging.log4j.core.net; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.appender.AppenderLoggingException; +import org.apache.logging.log4j.core.appender.ManagerFactory; +import org.apache.logging.log4j.core.appender.OutputStreamManager; +import org.apache.logging.log4j.core.helpers.Strings; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.io.Serializable; import java.net.ConnectException; import java.net.InetAddress; import java.net.Socket; @@ -27,12 +34,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.CountDownLatch; -import org.apache.logging.log4j.core.Layout; -import org.apache.logging.log4j.core.appender.AppenderLoggingException; -import org.apache.logging.log4j.core.appender.ManagerFactory; -import org.apache.logging.log4j.core.appender.OutputStreamManager; -import org.apache.logging.log4j.core.helpers.Strings; - /** * Manager of TCP Socket connections. */ @@ -72,7 +73,7 @@ public class TCPSocketManager extends AbstractSocketManager { */ public TCPSocketManager(final String name, final OutputStream os, final Socket sock, final InetAddress addr, final String host, final int port, final int delay, final boolean immediateFail, - final Layout layout) { + final Layout layout) { super(name, os, addr, host, port, layout); this.reconnectionDelay = delay; this.socket = sock; @@ -94,7 +95,7 @@ public class TCPSocketManager extends AbstractSocketManager { * @return A TCPSocketManager. */ public static TCPSocketManager getSocketManager(final String host, int port, int delay, - final boolean immediateFail, final Layout layout ) { + final boolean immediateFail, final Layout layout ) { if (Strings.isEmpty(host)) { throw new IllegalArgumentException("A host name is required"); } @@ -228,10 +229,10 @@ public class TCPSocketManager extends AbstractSocketManager { private final int port; private final int delay; private final boolean immediateFail; - private final Layout layout; + private final Layout layout; public FactoryData(final String host, final int port, final int delay, final boolean immediateFail, - final Layout layout) { + final Layout layout) { this.host = host; this.port = port; this.delay = delay; diff --git a/core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java b/core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java index b6bbf0c..39d8009 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java +++ b/core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java @@ -114,10 +114,10 @@ public final class PatternParser { this.config = config; final PluginManager manager = new PluginManager(converterKey, expectedClass); manager.collectPlugins(); - final Map plugins = manager.getPlugins(); + final Map> plugins = manager.getPlugins(); final Map> converters = new HashMap>(); - for (final PluginType type : plugins.values()) { + for (final PluginType type : plugins.values()) { try { @SuppressWarnings("unchecked") final Class clazz = (Class)type.getPluginClass(); diff --git a/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java b/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java index 0f66333..39802ec 100644 --- a/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java +++ b/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java @@ -81,11 +81,11 @@ public class ClassLoaderContextSelector implements ContextSelector { } else { if (getCallerClass != null) { try { - Class clazz = Class.class; + Class clazz = (Class) Class.class; boolean next = false; for (int index = 2; clazz != null; ++index) { final Object[] params = new Object[] {index}; - clazz = (Class) getCallerClass.invoke(null, params); + clazz = (Class) getCallerClass.invoke(null, params); if (clazz == null) { break; } @@ -106,7 +106,7 @@ public class ClassLoaderContextSelector implements ContextSelector { } if (securityManager != null) { - final Class clazz = securityManager.getCaller(fqcn); + final Class clazz = securityManager.getCaller(fqcn); if (clazz != null) { final ClassLoader ldr = clazz.getClassLoader() != null ? clazz.getClassLoader() : ClassLoader.getSystemClassLoader(); @@ -222,7 +222,7 @@ public class ClassLoaderContextSelector implements ContextSelector { private static void setupCallerCheck() { try { final ClassLoader loader = Loader.getClassLoader(); - final Class clazz = loader.loadClass("sun.reflect.Reflection"); + final Class clazz = loader.loadClass("sun.reflect.Reflection"); final Method[] methods = clazz.getMethods(); for (final Method method : methods) { final int modifier = method.getModifiers(); @@ -256,10 +256,10 @@ public class ClassLoaderContextSelector implements ContextSelector { */ private static class PrivateSecurityManager extends SecurityManager { - public Class getCaller(final String fqcn) { - final Class[] classes = getClassContext(); + public Class getCaller(final String fqcn) { + final Class[] classes = getClassContext(); boolean next = false; - for (final Class clazz : classes) { + for (final Class clazz : classes) { if (clazz.getName().equals(fqcn)) { next = true; continue; diff --git a/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java b/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java index 438802e..dcf9c0c 100644 --- a/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java +++ b/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java @@ -1,277 +1,277 @@ -/* - * 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.logging.dumbster.smtp; - -import java.net.ServerSocket; -import java.net.Socket; -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.PrintWriter; -import java.io.IOException; - -/** - * Dummy SMTP server for testing purposes. - * - * @todo constructor allowing user to pass preinitialized ServerSocket - */ -public class SimpleSmtpServer implements Runnable { - /** - * Stores all of the email received since this instance started up. - */ - private final List receivedMail; - - /** - * Default SMTP port is 25. - */ - public static final int DEFAULT_SMTP_PORT = 25; - - /** - * Indicates whether this server is stopped or not. - */ - private volatile boolean stopped = true; - - /** - * Handle to the server socket this server listens to. - */ - private ServerSocket serverSocket; - - /** - * Port the server listens on - set to the default SMTP port initially. - */ - private int port = DEFAULT_SMTP_PORT; - - /** - * Timeout listening on server socket. - */ - private static final int TIMEOUT = 500; - - /** - * Constructor. - * - * @param port port number - */ - public SimpleSmtpServer(final int port) { - receivedMail = new ArrayList(); - this.port = port; - } - - /** - * Main loop of the SMTP server. - */ - @Override - public void run() { - stopped = false; - try { - try { - serverSocket = new ServerSocket(port); - serverSocket.setSoTimeout(TIMEOUT); // Block for maximum of 1.5 seconds - } finally { - synchronized (this) { - // Notify when server socket has been created - notifyAll(); - } - } - - // Server: loop until stopped - while (!isStopped()) { - // Start server socket and listen for client connections - Socket socket = null; - try { - socket = serverSocket.accept(); - } catch (final Exception e) { - if (socket != null) { - socket.close(); - } - continue; // Non-blocking socket timeout occurred: try accept() again - } - - // Get the input and output streams - final BufferedReader input = new BufferedReader(new InputStreamReader(socket.getInputStream())); - final PrintWriter out = new PrintWriter(socket.getOutputStream()); - - synchronized (this) { - /* - * We synchronize over the handle method and the list update because the client call completes inside - * the handle method and we have to prevent the client from reading the list until we've updated it. - * For higher concurrency, we could just change handle to return void and update the list inside the method - * to limit the duration that we hold the lock. - */ - final List msgs = handleTransaction(out, input); - receivedMail.addAll(msgs); - } - socket.close(); - } - } catch (final Exception e) { - /** @todo Should throw an appropriate exception here. */ - e.printStackTrace(); - } finally { - if (serverSocket != null) { - try { - serverSocket.close(); - } catch (final IOException e) { - e.printStackTrace(); - } - } - } - } - - /** - * Check if the server has been placed in a stopped state. Allows another thread to - * stop the server safely. - * - * @return true if the server has been sent a stop signal, false otherwise - */ - public synchronized boolean isStopped() { - return stopped; - } - - /** - * Stops the server. Server is shutdown after processing of the current request is complete. - */ - public synchronized void stop() { - // Mark us closed - stopped = true; - try { - // Kick the server accept loop - serverSocket.close(); - } catch (final IOException e) { - // Ignore - } - } - - /** - * Handle an SMTP transaction, i.e. all activity between initial connect and QUIT command. - * - * @param out output stream - * @param input input stream - * @return List of SmtpMessage - * @throws IOException - */ - private List handleTransaction(final PrintWriter out, final BufferedReader input) throws IOException { - // Initialize the state machine - SmtpState smtpState = SmtpState.CONNECT; - final SmtpRequest smtpRequest = new SmtpRequest(SmtpActionType.CONNECT, "", smtpState); - - // Execute the connection request - final SmtpResponse smtpResponse = smtpRequest.execute(); - - // Send initial response - sendResponse(out, smtpResponse); - smtpState = smtpResponse.getNextState(); - - final List msgList = new ArrayList(); - SmtpMessage msg = new SmtpMessage(); - - while (smtpState != SmtpState.CONNECT) { - final String line = input.readLine(); - - if (line == null) { - break; - } - - // Create request from client input and current state - final SmtpRequest request = SmtpRequest.createRequest(line, smtpState); - // Execute request and create response object - final SmtpResponse response = request.execute(); - // Move to next internal state - smtpState = response.getNextState(); - // Send response to client - sendResponse(out, response); - - // Store input in message - final String params = request.getParams(); - msg.store(response, params); - - // If message reception is complete save it - if (smtpState == SmtpState.QUIT) { - msgList.add(msg); - msg = new SmtpMessage(); - } - } - - return msgList; - } - - /** - * Send response to client. - * - * @param out socket output stream - * @param smtpResponse response object - */ - private static void sendResponse(final PrintWriter out, final SmtpResponse smtpResponse) { - if (smtpResponse.getCode() > 0) { - final int code = smtpResponse.getCode(); - final String message = smtpResponse.getMessage(); - out.print(code + " " + message + "\r\n"); - out.flush(); - } - } - - /** - * Get email received by this instance since start up. - * - * @return List of String - */ - public synchronized Iterator getReceivedEmail() { - return receivedMail.iterator(); - } - - /** - * Get the number of messages received. - * - * @return size of received email list - */ - public synchronized int getReceivedEmailSize() { - return receivedMail.size(); - } - - /** - * Creates an instance of SimpleSmtpServer and starts it. Will listen on the default port. - * - * @return a reference to the SMTP server - */ - public static SimpleSmtpServer start() { - return start(DEFAULT_SMTP_PORT); - } - - /** - * Creates an instance of SimpleSmtpServer and starts it. - * - * @param port port number the server should listen to - * @return a reference to the SMTP server - */ - public static SimpleSmtpServer start(final int port) { - final SimpleSmtpServer server = new SimpleSmtpServer(port); - final Thread t = new Thread(server); - - - // Block until the server socket is created - synchronized (server) { - t.start(); - try { - server.wait(); - } catch (final InterruptedException e) { - // Ignore don't care. - } - } - return server; - } - -} +/* + * 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.logging.dumbster.smtp; + +import java.net.ServerSocket; +import java.net.Socket; +import java.util.List; +import java.util.ArrayList; +import java.util.Iterator; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.IOException; + +/** + * Dummy SMTP server for testing purposes. + * + * @todo constructor allowing user to pass preinitialized ServerSocket + */ +public class SimpleSmtpServer implements Runnable { + /** + * Stores all of the email received since this instance started up. + */ + private final List receivedMail; + + /** + * Default SMTP port is 25. + */ + public static final int DEFAULT_SMTP_PORT = 25; + + /** + * Indicates whether this server is stopped or not. + */ + private volatile boolean stopped = true; + + /** + * Handle to the server socket this server listens to. + */ + private ServerSocket serverSocket; + + /** + * Port the server listens on - set to the default SMTP port initially. + */ + private int port = DEFAULT_SMTP_PORT; + + /** + * Timeout listening on server socket. + */ + private static final int TIMEOUT = 500; + + /** + * Constructor. + * + * @param port port number + */ + public SimpleSmtpServer(final int port) { + receivedMail = new ArrayList(); + this.port = port; + } + + /** + * Main loop of the SMTP server. + */ + @Override + public void run() { + stopped = false; + try { + try { + serverSocket = new ServerSocket(port); + serverSocket.setSoTimeout(TIMEOUT); // Block for maximum of 1.5 seconds + } finally { + synchronized (this) { + // Notify when server socket has been created + notifyAll(); + } + } + + // Server: loop until stopped + while (!isStopped()) { + // Start server socket and listen for client connections + Socket socket = null; + try { + socket = serverSocket.accept(); + } catch (final Exception e) { + if (socket != null) { + socket.close(); + } + continue; // Non-blocking socket timeout occurred: try accept() again + } + + // Get the input and output streams + final BufferedReader input = new BufferedReader(new InputStreamReader(socket.getInputStream())); + final PrintWriter out = new PrintWriter(socket.getOutputStream()); + + synchronized (this) { + /* + * We synchronize over the handle method and the list update because the client call completes inside + * the handle method and we have to prevent the client from reading the list until we've updated it. + * For higher concurrency, we could just change handle to return void and update the list inside the method + * to limit the duration that we hold the lock. + */ + final List msgs = handleTransaction(out, input); + receivedMail.addAll(msgs); + } + socket.close(); + } + } catch (final Exception e) { + /** @todo Should throw an appropriate exception here. */ + e.printStackTrace(); + } finally { + if (serverSocket != null) { + try { + serverSocket.close(); + } catch (final IOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * Check if the server has been placed in a stopped state. Allows another thread to + * stop the server safely. + * + * @return true if the server has been sent a stop signal, false otherwise + */ + public synchronized boolean isStopped() { + return stopped; + } + + /** + * Stops the server. Server is shutdown after processing of the current request is complete. + */ + public synchronized void stop() { + // Mark us closed + stopped = true; + try { + // Kick the server accept loop + serverSocket.close(); + } catch (final IOException e) { + // Ignore + } + } + + /** + * Handle an SMTP transaction, i.e. all activity between initial connect and QUIT command. + * + * @param out output stream + * @param input input stream + * @return List of SmtpMessage + * @throws IOException + */ + private List handleTransaction(final PrintWriter out, final BufferedReader input) throws IOException { + // Initialize the state machine + SmtpState smtpState = SmtpState.CONNECT; + final SmtpRequest smtpRequest = new SmtpRequest(SmtpActionType.CONNECT, "", smtpState); + + // Execute the connection request + final SmtpResponse smtpResponse = smtpRequest.execute(); + + // Send initial response + sendResponse(out, smtpResponse); + smtpState = smtpResponse.getNextState(); + + final List msgList = new ArrayList(); + SmtpMessage msg = new SmtpMessage(); + + while (smtpState != SmtpState.CONNECT) { + final String line = input.readLine(); + + if (line == null) { + break; + } + + // Create request from client input and current state + final SmtpRequest request = SmtpRequest.createRequest(line, smtpState); + // Execute request and create response object + final SmtpResponse response = request.execute(); + // Move to next internal state + smtpState = response.getNextState(); + // Send response to client + sendResponse(out, response); + + // Store input in message + final String params = request.getParams(); + msg.store(response, params); + + // If message reception is complete save it + if (smtpState == SmtpState.QUIT) { + msgList.add(msg); + msg = new SmtpMessage(); + } + } + + return msgList; + } + + /** + * Send response to client. + * + * @param out socket output stream + * @param smtpResponse response object + */ + private static void sendResponse(final PrintWriter out, final SmtpResponse smtpResponse) { + if (smtpResponse.getCode() > 0) { + final int code = smtpResponse.getCode(); + final String message = smtpResponse.getMessage(); + out.print(code + " " + message + "\r\n"); + out.flush(); + } + } + + /** + * Get email received by this instance since start up. + * + * @return List of String + */ + public synchronized Iterator getReceivedEmail() { + return receivedMail.iterator(); + } + + /** + * Get the number of messages received. + * + * @return size of received email list + */ + public synchronized int getReceivedEmailSize() { + return receivedMail.size(); + } + + /** + * Creates an instance of SimpleSmtpServer and starts it. Will listen on the default port. + * + * @return a reference to the SMTP server + */ + public static SimpleSmtpServer start() { + return start(DEFAULT_SMTP_PORT); + } + + /** + * Creates an instance of SimpleSmtpServer and starts it. + * + * @param port port number the server should listen to + * @return a reference to the SMTP server + */ + public static SimpleSmtpServer start(final int port) { + final SimpleSmtpServer server = new SimpleSmtpServer(port); + final Thread t = new Thread(server); + + + // Block until the server socket is created + synchronized (server) { + t.start(); + try { + server.wait(); + } catch (final InterruptedException e) { + // Ignore don't care. + } + } + return server; + } + +} diff --git a/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java b/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java index a3b8fba..aada851 100644 --- a/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java +++ b/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java @@ -1,156 +1,156 @@ -/* - * 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.logging.dumbster.smtp; - -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.ArrayList; -import java.util.Set; - -/** - * Container for a complete SMTP message - headers and message body. - */ -public class SmtpMessage { - /** - * Headers: Map of List of String hashed on header name. - */ - private final Map> headers; - /** - * Message body. - */ - private final StringBuffer body; - - /** - * Constructor. Initializes headers Map and body buffer. - */ - public SmtpMessage() { - headers = new HashMap>(10); - body = new StringBuffer(); - } - - /** - * Update the headers or body depending on the SmtpResponse object and line of input. - * - * @param response SmtpResponse object - * @param params remainder of input line after SMTP command has been removed - */ - public void store(final SmtpResponse response, final String params) { - if (params != null) { - if (SmtpState.DATA_HDR.equals(response.getNextState())) { - final int headerNameEnd = params.indexOf(':'); - if (headerNameEnd >= 0) { - final String name = params.substring(0, headerNameEnd).trim(); - final String value = params.substring(headerNameEnd + 1).trim(); - addHeader(name, value); - } - } else if (SmtpState.DATA_BODY == response.getNextState()) { - body.append(params); - } - } - } - - /** - * Get an Iterator over the header names. - * - * @return an Iterator over the set of header names (String) - */ - public Iterator getHeaderNames() { - final Set nameSet = headers.keySet(); - return nameSet.iterator(); - } - - /** - * Get the value(s) associated with the given header name. - * - * @param name header name - * @return value(s) associated with the header name - */ - public String[] getHeaderValues(final String name) { - final List values = headers.get(name); - if (values == null) { - return new String[0]; - } else { - return values.toArray(new String[values.size()]); - } - } - - /** - * Get the first values associated with a given header name. - * - * @param name header name - * @return first value associated with the header name - */ - public String getHeaderValue(final String name) { - final List values = headers.get(name); - if (values == null) { - return null; - } else { - final Iterator iterator = values.iterator(); - return iterator.hasNext() ? iterator.next() : null; - } - } - - /** - * Get the message body. - * - * @return message body - */ - public String getBody() { - return body.toString(); - } - - /** - * Adds a header to the Map. - * - * @param name header name - * @param value header value - */ - private void addHeader(final String name, final String value) { - List valueList = headers.get(name); - if (valueList == null) { - valueList = new ArrayList(1); - headers.put(name, valueList); - } - valueList.add(value); - } - - /** - * String representation of the SmtpMessage. - * - * @return a String - */ - @Override - public String toString() { - final StringBuilder msg = new StringBuilder(); - for (final Map.Entry> entry : headers.entrySet()) { - final String name = entry.getKey(); - final List values = entry.getValue(); - for (final String value : values) { - msg.append(name); - msg.append(": "); - msg.append(value); - msg.append('\n'); - } - } - msg.append('\n'); - msg.append(body); - msg.append('\n'); - return msg.toString(); - } -} +/* + * 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.logging.dumbster.smtp; + +import java.util.Map; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.ArrayList; +import java.util.Set; + +/** + * Container for a complete SMTP message - headers and message body. + */ +public class SmtpMessage { + /** + * Headers: Map of List of String hashed on header name. + */ + private final Map> headers; + /** + * Message body. + */ + private final StringBuffer body; + + /** + * Constructor. Initializes headers Map and body buffer. + */ + public SmtpMessage() { + headers = new HashMap>(10); + body = new StringBuffer(); + } + + /** + * Update the headers or body depending on the SmtpResponse object and line of input. + * + * @param response SmtpResponse object + * @param params remainder of input line after SMTP command has been removed + */ + public void store(final SmtpResponse response, final String params) { + if (params != null) { + if (SmtpState.DATA_HDR.equals(response.getNextState())) { + final int headerNameEnd = params.indexOf(':'); + if (headerNameEnd >= 0) { + final String name = params.substring(0, headerNameEnd).trim(); + final String value = params.substring(headerNameEnd + 1).trim(); + addHeader(name, value); + } + } else if (SmtpState.DATA_BODY == response.getNextState()) { + body.append(params); + } + } + } + + /** + * Get an Iterator over the header names. + * + * @return an Iterator over the set of header names (String) + */ + public Iterator getHeaderNames() { + final Set nameSet = headers.keySet(); + return nameSet.iterator(); + } + + /** + * Get the value(s) associated with the given header name. + * + * @param name header name + * @return value(s) associated with the header name + */ + public String[] getHeaderValues(final String name) { + final List values = headers.get(name); + if (values == null) { + return new String[0]; + } else { + return values.toArray(new String[values.size()]); + } + } + + /** + * Get the first values associated with a given header name. + * + * @param name header name + * @return first value associated with the header name + */ + public String getHeaderValue(final String name) { + final List values = headers.get(name); + if (values == null) { + return null; + } else { + final Iterator iterator = values.iterator(); + return iterator.hasNext() ? iterator.next() : null; + } + } + + /** + * Get the message body. + * + * @return message body + */ + public String getBody() { + return body.toString(); + } + + /** + * Adds a header to the Map. + * + * @param name header name + * @param value header value + */ + private void addHeader(final String name, final String value) { + List valueList = headers.get(name); + if (valueList == null) { + valueList = new ArrayList(1); + headers.put(name, valueList); + } + valueList.add(value); + } + + /** + * String representation of the SmtpMessage. + * + * @return a String + */ + @Override + public String toString() { + final StringBuilder msg = new StringBuilder(); + for (final Map.Entry> entry : headers.entrySet()) { + final String name = entry.getKey(); + final List values = entry.getValue(); + for (final String value : values) { + msg.append(name); + msg.append(": "); + msg.append(value); + msg.append('\n'); + } + } + msg.append('\n'); + msg.append(body); + msg.append('\n'); + return msg.toString(); + } +} diff --git a/core/src/test/java/org/apache/logging/log4j/ReflectionComparison.java b/core/src/test/java/org/apache/logging/log4j/ReflectionComparison.java index 8bbbb39..8c5af0d 100644 --- a/core/src/test/java/org/apache/logging/log4j/ReflectionComparison.java +++ b/core/src/test/java/org/apache/logging/log4j/ReflectionComparison.java @@ -22,6 +22,7 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.StringFormattedMessage; import org.junit.BeforeClass; import org.junit.Test; + import sun.reflect.Reflection; import java.lang.reflect.Constructor; @@ -39,13 +40,13 @@ public class ReflectionComparison { private static final int COUNT = 1000000; - private static Class[] paramTypes = new Class[] {String.class, Object[].class}; + private static Class[] paramTypes = new Class[] {String.class, Object[].class}; @BeforeClass public static void setupCallerCheck() { try { final ClassLoader loader = Loader.getClassLoader(); - final Class clazz = loader.loadClass("sun.reflect.Reflection"); + final Class clazz = loader.loadClass("sun.reflect.Reflection"); final Method[] methods = clazz.getMethods(); for (final Method method : methods) { final int modifier = method.getModifiers(); @@ -109,11 +110,11 @@ public class ReflectionComparison { System.out.println(timer.toString()); } - private Class getCallerClass(final Object[] array) { + private Class getCallerClass(final Object[] array) { if (getCallerClass != null) { try { /*Object[] params = new Object[]{index}; */ - return (Class) getCallerClass.invoke(null, array); + return (Class) getCallerClass.invoke(null, array); } catch (final Exception ex) { fail(ex.getMessage()); // logger.debug("Unable to determine caller class via Sun Reflection", ex); diff --git a/core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java b/core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java index b219b13..dbe33dc 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java @@ -40,21 +40,20 @@ public class AppenderRefLevelTest { private static final String CONFIG = "log4j-reference-level.xml"; private static Configuration config; - private static ListAppender app1; - private static ListAppender app2; + private static ListAppender app1; + private static ListAppender app2; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("LIST1")) { - app1 = (ListAppender) entry.getValue(); + app1 = (ListAppender) entry.getValue(); } else if (entry.getKey().equals("LIST2")) { - app2 = (ListAppender) entry.getValue(); + app2 = (ListAppender) entry.getValue(); } } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java b/core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java index 7dd21b8..a01ec42 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java @@ -60,7 +60,7 @@ public class FileConfigTest { @Before public void before() { config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { app = (ListAppender) entry.getValue(); break; diff --git a/core/src/test/java/org/apache/logging/log4j/core/LogEventFactoryTest.java b/core/src/test/java/org/apache/logging/log4j/core/LogEventFactoryTest.java index d132af8..0646d07 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/LogEventFactoryTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/LogEventFactoryTest.java @@ -47,19 +47,18 @@ public class LogEventFactoryTest { private static final String CONFIG = "log4j2-config.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(Constants.LOG4J_LOG_EVENT_FACTORY, TestLogEventFactory.class.getName()); System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java b/core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java index fdb3f5b..bf17e08 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java @@ -49,9 +49,9 @@ public class LoggerTest { private static final String CONFIG = "log4j-test2.xml"; private static Configuration config; - private static ListAppender app; - private static ListAppender host; - private static ListAppender noThrown; + private static ListAppender app; + private static ListAppender host; + private static ListAppender noThrown; private static LoggerContext ctx; @BeforeClass @@ -68,16 +68,15 @@ public class LoggerTest { } @Before - @SuppressWarnings("unchecked") public void before() { config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); } else if (entry.getKey().equals("HostTest")) { - host = (ListAppender) entry.getValue(); + host = (ListAppender) entry.getValue(); } else if (entry.getKey().equals("NoThrowable")) { - noThrown = (ListAppender) entry.getValue(); + noThrown = (ListAppender) entry.getValue(); } } assertNotNull("No Appender", app); diff --git a/core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java b/core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java index d85384d..90c5047 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java @@ -40,9 +40,9 @@ public class LoggerUpdateTest { private static final String CONFIG = "log4j-test2.xml"; private static Configuration config; - private static ListAppender app; - private static ListAppender host; - private static ListAppender noThrown; + private static ListAppender app; + private static ListAppender host; + private static ListAppender noThrown; private static LoggerContext ctx; @BeforeClass @@ -59,16 +59,15 @@ public class LoggerUpdateTest { } @Before - @SuppressWarnings("unchecked") public void before() { config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); } else if (entry.getKey().equals("HostTest")) { - host = (ListAppender) entry.getValue(); + host = (ListAppender) entry.getValue(); } else if (entry.getKey().equals("NoThrowable")) { - noThrown = (ListAppender) entry.getValue(); + noThrown = (ListAppender) entry.getValue(); } } assertNotNull("No Appender", app); diff --git a/core/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java b/core/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java index 2a38c6c..611798f 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java @@ -35,7 +35,7 @@ public class ShutdownDisabledTest { private static final String CONFIG = "log4j-test3.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass @@ -52,7 +52,6 @@ public class ShutdownDisabledTest { } @Before - @SuppressWarnings("unchecked") public void before() { config = ctx.getConfiguration(); } diff --git a/core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java b/core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java index 8d5544b..6cf120b 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java @@ -42,18 +42,17 @@ public class StrictXMLConfigTest { private static final String CONFIG = "log4j-strict1.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java index 7a1de1d..f9543d5 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java @@ -41,18 +41,17 @@ import static org.junit.Assert.assertTrue; public class AsyncAppenderNoLocationTest { private static final String CONFIG = "log4j-asynch-no-location.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java index 0c2b2b0..598bc98 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java @@ -41,18 +41,17 @@ import static org.junit.Assert.*; public class AsyncAppenderTest { private static final String CONFIG = "log4j-asynch.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java index d984386..df0b836 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java @@ -52,7 +52,7 @@ public class ConsoleAppenderTest { public void testFollow() { final PrintStream ps = System.out; final Layout layout = PatternLayout.createLayout(null, null, null, null, null); - final ConsoleAppender app = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "true", "false"); + final ConsoleAppender app = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "true", "false"); app.start(); final LogEvent event = new Log4jLogEvent("TestLogger", null, ConsoleAppenderTest.class.getName(), Level.INFO, new SimpleMessage("Test"), null); diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java index f5580e9..7c0ab5f 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java @@ -41,19 +41,18 @@ import static org.junit.Assert.assertNotNull; public class FailoverAppenderTest { private static final String CONFIG = "log4j-failover.xml"; private static Configuration config; - private static ListAppender app; - private static FailOnceAppender foApp; + private static ListAppender app; + private static FailOnceAppender foApp; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); } else if (entry.getKey().equals("Once")) { foApp = (FailOnceAppender) entry.getValue(); } diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java index 9a52c88..245ec9c 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java @@ -138,7 +138,7 @@ public class FileAppenderTest { private static void writer(final boolean lock, final int count, final String name) throws Exception { final Layout layout = PatternLayout.createLayout(PatternLayout.SIMPLE_CONVERSION_PATTERN, null, null, null, null); - final FileAppender app = FileAppender.createAppender(FILENAME, "true", Boolean.toString(lock), "test", "false", + final FileAppender app = FileAppender.createAppender(FILENAME, "true", Boolean.toString(lock), "test", "false", "false", "false", layout, null, "false", null, null); final Thread t = Thread.currentThread(); app.start(); diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java index 9797a60..475e92b 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java @@ -38,7 +38,7 @@ public class OutputStreamAppenderTest { @Test public void testAppender() { final Layout layout = PatternLayout.createLayout(null, null, null, null, null); - final InMemoryAppender app = new InMemoryAppender("test", layout, null, false); + final InMemoryAppender app = new InMemoryAppender("test", layout, null, false); final LogEvent event = new Log4jLogEvent("TestLogger", null, OutputStreamAppenderTest.class.getName(), Level.INFO, new SimpleMessage("Test"), null); app.start(); diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/SMTPAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/SMTPAppenderTest.java index 3b5e8da..a5050fb 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/SMTPAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/SMTPAppenderTest.java @@ -149,7 +149,7 @@ public class SMTPAppenderTest { server.stop(); assertTrue(server.getReceivedEmailSize() == 1); - final SmtpMessage email = (SmtpMessage) server.getReceivedEmail().next(); + final SmtpMessage email = server.getReceivedEmail().next(); assertEquals("to@example.com", email.getHeaderValue("To")); assertEquals("cc@example.com", email.getHeaderValue("Cc")); diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java index a4ff4af..048de1d 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java @@ -85,9 +85,9 @@ public class SocketAppenderTest { @After public void teardown() { - final Map> map = root.getAppenders(); - for (final Map.Entry> entry : map.entrySet()) { - final Appender app = entry.getValue(); + final Map map = root.getAppenders(); + for (final Map.Entry entry : map.entrySet()) { + final Appender app = entry.getValue(); root.removeAppender(app); app.stop(); } diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java index 5456d5c..b115894 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java @@ -84,9 +84,9 @@ public class SyslogAppenderTest { @After public void teardown() { - final Map> map = root.getAppenders(); - for (final Map.Entry> entry : map.entrySet()) { - final Appender app = entry.getValue(); + final Map map = root.getAppenders(); + for (final Map.Entry entry : map.entrySet()) { + final Appender app = entry.getValue(); root.removeAppender(app); app.stop(); } diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java index 98a8e9e..4f34648 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java @@ -75,8 +75,8 @@ public abstract class AbstractJdbcAppenderTest { public void tearDown() throws SQLException { final LoggerContext context = (LoggerContext) LogManager.getContext(false); try { - final Map> list = context.getConfiguration().getAppenders(); - final Appender appender = list.get("databaseAppender"); + final Map list = context.getConfiguration().getAppenders(); + final Appender appender = list.get("databaseAppender"); assertNotNull("The appender should not be null.", appender); assertTrue("The appender should be a JDBCAppender.", appender instanceof JDBCAppender); ((JDBCAppender) appender).getManager().release(); diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java index e0f10d5..86a15ce 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java @@ -60,8 +60,8 @@ public abstract class AbstractJpaAppenderTest { public void tearDown() throws SQLException { final LoggerContext context = (LoggerContext) LogManager.getContext(false); try { - final Map> list = context.getConfiguration().getAppenders(); - final Appender appender = list.get("databaseAppender"); + final Map list = context.getConfiguration().getAppenders(); + final Appender appender = list.get("databaseAppender"); assertNotNull("The appender should not be null.", appender); assertTrue("The appender should be a JPAAppender.", appender instanceof JPAAppender); ((JPAAppender) appender).getManager().release(); diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java index 022d064..27643e0 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java @@ -47,21 +47,20 @@ import static org.junit.Assert.assertEquals; public class RewriteAppenderTest { private static final String CONFIG = "log4j-rewrite.xml"; private static Configuration config; - private static ListAppender app; - private static ListAppender app2; + private static ListAppender app; + private static ListAppender app2; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); } else if (entry.getKey().equals("List2")) { - app2 = (ListAppender) entry.getValue(); + app2 = (ListAppender) entry.getValue(); } } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppender2Test.java b/core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppender2Test.java index bef74d1..d6cbdc8 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppender2Test.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppender2Test.java @@ -43,18 +43,17 @@ import static org.junit.Assert.assertTrue; public class JSONRoutingAppender2Test { private static final String CONFIG = "log4j-routing2.json"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppenderTest.java index 8ce113c..622c5b5 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppenderTest.java @@ -43,18 +43,17 @@ import static org.junit.Assert.assertTrue; public class JSONRoutingAppenderTest { private static final String CONFIG = "log4j-routing.json"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java index afa65f9..8fbbde1 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java @@ -43,18 +43,17 @@ import static org.junit.Assert.assertTrue; public class RoutingAppenderTest { private static final String CONFIG = "log4j-routing.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithJndiTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithJndiTest.java index 6df8097..346747a 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithJndiTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithJndiTest.java @@ -16,20 +16,9 @@ */ package org.apache.logging.log4j.core.appender.routing; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.util.Map; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - import org.apache.logging.log4j.EventLogger; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.XMLConfigurationFactory; @@ -43,6 +32,16 @@ import org.junit.BeforeClass; import org.junit.Test; import org.mockejb.jndi.MockContextFactory; +import java.io.File; +import java.util.Map; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * RoutingAppenderWithJndiTest */ @@ -50,22 +49,21 @@ public class RoutingAppenderWithJndiTest { private static final String CONFIG = "log4j-routing-by-jndi.xml"; private static Configuration config; - private static ListAppender listAppender1; - private static ListAppender listAppender2; + private static ListAppender listAppender1; + private static ListAppender listAppender2; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List1")) { - listAppender1 = (ListAppender) entry.getValue(); + listAppender1 = (ListAppender) entry.getValue(); } if (entry.getKey().equals("List2")) { - listAppender2 = (ListAppender) entry.getValue(); + listAppender2 = (ListAppender) entry.getValue(); } } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java index aca8972..545244a 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java @@ -43,18 +43,17 @@ import static org.junit.Assert.assertTrue; public class RoutingDefaultAppenderTest { private static final String CONFIG = "log4j-routing3.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java b/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java index 2bc6309..3bda4c7 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java @@ -41,7 +41,7 @@ public class BaseConfigurationTest { // final String MISSINGROOT = "MissingRootTest"; // assertTrue("Incorrect Configuration. Expected " + MISSINGROOT + " but found " + config.getName(), // MISSINGROOT.equals(config.getName())); - final Map> map = config.getAppenders(); + final Map map = config.getAppenders(); assertNotNull("Appenders not null", map); assertEquals("Appenders Size", 2, map.size()); assertTrue("Contains List", map.containsKey("List")); @@ -54,14 +54,14 @@ public class BaseConfigurationTest { assertTrue("contains key=sample", loggerMap.containsKey("sample")); final LoggerConfig sample = loggerMap.get("sample"); - final Map> sampleAppenders = sample.getAppenders(); + final Map sampleAppenders = sample.getAppenders(); assertEquals("sampleAppenders Size", 1, sampleAppenders.size()); // sample only has List appender, not Console! assertTrue("sample has appender List", sampleAppenders.containsKey("List")); final BaseConfiguration baseConfig = (BaseConfiguration) config; final LoggerConfig root = baseConfig.getRootLogger(); - final Map> rootAppenders = root.getAppenders(); + final Map rootAppenders = root.getAppenders(); assertEquals("rootAppenders Size", 1, rootAppenders.size()); // root only has Console appender! assertTrue("root has appender Console", rootAppenders.containsKey("Console")); diff --git a/core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java b/core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java index 07c3d3c..305f77f 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java +++ b/core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java @@ -24,19 +24,19 @@ import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.filter.CompositeFilter; - import org.apache.logging.log4j.core.layout.PatternLayout; import org.junit.Test; import java.io.File; import java.io.FileInputStream; import java.io.InputStream; +import java.io.Serializable; import java.util.Map; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -73,7 +73,7 @@ public class TestConfigurator { assertNotNull("No configuration", config); assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(), CONFIG_NAME.equals(config.getName())); - final Map> map = config.getAppenders(); + final Map map = config.getAppenders(); assertNotNull("No Appenders", map != null && map.size() > 0); assertTrue("Wrong configuration", map.containsKey("List")); Configurator.shutdown(ctx); @@ -93,7 +93,7 @@ public class TestConfigurator { assertNotNull("No configuration", config); assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(), CONFIG_NAME.equals(config.getName())); - final Map> map = config.getAppenders(); + final Map map = config.getAppenders(); assertNotNull("No Appenders", map != null && map.size() > 0); assertTrue("Wrong configuration", map.containsKey("List")); Configurator.shutdown(ctx); @@ -113,7 +113,7 @@ public class TestConfigurator { assertNotNull("No configuration", config); assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(), CONFIG_NAME.equals(config.getName())); - final Map> map = config.getAppenders(); + final Map map = config.getAppenders(); assertNotNull("No Appenders", map != null && map.size() > 0); assertTrue("Wrong configuration", map.containsKey("List")); Configurator.shutdown(ctx); @@ -130,7 +130,7 @@ public class TestConfigurator { assertNotNull("No configuration", config); assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(), CONFIG_NAME.equals(config.getName())); - final Map> map = config.getAppenders(); + final Map map = config.getAppenders(); assertNotNull("No Appenders", map != null && map.size() > 0); assertTrue("Wrong configuration", map.containsKey("List")); Configurator.shutdown(ctx); @@ -147,7 +147,7 @@ public class TestConfigurator { assertNotNull("No configuration", config); assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(), CONFIG_NAME.equals(config.getName())); - final Map> map = config.getAppenders(); + final Map map = config.getAppenders(); assertNotNull("No Appenders", map != null && map.size() > 0); assertTrue("Wrong configuration", map.containsKey("List")); Configurator.shutdown(ctx); @@ -166,7 +166,7 @@ public class TestConfigurator { assertNotNull("No configuration", config); assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(), CONFIG_NAME.equals(config.getName())); - final Map> map = config.getAppenders(); + final Map map = config.getAppenders(); assertNotNull("No Appenders", map != null && map.size() > 0); assertTrue("Wrong configuration", map.containsKey("List")); @@ -192,17 +192,17 @@ public class TestConfigurator { assertNotNull("No configuration", config); assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(), CONFIG_NAME.equals(config.getName())); - final Map> map = config.getAppenders(); + final Map map = config.getAppenders(); assertNotNull("No Appenders", map != null && map.size() > 0); - Appender app = null; - for (final Map.Entry> entry: map.entrySet()) { + Appender app = null; + for (final Map.Entry entry: map.entrySet()) { if (entry.getKey().equals("List2")) { app = entry.getValue(); break; } } assertNotNull("No ListAppender named List2", app); - final Layout layout = app.getLayout(); + final Layout layout = app.getLayout(); assertNotNull("Appender List2 does not have a Layout", layout); assertTrue("Appender List2 is not configured with a PatternLayout", layout instanceof PatternLayout); final String pattern = ((PatternLayout) layout).getConversionPattern(); diff --git a/core/src/test/java/org/apache/logging/log4j/core/config/XMLConfigurationTest.java b/core/src/test/java/org/apache/logging/log4j/core/config/XMLConfigurationTest.java index bc6eef3..d2b0f60 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/config/XMLConfigurationTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/config/XMLConfigurationTest.java @@ -126,9 +126,9 @@ public class XMLConfigurationTest { public void testConfiguredAppenders() { final LoggerContext ctx = (LoggerContext) LogManager.getContext(); final Configuration c = ctx.getConfiguration(); - final Map> apps = c.getAppenders(); + final Map apps = c.getAppenders(); assertNotNull(apps); - assertEquals(3, apps.size()); + assertEquals(apps.size(), 3); } @Test @@ -142,10 +142,10 @@ public class XMLConfigurationTest { final Iterator iter = l.getFilters(); final Filter filter = iter.next(); assertTrue(filter instanceof ThreadContextMapFilter); - final Map> appenders = l.getAppenders(); + final Map appenders = l.getAppenders(); assertNotNull(appenders); assertTrue("number of appenders = " + appenders.size(), appenders.size() == 1); - final Appender a = appenders.get("STDOUT"); + final Appender a = appenders.get("STDOUT"); assertNotNull(a); assertEquals(a.getName(), "STDOUT"); } diff --git a/core/src/test/java/org/apache/logging/log4j/core/config/XMLLoggerPropsTest.java b/core/src/test/java/org/apache/logging/log4j/core/config/XMLLoggerPropsTest.java index 3a0a8d2..720e0e1 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/config/XMLLoggerPropsTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/config/XMLLoggerPropsTest.java @@ -39,19 +39,18 @@ public class XMLLoggerPropsTest { private static final String CONFIG = "log4j-loggerprops.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); System.setProperty("test", "test"); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java b/core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java index 2cb65f1..2384d11 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java @@ -40,19 +40,18 @@ public class BurstFilterTest { private static final String CONFIG = "log4j-burst.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static BurstFilter filter; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("ListAppender")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); filter = (BurstFilter) app.getFilter(); break; } diff --git a/core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java b/core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java index 9d6e05f..bfb5ea5 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java @@ -96,11 +96,10 @@ public class MapFilterTest { final Map eventMap = new HashMap(); eventMap.put("eventId", "Login"); logger.debug(new MapMessage(eventMap)); - final Map> appenders = config.getAppenders(); + final Map appenders = config.getAppenders(); final Appender app = appenders.get("LIST"); assertNotNull("No List appender", app); - @SuppressWarnings("unchecked") - final List msgs = ((ListAppender) app).getMessages(); + final List msgs = ((ListAppender) app).getMessages(); assertNotNull("No messages", msgs); assertTrue("No messages", msgs.size() > 0); diff --git a/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java b/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java index 35e5dd5..8137a16 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java @@ -87,7 +87,7 @@ public class HTMLLayoutTest { // set up appender final HTMLLayout layout = HTMLLayout.createLayout("true", null, null, null, "small", null); - final ListAppender appender = new ListAppender("List", null, layout, true, false); + final ListAppender appender = new ListAppender("List", null, layout, true, false); appender.start(); // set appender on root and set level to debug diff --git a/core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java b/core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java index f14b57a..42f559a 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java @@ -83,7 +83,7 @@ public class RFC5424LayoutTest { // set up appender final AbstractStringLayout layout = RFC5424Layout.createLayout("Local0", "Event", "3692", "true", "RequestContext", null, null, "true", null, "ATM", null, "key1, key2, locale", null, "loginId", null, null, null); - final ListAppender appender = new ListAppender("List", null, layout, true, false); + final ListAppender appender = new ListAppender("List", null, layout, true, false); appender.start(); @@ -147,7 +147,7 @@ public class RFC5424LayoutTest { // set up layout/appender final AbstractStringLayout layout = RFC5424Layout.createLayout("Local0", "Event", "3692", "true", "RequestContext", null, null, "true", "#012", "ATM", null, "key1, key2, locale", null, "loginId", null, null, null); - final ListAppender appender = new ListAppender("List", null, layout, true, false); + final ListAppender appender = new ListAppender("List", null, layout, true, false); appender.start(); @@ -210,7 +210,7 @@ public class RFC5424LayoutTest { // set up layout/appender final AbstractStringLayout layout = RFC5424Layout.createLayout("Local0", "Event", "3692", "true", "RequestContext", null, null, "true", null, "ATM", null, "key1, key2, locale", null, "loginId", "%xEx", null, null); - final ListAppender appender = new ListAppender("List", null, layout, true, false); + final ListAppender appender = new ListAppender("List", null, layout, true, false); appender.start(); // set appender on root and set level to debug @@ -254,7 +254,7 @@ public class RFC5424LayoutTest { // set up layout/appender final AbstractStringLayout layout = RFC5424Layout.createLayout("Local0", "Event", "3692", "true", "RequestContext", null, null, "true", null, "ATM", null, "key1, key2, locale", null, null, null, loggerFields, null); - final ListAppender appender = new ListAppender("List", null, layout, true, false); + final ListAppender appender = new ListAppender("List", null, layout, true, false); appender.start(); // set appender on root and set level to debug diff --git a/core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java b/core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java index c99d90d..fe01d7b 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java @@ -78,7 +78,7 @@ public class SerializedLayoutTest { // set up appender final SerializedLayout layout = SerializedLayout.createLayout(); - final ListAppender appender = new ListAppender("List", null, layout, false, true); + final ListAppender appender = new ListAppender("List", null, layout, false, true); appender.start(); // set appender on root and set level to debug diff --git a/core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java b/core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java index e78d92d..96b3691 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java @@ -78,7 +78,7 @@ public class SyslogLayoutTest { // set up appender final SyslogLayout layout = SyslogLayout.createLayout("Local0", "true", null, null); //ConsoleAppender appender = new ConsoleAppender("Console", layout); - final ListAppender appender = new ListAppender("List", null, layout, true, false); + final ListAppender appender = new ListAppender("List", null, layout, true, false); appender.start(); // set appender on root and set level to debug diff --git a/core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java b/core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java index 5cd1c50..31b84e4 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java @@ -78,7 +78,7 @@ public class XMLLayoutTest { // set up appender final XMLLayout layout = XMLLayout.createLayout("true", "true", "true", null, null, null); - final ListAppender appender = new ListAppender("List", null, layout, true, false); + final ListAppender appender = new ListAppender("List", null, layout, true, false); appender.start(); // set appender on root and set level to debug diff --git a/core/src/test/java/org/apache/logging/log4j/core/net/AbstractSocketServerTest.java b/core/src/test/java/org/apache/logging/log4j/core/net/AbstractSocketServerTest.java index 95d74e4..cc8a69b 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/net/AbstractSocketServerTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/net/AbstractSocketServerTest.java @@ -16,12 +16,6 @@ */ package org.apache.logging.log4j.core.net; -import java.io.IOException; -import java.io.Serializable; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.Appender; @@ -38,7 +32,13 @@ import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.After; import org.junit.Test; -import static org.junit.Assert.*; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @@ -76,9 +76,9 @@ public abstract class AbstractSocketServerTest { @After public void tearDown() { - final Map> map = root.getAppenders(); - for (final Map.Entry> entry : map.entrySet()) { - final Appender app = entry.getValue(); + final Map map = root.getAppenders(); + for (final Map.Entry entry : map.entrySet()) { + final Appender app = entry.getValue(); root.removeAppender(app); app.stop(); } @@ -106,13 +106,13 @@ public abstract class AbstractSocketServerTest { protected void testServer(final String message1, final String message2) throws Exception { final Filter socketFilter = new ThreadFilter(Filter.Result.NEUTRAL, Filter.Result.DENY); final Filter serverFilter = new ThreadFilter(Filter.Result.DENY, Filter.Result.NEUTRAL); - final SocketAppender appender = SocketAppender.createAppender("localhost", this.port, this.protocol, "-1", null, "Test", null, + final SocketAppender appender = SocketAppender.createAppender("localhost", this.port, this.protocol, "-1", null, "Test", null, "false", null, socketFilter, null, null); appender.start(); - final ListAppender listApp = new ListAppender("Events", serverFilter, null, false, false); + final ListAppender listApp = new ListAppender("Events", serverFilter, null, false, false); listApp.start(); final PatternLayout layout = PatternLayout.createLayout("%m %ex%n", null, null, null, null); - final ConsoleAppender console = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true"); + final ConsoleAppender console = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true"); final Logger serverLogger = ctx.getLogger(this.getClass().getName()); serverLogger.addAppender(console); serverLogger.setAdditive(false); diff --git a/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueAppenderTest.java b/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueAppenderTest.java index 8de4916..f458549 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueAppenderTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueAppenderTest.java @@ -78,7 +78,7 @@ public class JMSQueueAppenderTest { public void testConfiguration() throws Exception { final LoggerContext ctx = (LoggerContext) LogManager.getContext(); final Configuration config = ctx.getConfiguration(); - final Map> appenders = config.getAppenders(); + final Map appenders = config.getAppenders(); assertTrue(appenders.containsKey("JMSQueue")); } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueFailoverTest.java b/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueFailoverTest.java index 1590590..1bd3419 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueFailoverTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueFailoverTest.java @@ -58,7 +58,7 @@ public class JMSQueueFailoverTest { private static final String CONFIG = "log4j-jmsqueue-failover.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass @@ -76,12 +76,11 @@ public class JMSQueueFailoverTest { } @Before - @SuppressWarnings("unchecked") public void before() { config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java b/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java index 27a9f04..6990e75 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java @@ -83,9 +83,9 @@ public class JMSQueueTest { @After public void teardown() { - final Map> map = root.getAppenders(); - for (final Map.Entry> entry : map.entrySet()) { - final Appender app = entry.getValue(); + final Map map = root.getAppenders(); + for (final Map.Entry entry : map.entrySet()) { + final Appender app = entry.getValue(); root.removeAppender(app); app.stop(); } @@ -100,7 +100,7 @@ public class JMSQueueTest { QUEUE_NAME, null, null, null, clientFilters, "true"); appender.start(); final CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter}); - final ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false); + final ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false); listApp.start(); final PatternLayout layout = PatternLayout.createLayout("%m %ex%n", null, null, null, null); final ConsoleAppender console = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true"); diff --git a/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicFailoverTest.java b/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicFailoverTest.java index f6910b4..63c81a3 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicFailoverTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicFailoverTest.java @@ -57,7 +57,7 @@ public class JMSTopicFailoverTest { private static final String CONFIG = "log4j-jmstopic-failover.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass @@ -75,12 +75,11 @@ public class JMSTopicFailoverTest { } @Before - @SuppressWarnings("unchecked") public void before() { config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java b/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java index 41f32ad..b7ba265 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java @@ -25,28 +25,26 @@ import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.appender.JMSTopicAppender; -import org.apache.logging.log4j.test.appender.ListAppender; -import org.apache.logging.log4j.core.filter.CompositeFilter; import org.apache.logging.log4j.core.filter.AbstractFilter; +import org.apache.logging.log4j.core.filter.CompositeFilter; import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.status.StatusConsoleListener; import org.apache.logging.log4j.status.StatusLogger; - +import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - import org.mockejb.jms.MockTopic; import org.mockejb.jms.TopicConnectionFactoryImpl; import org.mockejb.jndi.MockContextFactory; -import javax.naming.Context; -import javax.naming.InitialContext; -import java.io.Serializable; import java.util.List; import java.util.Map; +import javax.naming.Context; +import javax.naming.InitialContext; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -84,9 +82,9 @@ public class JMSTopicTest { @After public void teardown() { - final Map> map = root.getAppenders(); - for (final Map.Entry> entry : map.entrySet()) { - final Appender app = entry.getValue(); + final Map map = root.getAppenders(); + for (final Map.Entry entry : map.entrySet()) { + final Appender app = entry.getValue(); root.removeAppender(app); app.stop(); } @@ -101,10 +99,10 @@ public class JMSTopicTest { TOPIC_NAME, null, null, null, clientFilters, "true"); appender.start(); final CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter}); - final ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false); + final ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false); listApp.start(); final PatternLayout layout = PatternLayout.createLayout("%m %ex%n", null, null, null, null); - final ConsoleAppender console = + final ConsoleAppender console = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true"); console.start(); final Logger serverLogger = ctx.getLogger(JMSTopicReceiver.class.getName()); diff --git a/core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowableTest.java b/core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowableTest.java index 2ac9a16..d330625 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowableTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowableTest.java @@ -30,7 +30,8 @@ import org.junit.Test; import java.util.List; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @@ -38,18 +39,17 @@ import static org.junit.Assert.*; public class ExtendedThrowableTest { private static final String CONFIG = "log4j-throwablefilter.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java b/core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java index c20eebc..8fe2fe1 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java @@ -42,24 +42,23 @@ import static org.junit.Assert.assertTrue; public class RegexReplacementTest { private static final String CONFIG = "log4j-replace.xml"; private static Configuration config; - private static ListAppender app; - private static ListAppender app2; + private static ListAppender app; + private static ListAppender app2; private static LoggerContext ctx; private static final String EXPECTED = "/RegexReplacementTest" + Constants.LINE_SEP; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); } if (entry.getKey().equals("List2")) { - app2 = (ListAppender) entry.getValue(); + app2 = (ListAppender) entry.getValue(); } } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/pattern/RootThrowableTest.java b/core/src/test/java/org/apache/logging/log4j/core/pattern/RootThrowableTest.java index a30df67..eecce6f 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/pattern/RootThrowableTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/pattern/RootThrowableTest.java @@ -39,18 +39,17 @@ import static org.junit.Assert.assertTrue; public class RootThrowableTest { private static final String CONFIG = "log4j-rootthrowablefilter.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); } } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java b/core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java index 9e516f4..68867df 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java @@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue; public class StyleConverterTest { private static final String CONFIG = "log4j-style.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; private static final String EXPECTED = @@ -49,14 +49,13 @@ public class StyleConverterTest { + Constants.LINE_SEP; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/pattern/ThrowableTest.java b/core/src/test/java/org/apache/logging/log4j/core/pattern/ThrowableTest.java index 8b9a228..2b6546e 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/pattern/ThrowableTest.java +++ b/core/src/test/java/org/apache/logging/log4j/core/pattern/ThrowableTest.java @@ -38,18 +38,17 @@ import static org.junit.Assert.*; public class ThrowableTest { private static final String CONFIG = "log4j-throwable.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass - @SuppressWarnings("unchecked") public static void setupClass() { System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); ctx = (LoggerContext) LogManager.getContext(false); config = ctx.getConfiguration(); - for (final Map.Entry> entry : config.getAppenders().entrySet()) { + for (final Map.Entry entry : config.getAppenders().entrySet()) { if (entry.getKey().equals("List")) { - app = (ListAppender) entry.getValue(); + app = (ListAppender) entry.getValue(); break; } } diff --git a/core/src/test/java/org/apache/logging/log4j/core/util/Compare.java b/core/src/test/java/org/apache/logging/log4j/core/util/Compare.java index 8e25317..0cd0cea 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/util/Compare.java +++ b/core/src/test/java/org/apache/logging/log4j/core/util/Compare.java @@ -31,7 +31,7 @@ public class Compare { static final int B2_NULL = -2; private static final InputStream open( - final Class testClass, + final Class testClass, final String fileName) throws IOException { final String resourceName = fileName; /* if (fileName.startsWith("witness/")) { @@ -53,7 +53,7 @@ public class Compare { return is; } - public static boolean compare(final Class testClass, + public static boolean compare(final Class testClass, final String file1, final String file2) throws IOException { @@ -69,7 +69,7 @@ public class Compare { } public static boolean compare( - final Class testClass, final String file1, final String file2, final BufferedReader in1, final BufferedReader in2) throws IOException { + final Class testClass, final String file1, final String file2, final BufferedReader in1, final BufferedReader in2) throws IOException { String s1; int lineCounter = 0; @@ -108,7 +108,7 @@ public class Compare { /** * Prints file on the console. */ - private static void outputFile(final Class testClass, final String file) + private static void outputFile(final Class testClass, final String file) throws IOException { final InputStream is = open(testClass, file); final BufferedReader in1 = new BufferedReader(new InputStreamReader(is)); diff --git a/core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java b/core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java index 2cf9ab0..f03b001 100644 --- a/core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java +++ b/core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java @@ -23,7 +23,7 @@ import java.lang.reflect.Field; */ public class Profiler { private static Object profiler; - private static Class profilingModes; + private static Class profilingModes; private static Class controllerClazz; static { @@ -55,7 +55,7 @@ public class Profiler { final Object[] args = new Object[2]; args[0] = f.getLong(profilingModes); args[1] = ""; - final Class[] parms = new Class[] {long.class, String.class}; + final Class[] parms = new Class[] {long.class, String.class}; controllerClazz.getMethod("startCPUProfiling", parms).invoke(profiler, args); } catch (final Exception e) { @@ -71,7 +71,7 @@ public class Profiler { final Field f = profilingModes.getDeclaredField("SNAPSHOT_WITHOUT_HEAP"); final Object[] args = new Object[1]; args[0] = f.getLong(profilingModes); - final Class[] parms = new Class[] {long.class}; + final Class[] parms = new Class[] {long.class}; profiler.getClass().getMethod("captureSnapshot", parms).invoke(profiler, args); profiler.getClass().getMethod("stopCPUProfiling").invoke(profiler); } diff --git a/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java b/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java index c2e70b3..35955b9 100644 --- a/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java +++ b/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java @@ -23,13 +23,11 @@ import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttr; import org.apache.logging.log4j.core.config.plugins.PluginFactory; -import java.io.Serializable; - /** * */ @Plugin(name="AlwaysFail", category ="Core",elementType="appender",printObject=true) -public class AlwaysFailAppender extends AbstractAppender { +public class AlwaysFailAppender extends AbstractAppender { private AlwaysFailAppender(final String name) { super(name, null, null, false); @@ -41,13 +39,13 @@ public class AlwaysFailAppender extends AbstractAppender } @PluginFactory - public static AlwaysFailAppender createAppender(@PluginAttr("name") final String name) { + public static AlwaysFailAppender createAppender(@PluginAttr("name") final String name) { if (name == null) { LOGGER.error("A name for the Appender must be specified"); return null; } - return new AlwaysFailAppender(name); + return new AlwaysFailAppender(name); } } diff --git a/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java b/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java index 60312a8..484b515 100644 --- a/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java +++ b/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java @@ -23,7 +23,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttr; import org.apache.logging.log4j.core.config.plugins.PluginFactory; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -31,7 +30,7 @@ import java.util.List; * */ @Plugin(name="FailOnce", category ="Core",elementType="appender",printObject=true) -public class FailOnceAppender extends AbstractAppender { +public class FailOnceAppender extends AbstractAppender { boolean fail = true; @@ -58,13 +57,13 @@ public class FailOnceAppender extends AbstractAppender FailOnceAppender createAppender(@PluginAttr("name") final String name) { + public static FailOnceAppender createAppender(@PluginAttr("name") final String name) { if (name == null) { LOGGER.error("A name for the Appender must be specified"); return null; } - return new FailOnceAppender(name); + return new FailOnceAppender(name); } } diff --git a/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java b/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java index 868c571..9bcf2a8 100644 --- a/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java +++ b/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java @@ -27,9 +27,9 @@ import org.apache.logging.log4j.core.filter.CompositeFilter; /** * */ -public class InMemoryAppender extends AbstractOutputStreamAppender { +public class InMemoryAppender extends AbstractOutputStreamAppender { - public InMemoryAppender(final String name, final Layout layout, final CompositeFilter filters, + public InMemoryAppender(final String name, final Layout layout, final CompositeFilter filters, final boolean ignoreExceptions) { super(name, layout, filters, ignoreExceptions, true, new InMemoryManager(name, layout)); } @@ -41,7 +41,7 @@ public class InMemoryAppender extends AbstractOutputStre private static class InMemoryManager extends OutputStreamManager { - public InMemoryManager(final String name, final Layout layout) { + public InMemoryManager(final String name, final Layout layout) { super(new ByteArrayOutputStream(), name, layout); } diff --git a/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java b/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java index afe982c..ddc883d 100644 --- a/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java +++ b/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java @@ -36,7 +36,7 @@ import java.util.List; * List could eventually grow to cause an OutOfMemoryError. */ @Plugin(name = "List", category = "Core", elementType = "appender", printObject = true) -public class ListAppender extends AbstractAppender { +public class ListAppender extends AbstractAppender { private final List events = new ArrayList(); @@ -56,7 +56,7 @@ public class ListAppender extends AbstractAppender { raw = false; } - public ListAppender(final String name, final Filter filter, final Layout layout, final boolean newline, + public ListAppender(final String name, final Filter filter, final Layout layout, final boolean newline, final boolean raw) { super(name, filter, layout); this.newLine = newline; @@ -71,7 +71,7 @@ public class ListAppender extends AbstractAppender { @Override public synchronized void append(final LogEvent event) { - final Layout layout = getLayout(); + final Layout layout = getLayout(); if (layout == null) { events.add(event); } else if (layout instanceof SerializedLayout) { @@ -126,7 +126,7 @@ public class ListAppender extends AbstractAppender { @Override public void stop() { super.stop(); - final Layout layout = getLayout(); + final Layout layout = getLayout(); if (layout != null) { final byte[] bytes = layout.getFooter(); if (bytes != null) { @@ -154,10 +154,10 @@ public class ListAppender extends AbstractAppender { } @PluginFactory - public static ListAppender createAppender(@PluginAttr("name") final String name, + public static ListAppender createAppender(@PluginAttr("name") final String name, @PluginAttr("entryPerNewLine") final String newLine, @PluginAttr("raw") final String raw, - @PluginElement("layout") final Layout layout, + @PluginElement("layout") final Layout layout, @PluginElement("filters") final Filter filter) { if (name == null) { @@ -168,6 +168,6 @@ public class ListAppender extends AbstractAppender { final boolean nl = Boolean.parseBoolean(newLine); final boolean r = Boolean.parseBoolean(raw); - return new ListAppender(name, filter, layout, nl, r); + return new ListAppender(name, filter, layout, nl, r); } } diff --git a/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java b/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java index c63c1d7..ce93aea 100644 --- a/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java +++ b/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java @@ -37,7 +37,7 @@ import org.apache.logging.log4j.core.layout.RFC5424Layout; * @param The {@link Layout}'s {@link Serializable} type. */ @Plugin(name = "Flume", category = "Core", elementType = "appender", printObject = true) -public final class FlumeAppender extends AbstractAppender implements FlumeEventFactory { +public final class FlumeAppender extends AbstractAppender implements FlumeEventFactory { private static final String[] EXCLUDED_PACKAGES = {"org.apache.flume", "org.apache.avro"}; private static final int DEFAULT_MAX_DELAY = 60000; @@ -67,7 +67,7 @@ public final class FlumeAppender extends AbstractAppende } } - private FlumeAppender(final String name, final Filter filter, final Layout layout, + private FlumeAppender(final String name, final Filter filter, final Layout layout, final boolean ignoreExceptions, final String includes, final String excludes, final String required, final String mdcPrefix, final String eventPrefix, final boolean compress, final FlumeEventFactory factory, final AbstractFlumeManager manager) { @@ -158,7 +158,7 @@ public final class FlumeAppender extends AbstractAppende * @return A Flume Avro Appender. */ @PluginFactory - public static FlumeAppender createAppender(@PluginElement("agents") Agent[] agents, + public static FlumeAppender createAppender(@PluginElement("agents") Agent[] agents, @PluginElement("properties") final Property[] properties, @PluginAttr("embedded") final String embedded, @PluginAttr("type") final String type, @@ -177,7 +177,7 @@ public final class FlumeAppender extends AbstractAppende @PluginAttr("compress") final String compressBody, @PluginAttr("batchSize") final String batchSize, @PluginElement("flumeEventFactory") final FlumeEventFactory factory, - @PluginElement("layout") Layout layout, + @PluginElement("layout") Layout layout, @PluginElement("filters") final Filter filter) { final boolean embed = embedded != null ? Boolean.parseBoolean(embedded) : @@ -216,11 +216,8 @@ public final class FlumeAppender extends AbstractAppende final int delay = Integers.parseInt(maxDelay, DEFAULT_MAX_DELAY ); if (layout == null) { - @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" }) - final - Layout l = (Layout) RFC5424Layout.createLayout(null, null, null, "True", null, mdcPrefix, eventPrefix, + layout = RFC5424Layout.createLayout(null, null, null, "True", null, mdcPrefix, eventPrefix, null, null, null, excludes, includes, required, null, null, null, null); - layout = l; } if (name == null) { @@ -262,7 +259,7 @@ public final class FlumeAppender extends AbstractAppende return null; } - return new FlumeAppender(name, filter, layout, ignoreExceptions, includes, + return new FlumeAppender(name, filter, layout, ignoreExceptions, includes, excludes, required, mdcPrefix, eventPrefix, compress, factory, manager); } } diff --git a/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java b/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java index a84d77e..c4f6a9a 100644 --- a/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java +++ b/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java @@ -382,13 +382,13 @@ public class FlumePersistentManager extends FlumeAvroManager { if (key != null) { final PluginManager manager = new PluginManager("KeyProvider", SecretKeyProvider.class); manager.collectPlugins(); - final Map plugins = manager.getPlugins(); + final Map> plugins = manager.getPlugins(); if (plugins != null) { boolean found = false; - for (final Map.Entry entry : plugins.entrySet()) { + for (final Map.Entry> entry : plugins.entrySet()) { if (entry.getKey().equalsIgnoreCase(key)) { found = true; - final Class cl = entry.getValue().getPluginClass(); + final Class cl = entry.getValue().getPluginClass(); try { final SecretKeyProvider provider = (SecretKeyProvider) cl.newInstance(); secretKey = provider.getSecretKey(); diff --git a/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java b/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java index 4e97c69..2e13bee 100644 --- a/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java +++ b/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java @@ -372,15 +372,15 @@ public class FlumeAppenderTest { private void removeAppenders(final Logger logger) { - final Map> map = logger.getAppenders(); - for (final Map.Entry> entry : map.entrySet()) { - final Appender app = entry.getValue(); + final Map map = logger.getAppenders(); + for (final Map.Entry entry : map.entrySet()) { + final Appender app = entry.getValue(); avroLogger.removeAppender(app); app.stop(); } } - private Appender getAppender(final Logger logger, final String name) { + private Appender getAppender(final Logger logger, final String name) { return logger.getAppenders().get(name); } diff --git a/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java b/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java index 0f29bad..c704926 100644 --- a/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java +++ b/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java @@ -77,7 +77,7 @@ public class LogFactoryImpl extends LogFactory { } @Override - public Log getInstance(final Class clazz) throws LogConfigurationException { + public Log getInstance(@SuppressWarnings("rawtypes") final Class clazz) throws LogConfigurationException { return getInstance(clazz.getName()); } diff --git a/jcl-bridge/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java b/jcl-bridge/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java index dacafce..c41142e 100644 --- a/jcl-bridge/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java +++ b/jcl-bridge/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java @@ -70,14 +70,13 @@ public class LoggerTest { verify("List", "o.a.l.l.j.LoggerTest Info Message {} MDC{}" + Constants.LINE_SEP); } - @SuppressWarnings("unchecked") private void verify(final String name, final String expected) { final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); - final Map> list = ctx.getConfiguration().getAppenders(); - final Appender listApp = list.get(name); + final Map list = ctx.getConfiguration().getAppenders(); + final Appender listApp = list.get(name); assertNotNull("Missing Appender", listApp); assertTrue("Not a ListAppender", listApp instanceof ListAppender); - final List events = ((ListAppender) listApp).getMessages(); + final List events = ((ListAppender) listApp).getMessages(); assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size()== 1); final String actual = events.get(0); assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual); diff --git a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java index ac6881b..83b9c94 100644 --- a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java +++ b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java @@ -27,14 +27,17 @@ import java.util.List; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.joran.spi.JoranException; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.message.MessageFactory; import org.apache.logging.log4j.message.ParameterizedMessageFactory; import org.apache.logging.log4j.message.StringFormatterMessageFactory; + import ch.qos.logback.core.testUtil.StringListAppender; import ch.qos.logback.classic.LoggerContext; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/log4j12-api/src/main/java/org/apache/log4j/Category.java b/log4j12-api/src/main/java/org/apache/log4j/Category.java index 732ca62..40c5528 100644 --- a/log4j12-api/src/main/java/org/apache/log4j/Category.java +++ b/log4j12-api/src/main/java/org/apache/log4j/Category.java @@ -92,11 +92,11 @@ public class Category { return prev == null ? logger : prev; } - public static Category getInstance(final Class clazz) { + public static Category getInstance(@SuppressWarnings("rawtypes") final Class clazz) { return getInstance(clazz.getName()); } - static Category getInstance(final LoggerContext context, final Class clazz) { + static Category getInstance(final LoggerContext context, @SuppressWarnings("rawtypes") final Class clazz) { return getInstance(context, clazz.getName()); } @@ -148,6 +148,7 @@ public class Category { @deprecated Please use {@link LogManager#getCurrentLoggers()} instead. */ + @SuppressWarnings("rawtypes") @Deprecated public static Enumeration getCurrentCategories() { return LogManager.getCurrentLoggers(); @@ -281,6 +282,7 @@ public class Category { public void callAppenders(final LoggingEvent event) { } + @SuppressWarnings("rawtypes") public Enumeration getAllAppenders() { return NullEnumeration.getInstance(); } diff --git a/log4j12-api/src/main/java/org/apache/log4j/LogManager.java b/log4j12-api/src/main/java/org/apache/log4j/LogManager.java index 7e56b65..5e9e612 100644 --- a/log4j12-api/src/main/java/org/apache/log4j/LogManager.java +++ b/log4j12-api/src/main/java/org/apache/log4j/LogManager.java @@ -73,7 +73,7 @@ public final class LogManager { return (Logger) Category.getInstance((LoggerContext) PrivateManager.getContext(), name); } - public static Logger getLogger(final Class clazz) { + public static Logger getLogger(@SuppressWarnings("rawtypes") final Class clazz) { return (Logger) Category.getInstance((LoggerContext) PrivateManager.getContext(), clazz.getName()); } @@ -89,6 +89,7 @@ public final class LogManager { return Logger.getLogger(name); } + @SuppressWarnings("rawtypes") public static Enumeration getCurrentLoggers() { return NullEnumeration.getInstance(); } @@ -183,11 +184,13 @@ public final class LogManager { } @Override + @SuppressWarnings("rawtypes") public Enumeration getCurrentLoggers() { return NullEnumeration.getInstance(); } @Override + @SuppressWarnings("rawtypes") public Enumeration getCurrentCategories() { return NullEnumeration.getInstance(); } diff --git a/log4j12-api/src/main/java/org/apache/log4j/NDC.java b/log4j12-api/src/main/java/org/apache/log4j/NDC.java index 870aac9..8b9214b 100644 --- a/log4j12-api/src/main/java/org/apache/log4j/NDC.java +++ b/log4j12-api/src/main/java/org/apache/log4j/NDC.java @@ -52,6 +52,7 @@ public final class NDC { * * @return Stack A clone of the current thread's diagnostic context. */ + @SuppressWarnings("rawtypes") public static Stack cloneStack() { final Stack stack = new Stack(); for (final String element : org.apache.logging.log4j.ThreadContext.cloneStack().asList()) { diff --git a/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java b/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java index 7bc7f47..d064004 100644 --- a/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java +++ b/log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java @@ -24,6 +24,7 @@ import java.util.NoSuchElementException; * * @since version 1.0 */ +@SuppressWarnings("rawtypes") public final class NullEnumeration implements Enumeration { private static final NullEnumeration INSTANCE = new NullEnumeration(); diff --git a/log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java b/log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java index a4f3b28..4e71f31 100644 --- a/log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java +++ b/log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java @@ -91,6 +91,7 @@ public interface LoggerRepository { void shutdown(); + @SuppressWarnings("rawtypes") Enumeration getCurrentLoggers(); /** @@ -98,6 +99,7 @@ public interface LoggerRepository { * * @return an enumeration of loggers. */ + @SuppressWarnings("rawtypes") Enumeration getCurrentCategories(); void fireAddAppenderEvent(Category logger, Appender appender); diff --git a/log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java b/log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java index b963464..9fd0efd 100644 --- a/log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java +++ b/log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java @@ -20,6 +20,7 @@ import java.io.InputStream; import java.io.Reader; import java.net.URL; import java.util.Properties; + import javax.xml.parsers.FactoryConfigurationError; import org.apache.log4j.config.PropertySetter; @@ -71,7 +72,7 @@ public class DOMConfigurator { } - public static Object parseElement(final Element element, final Properties props, final Class expectedClass) + public static Object parseElement(final Element element, final Properties props, @SuppressWarnings("rawtypes") final Class expectedClass) throws Exception { return null; } diff --git a/log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java b/log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java index 91959b9..af8cee0 100644 --- a/log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java +++ b/log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java @@ -43,7 +43,7 @@ public class CategoryTest { static ConfigurationFactory cf = new BasicConfigurationFactory(); - private static ListAppender appender = new ListAppender("List"); + private static ListAppender appender = new ListAppender("List"); @BeforeClass public static void setupClass() { @@ -162,7 +162,7 @@ public class CategoryTest { public void testClassName() { final Category category = Category.getInstance("TestCategory"); final Layout layout = PatternLayout.createLayout("%d %p %C{1.} [%t] %m%n", null, null, null, null); - final ListAppender appender = new ListAppender("List2", null, layout, false, false); + final ListAppender appender = new ListAppender("List2", null, layout, false, false); appender.start(); category.setAdditivity(false); category.getLogger().addAppender(appender); diff --git a/log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java b/log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java index 22bee95..2c16a6b 100644 --- a/log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java +++ b/log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java @@ -17,7 +17,13 @@ package org.apache.log4j; -import java.io.Serializable; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import java.util.List; import java.util.Locale; import java.util.ResourceBundle; @@ -34,8 +40,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** * Used for internal unit testing the Logger class. */ @@ -119,7 +123,7 @@ public class LoggerTest { public void testAdditivity1() { final Logger a = Logger.getLogger("a"); final Logger ab = Logger.getLogger("a.b"); - final CountingAppender ca = new CountingAppender(); + final CountingAppender ca = new CountingAppender(); ca.start(); a.getLogger().addAppender(ca); @@ -147,9 +151,9 @@ public class LoggerTest { final Logger abc = Logger.getLogger("a.b.c"); final Logger x = Logger.getLogger("x"); - final CountingAppender ca1 = new CountingAppender(); + final CountingAppender ca1 = new CountingAppender(); ca1.start(); - final CountingAppender ca2 = new CountingAppender(); + final CountingAppender ca2 = new CountingAppender(); ca2.start(); a.getLogger().addAppender(ca1); @@ -187,11 +191,11 @@ public class LoggerTest { final Logger abc = Logger.getLogger("a.b.c"); Logger.getLogger("x"); - final CountingAppender caRoot = new CountingAppender(); + final CountingAppender caRoot = new CountingAppender(); caRoot.start(); - final CountingAppender caA = new CountingAppender(); + final CountingAppender caA = new CountingAppender(); caA.start(); - final CountingAppender caABC = new CountingAppender(); + final CountingAppender caABC = new CountingAppender(); caABC.start(); root.getLogger().addAppender(caRoot); @@ -384,7 +388,7 @@ public class LoggerTest { */ @Test public void testTrace() { - final ListAppender appender = new ListAppender("List"); + final ListAppender appender = new ListAppender("List"); appender.start(); final Logger root = Logger.getRootLogger(); root.getLogger().addAppender(appender); @@ -411,7 +415,7 @@ public class LoggerTest { */ @Test public void testTraceWithException() { - final ListAppender appender = new ListAppender("List"); + final ListAppender appender = new ListAppender("List"); appender.start(); final Logger root = Logger.getRootLogger(); root.getLogger().addAppender(appender); @@ -439,7 +443,7 @@ public class LoggerTest { */ @Test public void testIsTraceEnabled() { - final ListAppender appender = new ListAppender("List"); + final ListAppender appender = new ListAppender("List"); appender.start(); final Logger root = Logger.getRootLogger(); root.getLogger().addAppender(appender); @@ -458,7 +462,7 @@ public class LoggerTest { @SuppressWarnings("deprecation") public void testLog() { final PatternLayout layout = PatternLayout.createLayout("%d %C %L %m", null, null, null, null); - final ListAppender appender = new ListAppender("List", null, layout, false, false); + final ListAppender appender = new ListAppender("List", null, layout, false, false); appender.start(); final Logger root = Logger.getRootLogger(); root.getLogger().addAppender(appender); @@ -489,7 +493,7 @@ public class LoggerTest { } } - private static class CountingAppender extends AbstractAppender { + private static class CountingAppender extends AbstractAppender { int counter; diff --git a/log4j12-api/src/test/java/org/apache/log4j/LoggingTest.java b/log4j12-api/src/test/java/org/apache/log4j/LoggingTest.java index bb61695..9f22f69 100644 --- a/log4j12-api/src/test/java/org/apache/log4j/LoggingTest.java +++ b/log4j12-api/src/test/java/org/apache/log4j/LoggingTest.java @@ -36,7 +36,7 @@ public class LoggingTest { private static final String CONFIG = "log4j2-config.xml"; private static Configuration config; - private static ListAppender app; + private static ListAppender app; private static LoggerContext ctx; @BeforeClass @@ -51,7 +51,6 @@ public class LoggingTest { } @Before - @SuppressWarnings("unchecked") public void before() { config = ctx.getConfiguration(); } diff --git a/pom.xml b/pom.xml index 2016309..5cc9091 100644 --- a/pom.xml +++ b/pom.xml @@ -390,7 +390,7 @@ 0.6-beta2 test - + javax.servlet servlet-api 2.5 @@ -483,6 +483,52 @@ maven-pmd-plugin ${pmd.plugin.version} + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.felix + + maven-bundle-plugin + + + [0.0.0,) + + + cleanVersions + + + + + + + + + org.codehaus.mojo + + exec-maven-plugin + + + [0.0.0,) + + + java + + + + + + + + + + diff --git a/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java b/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java index eba13c4..51fa8f0 100755 --- a/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java +++ b/samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java @@ -44,9 +44,9 @@ public class LogEventFactory { private static class AuditProxy implements InvocationHandler { private final StructuredDataMessage msg; - private final Class intrface; + private final Class intrface; - public AuditProxy(final StructuredDataMessage msg, final Class intrface) { + public AuditProxy(final StructuredDataMessage msg, final Class intrface) { this.msg = msg; this.intrface = intrface; } diff --git a/slf4j-impl/src/main/java/org/slf4j/helpers/EventDataConverter.java b/slf4j-impl/src/main/java/org/slf4j/helpers/EventDataConverter.java index 6ff9a4f..1259826 100644 --- a/slf4j-impl/src/main/java/org/slf4j/helpers/EventDataConverter.java +++ b/slf4j-impl/src/main/java/org/slf4j/helpers/EventDataConverter.java @@ -18,13 +18,13 @@ public class EventDataConverter { final EventData data = (objects != null && objects[0] instanceof EventData) ? (EventData) objects[0] : new EventData(s1); msg = new StructuredDataMessage(data.getEventId(), data.getMessage(), data.getEventType()); - for (final Map.Entry entry : data.getEventMap().entrySet()) { - final String key = entry.getKey().toString(); + for (final Map.Entry entry : data.getEventMap().entrySet()) { + final String key = entry.getKey(); if (EventData.EVENT_TYPE.equals(key) || EventData.EVENT_ID.equals(key) || EventData.EVENT_MESSAGE.equals(key)) { continue; } - ((StructuredDataMessage) msg).put(entry.getKey().toString(), entry.getValue().toString()); + ((StructuredDataMessage) msg).put(entry.getKey(), String.valueOf(entry.getValue())); } } catch (final Exception ex) { msg = new ParameterizedMessage(s1, objects, throwable); diff --git a/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java b/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java index fc49262..a191521 100644 --- a/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java +++ b/slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java @@ -53,7 +53,7 @@ public class Log4jMDCAdapter implements MDCAdapter { @Override @SuppressWarnings("unchecked") // nothing we can do about this, restricted by SLF4J API - public void setContextMap(final Map map) { + public void setContextMap(@SuppressWarnings("rawtypes") final Map map) { ThreadContext.clear(); for (final Map.Entry entry : ((Map) map).entrySet()) { ThreadContext.put(entry.getKey(), entry.getValue()); diff --git a/slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java index 9914ee9..7685ead 100644 --- a/slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java +++ b/slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java @@ -167,14 +167,13 @@ public class LoggerTest { verify("EventLogger", "o.a.l.s.LoggerTest Transfer [Audit@18060 Amount=\"200.00\" FromAccount=\"123457\" ToAccount=\"123456\"] Transfer Complete" + Constants.LINE_SEP); } - @SuppressWarnings("unchecked") private void verify(final String name, final String expected) { //LoggerContext ctx = (LoggerContext) LogManager.getContext(false); - final Map> list = ctx.getConfiguration().getAppenders(); - final Appender listApp = list.get(name); + final Map list = ctx.getConfiguration().getAppenders(); + final Appender listApp = list.get(name); assertNotNull("Missing Appender", listApp); assertTrue("Not a ListAppender", listApp instanceof ListAppender); - final List events = ((ListAppender) listApp).getMessages(); + final List events = ((ListAppender) listApp).getMessages(); assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size()== 1); final String actual = events.get(0); assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual); @@ -184,10 +183,10 @@ public class LoggerTest { @Before public void cleanup() { - final Map> list = ctx.getConfiguration().getAppenders(); - final Appender listApp = list.get("List"); + final Map list = ctx.getConfiguration().getAppenders(); + final Appender listApp = list.get("List"); ((ListAppender) listApp).clear(); - final Appender eventApp = list.get("EventLogger"); + final Appender eventApp = list.get("EventLogger"); ((ListAppender) eventApp).clear(); } } diff --git a/slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java b/slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java index c1e4127..cb2246a 100644 --- a/slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java +++ b/slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java @@ -70,14 +70,13 @@ public class OptionalTest { verify("EventLogger", "o.a.l.s.OptionalTest This is a test" + Constants.LINE_SEP); } - @SuppressWarnings("unchecked") private void verify(final String name, final String expected) { //LoggerContext ctx = (LoggerContext) LogManager.getContext(false); - final Map> list = ctx.getConfiguration().getAppenders(); - final Appender listApp = list.get(name); + final Map list = ctx.getConfiguration().getAppenders(); + final Appender listApp = list.get(name); assertNotNull("Missing Appender", listApp); assertTrue("Not a ListAppender", listApp instanceof ListAppender); - final List events = ((ListAppender) listApp).getMessages(); + final List events = ((ListAppender) listApp).getMessages(); assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size()== 1); final String actual = events.get(0); assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual); @@ -87,10 +86,10 @@ public class OptionalTest { @Before public void cleanup() { - final Map> list = ctx.getConfiguration().getAppenders(); - final Appender listApp = list.get("List"); + final Map list = ctx.getConfiguration().getAppenders(); + final Appender listApp = list.get("List"); ((ListAppender) listApp).clear(); - final Appender eventApp = list.get("EventLogger"); + final Appender eventApp = list.get("EventLogger"); ((ListAppender) eventApp).clear(); } } diff --git a/taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java b/taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java index 025c2a8..9817671 100644 --- a/taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java +++ b/taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java @@ -93,14 +93,13 @@ public class CatchingTagTest { verify("catching WARN M-CATCHING[ EXCEPTION ] E java.lang.Error: This is the last test."); } - @SuppressWarnings("unchecked") private void verify(final String expected) { final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); - final Map> list = ctx.getConfiguration().getAppenders(); - final Appender listApp = list.get("List"); + final Map list = ctx.getConfiguration().getAppenders(); + final Appender listApp = list.get("List"); assertNotNull("Missing Appender", listApp); assertTrue("Not a ListAppender", listApp instanceof ListAppender); - final List events = ((ListAppender) listApp).getMessages(); + final List events = ((ListAppender) listApp).getMessages(); try { assertEquals("Incorrect number of messages.", 1, events.size()); diff --git a/taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java b/taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java index bf3d3e0..e7f29f1 100644 --- a/taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java +++ b/taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java @@ -81,14 +81,13 @@ public class EntryTagTest { verify("entry params(log4j-test1.xml, 5792) TRACE M-ENTRY[ FLOW ] E"); } - @SuppressWarnings("unchecked") private void verify(final String expected) { final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); - final Map> list = ctx.getConfiguration().getAppenders(); - final Appender listApp = list.get("List"); + final Map list = ctx.getConfiguration().getAppenders(); + final Appender listApp = list.get("List"); assertNotNull("Missing Appender", listApp); assertTrue("Not a ListAppender", listApp instanceof ListAppender); - final List events = ((ListAppender) listApp).getMessages(); + final List events = ((ListAppender) listApp).getMessages(); try { assertEquals("Incorrect number of messages.", 1, events.size()); diff --git a/taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java b/taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java index 526a3fd..71de4c9 100644 --- a/taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java +++ b/taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java @@ -88,14 +88,13 @@ public class ExitTagTest { verify("exit with(5792) TRACE M-EXIT[ FLOW ] E"); } - @SuppressWarnings("unchecked") private void verify(final String expected) { final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); - final Map> list = ctx.getConfiguration().getAppenders(); - final Appender listApp = list.get("List"); + final Map list = ctx.getConfiguration().getAppenders(); + final Appender listApp = list.get("List"); assertNotNull("Missing Appender", listApp); assertTrue("Not a ListAppender", listApp instanceof ListAppender); - final List events = ((ListAppender) listApp).getMessages(); + final List events = ((ListAppender) listApp).getMessages(); try { assertEquals("Incorrect number of messages.", 1, events.size()); diff --git a/taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java b/taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java index c14c6b0..4ede770 100644 --- a/taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java +++ b/taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java @@ -293,14 +293,13 @@ public class LoggingMessageTagSupportTest { "This is another test"); } - @SuppressWarnings("unchecked") private void verify(final String expected) { final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); - final Map> list = ctx.getConfiguration().getAppenders(); - final Appender listApp = list.get("List"); + final Map list = ctx.getConfiguration().getAppenders(); + final Appender listApp = list.get("List"); assertNotNull("Missing Appender", listApp); assertTrue("Not a ListAppender", listApp instanceof ListAppender); - final List events = ((ListAppender) listApp).getMessages(); + final List events = ((ListAppender) listApp).getMessages(); try { assertEquals("Incorrect number of messages.", 1, events.size()); -- 1.8.3.1