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:48 UTC
[03/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make
appender managers and dependencies serializable."
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
index f60d0f9..ba593a3 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
@@ -49,7 +49,6 @@ public class OnStartupTriggeringPolicyTest {
}
private class MyRollingManager extends RollingFileManager {
- private static final long serialVersionUID = 1L;
private long timestamp;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/CountingCondition.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/CountingCondition.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/CountingCondition.java
index 7b4f570..9355582 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/CountingCondition.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/CountingCondition.java
@@ -17,15 +17,15 @@
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 org.apache.logging.log4j.core.appender.rolling.action.PathCondition;
+
/**
* Test helper class.
*/
-public class CountingCondition implements PathCondition, Serializable {
- private static final long serialVersionUID = 1L;
+public class CountingCondition implements PathCondition {
private final boolean accept;
private int acceptCount;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java
index 206a395..9b483a6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java
@@ -42,7 +42,6 @@ public class InMemoryAppender extends AbstractOutputStreamAppender<InMemoryAppen
}
static class InMemoryManager extends OutputStreamManager {
- private static final long serialVersionUID = 1L;
public InMemoryManager(final String name, final Layout<? extends Serializable> layout,
final boolean writeHeader) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java
index 4a3a065..55fb858 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java
@@ -23,7 +23,6 @@ import org.apache.logging.log4j.core.appender.AbstractManager;
*
*/
public abstract class AbstractFlumeManager extends AbstractManager {
- private static final long serialVersionUID = 1L;
public AbstractFlumeManager(final String name) {
super(name);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java
index b2e8760..e8cf2ea 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.flume.appender;
-import java.io.Serializable;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -29,8 +27,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* Agent Specification for FlumeAvroAppender.
*/
@Plugin(name = "Agent", category = "Core", printObject = true)
-public final class Agent implements Serializable {
- private static final long serialVersionUID = 1L;
+public final class Agent {
private static final String DEFAULT_HOST = "localhost";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/BatchEvent.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/BatchEvent.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/BatchEvent.java
index 9da9e9e..41af4fa 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/BatchEvent.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/BatchEvent.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.flume.appender;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -25,8 +24,7 @@ import org.apache.flume.Event;
/**
*
*/
-public class BatchEvent implements Serializable {
- private static final long serialVersionUID = 1L;
+public class BatchEvent {
private final List<Event> events = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
index 1d39185..dd5dd96 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.flume.appender;
-import java.io.IOException;
-import java.io.ObjectInputStream;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
@@ -31,7 +29,6 @@ import org.apache.logging.log4j.core.appender.ManagerFactory;
* Manager for FlumeAvroAppenders.
*/
public class FlumeAvroManager extends AbstractFlumeManager {
- private static final long serialVersionUID = 1L;
private static final int MAX_RECONNECTS = 3;
private static final int MINIMUM_TIMEOUT = 1000;
@@ -53,7 +50,7 @@ public class FlumeAvroManager extends AbstractFlumeManager {
private final int current = 0;
- private transient RpcClient rpcClient = null;
+ private RpcClient rpcClient = null;
private BatchEvent batchEvent = new BatchEvent();
private long nextSend = 0;
@@ -81,11 +78,6 @@ public class FlumeAvroManager extends AbstractFlumeManager {
this.rpcClient = connect(agents, retries, connectTimeout, requestTimeout);
}
- private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
- in.defaultReadObject();
- this.rpcClient = connect(this.agents, this.retries, this.connectTimeoutMillis, this.requestTimeoutMillis);
- }
-
/**
* Returns a FlumeAvroManager.
* @param name The name of the manager.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
index a4f45f1..a23c2ed 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
@@ -35,7 +35,6 @@ import org.apache.logging.log4j.util.Strings;
*
*/
public class FlumeEmbeddedManager extends AbstractFlumeManager {
- private static final long serialVersionUID = 1L;
private static final String FILE_SEP = PropertiesUtil.getProperties().getStringProperty("file.separator");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
index e846ae2..4134671 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
@@ -66,7 +66,6 @@ import com.sleepycat.je.Transaction;
* Manager that persists data to Berkeley DB before passing it on to Flume.
*/
public class FlumePersistentManager extends FlumeAvroManager {
- private static final long serialVersionUID = 1L;
/** Attribute name for the key provider. */
public static final String KEY_PROVIDER = "keyProvider";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/AbstractNoSqlConnection.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/AbstractNoSqlConnection.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/AbstractNoSqlConnection.java
index 2291e08..ac52eba 100644
--- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/AbstractNoSqlConnection.java
+++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/AbstractNoSqlConnection.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.nosql.appender;
-import java.io.Serializable;
import java.util.concurrent.atomic.AtomicBoolean;
/**
@@ -28,9 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
* @param <T>See
* {@link NoSqlConnection}.
*/
-public abstract class AbstractNoSqlConnection<W, T extends NoSqlObject<W>>
- implements NoSqlConnection<W, T>, Serializable {
- private static final long serialVersionUID = 1L;
+public abstract class AbstractNoSqlConnection<W, T extends NoSqlObject<W>> implements NoSqlConnection<W, T> {
private final AtomicBoolean closed = new AtomicBoolean(false);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java
index 3a005fa..d879b07 100644
--- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java
+++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManager.java
@@ -32,7 +32,6 @@ import org.apache.logging.log4j.core.util.Closer;
* @param <W> A type parameter for reassuring the compiler that all operations are using the same {@link NoSqlObject}.
*/
public final class NoSqlDatabaseManager<W> extends AbstractDatabaseManager {
- private static final long serialVersionUID = 1L;
private static final NoSQLDatabaseManagerFactory FACTORY = new NoSQLDatabaseManagerFactory();
private final NoSqlProvider<NoSqlConnection<W, ? extends NoSqlObject<W>>> provider;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbConnection.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbConnection.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbConnection.java
index 7ed5ec8..2494a5c 100644
--- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbConnection.java
+++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbConnection.java
@@ -31,7 +31,6 @@ import org.lightcouch.Response;
* The Apache CouchDB implementation of {@link NoSqlConnection}.
*/
public final class CouchDbConnection extends AbstractNoSqlConnection<Map<String, Object>, DefaultNoSqlObject> {
- private static final long serialVersionUID = 1L;
private final CouchDbClient client;
public CouchDbConnection(final CouchDbClient client) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbProvider.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbProvider.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbProvider.java
index 591d839..1f9f0e7 100644
--- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbProvider.java
+++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDbProvider.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.nosql.appender.couchdb;
-import java.io.Serializable;
import java.lang.reflect.Method;
import org.apache.logging.log4j.Logger;
@@ -36,8 +35,7 @@ import org.lightcouch.CouchDbProperties;
* The Apache CouchDB implementation of {@link NoSqlProvider}.
*/
@Plugin(name = "CouchDB", category = "Core", printObject = true)
-public final class CouchDbProvider implements NoSqlProvider<CouchDbConnection>, Serializable {
- private static final long serialVersionUID = 1L;
+public final class CouchDbProvider implements NoSqlProvider<CouchDbConnection> {
private static final int HTTP = 80;
private static final int HTTPS = 443;
private static final Logger LOGGER = StatusLogger.getLogger();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96f0aa97/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbConnection.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbConnection.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbConnection.java
index 4dfe588..577adea 100644
--- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbConnection.java
+++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbConnection.java
@@ -36,7 +36,6 @@ import com.mongodb.WriteConcern;
* The MongoDB implementation of {@link NoSqlConnection}.
*/
public final class MongoDbConnection extends AbstractNoSqlConnection<BasicDBObject, MongoDbObject> {
- 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-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java
index cacb784..be9d9f4 100644
--- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java
+++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.nosql.appender.mongodb;
-import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -43,8 +42,7 @@ import com.mongodb.WriteConcern;
* The MongoDB implementation of {@link NoSqlProvider}.
*/
@Plugin(name = "MongoDb", category = "Core", printObject = true)
-public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection>, Serializable {
- private static final long serialVersionUID = 1L;
+public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection> {
private static final WriteConcern DEFAULT_WRITE_CONCERN = WriteConcern.ACKNOWLEDGED;
private static final Logger LOGGER = StatusLogger.getLogger();