You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/03/01 03:02:36 UTC
logging-log4j2 git commit: LOG4J2-1300 - Remove serializability from
classes that don't need it
Repository: logging-log4j2
Updated Branches:
refs/heads/master 4e35f3f47 -> 5c6819530
LOG4J2-1300 - Remove serializability from classes that don't need it
Appenders and Filters are already supposed to be Serializable based on the abstract classes. This is not feasible based on the use of many non-serializable JDK classes (e.g., OutputStream, Buffer). As LogEvent, Logger, and MessageFactory (implementations) all implement Serializable without requiring everything else, then there's no need to serialize appenders, filters, and all the other plugin objects that are never serialized anywhere.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5c681953
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5c681953
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5c681953
Branch: refs/heads/master
Commit: 5c6819530803357c8e580ad5143db4f2a4f33e64
Parents: 4e35f3f
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:53:26 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 20:00:10 2016 -0600
----------------------------------------------------------------------
.../logging/log4j/core/AbstractLifeCycle.java | 6 +-
.../log4j/core/appender/AbstractAppender.java | 2 -
.../appender/AbstractOutputStreamAppender.java | 2 -
.../core/appender/AbstractWriterAppender.java | 2 -
.../log4j/core/appender/AsyncAppender.java | 1 -
.../log4j/core/appender/ConsoleAppender.java | 1 -
.../core/appender/DefaultErrorHandler.java | 5 +-
.../log4j/core/appender/FailoverAppender.java | 2 -
.../log4j/core/appender/FileAppender.java | 1 -
.../core/appender/MemoryMappedFileAppender.java | 2 -
.../core/appender/OutputStreamAppender.java | 2 -
.../core/appender/RandomAccessFileAppender.java | 2 -
.../core/appender/RollingFileAppender.java | 1 -
.../RollingRandomAccessFileAppender.java | 3 -
.../log4j/core/appender/SmtpAppender.java | 1 -
.../log4j/core/appender/SocketAppender.java | 2 -
.../log4j/core/appender/SyslogAppender.java | 1 -
.../log4j/core/appender/WriterAppender.java | 2 -
.../appender/db/AbstractDatabaseAppender.java | 1 -
.../logging/log4j/core/async/AsyncLogger.java | 1 -
.../log4j/core/async/AsyncLoggerConfig.java | 4 --
.../log4j/core/async/AsyncLoggerContext.java | 2 -
.../core/config/AbstractConfiguration.java | 38 ++++++-----
.../log4j/core/config/AppenderControl.java | 1 -
.../core/config/ConfigurationScheduler.java | 1 -
.../log4j/core/config/DefaultConfiguration.java | 2 -
.../logging/log4j/core/config/LoggerConfig.java | 1 -
.../log4j/core/config/NullConfiguration.java | 1 -
.../log4j/core/filter/AbstractFilter.java | 2 -
.../log4j/core/filter/AbstractFilterable.java | 2 -
.../logging/log4j/core/filter/BurstFilter.java | 2 -
.../log4j/core/filter/CompositeFilter.java | 2 -
.../core/filter/DynamicThresholdFilter.java | 2 -
.../log4j/core/filter/LevelRangeFilter.java | 2 -
.../logging/log4j/core/filter/MapFilter.java | 2 -
.../logging/log4j/core/filter/MarkerFilter.java | 2 -
.../logging/log4j/core/filter/RegexFilter.java | 2 -
.../logging/log4j/core/filter/ScriptFilter.java | 1 -
.../log4j/core/filter/StructuredDataFilter.java | 2 -
.../core/filter/ThreadContextMapFilter.java | 2 -
.../log4j/core/filter/ThresholdFilter.java | 2 -
.../logging/log4j/core/filter/TimeFilter.java | 2 -
.../log4j/core/layout/AbstractCsvLayout.java | 1 -
.../core/layout/AbstractJacksonLayout.java | 1 -
.../log4j/core/layout/AbstractLayout.java | 4 +-
.../log4j/core/layout/AbstractStringLayout.java | 16 -----
.../log4j/core/layout/CsvLogEventLayout.java | 2 -
.../log4j/core/layout/CsvParameterLayout.java | 2 -
.../logging/log4j/core/layout/GelfLayout.java | 1 -
.../logging/log4j/core/layout/HtmlLayout.java | 1 -
.../logging/log4j/core/layout/JsonLayout.java | 2 -
.../logging/log4j/core/layout/PatternMatch.java | 20 ++----
.../log4j/core/layout/Rfc5424Layout.java | 2 -
.../log4j/core/layout/SerializedLayout.java | 2 -
.../logging/log4j/core/layout/SyslogLayout.java | 2 -
.../logging/log4j/core/layout/XmlLayout.java | 2 -
.../log4j/core/BasicConfigurationFactory.java | 1 -
.../db/AbstractDatabaseAppenderTest.java | 2 -
...DynamicThresholdFilterSerializationTest.java | 47 --------------
.../core/layout/SerializableLayoutTest.java | 66 --------------------
.../log4j/test/appender/AlwaysFailAppender.java | 2 -
.../logging/log4j/test/layout/BasicLayout.java | 1 -
.../log4j/test/layout/SerializableLayout.java | 48 --------------
.../log4j/flume/appender/FlumeAppender.java | 1 -
.../log4j/nosql/appender/NoSqlAppender.java | 1 -
65 files changed, 25 insertions(+), 319 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
index 1bea574..a5a0c77 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core;
-import java.io.Serializable;
-
import org.apache.logging.log4j.status.StatusLogger;
/**
@@ -26,15 +24,13 @@ import org.apache.logging.log4j.status.StatusLogger;
* Wraps a {@link LifeCycle.State}.
* </p>
*/
-public class AbstractLifeCycle implements LifeCycle, Serializable {
+public class AbstractLifeCycle implements LifeCycle {
/**
* Allow subclasses access to the status logger without creating another instance.
*/
protected static final org.apache.logging.log4j.Logger LOGGER = StatusLogger.getLogger();
- private static final long serialVersionUID = 1L;
-
private volatile LifeCycle.State state = LifeCycle.State.INITIALIZED;
protected boolean equalsImpl(final Object obj) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
index af01fc1..9f253a0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
@@ -32,8 +32,6 @@ import org.apache.logging.log4j.core.util.Integers;
*/
public abstract class AbstractAppender extends AbstractFilterable implements Appender {
- private static final long serialVersionUID = 1L;
-
private final String name;
private final boolean ignoreExceptions;
private final Layout<? extends Serializable> layout;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
index 680ced9..7ed06d6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
@@ -28,8 +28,6 @@ import org.apache.logging.log4j.core.LogEvent;
*/
public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager> extends AbstractAppender {
- private static final long serialVersionUID = 1L;
-
/**
* Immediate flush means that the underlying writer or output stream will be flushed at the end of each append
* operation. Immediate flush is slower but ensures that each append request is actually written. If
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
index 2346d7d..18152fd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
@@ -32,8 +32,6 @@ import org.apache.logging.log4j.core.StringLayout;
*/
public abstract class AbstractWriterAppender<M extends WriterManager> extends AbstractAppender {
- private static final long serialVersionUID = 1L;
-
/**
* Immediate flush means that the underlying writer will be flushed at the
* end of each append operation. Immediate flush is slower but ensures that
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
index f9f25b3..c9d8326 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
@@ -54,7 +54,6 @@ import org.apache.logging.log4j.core.util.Constants;
@Plugin(name = "Async", category = "Core", elementType = "appender", printObject = true)
public final class AsyncAppender extends AbstractAppender {
- private static final long serialVersionUID = 1L;
private static final int DEFAULT_QUEUE_SIZE = 128;
private static final String SHUTDOWN = "Shutdown";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
index e751ee0..354171a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
@@ -51,7 +51,6 @@ import org.apache.logging.log4j.util.PropertiesUtil;
@Plugin(name = "Console", category = "Core", elementType = "appender", printObject = true)
public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputStreamManager> {
- private static final long serialVersionUID = 1L;
private static final String JANSI_CLASS = "org.fusesource.jansi.WindowsAnsiOutputStream";
private static ConsoleManagerFactory factory = new ConsoleManagerFactory();
private static final Target DEFAULT_TARGET = Target.SYSTEM_OUT;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java
index 85e132e..ceade7f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender;
-import java.io.Serializable;
import java.util.concurrent.TimeUnit;
import org.apache.logging.log4j.Logger;
@@ -28,9 +27,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
*
*/
-public class DefaultErrorHandler implements ErrorHandler, Serializable {
-
- private static final long serialVersionUID = 1L;
+public class DefaultErrorHandler implements ErrorHandler {
private static final Logger LOGGER = StatusLogger.getLogger();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
index 1011e29..b467d15 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
@@ -44,8 +44,6 @@ import org.apache.logging.log4j.core.util.Constants;
@Plugin(name = "Failover", category = "Core", elementType = "appender", printObject = true)
public final class FailoverAppender extends AbstractAppender {
- private static final long serialVersionUID = 1L;
-
private static final int DEFAULT_INTERVAL_SECONDS = 60;
private final String primaryRef;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
index d415ce2..587ba80 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
@@ -39,7 +39,6 @@ import org.apache.logging.log4j.core.util.Integers;
@Plugin(name = "File", category = "Core", elementType = "appender", printObject = true)
public final class FileAppender extends AbstractOutputStreamAppender<FileManager> {
- private static final long serialVersionUID = 1L;
private static final int DEFAULT_BUFFER_SIZE = 8192;
private final String fileName;
private final Advertiser advertiser;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
index 365f6db..a3cb25c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
@@ -42,8 +42,6 @@ import org.apache.logging.log4j.core.util.Integers;
@Plugin(name = "MemoryMappedFile", category = "Core", elementType = "appender", printObject = true)
public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender<MemoryMappedFileManager> {
- private static final long serialVersionUID = 1L;
-
private static final int BIT_POSITION_1GB = 30; // 2^30 ~= 1GB
private static final int MAX_REGION_LENGTH = 1 << BIT_POSITION_1GB;
private static final int MIN_REGION_LENGTH = 256;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
index 8afb9b8..53881bd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
@@ -135,8 +135,6 @@ public final class OutputStreamAppender extends AbstractOutputStreamAppender<Out
private static OutputStreamManagerFactory factory = new OutputStreamManagerFactory();
- private static final long serialVersionUID = 1L;
-
/**
* Creates an OutputStream Appender.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
index c2aaaab..8bcf8e2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
@@ -40,8 +40,6 @@ import org.apache.logging.log4j.core.util.Integers;
@Plugin(name = "RandomAccessFile", category = "Core", elementType = "appender", printObject = true)
public final class RandomAccessFileAppender extends AbstractOutputStreamAppender<RandomAccessFileManager> {
- private static final long serialVersionUID = 1L;
-
private final String fileName;
private Object advertisement;
private final Advertiser advertiser;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
index 896777d..8332953 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
@@ -46,7 +46,6 @@ import org.apache.logging.log4j.core.util.Integers;
public final class RollingFileAppender extends AbstractOutputStreamAppender<RollingFileManager> {
private static final int DEFAULT_BUFFER_SIZE = 8192;
- private static final long serialVersionUID = 1L;
private final String fileName;
private final String filePattern;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
index 419a4d5..21cff5b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
@@ -25,7 +25,6 @@ import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.rolling.DefaultRolloverStrategy;
-import org.apache.logging.log4j.core.appender.rolling.RollingFileManager;
import org.apache.logging.log4j.core.appender.rolling.RollingRandomAccessFileManager;
import org.apache.logging.log4j.core.appender.rolling.RolloverStrategy;
import org.apache.logging.log4j.core.appender.rolling.TriggeringPolicy;
@@ -47,8 +46,6 @@ import org.apache.logging.log4j.core.util.Integers;
@Plugin(name = "RollingRandomAccessFile", category = "Core", elementType = "appender", printObject = true)
public final class RollingRandomAccessFileAppender extends AbstractOutputStreamAppender<RollingRandomAccessFileManager> {
- private static final long serialVersionUID = 1L;
-
private final String fileName;
private final String filePattern;
private final Object advertisement;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
index 28edd24..aed1153 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
@@ -55,7 +55,6 @@ import org.apache.logging.log4j.core.util.Booleans;
@Plugin(name = "SMTP", category = "Core", elementType = "appender", printObject = true)
public final class SmtpAppender extends AbstractAppender {
- private static final long serialVersionUID = 1L;
private static final int DEFAULT_BUFFER_SIZE = 512;
/** The SMTP Manager */
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 87a9b7a..4a97189 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -45,8 +45,6 @@ import org.apache.logging.log4j.core.util.Booleans;
@Plugin(name = "Socket", category = "Core", elementType = "appender", printObject = true)
public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketManager> {
- private static final long serialVersionUID = 1L;
-
private final Object advertisement;
private final Advertiser advertiser;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
index a7881e1..df60764 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
@@ -44,7 +44,6 @@ import org.apache.logging.log4j.util.EnglishEnums;
@Plugin(name = "Syslog", category = "Core", elementType = "appender", printObject = true)
public class SyslogAppender extends SocketAppender {
- private static final long serialVersionUID = 1L;
protected static final String RFC5424 = "RFC5424";
protected SyslogAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
index e3d8ecb..b6e363a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
@@ -128,8 +128,6 @@ public final class WriterAppender extends AbstractWriterAppender<WriterManager>
private static WriterManagerFactory factory = new WriterManagerFactory();
- private static final long serialVersionUID = 1L;
-
/**
* Creates a WriterAppender.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
index f58100f..326d47f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
@@ -36,7 +36,6 @@ import org.apache.logging.log4j.core.appender.AppenderLoggingException;
* @param <T> Specifies which type of {@link AbstractDatabaseManager} this Appender requires.
*/
public abstract class AbstractDatabaseAppender<T extends AbstractDatabaseManager> extends AbstractAppender {
- private static final long serialVersionUID = 1L;
private final ReadWriteLock lock = new ReentrantReadWriteLock();
private final Lock readLock = lock.readLock();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
index d1c9e06..dbee74f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
@@ -66,7 +66,6 @@ public class AsyncLogger extends Logger implements EventTranslatorVararg<RingBuf
// this is within the MaxInlineSize threshold and makes these methods candidates for
// immediate inlining instead of waiting until they are designated "hot enough".
- private static final long serialVersionUID = 1L;
private static final StatusLogger LOGGER = StatusLogger.getLogger();
private static final Clock CLOCK = ClockFactory.getClock(); // not reconfigurable
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
index f7252fb..430d6c9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
@@ -68,8 +68,6 @@ import org.apache.logging.log4j.util.Strings;
@Plugin(name = "asyncLogger", category = Node.CATEGORY, printObject = true)
public class AsyncLoggerConfig extends LoggerConfig {
- private static final long serialVersionUID = 1L;
-
private AsyncLoggerConfigDelegate delegate;
protected AsyncLoggerConfig(final String name,
@@ -195,8 +193,6 @@ public class AsyncLoggerConfig extends LoggerConfig {
@Plugin(name = "asyncRoot", category = "Core", printObject = true)
public static class RootLogger extends LoggerConfig {
- private static final long serialVersionUID = 1L;
-
@PluginFactory
public static LoggerConfig createLogger(
@PluginAttribute("additivity") final String additivity,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContext.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContext.java
index 2e075e0..a256238 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContext.java
@@ -31,8 +31,6 @@ import org.apache.logging.log4j.status.StatusLogger;
*/
public class AsyncLoggerContext extends LoggerContext {
- private static final long serialVersionUID = 1L;
-
private final AsyncLoggerDisruptor loggerDisruptor;
public AsyncLoggerContext(final String name) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
index 9974917..30a3652 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
@@ -16,6 +16,24 @@
*/
package org.apache.logging.log4j.core.config;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Filter;
@@ -47,31 +65,11 @@ import org.apache.logging.log4j.core.util.NanoClock;
import org.apache.logging.log4j.core.util.WatchManager;
import org.apache.logging.log4j.util.PropertiesUtil;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
/**
* The base Configuration. Many configuration implementations will extend this class.
*/
public abstract class AbstractConfiguration extends AbstractFilterable implements Configuration {
- private static final long serialVersionUID = 1L;
-
private static final int BUF_SIZE = 16384;
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
index 175c9e1..6b91bd6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
@@ -31,7 +31,6 @@ import org.apache.logging.log4j.util.PerformanceSensitive;
* Wraps an {@link Appender} with details an appender implementation shouldn't need to know about.
*/
public class AppenderControl extends AbstractFilterable {
- private static final long serialVersionUID = 1L;
private final ThreadLocal<AppenderControl> recursive = new ThreadLocal<>();
private final Appender appender;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
index 52b9e18..ed2c277 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
@@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit;
public class ConfigurationScheduler extends AbstractLifeCycle {
private static final Logger LOGGER = StatusLogger.getLogger();
- private static final long serialVersionUID = 4570411889877332287L;
private ScheduledExecutorService executorService;
private int scheduledItems = 0;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
index 76a8f7d..e186c44 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
@@ -39,8 +39,6 @@ public class DefaultConfiguration extends AbstractConfiguration {
*/
public static final String DEFAULT_PATTERN = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n";
- private static final long serialVersionUID = 1L;
-
/**
* Constructor to create the default configuration.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index 1d0f530..ee100b4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -54,7 +54,6 @@ import org.apache.logging.log4j.util.Strings;
public class LoggerConfig extends AbstractFilterable {
public static final String ROOT = "root";
- private static final long serialVersionUID = 1L;
private static LogEventFactory LOG_EVENT_FACTORY = null;
private List<AppenderRef> appenderRefs = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/config/NullConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/NullConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/NullConfiguration.java
index 5f58a79..9b04b50 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/NullConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/NullConfiguration.java
@@ -27,7 +27,6 @@ public class NullConfiguration extends AbstractConfiguration {
* Name of this configuration.
*/
public static final String NULL_NAME = "Null";
- private static final long serialVersionUID = 1L;
public NullConfiguration() {
super(ConfigurationSource.NULL_SOURCE);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
index 26f0a84..52ee030 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
@@ -31,8 +31,6 @@ import org.apache.logging.log4j.message.Message;
*
*/
public abstract class AbstractFilter extends AbstractLifeCycle implements Filter {
-
- private static final long serialVersionUID = 1L;
/**
* The onMatch Result.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
index 00cf308..859a5aa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
@@ -27,8 +27,6 @@ import org.apache.logging.log4j.core.LogEvent;
*/
public abstract class AbstractFilterable extends AbstractLifeCycle implements Filterable {
- private static final long serialVersionUID = 1L;
-
/**
* May be null.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
index 9cc107b..8c78d1d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
@@ -56,8 +56,6 @@ import org.apache.logging.log4j.message.Message;
@Plugin(name = "BurstFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class BurstFilter extends AbstractFilter {
- private static final long serialVersionUID = 1L;
-
private static final long NANOS_IN_SECONDS = 1000000000;
private static final int DEFAULT_RATE = 10;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
index 5ff4a56..5fe084c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
@@ -40,8 +40,6 @@ import org.apache.logging.log4j.message.Message;
@Plugin(name = "filters", category = Node.CATEGORY, printObject = true)
public final class CompositeFilter extends AbstractLifeCycle implements Iterable<Filter>, Filter {
- private static final long serialVersionUID = 1L;
-
private final List<Filter> filters;
private CompositeFilter() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
index 7e32d20..65d8ffa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
@@ -40,8 +40,6 @@ import org.apache.logging.log4j.message.Message;
@Plugin(name = "DynamicThresholdFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class DynamicThresholdFilter extends AbstractFilter {
- private static final long serialVersionUID = 1L;
-
/**
* Create the DynamicThresholdFilter.
* @param key The name of the key to compare.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/LevelRangeFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/LevelRangeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/LevelRangeFilter.java
index 52dcdbd..58cb257 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/LevelRangeFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/LevelRangeFilter.java
@@ -39,8 +39,6 @@ import org.apache.logging.log4j.message.Message;
@Plugin(name = "LevelRangeFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class LevelRangeFilter extends AbstractFilter {
- private static final long serialVersionUID = 1L;
-
/**
* Create a ThresholdFilter.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
index 89ecfe6..09afb91 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
@@ -42,8 +42,6 @@ import org.apache.logging.log4j.message.Message;
@Plugin(name = "MapFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public class MapFilter extends AbstractFilter {
- private static final long serialVersionUID = 1L;
-
private final Map<String, List<String>> map;
private final boolean isAnd;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
index 49203f2..f8d736f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
@@ -34,8 +34,6 @@ import org.apache.logging.log4j.message.Message;
@Plugin(name = "MarkerFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class MarkerFilter extends AbstractFilter {
- private static final long serialVersionUID = 1L;
-
private final String name;
private MarkerFilter(final String name, final Result onMatch, final Result onMismatch) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
index 18034e4..0e20ab0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
@@ -44,8 +44,6 @@ import org.apache.logging.log4j.message.Message;
@Plugin(name = "RegexFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class RegexFilter extends AbstractFilter {
- private static final long serialVersionUID = 1L;
-
private static final int DEFAULT_PATTERN_FLAGS = 0;
private final Pattern pattern;
private final boolean useRawMessage;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
index 9c50d3c..7607f26 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
@@ -43,7 +43,6 @@ import org.apache.logging.log4j.status.StatusLogger;
@Plugin(name = "ScriptFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class ScriptFilter extends AbstractFilter {
- private static final long serialVersionUID = 1L;
private static org.apache.logging.log4j.Logger logger = StatusLogger.getLogger();
private final AbstractScript script;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
index a710cd4..1feed36 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
@@ -41,8 +41,6 @@ import org.apache.logging.log4j.message.StructuredDataMessage;
@Plugin(name = "StructuredDataFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class StructuredDataFilter extends MapFilter {
- private static final long serialVersionUID = 1L;
-
private StructuredDataFilter(final Map<String, List<String>> map, final boolean oper, final Result onMatch,
final Result onMismatch) {
super(map, oper, onMatch, onMismatch);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
index 4c63f17..f6d1c5c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
@@ -42,8 +42,6 @@ import org.apache.logging.log4j.message.Message;
@Plugin(name = "ThreadContextMapFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public class ThreadContextMapFilter extends MapFilter {
- private static final long serialVersionUID = 1L;
-
private final String key;
private final String value;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
index 02246eb..db7acea 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
@@ -38,8 +38,6 @@ import org.apache.logging.log4j.message.Message;
@Plugin(name = "ThresholdFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class ThresholdFilter extends AbstractFilter {
- private static final long serialVersionUID = 1L;
-
private final Level level;
private ThresholdFilter(final Level level, final Result onMatch, final Result onMismatch) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
index bd0fa18..41d22d6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
@@ -34,8 +34,6 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@Plugin(name = "TimeFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true)
public final class TimeFilter extends AbstractFilter {
- private static final long serialVersionUID = 1L;
-
/**
* Length of hour in milliseconds.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
index c5b0e90..ed1a70a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
@@ -34,7 +34,6 @@ public abstract class AbstractCsvLayout extends AbstractStringLayout {
protected static final String DEFAULT_CHARSET = "UTF-8";
protected static final String DEFAULT_FORMAT = "Default";
private static final String CONTENT_TYPE = "text/csv";
- private static final long serialVersionUID = 1L;
private final CSVFormat format;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
index ced02e2..7cbc798 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
@@ -33,7 +33,6 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
protected static final String DEFAULT_EOL = "\r\n";
protected static final String COMPACT_EOL = Strings.EMPTY;
- private static final long serialVersionUID = 1L;
protected final String eol;
protected final ObjectWriter objectWriter;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
index 8e0d201..f0a58b6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
@@ -33,15 +33,13 @@ import org.apache.logging.log4j.status.StatusLogger;
* @param <T>
* The Class that the Layout will format the LogEvent into.
*/
-public abstract class AbstractLayout<T extends Serializable> implements Layout<T>, Serializable {
+public abstract class AbstractLayout<T extends Serializable> implements Layout<T> {
/**
* Allow subclasses access to the status logger without creating another instance.
*/
protected static final Logger LOGGER = StatusLogger.getLogger();
- private static final long serialVersionUID = 1L;
-
/**
* The current Configuration.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
index 91e2a2f..607d965 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
@@ -16,9 +16,6 @@
*/
package org.apache.logging.log4j.core.layout;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@@ -59,8 +56,6 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
*/
protected static final int DEFAULT_STRING_BUILDER_SIZE = 1024;
- private static final long serialVersionUID = 1L;
-
private final static ThreadLocal<StringBuilder> threadLocal = new ThreadLocal<>();
/**
@@ -194,12 +189,6 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
return headerSerializer;
}
- private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
- in.defaultReadObject();
- final String csName = in.readUTF();
- charset = Charset.forName(csName);
- }
-
protected byte[] serializeToBytes(final Serializer serializer, byte[] defaultValue) {
final String serializable = serializeToString(serializer);
if (serializer == null) {
@@ -230,9 +219,4 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem
return getBytes(toSerializable(event));
}
- private void writeObject(final ObjectOutputStream out) throws IOException {
- out.defaultWriteObject();
- out.writeUTF(charset.name());
- }
-
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
index dd751f9..1a3d6ad 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
@@ -42,8 +42,6 @@ import org.apache.logging.log4j.status.StatusLogger;
@Plugin(name = "CsvLogEventLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public class CsvLogEventLayout extends AbstractCsvLayout {
- private static final long serialVersionUID = 1L;
-
public static CsvLogEventLayout createDefaultLayout() {
return new CsvLogEventLayout(null, Charset.forName(DEFAULT_CHARSET), CSVFormat.valueOf(DEFAULT_FORMAT), null, null);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
index 324a08a..9c792e7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
@@ -51,8 +51,6 @@ import org.apache.logging.log4j.status.StatusLogger;
@Plugin(name = "CsvParameterLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public class CsvParameterLayout extends AbstractCsvLayout {
- private static final long serialVersionUID = 1L;
-
public static AbstractCsvLayout createDefaultLayout() {
return new CsvParameterLayout(null, Charset.forName(DEFAULT_CHARSET), CSVFormat.valueOf(DEFAULT_FORMAT), null, null);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
index 0b3effa..7462818 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
@@ -101,7 +101,6 @@ public final class GelfLayout extends AbstractStringLayout {
private static final char Q = '\"';
private static final String QC = "\",";
private static final String QU = "\"_";
- private static final long serialVersionUID = 1L;
private static final BigDecimal TIME_DIVISOR = new BigDecimal(1000);
private final KeyValuePair[] additionalFields;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
index c2bb4c6..e3e60d9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
@@ -55,7 +55,6 @@ public final class HtmlLayout extends AbstractStringLayout {
*/
public static final String DEFAULT_FONT_FAMILY = "arial,sans-serif";
- private static final long serialVersionUID = 1L;
private static final String TRACE_PREFIX = "<br /> ";
private static final String REGEXP = Constants.LINE_SEPARATOR.equals("\n") ? "\n" : Constants.LINE_SEPARATOR + "|\n";
private static final String DEFAULT_TITLE = "Log4j Log Messages";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
index 28dd0a5..fa7a028 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
@@ -807,8 +807,6 @@ public final class JsonLayout extends AbstractJacksonLayout {
static final String CONTENT_TYPE = "application/json";
- private static final long serialVersionUID = 1L;
-
protected JsonLayout(final Configuration config, final boolean locationInfo, final boolean properties,
final boolean complete, final boolean compact, final boolean eventEol, final String headerPattern,
final String footerPattern, final Charset charset) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternMatch.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternMatch.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternMatch.java
index 2633c54..2c6803d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternMatch.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternMatch.java
@@ -17,25 +17,21 @@
package org.apache.logging.log4j.core.layout;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+
import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-
/**
* PatternMatch configuration item.
*
* @since 2.4.1 implements {@link Serializable}
*/
@Plugin(name = "PatternMatch", category = Node.CATEGORY, printObject = true)
-public final class PatternMatch implements Serializable {
-
- private static final long serialVersionUID = 4331228262821046877L;
+public final class PatternMatch {
private final String key;
private final String pattern;
@@ -76,14 +72,6 @@ public final class PatternMatch implements Serializable {
return new Builder();
}
- protected Object writeReplace() throws ObjectStreamException {
- return newBuilder().setKey(this.key).setPattern(this.pattern);
- }
-
- private void readObject(final ObjectInputStream stream) throws InvalidObjectException {
- throw new InvalidObjectException("Builder proxy required");
- }
-
public static class Builder implements org.apache.logging.log4j.core.util.Builder<PatternMatch>, Serializable {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
index e522d38..b450940 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
@@ -86,8 +86,6 @@ public final class Rfc5424Layout extends AbstractStringLayout {
*/
public static final String DEFAULT_MDCID = "mdc";
- private static final long serialVersionUID = 1L;
-
private static final String LF = "\n";
private static final int TWO_DIGITS = 10;
private static final int THREE_DIGITS = 100;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
index 6d2349d..65293bd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
@@ -33,8 +33,6 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@Plugin(name = "SerializedLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public final class SerializedLayout extends AbstractLayout<LogEvent> {
- private static final long serialVersionUID = 1L;
-
private static byte[] serializedHeader;
static {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
index 67c797d..d53bc15 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
@@ -48,8 +48,6 @@ public final class SyslogLayout extends AbstractStringLayout {
*/
public static final Pattern NEWLINE_PATTERN = Pattern.compile("\\r?\\n");
- private static final long serialVersionUID = 1L;
-
private final Facility facility;
private final boolean includeNewLine;
private final String escapeNewLine;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
index 8e01bd3..4364d9d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
@@ -192,8 +192,6 @@ import org.apache.logging.log4j.core.jackson.XmlConstants;
@Plugin(name = "XmlLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
public final class XmlLayout extends AbstractJacksonLayout {
- private static final long serialVersionUID = 1L;
-
private static final String ROOT_TAG = "Events";
protected XmlLayout(final boolean locationInfo, final boolean properties, final boolean complete, final boolean compact, final Charset charset) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java
index ab0f25d..844192f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java
@@ -47,7 +47,6 @@ public class BasicConfigurationFactory extends ConfigurationFactory {
public class BasicConfiguration extends AbstractConfiguration {
- private static final long serialVersionUID = 1L;
private static final String DEFAULT_LEVEL = "org.apache.logging.log4j.level";
public BasicConfiguration() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java
index 48ab06f..a558460 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java
@@ -159,8 +159,6 @@ public class AbstractDatabaseAppenderTest {
private static abstract class LocalAbstractDatabaseAppender extends
AbstractDatabaseAppender<LocalAbstractDatabaseManager> {
- private static final long serialVersionUID = 1L;
-
public LocalAbstractDatabaseAppender(final String name, final Filter filter, final boolean exceptionSuppressed,
final LocalAbstractDatabaseManager manager) {
super(name, filter, exceptionSuppressed, manager);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterSerializationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterSerializationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterSerializationTest.java
deleted file mode 100644
index deff0fb..0000000
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterSerializationTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* 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.log4j.core.filter;
-
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.apache.logging.log4j.AbstractSerializationTest;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.Filter.Result;
-import org.apache.logging.log4j.core.util.KeyValuePair;
-import org.junit.runners.Parameterized.Parameters;
-
-public class DynamicThresholdFilterSerializationTest extends AbstractSerializationTest {
-
- @Parameters
- public static Collection<Object[]> data() {
- final KeyValuePair[] pairs = new KeyValuePair[] {
- new KeyValuePair("testuser", "DEBUG"),
- new KeyValuePair("JohnDoe", "warn") };
- final KeyValuePair[] pairsEmpty = new KeyValuePair[0];
- return Arrays.asList(new Object[][] {
- { DynamicThresholdFilter.createFilter("userid", pairsEmpty, Level.ERROR, Result.ACCEPT, Result.DENY) },
- { DynamicThresholdFilter.createFilter("userid", pairsEmpty, Level.ERROR, null, null) },
- { DynamicThresholdFilter.createFilter("userid", pairs, Level.ERROR, null, null) } });
- }
-
- public DynamicThresholdFilterSerializationTest(final Serializable serializable) {
- super(serializable);
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializableLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializableLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializableLayoutTest.java
deleted file mode 100644
index d470f07..0000000
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializableLayoutTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.log4j.core.layout;
-
-import org.apache.logging.log4j.core.util.Constants;
-import org.apache.logging.log4j.test.layout.SerializableLayout;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.nio.charset.Charset;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Verifies an implementation of AbstractStringLayout will serialize and deserialize properly to address LOG4J2-1099.
- */
-public class SerializableLayoutTest {
-
- public static final String HEADER = "Test Header" + Constants.LINE_SEPARATOR;
- public static final String FOOTER = "Test Footer" + Constants.LINE_SEPARATOR;
- public static final String MESSAGE_PREFIX = "TEST PREFIX: ";
-
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
- @Test
- public void testPluginObjectSerialization() throws Exception {
- final SerializableLayout originalLayout = new SerializableLayout(MESSAGE_PREFIX, Charset.defaultCharset(),
- HEADER.getBytes(), FOOTER.getBytes());
- final File serializedFile = temporaryFolder.newFile();
- try (final FileOutputStream fileOutputStream = new FileOutputStream(serializedFile)) {
- final ObjectOutputStream out = new ObjectOutputStream(fileOutputStream);
- out.writeObject(originalLayout);
- }
- SerializableLayout serializedLayout;
- try (final FileInputStream fileInputStream = new FileInputStream(serializedFile)) {
- final ObjectInputStream in = new ObjectInputStream(fileInputStream);
- serializedLayout = (SerializableLayout) in.readObject();
- }
- assertEquals(originalLayout.getMessagePrefix(), serializedLayout.getMessagePrefix());
- assertEquals(originalLayout.getCharset(), serializedLayout.getCharset());
- assertArrayEquals(originalLayout.getHeader(), serializedLayout.getHeader());
- assertArrayEquals(originalLayout.getFooter(), serializedLayout.getFooter());
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
index 1a9138e..c2b51e3 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
@@ -29,8 +29,6 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@Plugin(name="AlwaysFail", category ="Core",elementType="appender",printObject=true)
public class AlwaysFailAppender extends AbstractAppender {
- private static final long serialVersionUID = 1L;
-
private AlwaysFailAppender(final String name) {
super(name, null, null, false);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
index b6baf87..4bda27e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java
@@ -31,7 +31,6 @@ import org.apache.logging.log4j.core.util.Constants;
@Plugin(name = "BasicLayout", category = "Core", elementType = "layout", printObject = true)
public class BasicLayout extends AbstractStringLayout {
- private static final long serialVersionUID = 1L;
private static final String HEADER = "Header" + Constants.LINE_SEPARATOR;
public BasicLayout(final Charset charset) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/SerializableLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/SerializableLayout.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/SerializableLayout.java
deleted file mode 100644
index 114c7e3..0000000
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/SerializableLayout.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.log4j.test.layout;
-
-import java.nio.charset.Charset;
-
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.layout.AbstractStringLayout;
-import org.apache.logging.log4j.core.util.Constants;
-
-/**
- * Test Layout for verification AbstractStringLayout subclass serialization compatibility.
- */
-public class SerializableLayout extends AbstractStringLayout {
-
- private static final long serialVersionUID = 1L;
-
- private final String messagePrefix;
-
- public SerializableLayout(final String messagePrefix, Charset charset, final byte[] header, final byte[] footer) {
- super(charset, header, footer);
- this.messagePrefix = messagePrefix;
- }
-
- @Override
- public String toSerializable(final LogEvent event) {
- return messagePrefix + event.getMessage().getFormattedMessage() + Constants.LINE_SEPARATOR;
- }
-
- public String getMessagePrefix() {
- return messagePrefix;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
index 1c466ef..7c5e364 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
@@ -40,7 +40,6 @@ import org.apache.logging.log4j.core.util.Integers;
@Plugin(name = "Flume", category = "Core", elementType = "appender", printObject = true)
public final class FlumeAppender extends AbstractAppender implements FlumeEventFactory {
- private static final long serialVersionUID = 1L;
private static final String[] EXCLUDED_PACKAGES = {"org.apache.flume", "org.apache.avro"};
private static final int DEFAULT_MAX_DELAY = 60000;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5c681953/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlAppender.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlAppender.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlAppender.java
index f1f75f3..bd2deb3 100644
--- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlAppender.java
+++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlAppender.java
@@ -50,7 +50,6 @@ import org.apache.logging.log4j.core.util.Booleans;
*/
@Plugin(name = "NoSql", category = "Core", elementType = "appender", printObject = true)
public final class NoSqlAppender extends AbstractDatabaseAppender<NoSqlDatabaseManager<?>> {
- private static final long serialVersionUID = 1L;
private final String description;
private NoSqlAppender(final String name, final Filter filter, final boolean ignoreExceptions,