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:50 UTC
[05/12] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make remaing
StrLookups serializable."
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.