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 02:14:49 UTC
[04/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make
appender managers and dependencies serializable."
Revert "[LOG4J2-1300] Make appender managers and dependencies serializable."
This reverts commit 026d279408529092d6ab18a7233e7023648e97e1.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/96f0aa97
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/96f0aa97
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/96f0aa97
Branch: refs/heads/master
Commit: 96f0aa97fe08d123c067fbfa91c18c26870840c8
Parents: 391e9fd
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:09:00 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../log4j/core/appender/FailoversPlugin.java | 5 +---
.../log4j/core/appender/FileManager.java | 1 -
.../core/appender/MemoryMappedFileManager.java | 1 -
.../core/appender/OutputStreamManager.java | 1 -
.../core/appender/RandomAccessFileManager.java | 1 -
.../log4j/core/appender/WriterManager.java | 1 -
.../appender/db/AbstractDatabaseManager.java | 1 -
.../db/jdbc/DataSourceConnectionSource.java | 4 +--
.../db/jdbc/FactoryMethodConnectionSource.java | 4 +--
.../appender/db/jdbc/JdbcDatabaseManager.java | 9 +++----
.../appender/db/jpa/JpaDatabaseManager.java | 7 +++--
.../log4j/core/appender/mom/JmsManager.java | 1 -
.../core/appender/mom/kafka/KafkaManager.java | 10 +------
.../rolling/AbstractRolloverStrategy.java | 5 +---
.../rolling/CompositeTriggeringPolicy.java | 4 +--
.../appender/rolling/CronTriggeringPolicy.java | 10 +++----
.../rolling/DefaultRolloverStrategy.java | 8 +++---
.../rolling/OnStartupTriggeringPolicy.java | 4 +--
.../core/appender/rolling/PatternProcessor.java | 4 +--
.../appender/rolling/RollingFileManager.java | 1 -
.../rolling/RollingRandomAccessFileManager.java | 1 -
.../rolling/SizeBasedTriggeringPolicy.java | 5 +---
.../rolling/TimeBasedTriggeringPolicy.java | 5 +---
.../appender/rolling/action/AbstractAction.java | 4 +--
.../rolling/action/AbstractPathAction.java | 1 -
.../rolling/action/CommonsCompressAction.java | 1 -
.../rolling/action/CompositeAction.java | 1 -
.../appender/rolling/action/DeleteAction.java | 1 -
.../rolling/action/FileRenameAction.java | 1 -
.../rolling/action/GzCompressAction.java | 1 -
.../rolling/action/IfAccumulatedFileCount.java | 4 +--
.../rolling/action/IfAccumulatedFileSize.java | 4 +--
.../core/appender/rolling/action/IfAll.java | 4 +--
.../core/appender/rolling/action/IfAny.java | 4 +--
.../appender/rolling/action/IfFileName.java | 4 +--
.../appender/rolling/action/IfLastModified.java | 4 +--
.../core/appender/rolling/action/IfNot.java | 4 +--
.../appender/rolling/action/PathSorter.java | 3 +--
.../rolling/action/ScriptCondition.java | 4 +--
.../rolling/action/ZipCompressAction.java | 1 -
.../logging/log4j/core/config/AppenderRef.java | 5 +---
.../core/layout/MarkerPatternSelector.java | 12 ++++-----
.../log4j/core/layout/PatternLayout.java | 7 ++---
.../core/layout/ScriptPatternSelector.java | 14 +++++-----
.../log4j/core/lookup/AbstractLookup.java | 5 +---
.../logging/log4j/core/lookup/StrMatcher.java | 9 +------
.../log4j/core/lookup/StrSubstitutor.java | 4 +--
.../log4j/core/net/AbstractSocketManager.java | 1 -
.../log4j/core/net/DatagramSocketManager.java | 1 -
.../logging/log4j/core/net/JndiManager.java | 1 -
.../logging/log4j/core/net/SmtpManager.java | 12 ++++++---
.../log4j/core/net/SslSocketManager.java | 1 -
.../log4j/core/net/TcpSocketManager.java | 28 +++++++-------------
.../net/ssl/AbstractKeyStoreConfiguration.java | 15 +----------
.../core/net/ssl/KeyStoreConfiguration.java | 1 -
.../log4j/core/net/ssl/SslConfiguration.java | 13 ++-------
.../log4j/core/net/ssl/StoreConfiguration.java | 5 +---
.../core/net/ssl/TrustStoreConfiguration.java | 1 -
.../logging/log4j/core/util/CronExpression.java | 15 +----------
.../logging/log4j/core/util/CyclicBuffer.java | 4 +--
.../db/AbstractDatabaseAppenderTest.java | 1 -
.../rolling/OnStartupTriggeringPolicyTest.java | 1 -
.../rolling/action/CountingCondition.java | 6 ++---
.../log4j/test/appender/InMemoryAppender.java | 1 -
.../flume/appender/AbstractFlumeManager.java | 1 -
.../logging/log4j/flume/appender/Agent.java | 5 +---
.../log4j/flume/appender/BatchEvent.java | 4 +--
.../log4j/flume/appender/FlumeAvroManager.java | 10 +------
.../flume/appender/FlumeEmbeddedManager.java | 1 -
.../flume/appender/FlumePersistentManager.java | 1 -
.../nosql/appender/AbstractNoSqlConnection.java | 5 +---
.../nosql/appender/NoSqlDatabaseManager.java | 1 -
.../appender/couchdb/CouchDbConnection.java | 1 -
.../nosql/appender/couchdb/CouchDbProvider.java | 4 +--
.../appender/mongodb/MongoDbConnection.java | 1 -
.../nosql/appender/mongodb/MongoDbProvider.java | 4 +--
76 files changed, 83 insertions(+), 257 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
index a4fa6ec..2d1b9a6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core.appender;
-import java.io.Serializable;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.AppenderRef;
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -29,8 +27,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* The array of failover Appenders.
*/
@Plugin(name = "failovers", category = "Core")
-public final class FailoversPlugin implements Serializable {
- private static final long serialVersionUID = 1L;
+public final class FailoversPlugin {
private static final Logger LOGGER = StatusLogger.getLogger();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
index 8d7e25b..4de34ad 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
@@ -35,7 +35,6 @@ import org.apache.logging.log4j.core.Layout;
* Manages actual File I/O for File Appenders.
*/
public class FileManager extends OutputStreamManager {
- private static final long serialVersionUID = 1L;
private static final FileManagerFactory FACTORY = new FileManagerFactory();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
index 338aed8..9335ddb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
@@ -55,7 +55,6 @@ import org.apache.logging.log4j.core.util.NullOutputStream;
*/
//CHECKSTYLE:ON
public class MemoryMappedFileManager extends OutputStreamManager {
- private static final long serialVersionUID = 1L;
/**
* Default length of region to map.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
index 2fd7c30..cb1813e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.Layout;
* allow appenders to reconfigure without requiring a new stream.
*/
public class OutputStreamManager extends AbstractManager {
- private static final long serialVersionUID = 1L;
private volatile OutputStream os;
protected final Layout<?> layout;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
index 268fcaf..ec616c4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
@@ -35,7 +35,6 @@ import org.apache.logging.log4j.core.util.NullOutputStream;
* I/O.
*/
public class RandomAccessFileManager extends OutputStreamManager implements ByteBufferDestination {
- private static final long serialVersionUID = 1L;
static final int DEFAULT_BUFFER_SIZE = 256 * 1024;
private static final RandomAccessFileManagerFactory FACTORY = new RandomAccessFileManagerFactory();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
index 006bdb9..11ac856 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.StringLayout;
* allow appenders to reconfigure without requiring a new writer.
*/
public class WriterManager extends AbstractManager {
- private static final long serialVersionUID = 1L;
/**
* Creates a Manager.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
index cf74532..67c7e4a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
@@ -28,7 +28,6 @@ import org.apache.logging.log4j.core.appender.ManagerFactory;
* Manager that allows database appenders to have their configuration reloaded without losing events.
*/
public abstract class AbstractDatabaseManager extends AbstractManager implements Flushable {
- private static final long serialVersionUID = 1L;
private final ArrayList<LogEvent> buffer;
private final int bufferSize;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java
index a875340..a984e18 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.db.jdbc;
-import java.io.Serializable;
import java.sql.Connection;
import java.sql.SQLException;
@@ -35,8 +34,7 @@ import org.apache.logging.log4j.util.Strings;
* A {@link JdbcAppender} connection source that uses a {@link DataSource} to connect to the database.
*/
@Plugin(name = "DataSource", category = "Core", elementType = "connectionSource", printObject = true)
-public final class DataSourceConnectionSource implements ConnectionSource, Serializable {
- private static final long serialVersionUID = 1L;
+public final class DataSourceConnectionSource implements ConnectionSource {
private static final Logger LOGGER = StatusLogger.getLogger();
private final DataSource dataSource;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java
index e54f96c..40dac0c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.appender.db.jdbc;
import java.io.PrintWriter;
-import java.io.Serializable;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.SQLException;
@@ -37,8 +36,7 @@ import org.apache.logging.log4j.util.Strings;
* {@link DataSource}.
*/
@Plugin(name = "ConnectionFactory", category = "Core", elementType = "connectionSource", printObject = true)
-public final class FactoryMethodConnectionSource implements ConnectionSource, Serializable {
- private static final long serialVersionUID = 1L;
+public final class FactoryMethodConnectionSource implements ConnectionSource {
private static final Logger LOGGER = StatusLogger.getLogger();
private final DataSource dataSource;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
index 8ae8d30..a1d6204 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.db.jdbc;
-import java.io.Serializable;
import java.io.StringReader;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@@ -37,7 +36,6 @@ import org.apache.logging.log4j.core.util.Closer;
* An {@link AbstractDatabaseManager} implementation for relational databases accessed via JDBC.
*/
public final class JdbcDatabaseManager extends AbstractDatabaseManager {
- private static final long serialVersionUID = 1L;
private static final JdbcDatabaseManagerFactory INSTANCE = new JdbcDatabaseManagerFactory();
@@ -45,8 +43,8 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
private final ConnectionSource connectionSource;
private final String sqlStatement;
- private transient Connection connection;
- private transient PreparedStatement statement;
+ private Connection connection;
+ private PreparedStatement statement;
private boolean isBatchSupported;
private JdbcDatabaseManager(final String name, final int bufferSize, final ConnectionSource connectionSource,
@@ -240,8 +238,7 @@ public final class JdbcDatabaseManager extends AbstractDatabaseManager {
/**
* Encapsulates information about a database column and how to persist data to it.
*/
- private static final class Column implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final class Column {
private final PatternLayout layout;
private final boolean isEventTimestamp;
private final boolean isUnicode;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
index 77df508..480c8b7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
@@ -32,17 +32,16 @@ import org.apache.logging.log4j.core.appender.db.AbstractDatabaseManager;
* An {@link AbstractDatabaseManager} implementation for relational databases accessed via JPA.
*/
public final class JpaDatabaseManager extends AbstractDatabaseManager {
- private static final long serialVersionUID = 1L;
private static final JPADatabaseManagerFactory FACTORY = new JPADatabaseManagerFactory();
private final String entityClassName;
private final Constructor<? extends AbstractLogEventWrapperEntity> entityConstructor;
private final String persistenceUnitName;
- private transient EntityManagerFactory entityManagerFactory;
+ private EntityManagerFactory entityManagerFactory;
- private transient EntityManager entityManager;
- private transient EntityTransaction transaction;
+ private EntityManager entityManager;
+ private EntityTransaction transaction;
private JpaDatabaseManager(final String name, final int bufferSize,
final Class<? extends AbstractLogEventWrapperEntity> entityClass,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
index 035a0ea..e5fe012 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
@@ -39,7 +39,6 @@ import org.apache.logging.log4j.status.StatusLogger;
* involving a configured ConnectionFactory and Destination.
*/
public class JmsManager extends AbstractManager {
- private static final long serialVersionUID = 1L;
private static final Logger LOGGER = StatusLogger.getLogger();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
index 6e98ef5..ca141b0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
@@ -17,8 +17,6 @@
package org.apache.logging.log4j.core.appender.mom.kafka;
-import java.io.IOException;
-import java.io.ObjectInputStream;
import java.util.Properties;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -31,7 +29,6 @@ import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.util.Log4jThread;
public class KafkaManager extends AbstractManager {
- private static final long serialVersionUID = 1L;
public static final String DEFAULT_TIMEOUT_MILLIS = "30000";
@@ -41,7 +38,7 @@ public class KafkaManager extends AbstractManager {
static KafkaProducerFactory producerFactory = new DefaultKafkaProducerFactory();
private final Properties config = new Properties();
- private transient Producer<byte[], byte[]> producer = null;
+ private Producer<byte[], byte[]> producer = null;
private final int timeoutMillis;
private final String topic;
@@ -58,11 +55,6 @@ public class KafkaManager extends AbstractManager {
this.timeoutMillis = Integer.parseInt(config.getProperty("timeout.ms", DEFAULT_TIMEOUT_MILLIS));
}
- private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
- in.defaultReadObject();
- this.producer = null;
- }
-
@Override
public void releaseSub() {
if (producer != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java
index 13f0bde..702e3af 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java
@@ -16,16 +16,13 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
-import java.io.Serializable;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.status.StatusLogger;
/**
*
*/
-public abstract class AbstractRolloverStrategy implements RolloverStrategy, Serializable {
- private static final long serialVersionUID = 1L;
+public abstract class AbstractRolloverStrategy implements RolloverStrategy {
/**
* Allow subclasses access to the status logger without creating another instance.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
index d4e98fd..0ce04de 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
-import java.io.Serializable;
import java.util.Arrays;
import org.apache.logging.log4j.core.LogEvent;
@@ -28,8 +27,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
* Triggering policy that wraps other policies.
*/
@Plugin(name = "Policies", category = "Core", printObject = true)
-public final class CompositeTriggeringPolicy implements TriggeringPolicy, Serializable {
- private static final long serialVersionUID = 1L;
+public final class CompositeTriggeringPolicy implements TriggeringPolicy {
private final TriggeringPolicy[] triggeringPolicy;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
index 14b7693..b45d6e0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
@@ -16,10 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
-import java.io.Serializable;
-import java.text.ParseException;
-import java.util.Date;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
@@ -31,13 +27,15 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.util.CronExpression;
import org.apache.logging.log4j.status.StatusLogger;
+import java.text.ParseException;
+import java.util.Date;
+
/**
* Rolls a file over based on a cron schedule.
*/
@Plugin(name = "CronTriggeringPolicy", category = "Core", printObject = true)
@Scheduled
-public final class CronTriggeringPolicy implements TriggeringPolicy, Serializable {
- private static final long serialVersionUID = 1L;
+public final class CronTriggeringPolicy implements TriggeringPolicy {
private static Logger LOGGER = StatusLogger.getLogger();
private static final String defaultSchedule = "0 0 0 * * ?";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
index 557b9a5..b030d17 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.appender.rolling;
import java.io.File;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -77,15 +76,14 @@ import org.apache.logging.log4j.status.StatusLogger;
* </p>
*/
@Plugin(name = "DefaultRolloverStrategy", category = "Core", printObject = true)
-public class DefaultRolloverStrategy implements RolloverStrategy, Serializable {
- private static final long serialVersionUID = 1L;
+public class DefaultRolloverStrategy implements RolloverStrategy {
/**
* Enumerates over supported file extensions.
* <p>
* Package-protected for unit tests.
*/
- enum FileExtensions {
+ static enum FileExtensions {
ZIP(".zip") {
@Override
Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource,
@@ -135,7 +133,7 @@ public class DefaultRolloverStrategy implements RolloverStrategy, Serializable {
private final String extension;
- FileExtensions(final String extension) {
+ private FileExtensions(final String extension) {
Objects.requireNonNull(extension, "extension");
this.extension = extension;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
index 61a87ea..6f2dd6b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
-import java.io.Serializable;
import java.lang.reflect.Method;
import org.apache.logging.log4j.core.LogEvent;
@@ -31,8 +30,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* always return false.
*/
@Plugin(name = "OnStartupTriggeringPolicy", category = "Core", printObject = true)
-public class OnStartupTriggeringPolicy implements TriggeringPolicy, Serializable {
- private static final long serialVersionUID = 1L;
+public class OnStartupTriggeringPolicy implements TriggeringPolicy {
private static long JVM_START_TIME = initStartTime();
private boolean evaluated = false;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
index 424e241..af5bcdb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
-import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -37,8 +36,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* Parses the rollover pattern.
*/
-public class PatternProcessor implements Serializable {
- private static final long serialVersionUID = 1L;
+public class PatternProcessor {
protected static final Logger LOGGER = StatusLogger.getLogger();
private static final String KEY = "FileConverter";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
index 1e77d19..9e5d203 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
@@ -38,7 +38,6 @@ import org.apache.logging.log4j.core.util.Log4jThread;
* The Rolling File Manager.
*/
public class RollingFileManager extends FileManager {
- private static final long serialVersionUID = 1L;
private static RollingFileManagerFactory factory = new RollingFileManagerFactory();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
index 612ae31..090be46 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
@@ -34,7 +34,6 @@ import org.apache.logging.log4j.core.util.NullOutputStream;
* {@code RandomAccessFile} to do the I/O.
*/
public class RollingRandomAccessFileManager extends RollingFileManager implements ByteBufferDestination {
- private static final long serialVersionUID = 1L;
/**
* The default buffer size.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
index 1d242db..712d5a6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
-import java.io.Serializable;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -29,8 +27,7 @@ import org.apache.logging.log4j.status.StatusLogger;
*
*/
@Plugin(name = "SizeBasedTriggeringPolicy", category = "Core", printObject = true)
-public class SizeBasedTriggeringPolicy implements TriggeringPolicy, Serializable {
- private static final long serialVersionUID = 1L;
+public class SizeBasedTriggeringPolicy implements TriggeringPolicy {
/**
* Allow subclasses access to the status logger without creating another instance.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
index 93215c8..2111a77 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
-import java.io.Serializable;
-
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -28,8 +26,7 @@ import org.apache.logging.log4j.core.util.Integers;
* Rolls a file over based on time.
*/
@Plugin(name = "TimeBasedTriggeringPolicy", category = "Core", printObject = true)
-public final class TimeBasedTriggeringPolicy implements TriggeringPolicy, Serializable {
- private static final long serialVersionUID = 1L;
+public final class TimeBasedTriggeringPolicy implements TriggeringPolicy {
private long nextRolloverMillis;
private final int interval;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractAction.java
index 181670b..633d4bc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractAction.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.appender.rolling.action;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.status.StatusLogger;
@@ -26,8 +25,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* Abstract base class for implementations of Action.
*/
-public abstract class AbstractAction implements Action, Serializable {
- private static final long serialVersionUID = 1L;
+public abstract class AbstractAction implements Action {
/**
* Allows subclasses access to the status logger without creating another instance.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
index 89914db..e66f543 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
@@ -36,7 +36,6 @@ import org.apache.logging.log4j.core.lookup.StrSubstitutor;
* Abstract action for processing files that are accepted by the specified PathFilters.
*/
public abstract class AbstractPathAction extends AbstractAction {
- private static final long serialVersionUID = 1L;
private final String basePathString;
private final Set<FileVisitOption> options;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java
index c0766f3..de1fed0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java
@@ -31,7 +31,6 @@ import org.apache.commons.compress.utils.IOUtils;
* Compresses a file using bzip2 compression.
*/
public final class CommonsCompressAction extends AbstractAction {
- private static final long serialVersionUID = 1L;
private static final int BUF_SIZE = 8102;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CompositeAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CompositeAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CompositeAction.java
index 2c577f3..5637144 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CompositeAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CompositeAction.java
@@ -25,7 +25,6 @@ import java.util.List;
* A group of Actions to be executed in sequence.
*/
public class CompositeAction extends AbstractAction {
- private static final long serialVersionUID = 1L;
/**
* Actions to perform.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
index 5f40635..c2c385f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
@@ -37,7 +37,6 @@ import org.apache.logging.log4j.core.lookup.StrSubstitutor;
*/
@Plugin(name = "Delete", category = "Core", printObject = true)
public class DeleteAction extends AbstractPathAction {
- private static final long serialVersionUID = 1L;
private final PathSorter pathSorter;
private final boolean testMode;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java
index 6973dea..4337eec 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java
@@ -26,7 +26,6 @@ import java.nio.channels.FileChannel;
* File rename action.
*/
public class FileRenameAction extends AbstractAction {
- private static final long serialVersionUID = 1L;
/**
* Source.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
index 69c45c9..785f6d5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
@@ -28,7 +28,6 @@ import java.util.zip.GZIPOutputStream;
* Compresses a file using GZ compression.
*/
public final class GzCompressAction extends AbstractAction {
- private static final long serialVersionUID = 1L;
private static final int BUF_SIZE = 8102;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
index d87c219..b70dc26 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling.action;
-import java.io.Serializable;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
@@ -34,8 +33,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* PathCondition that accepts paths after some count threshold is exceeded during the file tree walk.
*/
@Plugin(name = "IfAccumulatedFileCount", category = "Core", printObject = true)
-public final class IfAccumulatedFileCount implements PathCondition, Serializable {
- private static final long serialVersionUID = 1L;
+public final class IfAccumulatedFileCount implements PathCondition {
private static final Logger LOGGER = StatusLogger.getLogger();
private final int threshold;
private int count;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
index ec9c84c..bcf543a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling.action;
-import java.io.Serializable;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
@@ -35,8 +34,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* PathCondition that accepts paths after the accumulated file size threshold is exceeded during the file tree walk.
*/
@Plugin(name = "IfAccumulatedFileSize", category = "Core", printObject = true)
-public final class IfAccumulatedFileSize implements PathCondition, Serializable {
- private static final long serialVersionUID = 1L;
+public final class IfAccumulatedFileSize implements PathCondition {
private static final Logger LOGGER = StatusLogger.getLogger();
private final long thresholdBytes;
private long accumulatedSize;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
index c22f7e9..627a082 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling.action;
-import java.io.Serializable;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
@@ -31,8 +30,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
* Corresponds to logical "AND".
*/
@Plugin(name = "IfAll", category = "Core", printObject = true)
-public final class IfAll implements PathCondition, Serializable {
- private static final long serialVersionUID = 1L;
+public final class IfAll implements PathCondition {
private final PathCondition[] components;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
index c53a0b9..30529d4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling.action;
-import java.io.Serializable;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
@@ -31,8 +30,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
* Corresponds to logical "OR".
*/
@Plugin(name = "IfAny", category = "Core", printObject = true)
-public final class IfAny implements PathCondition, Serializable {
- private static final long serialVersionUID = 1L;
+public final class IfAny implements PathCondition {
private final PathCondition[] components;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java
index b865aee..ad958e4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling.action;
-import java.io.Serializable;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Path;
@@ -43,8 +42,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* expression described in {@link FileSystem#getPathMatcher(String)}.
*/
@Plugin(name = "IfFileName", category = "Core", printObject = true)
-public final class IfFileName implements PathCondition, Serializable {
- private static final long serialVersionUID = 1L;
+public final class IfFileName implements PathCondition {
private static final Logger LOGGER = StatusLogger.getLogger();
private final PathMatcher pathMatcher;
private final String syntaxAndPattern;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java
index 39012df..a3956c1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling.action;
-import java.io.Serializable;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.attribute.FileTime;
@@ -38,8 +37,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* PathCondition that accepts paths that are older than the specified duration.
*/
@Plugin(name = "IfLastModified", category = "Core", printObject = true)
-public final class IfLastModified implements PathCondition, Serializable {
- private static final long serialVersionUID = 1L;
+public final class IfLastModified implements PathCondition {
private static final Logger LOGGER = StatusLogger.getLogger();
private static final Clock CLOCK = ClockFactory.getClock();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfNot.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfNot.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfNot.java
index 0c044cb..37d2eff 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfNot.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfNot.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.rolling.action;
-import java.io.Serializable;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Objects;
@@ -29,8 +28,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
* Wrapper {@code PathCondition} that accepts objects that are rejected by the wrapped component filter.
*/
@Plugin(name = "IfNot", category = "Core", printObject = true)
-public final class IfNot implements PathCondition, Serializable {
- private static final long serialVersionUID = 1L;
+public final class IfNot implements PathCondition {
private final PathCondition negate;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSorter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSorter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSorter.java
index 478e145..2e765ab 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSorter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSorter.java
@@ -17,12 +17,11 @@
package org.apache.logging.log4j.core.appender.rolling.action;
-import java.io.Serializable;
import java.util.Comparator;
/**
* Defines the interface of classes that can sort Paths.
*/
-public interface PathSorter extends Comparator<PathWithAttributes>, Serializable {
+public interface PathSorter extends Comparator<PathWithAttributes>{
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptCondition.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptCondition.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptCondition.java
index f67ffff..1abb792 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptCondition.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptCondition.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.appender.rolling.action;
-import java.io.Serializable;
import java.nio.file.Path;
import java.util.List;
import java.util.Objects;
@@ -41,8 +40,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* @see #createCondition(AbstractScript, Configuration)
*/
@Plugin(name = "ScriptCondition", category = "Core", printObject = true)
-public class ScriptCondition implements Serializable {
- private static final long serialVersionUID = 1L;
+public class ScriptCondition {
private static Logger LOGGER = StatusLogger.getLogger();
private final AbstractScript script;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
index b8fc6b2..8ac9b4b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
@@ -28,7 +28,6 @@ import java.util.zip.ZipOutputStream;
* Compresses a file using Zip compression.
*/
public final class ZipCompressAction extends AbstractAction {
- private static final long serialVersionUID = 1L;
private static final int BUF_SIZE = 8102;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java
index ba3f4af..e0ee77a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.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.Logger;
import org.apache.logging.log4j.core.Filter;
@@ -33,8 +31,7 @@ import org.apache.logging.log4j.status.StatusLogger;
*/
@Plugin(name = "AppenderRef", category = Node.CATEGORY, printObject = true)
@PluginAliases("appender-ref")
-public final class AppenderRef implements Serializable {
- private static final long serialVersionUID = 1L;
+public final class AppenderRef {
private static final Logger LOGGER = StatusLogger.getLogger();
private final String ref;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
index e8c19d7..383f0ed 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
@@ -16,11 +16,6 @@
*/
package org.apache.logging.log4j.core.layout;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
@@ -35,12 +30,15 @@ import org.apache.logging.log4j.core.pattern.PatternFormatter;
import org.apache.logging.log4j.core.pattern.PatternParser;
import org.apache.logging.log4j.status.StatusLogger;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* Selects the pattern to use based on the Marker in the LogEvent.
*/
@Plugin(name = "MarkerPatternSelector", category = Node.CATEGORY, elementType = PatternSelector.ELEMENT_TYPE, printObject = true)
-public class MarkerPatternSelector implements PatternSelector, Serializable {
- private static final long serialVersionUID = 1L;
+public class MarkerPatternSelector implements PatternSelector {
private final Map<String, PatternFormatter[]> formatterMap = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index d1afacf..970e3f0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.layout;
-import java.io.Serializable;
import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.HashMap;
@@ -280,8 +279,7 @@ public final class PatternLayout extends AbstractStringLayout {
.build();
}
- private static class PatternSerializer implements Serializer, Serializer2, Serializable {
- private static final long serialVersionUID = 1L;
+ private static class PatternSerializer implements Serializer, Serializer2 {
private final PatternFormatter[] formatters;
private final RegexReplacement replace;
@@ -325,8 +323,7 @@ public final class PatternLayout extends AbstractStringLayout {
}
}
- private static class PatternSelectorSerializer implements Serializer, Serializer2, Serializable {
- private static final long serialVersionUID = 1L;
+ private static class PatternSelectorSerializer implements Serializer, Serializer2 {
private final PatternSelector patternSelector;
private final RegexReplacement replace;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
index ba53194..6a02c46 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
@@ -16,12 +16,6 @@
*/
package org.apache.logging.log4j.core.layout;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.script.SimpleBindings;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
@@ -37,12 +31,16 @@ import org.apache.logging.log4j.core.script.AbstractScript;
import org.apache.logging.log4j.core.script.ScriptRef;
import org.apache.logging.log4j.status.StatusLogger;
+import javax.script.SimpleBindings;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* Selects the pattern to use based on the Marker in the LogEvent.
*/
@Plugin(name = "ScriptPatternSelector", category = Node.CATEGORY, elementType = PatternSelector.ELEMENT_TYPE, printObject = true)
-public class ScriptPatternSelector implements PatternSelector, Serializable {
- private static final long serialVersionUID = 1L;
+public class ScriptPatternSelector implements PatternSelector {
private final Map<String, PatternFormatter[]> formatterMap = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
index c4442c7..1dba499 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
@@ -16,15 +16,12 @@
*/
package org.apache.logging.log4j.core.lookup;
-import java.io.Serializable;
-
/**
* A default lookup for others to extend.
*
* @since 2.1
*/
-public abstract class AbstractLookup implements StrLookup, Serializable {
- private static final long serialVersionUID = 1L;
+public abstract class AbstractLookup implements StrLookup {
/**
* Calls {@code lookup(null, key)} in the super class.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
index eb25d7d..f6d787a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.lookup;
-import java.io.Serializable;
import java.util.Arrays;
import org.apache.logging.log4j.util.Chars;
@@ -29,8 +28,7 @@ import org.apache.logging.log4j.util.Strings;
* This class comes complete with various factory methods.
* If these do not suffice, you can subclass and implement your own matcher.
*/
-public abstract class StrMatcher implements Serializable {
- private static final long serialVersionUID = 1L;
+public abstract class StrMatcher {
/**
* Matches the comma character.
@@ -269,7 +267,6 @@ public abstract class StrMatcher implements Serializable {
* Class used to define a set of characters for matching purposes.
*/
static final class CharSetMatcher extends StrMatcher {
- private static final long serialVersionUID = 1L;
/** The set of characters to match. */
private final char[] chars;
@@ -304,7 +301,6 @@ public abstract class StrMatcher implements Serializable {
* Class used to define a character for matching purposes.
*/
static final class CharMatcher extends StrMatcher {
- private static final long serialVersionUID = 1L;
/** The character to match. */
private final char ch;
@@ -338,7 +334,6 @@ public abstract class StrMatcher implements Serializable {
* Class used to define a set of characters for matching purposes.
*/
static final class StringMatcher extends StrMatcher {
- private static final long serialVersionUID = 1L;
/** The string to match, as a character array. */
private final char[] chars;
@@ -387,7 +382,6 @@ public abstract class StrMatcher implements Serializable {
* Class used to match no characters.
*/
static final class NoMatcher extends StrMatcher {
- private static final long serialVersionUID = 1L;
/**
* Constructs a new instance of <code>NoMatcher</code>.
@@ -416,7 +410,6 @@ public abstract class StrMatcher implements Serializable {
* Class used to match whitespace as per trim().
*/
static final class TrimMatcher extends StrMatcher {
- private static final long serialVersionUID = 1L;
/**
* Constructs a new instance of <code>TrimMatcher</code>.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
index 83e759a..0b9ead6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.lookup;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
@@ -137,8 +136,7 @@ import org.apache.logging.log4j.util.Strings;
* property to <b>true</b>.
* </p>
*/
-public class StrSubstitutor implements Serializable {
- private static final long serialVersionUID = 1L;
+public class StrSubstitutor {
/**
* Constant for the default escape character.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
index b748afe..ceeeeff 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
@@ -29,7 +29,6 @@ import org.apache.logging.log4j.core.appender.OutputStreamManager;
* Abstract base class for managing sockets.
*/
public abstract class AbstractSocketManager extends OutputStreamManager {
- private static final long serialVersionUID = 1L;
/**
* The Internet address of the host.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
index 26d147b..0bcd793 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
@@ -31,7 +31,6 @@ import org.apache.logging.log4j.util.Strings;
* Socket Manager for UDP connections.
*/
public class DatagramSocketManager extends AbstractSocketManager {
- private static final long serialVersionUID = 1L;
private static final DatagramSocketManagerFactory FACTORY = new DatagramSocketManagerFactory();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
index 44e653f..31009b6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
@@ -33,7 +33,6 @@ import org.apache.logging.log4j.core.util.JndiCloser;
* @since 2.1
*/
public class JndiManager extends AbstractManager {
- private static final long serialVersionUID = 1L;
private static final JndiManagerFactory FACTORY = new JndiManagerFactory();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java
index 332ddf7..f3878f9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.core.net;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.Serializable;
import java.util.Date;
import java.util.Properties;
@@ -55,7 +54,6 @@ import org.apache.logging.log4j.util.Strings;
* Manager for sending SMTP events.
*/
public class SmtpManager extends AbstractManager {
- private static final long serialVersionUID = 1L;
private static final SMTPManagerFactory FACTORY = new SMTPManagerFactory();
private final Session session;
@@ -164,7 +162,13 @@ public class SmtpManager extends AbstractManager {
final MimeMultipart mp = getMimeMultipart(encodedBytes, headers);
sendMultipartMessage(message, mp);
- } catch (final MessagingException | IOException | RuntimeException e) {
+ } catch (final MessagingException e) {
+ logError("caught exception while sending e-mail notification.", e);
+ throw new LoggingException("Error occurred while sending email", e);
+ } catch (final IOException e) {
+ logError("caught exception while sending e-mail notification.", e);
+ throw new LoggingException("Error occurred while sending email", e);
+ } catch (final RuntimeException e) {
logError("caught exception while sending e-mail notification.", e);
throw new LoggingException("Error occurred while sending email", e);
}
@@ -255,7 +259,7 @@ public class SmtpManager extends AbstractManager {
/**
* Factory data.
*/
- private static class FactoryData implements Serializable {
+ private static class FactoryData {
private final String to;
private final String cc;
private final String bcc;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
index 9f15d27..eeca463 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
@@ -38,7 +38,6 @@ import org.apache.logging.log4j.util.Strings;
*
*/
public class SslSocketManager extends TcpSocketManager {
- private static final long serialVersionUID = 1L;
public static final int DEFAULT_PORT = 6514;
private static final SslSocketManagerFactory FACTORY = new SslSocketManagerFactory();
private final SslConfiguration sslConfig;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
index 51d17ac..d518aee 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.core.net;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.ObjectInputStream;
import java.io.OutputStream;
import java.io.Serializable;
import java.net.ConnectException;
@@ -40,7 +39,6 @@ import org.apache.logging.log4j.util.Strings;
* Manager of TCP Socket connections.
*/
public class TcpSocketManager extends AbstractSocketManager {
- private static final long serialVersionUID = 1L;
/**
The default reconnection delay (30000 milliseconds or 30 seconds).
*/
@@ -54,9 +52,9 @@ public class TcpSocketManager extends AbstractSocketManager {
private final int reconnectionDelay;
- private transient Reconnector connector;
+ private Reconnector connector;
- private transient Socket socket;
+ private Socket socket;
private final boolean retry;
@@ -87,22 +85,13 @@ public class TcpSocketManager extends AbstractSocketManager {
this.immediateFail = immediateFail;
retry = delay > 0;
if (sock == null) {
- startReconnector();
+ connector = new Reconnector(this);
+ connector.setDaemon(true);
+ connector.setPriority(Thread.MIN_PRIORITY);
+ connector.start();
}
}
- private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
- in.defaultReadObject();
- startReconnector();
- }
-
- private void startReconnector() {
- connector = new Reconnector(this);
- connector.setDaemon(true);
- connector.setPriority(Thread.MIN_PRIORITY);
- connector.start();
- }
-
/**
* Obtain a TcpSocketManager.
* @param host The host to connect to.
@@ -146,7 +135,10 @@ public class TcpSocketManager extends AbstractSocketManager {
}
} catch (final IOException ex) {
if (retry && connector == null) {
- startReconnector();
+ connector = new Reconnector(this);
+ connector.setDaemon(true);
+ connector.setPriority(Thread.MIN_PRIORITY);
+ connector.start();
}
final String msg = "Error writing to " + getName();
throw new AppenderLoggingException(msg, ex);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
index 48bee69..57fd791 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
@@ -19,20 +19,16 @@ package org.apache.logging.log4j.core.net.ssl;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.ObjectInputStream;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
-import org.apache.logging.log4j.core.util.Throwables;
-
/**
* Configuration of the KeyStore
*/
public class AbstractKeyStoreConfiguration extends StoreConfiguration<KeyStore> {
- private static final long serialVersionUID = 1L;
- private transient KeyStore keyStore;
+ private final KeyStore keyStore;
private final String keyStoreType;
public AbstractKeyStoreConfiguration(final String location, final String password, final String keyStoreType)
@@ -42,15 +38,6 @@ public class AbstractKeyStoreConfiguration extends StoreConfiguration<KeyStore>
this.keyStore = this.load();
}
- private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
- in.defaultReadObject();
- try {
- this.keyStore = this.load();
- } catch (final StoreConfigurationException e) {
- Throwables.rethrow(e);
- }
- }
-
@Override
protected KeyStore load() throws StoreConfigurationException {
LOGGER.debug("Loading keystore from file with params(location={})", this.getLocation());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
index 737fc61..c5369ea 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
@@ -31,7 +31,6 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
*/
@Plugin(name = "KeyStore", category = "Core", printObject = true)
public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
- private static final long serialVersionUID = 1L;
private final String keyManagerFactoryAlgorithm;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
index df56898..a978f0b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
@@ -16,9 +16,6 @@
*/
package org.apache.logging.log4j.core.net.ssl;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
import java.security.KeyManagementException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@@ -42,12 +39,11 @@ import org.apache.logging.log4j.status.StatusLogger;
* SSL Configuration
*/
@Plugin(name = "Ssl", category = "Core", printObject = true)
-public class SslConfiguration implements Serializable {
- private static final long serialVersionUID = 1L;
+public class SslConfiguration {
private static final StatusLogger LOGGER = StatusLogger.getLogger();
private final KeyStoreConfiguration keyStoreConfig;
private final TrustStoreConfiguration trustStoreConfig;
- private transient SSLContext sslContext;
+ private final SSLContext sslContext;
private final String protocol;
private SslConfiguration(final String protocol, final KeyStoreConfiguration keyStoreConfig,
@@ -58,11 +54,6 @@ public class SslConfiguration implements Serializable {
this.sslContext = this.createSslContext();
}
- private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
- in.defaultReadObject();
- this.sslContext = this.createSslContext();
- }
-
public SSLSocketFactory getSslSocketFactory() {
return sslContext.getSocketFactory();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
index 6125016..fd51e40 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
@@ -16,15 +16,12 @@
*/
package org.apache.logging.log4j.core.net.ssl;
-import java.io.Serializable;
-
import org.apache.logging.log4j.status.StatusLogger;
/**
*
*/
-public class StoreConfiguration<T> implements Serializable {
- private static final long serialVersionUID = 1L;
+public class StoreConfiguration<T> {
protected static final StatusLogger LOGGER = StatusLogger.getLogger();
private String location;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
index df1437b..7bae22e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
*/
@Plugin(name = "TrustStore", category = "Core", printObject = true)
public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration {
- private static final long serialVersionUID = 1L;
private final String trustManagerFactoryAlgorithm;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
index 89c76c9..dbb5a9d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
@@ -21,9 +21,6 @@ package org.apache.logging.log4j.core.util;
* Copyright Terracotta, Inc.
*/
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
import java.text.ParseException;
import java.util.Calendar;
import java.util.Date;
@@ -197,8 +194,7 @@ import java.util.TreeSet;
* </ul>
* </p>
*/
-public final class CronExpression implements Serializable {
- private static final long serialVersionUID = 1L;
+public final class CronExpression {
protected static final int SECOND = 0;
protected static final int MINUTE = 1;
@@ -276,15 +272,6 @@ public final class CronExpression implements Serializable {
buildExpression(this.cronExpression);
}
- private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
- in.defaultReadObject();
- try {
- buildExpression(this.cronExpression);
- } catch (final ParseException e) {
- Throwables.rethrow(e);
- }
- }
-
/**
* Indicates whether the given date satisfies the cron expression. Note that
* milliseconds are ignored, so two Dates falling on different milliseconds
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CyclicBuffer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CyclicBuffer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CyclicBuffer.java
index e6065b6..35b7eb5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CyclicBuffer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CyclicBuffer.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.util;
-import java.io.Serializable;
import java.lang.reflect.Array;
/**
@@ -24,8 +23,7 @@ import java.lang.reflect.Array;
* size of the buffer the oldest element will be overwritten. Access to the buffer is thread safe.
* @param <T> The type of object stored in the buffer.
*/
-public final class CyclicBuffer<T> implements Serializable {
- private static final long serialVersionUID = 1L;
+public final class CyclicBuffer<T> {
private final T[] ring;
private int first = 0;
private int last = 0;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/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 fe62761..48ab06f 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
@@ -151,7 +151,6 @@ public class AbstractDatabaseAppenderTest {
}
private static abstract class LocalAbstractDatabaseManager extends AbstractDatabaseManager {
- private static final long serialVersionUID = 1L;
public LocalAbstractDatabaseManager(final String name, final int bufferSize) {
super(name, bufferSize);
}