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:46 UTC
[01/12] logging-log4j2 git commit: Revert "Make Node and PluginType
Serializable."
Repository: logging-log4j2
Updated Branches:
refs/heads/master 9db483101 -> 4e35f3f47
Revert "Make Node and PluginType Serializable."
This reverts commit ee8a9d43f77b07161fed85c5a05606ef97c404d2.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4e35f3f4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4e35f3f4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4e35f3f4
Branch: refs/heads/master
Commit: 4e35f3f47b5a906fdc0e0f534969b32aa9e72c7f
Parents: 8c14ca8
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:10:27 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/core/config/Node.java | 4 +---
.../logging/log4j/core/config/plugins/util/PluginType.java | 5 +----
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e35f3f4/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Node.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Node.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Node.java
index 9b39513..c92c904 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Node.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Node.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.config;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -27,7 +26,7 @@ import org.apache.logging.log4j.core.config.plugins.util.PluginType;
/**
* A Configuration node.
*/
-public class Node implements Serializable {
+public class Node {
/**
* Main plugin category for plugins which are represented as a configuration node. Such plugins tend to be
@@ -36,7 +35,6 @@ public class Node implements Serializable {
* @since 2.1
*/
public static final String CATEGORY = "Core";
- private static final long serialVersionUID = 1L;
private final Node parent;
private final String name;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4e35f3f4/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginType.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginType.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginType.java
index de583d3..cc6bc66 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginType.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginType.java
@@ -17,8 +17,6 @@
package org.apache.logging.log4j.core.config.plugins.util;
-import java.io.Serializable;
-
import org.apache.logging.log4j.core.config.plugins.processor.PluginEntry;
/**
@@ -27,9 +25,8 @@ import org.apache.logging.log4j.core.config.plugins.processor.PluginEntry;
* @param <T> The plug-in class, which can be any kind of class.
* @see org.apache.logging.log4j.core.config.plugins.Plugin
*/
-public class PluginType<T> implements Serializable {
+public class PluginType<T> {
- private static final long serialVersionUID = 1L;
private final PluginEntry pluginEntry;
private final Class<T> pluginClass;
private final String elementName;
[07/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make
AbstractConfiguration and dependencies serializable."
Posted by ma...@apache.org.
Revert "[LOG4J2-1300] Make AbstractConfiguration and dependencies serializable."
This reverts commit 7f58ca339efe6f008664714ef286f8e7f53cfeb6.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ecaed16c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ecaed16c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ecaed16c
Branch: refs/heads/master
Commit: ecaed16c2fed8d723316de5b36a6614edb70e336
Parents: 36b5da2
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:08:28 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/LoggerContext.java | 2 +-
.../log4j/core/async/AsyncLoggerConfigDisruptor.java | 8 +++-----
.../logging/log4j/core/async/AsyncLoggerDisruptor.java | 10 ++++------
.../log4j/core/async/DefaultAsyncEventRouter.java | 5 +----
.../log4j/core/async/DiscardingAsyncEventRouter.java | 7 +++----
.../logging/log4j/core/config/ConfigurationSource.java | 4 +---
.../logging/log4j/core/config/CustomLevelConfig.java | 4 +---
.../log4j/core/config/plugins/util/PluginManager.java | 12 +++++-------
.../apache/logging/log4j/core/lookup/Interpolator.java | 1 -
.../apache/logging/log4j/core/util/DummyNanoClock.java | 5 +----
.../apache/logging/log4j/core/util/SystemNanoClock.java | 5 +----
.../log4j/core/async/AsyncEventRouterFactoryTest.java | 10 +++-------
12 files changed, 24 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
index 18535fb..4b80054 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
@@ -76,7 +76,7 @@ public class LoggerContext extends AbstractLifeCycle implements org.apache.loggi
private Object externalContext;
private String contextName;
private volatile URI configLocation;
- private transient Cancellable shutdownCallback;
+ private Cancellable shutdownCallback;
private final Lock configLock = new ReentrantLock();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java
index 393bb89..257e89a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.async;
-import java.io.Serializable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
@@ -50,8 +49,7 @@ import com.lmax.disruptor.dsl.ProducerType;
* This class serves to make the dependency on the Disruptor optional, so that these classes are only loaded when the
* {@code AsyncLoggerConfig} is actually used.
*/
-public class AsyncLoggerConfigDisruptor implements AsyncLoggerConfigDelegate, Serializable {
- private static final long serialVersionUID = 1L;
+public class AsyncLoggerConfigDisruptor implements AsyncLoggerConfigDelegate {
private static final int MAX_DRAIN_ATTEMPTS_BEFORE_SHUTDOWN = 200;
private static final int SLEEP_MILLIS_BETWEEN_DRAIN_ATTEMPTS = 50;
@@ -138,8 +136,8 @@ public class AsyncLoggerConfigDisruptor implements AsyncLoggerConfigDelegate, Se
private static final ThreadFactory THREAD_FACTORY = new DaemonThreadFactory("AsyncLoggerConfig-");
- private transient volatile Disruptor<Log4jEventWrapper> disruptor;
- private transient ExecutorService executor;
+ private volatile Disruptor<Log4jEventWrapper> disruptor;
+ private ExecutorService executor;
private long backgroundThreadId; // LOG4J2-471
public AsyncLoggerConfigDisruptor() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
index 7c62db9..1188b73 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.async;
-import java.io.Serializable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -37,19 +36,18 @@ import com.lmax.disruptor.dsl.ProducerType;
* life cycle of the context. The AsyncLoggerDisruptor of the context is shared by all AsyncLogger objects created by
* that AsyncLoggerContext.
*/
-class AsyncLoggerDisruptor implements Serializable {
- private static final long serialVersionUID = 1L;
+class AsyncLoggerDisruptor {
private static final int SLEEP_MILLIS_BETWEEN_DRAIN_ATTEMPTS = 50;
private static final int MAX_DRAIN_ATTEMPTS_BEFORE_SHUTDOWN = 200;
private static final StatusLogger LOGGER = StatusLogger.getLogger();
- private transient volatile Disruptor<RingBufferLogEvent> disruptor;
- private transient ExecutorService executor;
+ private volatile Disruptor<RingBufferLogEvent> disruptor;
+ private ExecutorService executor;
private String contextName;
private boolean useThreadLocalTranslator = true;
private long backgroundThreadId;
- private transient AsyncEventRouter asyncEventRouter;
+ private AsyncEventRouter asyncEventRouter;
private int ringBufferSize;
AsyncLoggerDisruptor(String contextName) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncEventRouter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncEventRouter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncEventRouter.java
index fb94c8e..aee9336 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncEventRouter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncEventRouter.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core.async;
-import java.io.Serializable;
-
import org.apache.logging.log4j.Level;
/**
@@ -25,8 +23,7 @@ import org.apache.logging.log4j.Level;
* background thread and the queue is full (enqueueing would cause a deadlock). In that case send the event directly to
* the appender (in the current thread).
*/
-public class DefaultAsyncEventRouter implements AsyncEventRouter, Serializable {
- private static final long serialVersionUID = 1L;
+public class DefaultAsyncEventRouter implements AsyncEventRouter {
@Override
public EventRoute getRoute(final long backgroundThreadId, final Level level, final int queueSize,
final int queueRemainingCapacity) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DiscardingAsyncEventRouter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DiscardingAsyncEventRouter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DiscardingAsyncEventRouter.java
index a1f8fc0..2f5805a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DiscardingAsyncEventRouter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DiscardingAsyncEventRouter.java
@@ -16,13 +16,13 @@
*/
package org.apache.logging.log4j.core.async;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicLong;
-
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.status.StatusLogger;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicLong;
+
/**
* Discarding router extends the DefaultAsyncEventRouter by first verifying if the queue is fuller than the specified
* threshold ratio; if this is the case, log events {@linkplain Level#isMoreSpecificThan(Level) more specific} than
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.status.StatusLogger;
* default routing rules hold.
*/
public class DiscardingAsyncEventRouter extends DefaultAsyncEventRouter {
- private static final long serialVersionUID = 1L;
private static final Logger LOGGER = StatusLogger.getLogger();
private final int thresholdQueueRemainingCapacity;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
index 3f812d1..edb2d75 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
@@ -23,15 +23,13 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Serializable;
import java.net.URL;
import java.util.Objects;
/**
* Represents the source for the logging configuration.
*/
-public class ConfigurationSource implements Serializable {
- private static final long serialVersionUID = 1L;
+public class ConfigurationSource {
/**
* ConfigurationSource to use with Configurations that do not require a "real" configuration source.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
index c3ddebc..e7e00d1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.config;
-import java.io.Serializable;
import java.util.Objects;
import org.apache.logging.log4j.Level;
@@ -29,8 +28,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* Descriptor of a custom Level object that is created via configuration.
*/
@Plugin(name = "CustomLevel", category = "Core", printObject = true)
-public final class CustomLevelConfig implements Serializable {
- private static final long serialVersionUID = 1L;
+public final class CustomLevelConfig {
private final String levelName;
private final int intLevel;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
index 5835d88..704ffd1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
@@ -17,7 +17,10 @@
package org.apache.logging.log4j.core.config.plugins.util;
-import java.io.Serializable;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.util.Strings;
+
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -25,15 +28,10 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.apache.logging.log4j.util.Strings;
-
/**
* Loads and manages all the plugins.
*/
-public class PluginManager implements Serializable {
- private static final long serialVersionUID = 1L;
+public class PluginManager {
private static final CopyOnWriteArrayList<String> PACKAGES = new CopyOnWriteArrayList<>();
private static final String LOG4J_PACKAGES = "org.apache.logging.log4j.core";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
index 67aff43..ec2fbc0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
@@ -32,7 +32,6 @@ import org.apache.logging.log4j.status.StatusLogger;
* Proxies all the other {@link StrLookup}s.
*/
public class Interpolator extends AbstractLookup {
- private static final long serialVersionUID = 1L;
private static final Logger LOGGER = StatusLogger.getLogger();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DummyNanoClock.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DummyNanoClock.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DummyNanoClock.java
index 49f82ae..8200c38 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DummyNanoClock.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DummyNanoClock.java
@@ -16,13 +16,10 @@
*/
package org.apache.logging.log4j.core.util;
-import java.io.Serializable;
-
/**
* Implementation of the {@code NanoClock} interface that always returns a fixed value.
*/
-public final class DummyNanoClock implements NanoClock, Serializable {
- private static final long serialVersionUID = 1L;
+public final class DummyNanoClock implements NanoClock {
private final long fixedNanoTime;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/main/java/org/apache/logging/log4j/core/util/SystemNanoClock.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/SystemNanoClock.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/SystemNanoClock.java
index 2b1abaa..9310e6c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/SystemNanoClock.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/SystemNanoClock.java
@@ -16,13 +16,10 @@
*/
package org.apache.logging.log4j.core.util;
-import java.io.Serializable;
-
/**
* Implementation of the {@code NanoClock} interface that returns the system nano time.
*/
-public final class SystemNanoClock implements NanoClock, Serializable {
- private static final long serialVersionUID = 1L;
+public final class SystemNanoClock implements NanoClock {
/**
* Returns the system high-resolution time.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ecaed16c/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncEventRouterFactoryTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncEventRouterFactoryTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncEventRouterFactoryTest.java
index 2bb0ef6..804401b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncEventRouterFactoryTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncEventRouterFactoryTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core.async;
-import java.io.Serializable;
-
import org.apache.logging.log4j.Level;
import org.junit.After;
import org.junit.Before;
@@ -110,8 +108,7 @@ public class AsyncEventRouterFactoryTest {
}
}
- static class CustomRouterDefaultConstructor implements AsyncEventRouter, Serializable {
- private static final long serialVersionUID = 1L;
+ static class CustomRouterDefaultConstructor implements AsyncEventRouter {
public CustomRouterDefaultConstructor() {
}
@@ -122,8 +119,7 @@ public class AsyncEventRouterFactoryTest {
}
}
- static class CustomRouterIntConstructor implements AsyncEventRouter, Serializable {
- private static final long serialVersionUID = 1L;
+ static class CustomRouterIntConstructor implements AsyncEventRouter {
public CustomRouterIntConstructor(int queueSize) {
}
@@ -154,4 +150,4 @@ public class AsyncEventRouterFactoryTest {
DoesNotImplementInterface.class.getName());
assertEquals(DefaultAsyncEventRouter.class, AsyncEventRouterFactory.create(256).getClass());
}
-}
+}
\ No newline at end of file
[11/12] logging-log4j2 git commit: Revert "Make filters all properly
serializable."
Posted by ma...@apache.org.
Revert "Make filters all properly serializable."
This reverts commit 06a28d523b6d33bccbf90edffcb2f2a450b4f476.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8c14ca8f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8c14ca8f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8c14ca8f
Branch: refs/heads/master
Commit: 8c14ca8f35686e1c509b4fb9aaccf31d2c80c423
Parents: 67069c1
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:10:17 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/filter/BurstFilter.java | 5 +----
.../org/apache/logging/log4j/core/script/AbstractScript.java | 5 +----
.../main/java/org/apache/logging/log4j/core/script/Script.java | 1 -
.../java/org/apache/logging/log4j/core/script/ScriptFile.java | 1 -
.../java/org/apache/logging/log4j/core/script/ScriptRef.java | 1 -
5 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8c14ca8f/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
index 3b24ca6..9cc107b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.filter;
-import java.io.Serializable;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.DelayQueue;
@@ -172,9 +171,7 @@ public final class BurstFilter extends AbstractFilter {
*
* Consider this class private, package visibility for testing.
*/
- private static class LogDelay implements Delayed, Serializable {
-
- private static final long serialVersionUID = 1L;
+ private static class LogDelay implements Delayed {
LogDelay(final long expireTime) {
this.expireTime = expireTime;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8c14ca8f/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
index fb0bc39..9e331d6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
@@ -16,14 +16,11 @@
*/
package org.apache.logging.log4j.core.script;
-import java.io.Serializable;
-
/**
* Container for the language and body of a script.
*/
-public abstract class AbstractScript implements Serializable {
+public abstract class AbstractScript {
- private static final long serialVersionUID = 1L;
protected static final String DEFAULT_LANGUAGE = "JavaScript";
private final String language;
private final String scriptText;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8c14ca8f/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
index fa0842f..3f0c1da 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.status.StatusLogger;
@Plugin(name = "Script", category = Node.CATEGORY, printObject = true)
public class Script extends AbstractScript {
- private static final long serialVersionUID = 1L;
private static final Logger logger = StatusLogger.getLogger();
public Script(String name, String language, String scriptText) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8c14ca8f/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
index b180032..f2fe085 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
@@ -43,7 +43,6 @@ import org.apache.logging.log4j.status.StatusLogger;
@Plugin(name = "ScriptFile", category = Node.CATEGORY, printObject = true)
public class ScriptFile extends AbstractScript {
- private static final long serialVersionUID = 1L;
private static final Logger LOGGER = StatusLogger.getLogger();
private final Path filePath;
private final boolean isWatched;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8c14ca8f/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
index 8507621..0ace830 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
@@ -31,7 +31,6 @@ import org.apache.logging.log4j.status.StatusLogger;
@Plugin(name = "ScriptRef", category = Node.CATEGORY, printObject = true)
public class ScriptRef extends AbstractScript {
- private static final long serialVersionUID = 1L;
private static final Logger logger = StatusLogger.getLogger();
private final ScriptManager scriptManager;
[08/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make
AbstractManager Serializable."
Posted by ma...@apache.org.
Revert "[LOG4J2-1300] Make AbstractManager Serializable."
This reverts commit 64d33fd411ca017959f5bf41f84d9fe9a91fd5ae.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ea85196d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ea85196d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ea85196d
Branch: refs/heads/master
Commit: ea85196d32a5ed6652d5b832ae0aa27b3745b563
Parents: 96f0aa9
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:09:17 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/appender/AbstractManager.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ea85196d/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
index 46910f0..45f5141 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.appender;
-import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.locks.Lock;
@@ -30,8 +29,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* Abstract base class used to register managers.
*/
-public abstract class AbstractManager implements Serializable {
- private static final long serialVersionUID = 1L;
+public abstract class AbstractManager {
/**
* Allow subclasses access to the status logger without creating another instance.
[05/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make remaing
StrLookups serializable."
Posted by ma...@apache.org.
Revert "[LOG4J2-1300] Make remaing StrLookups serializable."
This reverts commit 21c2f4e15f11fc6ffd423710a3d64256dbfcf44d.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/adbf455d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/adbf455d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/adbf455d
Branch: refs/heads/master
Commit: adbf455d31c66f237ca757251dd94216957b566c
Parents: 9db4831
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:06:54 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/lookup/ContextMapLookup.java | 5 +----
.../java/org/apache/logging/log4j/core/lookup/DateLookup.java | 4 +---
.../log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java | 1 -
.../org/apache/logging/log4j/core/lookup/MainMapLookup.java | 1 -
.../java/org/apache/logging/log4j/core/lookup/MapLookup.java | 4 +---
.../apache/logging/log4j/core/lookup/StructuredDataLookup.java | 5 +----
6 files changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/adbf455d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java
index 534eb58..9a39338 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core.lookup;
-import java.io.Serializable;
-
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -26,8 +24,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
* Looks up keys from {@link ThreadContext} objects..
*/
@Plugin(name = "ctx", category = StrLookup.CATEGORY)
-public class ContextMapLookup implements StrLookup, Serializable {
- private static final long serialVersionUID = 1L;
+public class ContextMapLookup implements StrLookup {
/**
* Looks up the value from the ThreadContext Map.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/adbf455d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
index c79b82b..3e630b0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.lookup;
-import java.io.Serializable;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -32,8 +31,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* Formats the current date or the date in the LogEvent. The "key" is used as the format String.
*/
@Plugin(name = "date", category = StrLookup.CATEGORY)
-public class DateLookup implements StrLookup, Serializable {
- private static final long serialVersionUID = 1L;
+public class DateLookup implements StrLookup {
private static final Logger LOGGER = StatusLogger.getLogger();
private static final Marker LOOKUP = MarkerManager.getMarker("LOOKUP");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/adbf455d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
index ba2bcd4..3dc2e5d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
*/
@Plugin(name = "jvmrunargs", category = StrLookup.CATEGORY)
public class JmxRuntimeInputArgumentsLookup extends MapLookup {
- private static final long serialVersionUID = 1L;
static {
final List<String> argsList = ManagementFactory.getRuntimeMXBean().getInputArguments();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/adbf455d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
index 7f9431f..a50de0d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
*/
@Plugin(name = "main", category = StrLookup.CATEGORY)
public class MainMapLookup extends MapLookup {
- private static final long serialVersionUID = 1L;
/**
* A singleton used by a main method to save its arguments.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/adbf455d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java
index d624167..c369a0b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.lookup;
-import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -29,8 +28,7 @@ import org.apache.logging.log4j.message.MapMessage;
* A map-based lookup.
*/
@Plugin(name = "map", category = StrLookup.CATEGORY)
-public class MapLookup implements StrLookup, Serializable {
- private static final long serialVersionUID = 1L;
+public class MapLookup implements StrLookup {
/**
* Map keys are variable names and value.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/adbf455d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java
index 1656b77..379d6a9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core.lookup;
-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.message.StructuredDataMessage;
@@ -26,8 +24,7 @@ import org.apache.logging.log4j.message.StructuredDataMessage;
* Looks up keys from {@link org.apache.logging.log4j.message.StructuredDataMessage} log messages.
*/
@Plugin(name = "sd", category = StrLookup.CATEGORY)
-public class StructuredDataLookup implements StrLookup, Serializable {
- private static final long serialVersionUID = 1L;
+public class StructuredDataLookup implements StrLookup {
/**
* Returns {@code null}. This Lookup plugin does not make sense outside the context of a LogEvent.
[02/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make pattern
converters and dependencies serializable."
Posted by ma...@apache.org.
Revert "[LOG4J2-1300] Make pattern converters and dependencies serializable."
This reverts commit b7f6feaa52ea2cb3226e4f8d145161d3c45c2201.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/67069c10
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/67069c10
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/67069c10
Branch: refs/heads/master
Commit: 67069c106d296e2e3cbf48e10b2d682977a05fd9
Parents: 7c4b2c5
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:09:57 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../log4j/core/impl/ThrowableFormatOptions.java | 4 +---
.../core/pattern/AbstractPatternConverter.java | 5 +----
.../core/pattern/AbstractStyleNameConverter.java | 17 -----------------
.../core/pattern/ClassNamePatternConverter.java | 1 -
.../log4j/core/pattern/DatePatternConverter.java | 16 ++--------------
.../core/pattern/EncodingPatternConverter.java | 1 -
.../EqualsIgnoreCaseReplacementConverter.java | 1 -
.../core/pattern/EqualsReplacementConverter.java | 1 -
.../pattern/ExtendedThrowablePatternConverter.java | 1 -
.../core/pattern/FileDatePatternConverter.java | 5 +----
.../core/pattern/FileLocationPatternConverter.java | 1 -
.../logging/log4j/core/pattern/FormattingInfo.java | 6 +-----
.../core/pattern/FullLocationPatternConverter.java | 1 -
.../log4j/core/pattern/HighlightConverter.java | 1 -
.../core/pattern/IntegerPatternConverter.java | 1 -
.../log4j/core/pattern/LevelPatternConverter.java | 1 -
.../core/pattern/LineLocationPatternConverter.java | 1 -
.../pattern/LineSeparatorPatternConverter.java | 1 -
.../core/pattern/LiteralPatternConverter.java | 1 -
.../core/pattern/LogEventPatternConverter.java | 1 -
.../log4j/core/pattern/LoggerPatternConverter.java | 1 -
.../log4j/core/pattern/MapPatternConverter.java | 1 -
.../log4j/core/pattern/MarkerPatternConverter.java | 1 -
.../pattern/MarkerSimpleNamePatternConverter.java | 1 -
.../log4j/core/pattern/MdcPatternConverter.java | 1 -
.../core/pattern/MessagePatternConverter.java | 2 +-
.../pattern/MethodLocationPatternConverter.java | 1 -
.../log4j/core/pattern/NameAbbreviator.java | 10 ++--------
.../log4j/core/pattern/NamePatternConverter.java | 1 -
.../core/pattern/NanoTimePatternConverter.java | 1 -
.../log4j/core/pattern/NdcPatternConverter.java | 1 -
.../log4j/core/pattern/PatternFormatter.java | 6 +-----
.../core/pattern/RegexReplacementConverter.java | 1 -
.../core/pattern/RelativeTimePatternConverter.java | 1 -
.../pattern/RootThrowablePatternConverter.java | 1 -
.../pattern/SequenceNumberPatternConverter.java | 1 -
.../logging/log4j/core/pattern/StyleConverter.java | 1 -
.../log4j/core/pattern/ThreadPatternConverter.java | 1 -
.../core/pattern/ThrowablePatternConverter.java | 1 -
.../log4j/core/pattern/UuidPatternConverter.java | 1 -
.../VariablesNotEmptyReplacementConverter.java | 1 -
.../log4j/core/util/datetime/FixedDateFormat.java | 5 +----
42 files changed, 11 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
index e6de6b1..d5e0285 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.impl;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
@@ -28,8 +27,7 @@ import org.apache.logging.log4j.util.Strings;
/**
* Contains options which control how a {@link Throwable} pattern is formatted.
*/
-public final class ThrowableFormatOptions implements Serializable {
- private static final long serialVersionUID = 1L;
+public final class ThrowableFormatOptions {
private static final int DEFAULT_LINES = Integer.MAX_VALUE;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractPatternConverter.java
index 9ca7d83..2118bd7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractPatternConverter.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core.pattern;
-import java.io.Serializable;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.status.StatusLogger;
@@ -29,8 +27,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* responsible for converting an object in a converter specific manner.
* </p>
*/
-public abstract class AbstractPatternConverter implements PatternConverter, Serializable {
- private static final long serialVersionUID = 1L;
+public abstract class AbstractPatternConverter implements PatternConverter {
/**
* Allow subclasses access to the status logger.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java
index a3eb184..c15c9fc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.core.layout.PatternLayout;
* Style pattern converter. Adds ANSI color styling to the result of the enclosed pattern.
*/
public abstract class AbstractStyleNameConverter extends LogEventPatternConverter /*TODO: implements AnsiConverter*/ {
- private static final long serialVersionUID = 1L;
private final List<PatternFormatter> formatters;
@@ -56,8 +55,6 @@ public abstract class AbstractStyleNameConverter extends LogEventPatternConverte
@ConverterKeys(Black.NAME)
public static final class Black extends AbstractStyleNameConverter {
- private static final long serialVersionUID = 1L;
-
/** Black */
protected static final String NAME = "black";
@@ -91,8 +88,6 @@ public abstract class AbstractStyleNameConverter extends LogEventPatternConverte
@ConverterKeys(Blue.NAME)
public static final class Blue extends AbstractStyleNameConverter {
- private static final long serialVersionUID = 1L;
-
/** Blue */
protected static final String NAME = "blue";
@@ -126,8 +121,6 @@ public abstract class AbstractStyleNameConverter extends LogEventPatternConverte
@ConverterKeys(Cyan.NAME)
public static final class Cyan extends AbstractStyleNameConverter {
- private static final long serialVersionUID = 1L;
-
/** Cyan */
protected static final String NAME = "cyan";
@@ -161,8 +154,6 @@ public abstract class AbstractStyleNameConverter extends LogEventPatternConverte
@ConverterKeys(Green.NAME)
public static final class Green extends AbstractStyleNameConverter {
- private static final long serialVersionUID = 1L;
-
/** Green */
protected static final String NAME = "green";
@@ -196,8 +187,6 @@ public abstract class AbstractStyleNameConverter extends LogEventPatternConverte
@ConverterKeys(Magenta.NAME)
public static final class Magenta extends AbstractStyleNameConverter {
- private static final long serialVersionUID = 1L;
-
/** Magenta */
protected static final String NAME = "magenta";
@@ -231,8 +220,6 @@ public abstract class AbstractStyleNameConverter extends LogEventPatternConverte
@ConverterKeys(Red.NAME)
public static final class Red extends AbstractStyleNameConverter {
- private static final long serialVersionUID = 1L;
-
/** Red */
protected static final String NAME = "red";
@@ -266,8 +253,6 @@ public abstract class AbstractStyleNameConverter extends LogEventPatternConverte
@ConverterKeys(White.NAME)
public static final class White extends AbstractStyleNameConverter {
- private static final long serialVersionUID = 1L;
-
/** White */
protected static final String NAME = "white";
@@ -301,8 +286,6 @@ public abstract class AbstractStyleNameConverter extends LogEventPatternConverte
@ConverterKeys(Yellow.NAME)
public static final class Yellow extends AbstractStyleNameConverter {
- private static final long serialVersionUID = 1L;
-
/** Yellow */
protected static final String NAME = "yellow";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java
index 62bdee9..a2e0f2a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "ClassNamePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "C", "class" })
public final class ClassNamePatternConverter extends NamePatternConverter {
- private static final long serialVersionUID = 1L;
private static final String NA = "?";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
index d36146a..9fdfcd8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.pattern;
-import java.io.Serializable;
import java.util.Arrays;
import java.util.Date;
import java.util.Objects;
@@ -36,11 +35,8 @@ import org.apache.logging.log4j.core.util.datetime.FixedDateFormat.FixedFormat;
@Plugin(name = "DatePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({"d", "date"})
public final class DatePatternConverter extends LogEventPatternConverter implements ArrayPatternConverter {
- private static final long serialVersionUID = 1L;
-
- private abstract static class Formatter implements Serializable {
- private static final long serialVersionUID = 1L;
+ private abstract static class Formatter {
long previousTime; // for ThreadLocal caching mode
abstract String format(long timeMillis);
@@ -53,8 +49,6 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
}
private static final class PatternFormatter extends Formatter {
- private static final long serialVersionUID = 1L;
-
private final FastDateFormat fastDateFormat;
// this field is only used in ThreadLocal caching mode
@@ -85,8 +79,6 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
}
private static final class FixedFormatter extends Formatter {
- private static final long serialVersionUID = 1L;
-
private final FixedDateFormat fixedDateFormat;
// below fields are only used in ThreadLocal caching mode
@@ -117,7 +109,6 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
}
private static final class UnixFormatter extends Formatter {
- private static final long serialVersionUID = 1L;
@Override
String format(final long timeMillis) {
@@ -131,7 +122,6 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
}
private static final class UnixMillisFormatter extends Formatter {
- private static final long serialVersionUID = 1L;
@Override
String format(final long timeMillis) {
@@ -144,9 +134,7 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
}
}
- private final class CachedTime implements Serializable {
- private static final long serialVersionUID = 1L;
-
+ private final class CachedTime {
public long timestampMillis;
public String formatted;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java
index 86c14f7..b437309 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EncodingPatternConverter.java
@@ -29,7 +29,6 @@ import org.apache.logging.log4j.core.layout.PatternLayout;
@Plugin(name = "encode", category = PatternConverter.CATEGORY)
@ConverterKeys({ "enc", "encode" })
public final class EncodingPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
private final List<PatternFormatter> formatters;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsIgnoreCaseReplacementConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsIgnoreCaseReplacementConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsIgnoreCaseReplacementConverter.java
index 4cb319c..1265108 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsIgnoreCaseReplacementConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsIgnoreCaseReplacementConverter.java
@@ -29,7 +29,6 @@ import org.apache.logging.log4j.core.layout.PatternLayout;
@Plugin(name = "equalsIgnoreCase", category = PatternConverter.CATEGORY)
@ConverterKeys({ "equalsIgnoreCase" })
public final class EqualsIgnoreCaseReplacementConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Gets an instance of the class.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverter.java
index 7b53a4f..2534b5d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverter.java
@@ -29,7 +29,6 @@ import org.apache.logging.log4j.core.layout.PatternLayout;
@Plugin(name = "equals", category = PatternConverter.CATEGORY)
@ConverterKeys({ "equals" })
public final class EqualsReplacementConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Gets an instance of the class.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
index ba70796..6ed8c22 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
@@ -33,7 +33,6 @@ import org.apache.logging.log4j.core.util.Constants;
@Plugin(name = "ExtendedThrowablePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "xEx", "xThrowable", "xException" })
public final class ExtendedThrowablePatternConverter extends ThrowablePatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Private constructor.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileDatePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileDatePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileDatePatternConverter.java
index 1f6a083..7a83d78 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileDatePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileDatePatternConverter.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core.pattern;
-import java.io.Serializable;
-
import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
@@ -27,8 +25,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
*/
@Plugin(name = "FileDatePatternConverter", category = "FileConverter")
@ConverterKeys({ "d", "date" })
-public final class FileDatePatternConverter implements Serializable {
- private static final long serialVersionUID = 1L;
+public final class FileDatePatternConverter {
/**
* Private constructor.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
index 52d6e97..7fcd33d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FileLocationPatternConverter.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "FileLocationPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "F", "file" })
public final class FileLocationPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Singleton.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FormattingInfo.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FormattingInfo.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FormattingInfo.java
index d8d7bcc..18369db 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FormattingInfo.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FormattingInfo.java
@@ -17,14 +17,10 @@
package org.apache.logging.log4j.core.pattern;
-import java.io.Serializable;
-
/**
* Modifies the output of a pattern converter for a specified minimum and maximum width and alignment.
*/
-public final class FormattingInfo implements Serializable {
- private static final long serialVersionUID = 1L;
-
+public final class FormattingInfo {
/**
* Array of spaces.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
index ed436c2..120a671 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FullLocationPatternConverter.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "FullLocationPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "l", "location" })
public final class FullLocationPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Singleton.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
index e36eb3a..0e2f63d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
@@ -69,7 +69,6 @@ import org.apache.logging.log4j.util.Strings;
@Plugin(name = "highlight", category = PatternConverter.CATEGORY)
@ConverterKeys({ "highlight" })
public final class HighlightConverter extends LogEventPatternConverter implements AnsiConverter {
- private static final long serialVersionUID = 1L;
private static final Map<Level, String> DEFAULT_STYLES = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
index 0e27896..5380d45 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
@@ -27,7 +27,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "IntegerPatternConverter", category = "FileConverter")
@ConverterKeys({ "i", "index" })
public final class IntegerPatternConverter extends AbstractPatternConverter implements ArrayPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Singleton.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
index 932e37a..c044afd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
@@ -31,7 +31,6 @@ import org.apache.logging.log4j.core.util.Patterns;
@Plugin(name = "LevelPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "p", "level" })
public final class LevelPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
private static final String OPTION_LENGTH = "length";
private static final String OPTION_LOWER = "lowerCase";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
index 8b168dd..2b912d7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineLocationPatternConverter.java
@@ -25,7 +25,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "LineLocationPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "L", "line" })
public final class LineLocationPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Singleton.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
index 6cd26e8..6d41bf9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.util.Constants;
@Plugin(name = "LineSeparatorPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "n" })
public final class LineSeparatorPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Singleton.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java
index e8a5c80..0751bca 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LiteralPatternConverter.java
@@ -25,7 +25,6 @@ import org.apache.logging.log4j.core.util.OptionConverter;
* Formats a string literal.
*/
public final class LiteralPatternConverter extends LogEventPatternConverter implements ArrayPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* String literal.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LogEventPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LogEventPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LogEventPatternConverter.java
index 3494187..84cee32 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LogEventPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LogEventPatternConverter.java
@@ -23,7 +23,6 @@ import org.apache.logging.log4j.core.LogEvent;
* that can format information from instances of LoggingEvent.
*/
public abstract class LogEventPatternConverter extends AbstractPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Constructs an instance of LoggingEventPatternConverter.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
index 16c4f8d..2b5651b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LoggerPatternConverter.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "LoggerPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "c", "logger" })
public final class LoggerPatternConverter extends NamePatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Singleton.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
index 9cbb5cb..a91b8dd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java
@@ -33,7 +33,6 @@ import org.apache.logging.log4j.message.MapMessage;
@Plugin(name = "MapPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "K", "map", "MAP" })
public final class MapPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Name of property to output.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
index 6d091e6..af29f06 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerPatternConverter.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "MarkerPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "marker" })
public final class MarkerPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Private constructor.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerSimpleNamePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerSimpleNamePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerSimpleNamePatternConverter.java
index 3ed6144..525641c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerSimpleNamePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerSimpleNamePatternConverter.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "MarkerNamePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "markerSimpleName" })
public final class MarkerSimpleNamePatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Private constructor.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
index 2a13789..1663923 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
@@ -33,7 +33,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "MdcPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "X", "mdc", "MDC" })
public final class MdcPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Name of property to output.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
index 8650de0..fd389f4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
@@ -21,6 +21,7 @@ import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.MultiformatMessage;
+import org.apache.logging.log4j.message.ReusableMessage;
import org.apache.logging.log4j.util.StringBuilderFormattable;
/**
@@ -29,7 +30,6 @@ import org.apache.logging.log4j.util.StringBuilderFormattable;
@Plugin(name = "MessagePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "m", "msg", "message" })
public final class MessagePatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
private final String[] formats;
private final Configuration config;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
index 339193a..457b7a6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MethodLocationPatternConverter.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "MethodLocationPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "M", "method" })
public final class MethodLocationPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Singleton.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java
index 8411e74..e145f81 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.pattern;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -24,8 +23,7 @@ import java.util.List;
/**
* NameAbbreviator generates abbreviated logger and class names.
*/
-public abstract class NameAbbreviator implements Serializable {
- private static final long serialVersionUID = 1L;
+public abstract class NameAbbreviator {
/**
* Default (no abbreviation) abbreviator.
*/
@@ -138,7 +136,6 @@ public abstract class NameAbbreviator implements Serializable {
* Abbreviator that simply appends full name to buffer.
*/
private static class NOPAbbreviator extends NameAbbreviator {
- private static final long serialVersionUID = 1L;
/**
* Constructor.
*/
@@ -158,7 +155,6 @@ public abstract class NameAbbreviator implements Serializable {
* Abbreviator that drops starting path elements.
*/
private static class MaxElementAbbreviator extends NameAbbreviator {
- private static final long serialVersionUID = 1L;
/**
* Maximum number of path elements to output.
*/
@@ -201,8 +197,7 @@ public abstract class NameAbbreviator implements Serializable {
/**
* Fragment of an pattern abbreviator.
*/
- private static class PatternAbbreviatorFragment implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static class PatternAbbreviatorFragment {
/**
* Count of initial characters of element to output.
*/
@@ -259,7 +254,6 @@ public abstract class NameAbbreviator implements Serializable {
* Pattern abbreviator.
*/
private static class PatternAbbreviator extends NameAbbreviator {
- private static final long serialVersionUID = 1L;
/**
* Element abbreviation patterns.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NamePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NamePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NamePatternConverter.java
index 3f31094..b35c787 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NamePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NamePatternConverter.java
@@ -21,7 +21,6 @@ package org.apache.logging.log4j.core.pattern;
* Abstract base class for other pattern converters which can return only parts of their name.
*/
public abstract class NamePatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Abbreviator.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NanoTimePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NanoTimePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NanoTimePatternConverter.java
index 146649c..3d11447 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NanoTimePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NanoTimePatternConverter.java
@@ -25,7 +25,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "NanoTimePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "N", "nano" })
public final class NanoTimePatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Private constructor.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NdcPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NdcPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NdcPatternConverter.java
index 4e1da54..916f107 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NdcPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NdcPatternConverter.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "NdcPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({"x", "NDC"})
public final class NdcPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Singleton.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java
index fe90d0f..4bde1e2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java
@@ -16,17 +16,13 @@
*/
package org.apache.logging.log4j.core.pattern;
-import java.io.Serializable;
-
import org.apache.logging.log4j.core.LogEvent;
/**
*
*/
-public class PatternFormatter implements Serializable {
- private static final long serialVersionUID = 1L;
-
+public class PatternFormatter {
private final LogEventPatternConverter converter;
private final FormattingInfo field;
private final boolean skipFormattingInfo;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
index 8a5e7b6..f7c4697 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverter.java
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.core.layout.PatternLayout;
@Plugin(name = "replace", category = PatternConverter.CATEGORY)
@ConverterKeys({ "replace" })
public final class RegexReplacementConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
private final Pattern pattern;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
index bd1eec5..9767be1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
@@ -27,7 +27,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "RelativeTimePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "r", "relative" })
public class RelativeTimePatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Cached formatted timestamp.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
index 699df53..e3e7d33 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
@@ -33,7 +33,6 @@ import org.apache.logging.log4j.core.util.Constants;
@Plugin(name = "RootThrowablePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "rEx", "rThrowable", "rException" })
public final class RootThrowablePatternConverter extends ThrowablePatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Private constructor.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java
index 8f162e4..9e14c78 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java
@@ -28,7 +28,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "SequenceNumberPatternConverter", category = "Converter")
@ConverterKeys({ "sn", "sequenceNumber" })
public final class SequenceNumberPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
private static final AtomicLong SEQUENCE = new AtomicLong();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
index 4cadbc6..202d771 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
@@ -31,7 +31,6 @@ import org.apache.logging.log4j.core.util.Patterns;
@Plugin(name = "style", category = PatternConverter.CATEGORY)
@ConverterKeys({ "style" })
public final class StyleConverter extends LogEventPatternConverter implements AnsiConverter {
- private static final long serialVersionUID = 1L;
private final List<PatternFormatter> patternFormatters;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
index 6d771c2..c763e51 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
@@ -25,7 +25,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
@Plugin(name = "ThreadPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "t", "thread" })
public final class ThreadPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
/**
* Singleton.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
index cad5739..a651ae6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
@@ -34,7 +34,6 @@ import org.apache.logging.log4j.util.Strings;
@Plugin(name = "ThrowablePatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "ex", "throwable", "exception" })
public class ThrowablePatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
private String rawOption;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UuidPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UuidPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UuidPatternConverter.java
index 4483765..439935b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UuidPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UuidPatternConverter.java
@@ -28,7 +28,6 @@ import org.apache.logging.log4j.core.util.UuidUtil;
@Plugin(name = "UuidPatternConverter", category = PatternConverter.CATEGORY)
@ConverterKeys({ "u", "uuid" })
public final class UuidPatternConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
private final boolean isRandom;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverter.java
index a64bdb4..9a58f79 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverter.java
@@ -29,7 +29,6 @@ import org.apache.logging.log4j.core.layout.PatternLayout;
@Plugin(name = "notEmpty", category = PatternConverter.CATEGORY)
@ConverterKeys({ "notEmpty", "varsNotEmpty", "variablesNotEmpty", })
public final class VariablesNotEmptyReplacementConverter extends LogEventPatternConverter {
- private static final long serialVersionUID = 1L;
private final List<PatternFormatter> formatters;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/67069c10/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
index ddf34bd..631d334 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.util.datetime;
-import java.io.Serializable;
import java.util.Calendar;
import java.util.Objects;
@@ -28,9 +27,7 @@ import java.util.Objects;
* Related benchmarks: /log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TimeFormatBenchmark.java and
* /log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
*/
-public class FixedDateFormat implements Serializable {
- private static final long serialVersionUID = 1L;
-
+public class FixedDateFormat {
/**
* Enumeration over the supported date/time format patterns.
* <p>
[09/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Use
transient fields in AsyncAppender."
Posted by ma...@apache.org.
Revert "[LOG4J2-1300] Use transient fields in AsyncAppender."
This reverts commit bc2bdabd84e7d994f1d377d385d60cd070d09569.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/391e9fd4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/391e9fd4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/391e9fd4
Branch: refs/heads/master
Commit: 391e9fd40b878424a85167f9e9666bbd16e14812
Parents: ecaed16
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:08:39 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/appender/AsyncAppender.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/391e9fd4/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
index 7f31ffa..f9f25b3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
@@ -69,8 +69,8 @@ public final class AsyncAppender extends AbstractAppender {
private final String errorRef;
private final boolean includeLocation;
private AppenderControl errorAppender;
- private transient AsyncThread thread;
- private transient AsyncEventRouter asyncEventRouter;
+ private AsyncThread thread;
+ private AsyncEventRouter asyncEventRouter;
private AsyncAppender(final String name, final Filter filter, final AppenderRef[] appenderRefs,
final String errorRef, final int queueSize, final boolean blocking, final boolean ignoreExceptions,
[06/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Add missing
serialVersionUID."
Posted by ma...@apache.org.
Revert "[LOG4J2-1300] Add missing serialVersionUID."
This reverts commit c575c0094b180c4420c7c8ff2357ef855ea385af.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/36b5da2d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/36b5da2d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/36b5da2d
Branch: refs/heads/master
Commit: 36b5da2dd24b748c97ed60c5c8e41e5bdf8faf66
Parents: adbf455
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:07:10 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../logging/log4j/core/lookup/EnvironmentLookup.java | 1 -
.../org/apache/logging/log4j/core/lookup/JavaLookup.java | 1 -
.../org/apache/logging/log4j/core/lookup/JndiLookup.java | 1 -
.../org/apache/logging/log4j/core/lookup/Log4jLookup.java | 1 -
.../apache/logging/log4j/core/lookup/MarkerLookup.java | 1 -
.../logging/log4j/core/lookup/ResourceBundleLookup.java | 1 -
.../logging/log4j/core/lookup/SystemPropertiesLookup.java | 1 -
.../org/apache/logging/log4j/lookup/CustomLookup.java | 10 +++++-----
.../org/apache/logging/log4j/lookup/MapMessageLookup.java | 9 ++++-----
.../main/java/org/apache/logging/log4j/web/WebLookup.java | 1 -
10 files changed, 9 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36b5da2d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java
index acfb3c5..1d3b811 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java
@@ -24,7 +24,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
*/
@Plugin(name = "env", category = StrLookup.CATEGORY)
public class EnvironmentLookup extends AbstractLookup {
- private static final long serialVersionUID = 1L;
/**
* Looks up the value of the environment variable.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36b5da2d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JavaLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JavaLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JavaLookup.java
index fd75af8..08e3885 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JavaLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JavaLookup.java
@@ -27,7 +27,6 @@ import org.apache.logging.log4j.util.Strings;
*/
@Plugin(name = "java", category = StrLookup.CATEGORY)
public class JavaLookup extends AbstractLookup {
- private static final long serialVersionUID = 1L;
private final SystemPropertiesLookup spLookup = new SystemPropertiesLookup();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36b5da2d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
index de88a30..d7d50cb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
@@ -31,7 +31,6 @@ import org.apache.logging.log4j.status.StatusLogger;
*/
@Plugin(name = "jndi", category = StrLookup.CATEGORY)
public class JndiLookup extends AbstractLookup {
- private static final long serialVersionUID = 1L;
private static final Logger LOGGER = StatusLogger.getLogger();
private static final Marker LOOKUP = MarkerManager.getMarker("LOOKUP");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36b5da2d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Log4jLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Log4jLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Log4jLookup.java
index 9a8a9cb..4061900 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Log4jLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Log4jLookup.java
@@ -33,7 +33,6 @@ import org.apache.logging.log4j.status.StatusLogger;
*/
@Plugin(name = "log4j", category = StrLookup.CATEGORY)
public class Log4jLookup extends AbstractLookup {
- private static final long serialVersionUID = 1L;
public final static String KEY_CONFIG_LOCATION = "configLocation";
public final static String KEY_CONFIG_PARENT_LOCATION = "configParentLocation";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36b5da2d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
index 834d66a..320db49 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
@@ -29,7 +29,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
*/
@Plugin(name = "marker", category = StrLookup.CATEGORY)
public class MarkerLookup extends AbstractLookup {
- private static final long serialVersionUID = 1L;
static final String MARKER = "marker";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36b5da2d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java
index 046090a..83187c2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java
@@ -31,7 +31,6 @@ import org.apache.logging.log4j.status.StatusLogger;
*/
@Plugin(name = "bundle", category = StrLookup.CATEGORY)
public class ResourceBundleLookup extends AbstractLookup {
- private static final long serialVersionUID = 1L;
private static final Logger LOGGER = StatusLogger.getLogger();
private static final Marker LOOKUP = MarkerManager.getMarker("LOOKUP");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36b5da2d/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java
index 5d687cd..d2fb530 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java
@@ -28,7 +28,6 @@ import org.apache.logging.log4j.status.StatusLogger;
*/
@Plugin(name = "sys", category = StrLookup.CATEGORY)
public class SystemPropertiesLookup extends AbstractLookup {
- private static final long serialVersionUID = 1L;
private static final Logger LOGGER = StatusLogger.getLogger();
private static final Marker LOOKUP = MarkerManager.getMarker("LOOKUP");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36b5da2d/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java
----------------------------------------------------------------------
diff --git a/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java b/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java
index ae3ba43..471d2ba 100644
--- a/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java
+++ b/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java
@@ -16,10 +16,6 @@
*/
package org.apache.logging.log4j.lookup;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
@@ -29,13 +25,17 @@ import org.apache.logging.log4j.core.lookup.AbstractLookup;
import org.apache.logging.log4j.core.lookup.StrLookup;
import org.apache.logging.log4j.status.StatusLogger;
+import java.lang.Override;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
/**
*
*/
@Plugin(name = "custom", category = StrLookup.CATEGORY)
public class CustomLookup extends AbstractLookup {
- private static final long serialVersionUID = 1L;
private static final Logger LOGGER = StatusLogger.getLogger();
private static final Marker LOOKUP = MarkerManager.getMarker("LOOKUP");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36b5da2d/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java
----------------------------------------------------------------------
diff --git a/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java b/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java
index 868c440..1ed1868 100644
--- a/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java
+++ b/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java
@@ -16,10 +16,6 @@
*/
package org.apache.logging.log4j.lookup;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
@@ -31,13 +27,16 @@ import org.apache.logging.log4j.message.MapMessage;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.status.StatusLogger;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
/**
*
*/
@Plugin(name = "mapMessage", category = StrLookup.CATEGORY)
public class MapMessageLookup extends AbstractLookup {
- private static final long serialVersionUID = 1L;
private static final Logger LOGGER = StatusLogger.getLogger();
private static final Marker LOOKUP = MarkerManager.getMarker("LOOKUP");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/36b5da2d/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
----------------------------------------------------------------------
diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
index d8ec355..072f6c9 100644
--- a/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
+++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/WebLookup.java
@@ -27,7 +27,6 @@ import org.apache.logging.log4j.util.Strings;
@Plugin(name = "web", category = "Lookup")
public class WebLookup extends AbstractLookup {
- private static final long serialVersionUID = 1L;
private static final String ATTR_PREFIX = "attr.";
private static final String INIT_PARAM_PREFIX = "initParam.";
[12/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make other
pattern classes serializable."
Posted by ma...@apache.org.
Revert "[LOG4J2-1300] Make other pattern classes serializable."
This reverts commit 7a5f4e33f30d041c298475fb2fbd044ddba027c8.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7c4b2c50
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7c4b2c50
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7c4b2c50
Branch: refs/heads/master
Commit: 7c4b2c50b1a4abe3f9b6838ea5cf395e7012184c
Parents: 0c00057
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:09:47 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/pattern/PatternParser.java | 4 +---
.../org/apache/logging/log4j/core/pattern/RegexReplacement.java | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c4b2c50/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
index e18175b..4adb90a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.pattern;
-import java.io.Serializable;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -41,8 +40,7 @@ import org.apache.logging.log4j.util.Strings;
* It is this class that parses conversion patterns and creates a chained list of {@link PatternConverter
* PatternConverters}.
*/
-public final class PatternParser implements Serializable {
- private static final long serialVersionUID = 1L;
+public final class PatternParser {
static final String NO_CONSOLE_NO_ANSI = "noConsoleNoAnsi";
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c4b2c50/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
index b0831ea..3ffc63c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.pattern;
-import java.io.Serializable;
import java.util.regex.Pattern;
import org.apache.logging.log4j.Logger;
@@ -29,8 +28,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* Replace tokens in the LogEvent message.
*/
@Plugin(name = "replace", category = "Core", printObject = true)
-public final class RegexReplacement implements Serializable {
- private static final long serialVersionUID = 1L;
+public final class RegexReplacement {
private static final Logger LOGGER = StatusLogger.getLogger();
[04/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make
appender managers and dependencies serializable."
Posted by ma...@apache.org.
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);
}
[10/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make
Advertiser implementations Serializable."
Posted by ma...@apache.org.
Revert "[LOG4J2-1300] Make Advertiser implementations Serializable."
This reverts commit ce7d5d230c98a815d1173ae63e19a6a064c4cafc.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0c00057a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0c00057a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0c00057a
Branch: refs/heads/master
Commit: 0c00057a13091062df12d6c965ad1801eef3a45c
Parents: ea85196
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:09:29 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../apache/logging/log4j/core/net/MulticastDnsAdvertiser.java | 4 +---
.../org/apache/logging/log4j/core/config/InMemoryAdvertiser.java | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c00057a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
index 40d1956..479d25f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.net;
-import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -37,8 +36,7 @@ import org.apache.logging.log4j.status.StatusLogger;
*
*/
@Plugin(name = "multicastdns", category = "Core", elementType = "advertiser", printObject = false)
-public class MulticastDnsAdvertiser implements Advertiser, Serializable {
- private static final long serialVersionUID = 1L;
+public class MulticastDnsAdvertiser implements Advertiser {
/**
* Status logger.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c00057a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
index 892c87c..81d9676 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.config;
-import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@@ -24,8 +23,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.net.Advertiser;
@Plugin(name = "memory", category = "Core", elementType = "advertiser", printObject = false)
-public class InMemoryAdvertiser implements Advertiser, Serializable {
- private static final long serialVersionUID = 1L;
+public class InMemoryAdvertiser implements Advertiser {
private static Map<Object, Map<String, String>> properties = new HashMap<>();
public static Map<Object, Map<String, String>> getAdvertisedEntries()
[03/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make
appender managers and dependencies serializable."
Posted by ma...@apache.org.
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();