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 16:38:11 UTC
[2/3] logging-log4j2 git commit: LOG4J2-1300 - Remove serializability
from classes that don't need it
LOG4J2-1300 - Remove serializability from classes that don't need it
Removed serialVersionUID and Serializable from remaining classes.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ac3e721f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ac3e721f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ac3e721f
Branch: refs/heads/master
Commit: ac3e721f59fd75cb44bc96bafe26f35320c6f958
Parents: 88f04e3
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 1 09:37:02 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 1 09:37:02 2016 -0600
----------------------------------------------------------------------
.../logging/log4j/core/LoggerContext.java | 1 -
.../core/appender/db/jdbc/JdbcAppender.java | 1 -
.../log4j/core/appender/db/jpa/JpaAppender.java | 1 -
.../log4j/core/appender/mom/JmsAppender.java | 1 -
.../appender/mom/jeromq/JeroMqAppender.java | 2 --
.../core/appender/mom/kafka/KafkaAppender.java | 10 +++------
.../core/appender/rewrite/RewriteAppender.java | 2 --
.../core/appender/routing/IdlePurgePolicy.java | 1 -
.../core/appender/routing/RoutingAppender.java | 1 -
.../log4j/core/config/DefaultAdvertiser.java | 5 +----
.../core/config/json/JsonConfiguration.java | 21 +++++++++----------
.../properties/PropertiesConfiguration.java | 6 ++----
.../log4j/core/config/xml/XmlConfiguration.java | 2 --
.../core/config/yaml/YamlConfiguration.java | 2 --
.../util/DefaultShutdownCallbackRegistry.java | 4 +---
.../logging/log4j/core/util/KeyValuePair.java | 22 ++------------------
.../logging/log4j/core/util/WatchManager.java | 11 +++++-----
.../log4j/web/Log4jWebInitializerImpl.java | 2 --
.../log4j/web/appender/ServletAppender.java | 2 --
19 files changed, 24 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/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 4b80054..cb78fe4 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
@@ -62,7 +62,6 @@ public class LoggerContext extends AbstractLifeCycle implements org.apache.loggi
*/
public static final String PROPERTY_CONFIG = "config";
- private static final long serialVersionUID = 1L;
private static final Configuration NULL_CONFIGURATION = new NullConfiguration();
private final ConcurrentMap<String, Logger> loggers = new ConcurrentHashMap<>();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
index 584e30f..0359117 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
@@ -36,7 +36,6 @@ import org.apache.logging.log4j.core.util.Booleans;
*/
@Plugin(name = "JDBC", category = "Core", elementType = "appender", printObject = true)
public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseManager> {
- private static final long serialVersionUID = 1L;
private final String description;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java
index 1f4a92b..bfbdca6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java
@@ -39,7 +39,6 @@ import org.apache.logging.log4j.util.Strings;
*/
@Plugin(name = "JPA", category = "Core", elementType = "appender", printObject = true)
public final class JpaAppender extends AbstractDatabaseAppender<JpaDatabaseManager> {
- private static final long serialVersionUID = 1L;
private final String description;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
index c714ef8..e454373 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
@@ -44,7 +44,6 @@ import org.apache.logging.log4j.core.net.JndiManager;
@PluginAliases({"JMSQueue", "JMSTopic"})
public class JmsAppender extends AbstractAppender {
- private static final long serialVersionUID = 1L;
private final JmsManager manager;
private final MessageProducer producer;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
index 49345c7..974477b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
@@ -80,8 +80,6 @@ public final class JeroMqAppender extends AbstractAppender {
// ZMQ sockets are not thread safe.
private static ZMQ.Socket publisher;
- private static final long serialVersionUID = 1L;
-
private static final String SIMPLE_NAME = JeroMqAppender.class.getSimpleName();
static {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
index 143ff33..ea6484e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
@@ -17,6 +17,9 @@
package org.apache.logging.log4j.core.appender.mom.kafka;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
@@ -31,19 +34,12 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi
import org.apache.logging.log4j.core.layout.SerializedLayout;
import org.apache.logging.log4j.core.util.StringEncoder;
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-
/**
* Sends log events to an Apache Kafka topic.
*/
@Plugin(name = "Kafka", category = "Core", elementType = "appender", printObject = true)
public final class KafkaAppender extends AbstractAppender {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
@PluginFactory
public static KafkaAppender createAppender(
@PluginElement("Layout") final Layout<? extends Serializable> layout,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
index fe876e6..446fe04 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
@@ -38,8 +38,6 @@ import org.apache.logging.log4j.core.util.Booleans;
*/
@Plugin(name = "Rewrite", category = "Core", elementType = "appender", printObject = true)
public final class RewriteAppender extends AbstractAppender {
-
- private static final long serialVersionUID = 1L;
private final Configuration config;
private final ConcurrentMap<String, AppenderControl> appenders = new ConcurrentHashMap<>();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
index fe62783..953f1bc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
@@ -42,7 +42,6 @@ import org.apache.logging.log4j.status.StatusLogger;
public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, Runnable {
private static final Logger LOGGER = StatusLogger.getLogger();
- private static final long serialVersionUID = 7481062062560624564L;
private final long timeToLive;
private final ConcurrentMap<String, Long> appendersUsage = new ConcurrentHashMap<>();
private RoutingAppender routingAppender;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
index a3fdcba..a6b5df0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
@@ -46,7 +46,6 @@ import org.apache.logging.log4j.core.util.Booleans;
*/
@Plugin(name = "Routing", category = "Core", elementType = "appender", printObject = true)
public final class RoutingAppender extends AbstractAppender {
- private static final long serialVersionUID = 1L;
private static final String DEFAULT_KEY = "ROUTING_APPENDER_DEFAULT";
private final Routes routes;
private final Route defaultRoute;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java
index 914777a..cc0e1bc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultAdvertiser.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.config;
-import java.io.Serializable;
import java.util.Map;
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -26,9 +25,7 @@ import org.apache.logging.log4j.core.net.Advertiser;
* The default advertiser does not do anything.
*/
@Plugin(name = "default", category = Node.CATEGORY, elementType = "advertiser", printObject = false)
-public class DefaultAdvertiser implements Advertiser, Serializable {
-
- private static final long serialVersionUID = 1L;
+public class DefaultAdvertiser implements Advertiser {
/**
* Does nothing.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
index e4bf0f0..fcde1d5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
@@ -16,6 +16,16 @@
*/
package org.apache.logging.log4j.core.config.json;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -32,22 +42,11 @@ import org.apache.logging.log4j.core.config.status.StatusConfiguration;
import org.apache.logging.log4j.core.util.FileWatcher;
import org.apache.logging.log4j.core.util.Patterns;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
* Creates a Node hierarchy from a JSON file.
*/
public class JsonConfiguration extends AbstractConfiguration implements Reconfigurable {
- private static final long serialVersionUID = 1L;
private static final String[] VERBOSE_CLASSES = new String[] { ResolverUtil.class.getName() };
private final List<Status> status = new ArrayList<>();
private JsonNode root;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
index 19dbbf3..8a8e9fa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
@@ -16,22 +16,20 @@
*/
package org.apache.logging.log4j.core.config.properties;
+import java.io.IOException;
+
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationSource;
import org.apache.logging.log4j.core.config.Reconfigurable;
import org.apache.logging.log4j.core.config.builder.api.Component;
import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
-import java.io.IOException;
-
/**
* Configuration created from a properties file.
* @since 2.4
*/
public class PropertiesConfiguration extends BuiltConfiguration implements Reconfigurable {
- private static final long serialVersionUID = 5198216024278070407L;
-
public PropertiesConfiguration(ConfigurationSource source, Component root) {
super(source, root);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
index 1db5392..4369b89 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
@@ -63,8 +63,6 @@ import org.xml.sax.SAXException;
*/
public class XmlConfiguration extends AbstractConfiguration implements Reconfigurable {
- private static final long serialVersionUID = 1L;
-
private static final String XINCLUDE_FIXUP_LANGUAGE =
"http://apache.org/xml/features/xinclude/fixup-language";
private static final String XINCLUDE_FIXUP_BASE_URIS =
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java
index b8d529d..6350a48 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java
@@ -28,8 +28,6 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
public class YamlConfiguration extends JsonConfiguration {
- private static final long serialVersionUID = 1L;
-
public YamlConfiguration(final ConfigurationSource configSource) {
super(configSource);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DefaultShutdownCallbackRegistry.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DefaultShutdownCallbackRegistry.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DefaultShutdownCallbackRegistry.java
index 196f2c8..8d08ecb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DefaultShutdownCallbackRegistry.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DefaultShutdownCallbackRegistry.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.util;
-import java.io.Serializable;
import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
import java.lang.ref.WeakReference;
@@ -37,10 +36,9 @@ import org.apache.logging.log4j.status.StatusLogger;
*
* @since 2.1
*/
-public class DefaultShutdownCallbackRegistry implements ShutdownCallbackRegistry, LifeCycle, Runnable, Serializable {
+public class DefaultShutdownCallbackRegistry implements ShutdownCallbackRegistry, LifeCycle, Runnable {
/** Status logger. */
protected static final Logger LOGGER = StatusLogger.getLogger();
- private static final long serialVersionUID = 1L;
private final AtomicReference<State> state = new AtomicReference<>(State.INITIALIZED);
private final ThreadFactory threadFactory;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java
index 7375be6..b6086c5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/KeyValuePair.java
@@ -17,9 +17,6 @@
package org.apache.logging.log4j.core.util;
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamException;
import java.io.Serializable;
import org.apache.logging.log4j.core.config.Node;
@@ -34,9 +31,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
* @since 2.1 implements {@link #hashCode()} and {@link #equals(Object)}
*/
@Plugin(name = "KeyValuePair", category = Node.CATEGORY, printObject = true)
-public final class KeyValuePair implements Serializable {
-
- private static final long serialVersionUID = 4331228262821046866L;
+public final class KeyValuePair {
private final String key;
private final String value;
@@ -77,17 +72,7 @@ public final class KeyValuePair implements Serializable {
return new Builder();
}
- protected Object writeReplace() throws ObjectStreamException {
- return newBuilder().setKey(this.key).setValue(this.value);
- }
-
- private void readObject(final ObjectInputStream stream) throws InvalidObjectException {
- throw new InvalidObjectException("Builder proxy required");
- }
-
- public static class Builder implements org.apache.logging.log4j.core.util.Builder<KeyValuePair>, Serializable {
-
- private static final long serialVersionUID = 1L;
+ public static class Builder implements org.apache.logging.log4j.core.util.Builder<KeyValuePair> {
@PluginBuilderAttribute
private String key;
@@ -110,9 +95,6 @@ public final class KeyValuePair implements Serializable {
return new KeyValuePair(key, value);
}
- protected Object readResolve() throws ObjectStreamException {
- return new KeyValuePair(key, value);
- }
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
index 12b07c3..db9fcfd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
@@ -16,11 +16,6 @@
*/
package org.apache.logging.log4j.core.util;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.AbstractLifeCycle;
-import org.apache.logging.log4j.core.config.ConfigurationScheduler;
-import org.apache.logging.log4j.status.StatusLogger;
-
import java.io.File;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -28,12 +23,16 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.AbstractLifeCycle;
+import org.apache.logging.log4j.core.config.ConfigurationScheduler;
+import org.apache.logging.log4j.status.StatusLogger;
+
/**
* Manages FileWatchers.
*/
public class WatchManager extends AbstractLifeCycle {
- private static final long serialVersionUID = 8998356999926962686L;
private static Logger logger = StatusLogger.getLogger();
private final ConcurrentMap<File, FileMonitor> watchers = new ConcurrentHashMap<>();
private int intervalSeconds = 0;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java
----------------------------------------------------------------------
diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java
index 17f4ece..2da549c 100644
--- a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java
+++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java
@@ -49,8 +49,6 @@ final class Log4jWebInitializerImpl extends AbstractLifeCycle implements Log4jWe
private static final String WEB_INF = "/WEB-INF/";
- private static final long serialVersionUID = 1L;
-
static {
if (Loader.isClassAvailable("org.apache.logging.log4j.core.web.JNDIContextFilter")) {
throw new IllegalStateException("You are using Log4j 2 in a web application with the old, extinct "
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ac3e721f/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java
----------------------------------------------------------------------
diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java
index c171250..606e45c 100644
--- a/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java
+++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java
@@ -38,8 +38,6 @@ import org.apache.logging.log4j.web.WebLoggerContextUtils;
@Plugin(name = "Servlet", category = "Core", elementType = "appender", printObject = true)
public class ServletAppender extends AbstractAppender {
- private static final long serialVersionUID = 1L;
-
private final ServletContext servletContext;
private ServletAppender(final String name, final AbstractStringLayout layout, final Filter filter,