You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/03/08 17:37:17 UTC

[1/8] logging-log4j2 git commit: Format nit.

Repository: logging-log4j2
Updated Branches:
  refs/heads/gelf-layout-gc-free 58152b79b -> 821e6201d


Format nit.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/19e6ecd2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/19e6ecd2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/19e6ecd2

Branch: refs/heads/gelf-layout-gc-free
Commit: 19e6ecd25b1ed9a70d20a3d66d4d332c4b7efdb0
Parents: f1e5063
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 8 09:16:03 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 8 09:16:03 2016 -0600

----------------------------------------------------------------------
 .../src/test/java/org/apache/logging/log4j/EventLoggerTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19e6ecd2/log4j-api/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/EventLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
index 903f5b0..181a344 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
@@ -40,7 +40,7 @@ public class EventLoggerTest {
         results.clear();
     }
 
-      @Test
+    @Test
     public void structuredData() {
         ThreadContext.put("loginId", "JohnDoe");
         ThreadContext.put("ipAddress", "192.168.0.120");

[6/8] logging-log4j2 git commit: Format nit.

Posted by mi...@apache.org.
Format nit.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bc5a8097
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bc5a8097
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bc5a8097

Branch: refs/heads/gelf-layout-gc-free
Commit: bc5a8097b2179a8023345d7099fa0dd99ecc77dc
Parents: 62f42bf
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 8 10:11:19 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 8 10:11:19 2016 -0600

----------------------------------------------------------------------
 .../org/apache/logging/log4j/test/appender/AlwaysFailAppender.java | 2 +-
 .../org/apache/logging/log4j/test/appender/DeadlockAppender.java   | 2 +-
 .../org/apache/logging/log4j/test/appender/FailOnceAppender.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bc5a8097/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
index dc9047b..6d5fb11 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi
 /**
  *
  */
-@Plugin(name="AlwaysFail", category ="Core",elementType="appender",printObject=true)
+@Plugin(name="AlwaysFail", category ="Core", elementType="appender", printObject=true)
 public class AlwaysFailAppender extends AbstractAppender {
 
     private AlwaysFailAppender(final String name) {

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bc5a8097/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
index 8383c50..7dd0c62 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi
 /**
  *
  */
-@Plugin(name="Deadlock", category ="Core",elementType="appender",printObject=true)
+@Plugin(name="Deadlock", category ="Core", elementType="appender", printObject=true)
 public class DeadlockAppender extends AbstractAppender {
 
     private WorkerThread thread = null;

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bc5a8097/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
index b2e8c2a..ebe1617 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi
 /**
  *
  */
-@Plugin(name="FailOnce", category ="Core",elementType="appender",printObject=true)
+@Plugin(name="FailOnce", category ="Core", elementType="appender", printObject=true)
 public class FailOnceAppender extends AbstractAppender {
 
     boolean fail = true;

[8/8] logging-log4j2 git commit: Merge branch 'master' into gelf-layout-gc-free

Posted by mi...@apache.org.
Merge branch 'master' into gelf-layout-gc-free


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/821e6201
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/821e6201
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/821e6201

Branch: refs/heads/gelf-layout-gc-free
Commit: 821e6201d98cec8a6a0bcaa19d09540e1ea4e80b
Parents: 58152b7 cc37ea6
Author: Mikael Ståldal <mi...@magine.com>
Authored: Tue Mar 8 17:37:08 2016 +0100
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Tue Mar 8 17:37:08 2016 +0100

----------------------------------------------------------------------
 .../apache/logging/log4j/EventLoggerTest.java   |  2 +-
 .../apache/logging/log4j/LambdaLoggerTest.java  |  3 +--
 .../core/pattern/DatePatternConverterTest.java  |  2 +-
 .../apache/logging/log4j/junit/CleanFiles.java  |  2 +-
 .../log4j/test/appender/AlwaysFailAppender.java | 11 ++++------
 .../log4j/test/appender/DeadlockAppender.java   | 13 ++++--------
 .../log4j/test/appender/FailOnceAppender.java   | 13 ++++--------
 .../log4j/test/appender/InMemoryAppender.java   |  2 --
 .../log4j/test/appender/ListAppender.java       |  6 +-----
 .../test/appender/UsesLoggingAppender.java      | 22 +++++++-------------
 10 files changed, 24 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/821e6201/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
----------------------------------------------------------------------
diff --cc log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
index cd9ec82,125f3d8..97ca15d
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
@@@ -44,11 -41,9 +44,9 @@@ import org.apache.logging.log4j.core.la
  @Plugin(name = "List", category = "Core", elementType = "appender", printObject = true)
  public class ListAppender extends AbstractAppender {
  
-     private static final long serialVersionUID = 1L;
- 
      // Use CopyOnWriteArrayList?
  
 -    private final List<LogEvent> events = new ArrayList<>();
 +    final List<LogEvent> events = new ArrayList<>();
  
      private final List<String> messages = new ArrayList<>();

[4/8] logging-log4j2 git commit: Simplify test appender factories.

Posted by mi...@apache.org.
Simplify test appender factories.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/980345c5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/980345c5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/980345c5

Branch: refs/heads/gelf-layout-gc-free
Commit: 980345c5f0043b59d1e7c46074d69cb99ddcdb6d
Parents: 3853df6
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 8 10:09:00 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 8 10:09:00 2016 -0600

----------------------------------------------------------------------
 .../log4j/test/appender/AlwaysFailAppender.java |  9 +++------
 .../log4j/test/appender/DeadlockAppender.java   |  9 +++------
 .../log4j/test/appender/FailOnceAppender.java   |  9 +++------
 .../log4j/test/appender/ListAppender.java       |  4 +---
 .../test/appender/UsesLoggingAppender.java      | 20 +++++++-------------
 5 files changed, 17 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/980345c5/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
index c2b51e3..dc9047b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
@@ -22,6 +22,7 @@ import org.apache.logging.log4j.core.appender.AbstractAppender;
 import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
 
 /**
  *
@@ -39,12 +40,8 @@ public class AlwaysFailAppender extends AbstractAppender {
     }
 
     @PluginFactory
-    public static AlwaysFailAppender createAppender(@PluginAttribute("name") final String name) {
-        if (name == null) {
-            LOGGER.error("A name for the Appender must be specified");
-            return null;
-        }
-
+    public static AlwaysFailAppender createAppender(
+        @PluginAttribute("name") @Required(message = "A name for the Appender must be specified") final String name) {
         return new AlwaysFailAppender(name);
     }
 

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/980345c5/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
index 59bd317..4869cfa 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
@@ -24,6 +24,7 @@ import org.apache.logging.log4j.core.appender.AbstractAppender;
 import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
 
 /**
  *
@@ -63,12 +64,8 @@ public class DeadlockAppender extends AbstractAppender {
     }
 
     @PluginFactory
-    public static DeadlockAppender createAppender(@PluginAttribute("name") final String name) {
-        if (name == null) {
-            LOGGER.error("A name for the Appender must be specified");
-            return null;
-        }
-
+    public static DeadlockAppender createAppender(
+        @PluginAttribute("name") @Required(message = "A name for the Appender must be specified") final String name) {
         return new DeadlockAppender(name);
     }
 

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/980345c5/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
index ee7ae44..e58007b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
@@ -25,6 +25,7 @@ import org.apache.logging.log4j.core.appender.AbstractAppender;
 import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
 
 /**
  *
@@ -58,12 +59,8 @@ public class FailOnceAppender extends AbstractAppender {
     }
 
     @PluginFactory
-    public static FailOnceAppender createAppender(@PluginAttribute("name") final String name) {
-        if (name == null) {
-            LOGGER.error("A name for the Appender must be specified");
-            return null;
-        }
-
+    public static FailOnceAppender createAppender(
+        @PluginAttribute("name") @Required(message = "A name for the Appender must be specified") final String name) {
         return new FailOnceAppender(name);
     }
 

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/980345c5/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
index 05fa157..7f38a44 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
@@ -163,9 +163,7 @@ public class ListAppender extends AbstractAppender {
 
     @PluginFactory
     public static ListAppender createAppender(
-            @PluginAttribute("name")
-            @Required(message = "No name provided for ListAppender")
-            final String name,
+            @PluginAttribute("name") @Required(message = "No name provided for ListAppender") final String name,
             @PluginAttribute("entryPerNewLine") final boolean newLine,
             @PluginAttribute("raw") final boolean raw,
             @PluginElement("Layout") final Layout<? extends Serializable> layout,

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/980345c5/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java
index 0cfb197..8628b7c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java
@@ -24,6 +24,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
 import org.apache.logging.log4j.core.config.plugins.PluginElement;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
 import org.apache.logging.log4j.test.SomethingThatUsesLogging;
 
 /**
@@ -42,19 +43,12 @@ public final class UsesLoggingAppender extends AbstractAppender {
     }
 
     @PluginFactory
-    public static UsesLoggingAppender createAppender(@PluginAttribute("name") final String name,
-                                            @PluginAttribute("ignoreExceptions") final String ignore,
-                                            @PluginElement("Layout") final Layout<?> layout,
-                                            @PluginElement("Filter") final Filter filter) {
-
-        final boolean ignoreExceptions = Boolean.parseBoolean(ignore);
-
-        if (name == null) {
-            LOGGER.error("No name provided for MyAppender");
-            return null;
-        }
-
-        return new UsesLoggingAppender(name, filter, layout, ignoreExceptions);
+    public static UsesLoggingAppender createAppender(
+        @PluginAttribute("name") @Required(message = "A name for the Appender must be specified") final String name,
+        @PluginAttribute("ignoreExceptions") final boolean ignore,
+        @PluginElement("Layout") final Layout<?> layout,
+        @PluginElement("Filter") final Filter filter) {
+        return new UsesLoggingAppender(name, filter, layout, ignore);
     }
 
     @Override

[5/8] logging-log4j2 git commit: Remove unused serialVersionUID.

Posted by mi...@apache.org.
Remove unused serialVersionUID.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/62f42bfd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/62f42bfd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/62f42bfd

Branch: refs/heads/gelf-layout-gc-free
Commit: 62f42bfd44718c709b12c0979f50357194b36d5a
Parents: 980345c
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 8 10:09:56 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 8 10:09:56 2016 -0600

----------------------------------------------------------------------
 .../org/apache/logging/log4j/test/appender/DeadlockAppender.java   | 2 --
 .../org/apache/logging/log4j/test/appender/FailOnceAppender.java   | 2 --
 .../org/apache/logging/log4j/test/appender/InMemoryAppender.java   | 2 --
 .../java/org/apache/logging/log4j/test/appender/ListAppender.java  | 2 --
 .../apache/logging/log4j/test/appender/UsesLoggingAppender.java    | 2 --
 5 files changed, 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/62f42bfd/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
index 4869cfa..8383c50 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/DeadlockAppender.java
@@ -32,8 +32,6 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi
 @Plugin(name="Deadlock", category ="Core",elementType="appender",printObject=true)
 public class DeadlockAppender extends AbstractAppender {
 
-    private static final long serialVersionUID = 1L;
-
     private WorkerThread thread = null;
 
     private DeadlockAppender(final String name) {

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/62f42bfd/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
index e58007b..b2e8c2a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
@@ -33,8 +33,6 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi
 @Plugin(name="FailOnce", category ="Core",elementType="appender",printObject=true)
 public class FailOnceAppender extends AbstractAppender {
 
-    private static final long serialVersionUID = 1L;
-
     boolean fail = true;
 
     private final List<LogEvent> events = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/62f42bfd/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 9b483a6..2d7ccaa 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
@@ -29,8 +29,6 @@ import org.apache.logging.log4j.core.filter.CompositeFilter;
  */
 public class InMemoryAppender extends AbstractOutputStreamAppender<InMemoryAppender.InMemoryManager> {
 
-    private static final long serialVersionUID = 1L;
-
     public InMemoryAppender(final String name, final Layout<? extends Serializable> layout, final CompositeFilter filters,
                             final boolean ignoreExceptions, final boolean writeHeader) {
         super(name, layout, filters, ignoreExceptions, true, new InMemoryManager(name, layout, writeHeader));

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/62f42bfd/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
index 7f38a44..125f3d8 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
@@ -41,8 +41,6 @@ import org.apache.logging.log4j.core.layout.SerializedLayout;
 @Plugin(name = "List", category = "Core", elementType = "appender", printObject = true)
 public class ListAppender extends AbstractAppender {
 
-    private static final long serialVersionUID = 1L;
-
     // Use CopyOnWriteArrayList?
 
     private final List<LogEvent> events = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/62f42bfd/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java
index 8628b7c..12b406b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java
@@ -33,8 +33,6 @@ import org.apache.logging.log4j.test.SomethingThatUsesLogging;
 @Plugin(name = "UsesLoggingAppender", category = "Core", elementType = "appender", printObject = true)
 public final class UsesLoggingAppender extends AbstractAppender {
 
-    private static final long serialVersionUID = 1L;
-
     private final SomethingThatUsesLogging thing;
 
     private UsesLoggingAppender(final String name, final Filter filter, final Layout<?> layout, final boolean ignoreExceptions) {

[3/8] logging-log4j2 git commit: Use Supplier instead of MessageSupplier.

Posted by mi...@apache.org.
Use Supplier<Message> instead of MessageSupplier.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3853df6c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3853df6c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3853df6c

Branch: refs/heads/gelf-layout-gc-free
Commit: 3853df6ca1b4ff66a7759416dc00039ef48fb497
Parents: 4cc2d12
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 8 10:03:34 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 8 10:03:34 2016 -0600

----------------------------------------------------------------------
 .../src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3853df6c/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
index a5d2c8a..9b4fcf1 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
@@ -23,7 +23,6 @@ import java.util.List;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.SimpleMessage;
 import org.apache.logging.log4j.spi.AbstractLogger;
-import org.apache.logging.log4j.util.MessageSupplier;
 import org.apache.logging.log4j.util.Supplier;
 import org.junit.Before;
 import org.junit.Test;
@@ -110,7 +109,7 @@ public class LambdaLoggerTest {
     final Throwable throwable = new Error("I'm Bad");
     final Marker marker = MarkerManager.getMarker("test");
 
-    private class MyMessageSupplier implements MessageSupplier {
+    private class MyMessageSupplier implements Supplier<Message> {
         public boolean invoked = false;
 
         @Override

[7/8] logging-log4j2 git commit: Use named constant instead of magic int.

Posted by mi...@apache.org.
Use named constant instead of magic int.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cc37ea67
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cc37ea67
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cc37ea67

Branch: refs/heads/gelf-layout-gc-free
Commit: cc37ea67085aeb6b15c474a66c7ebb62c8b1e2ec
Parents: bc5a809
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 8 10:24:14 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 8 10:24:14 2016 -0600

----------------------------------------------------------------------
 .../logging/log4j/core/pattern/DatePatternConverterTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cc37ea67/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
index 2b572b1..3455d30 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
@@ -154,7 +154,7 @@ public class DatePatternConverterTest {
         @Override
         public long getTimeMillis() {
             final Calendar cal = Calendar.getInstance();
-            cal.set(2011, 11, 30, 10, 56, 35);
+            cal.set(2011, Calendar.DECEMBER, 30, 10, 56, 35);
             cal.set(Calendar.MILLISECOND, 987);
             return cal.getTimeInMillis();
         }

[2/8] logging-log4j2 git commit: Better ivar name

Posted by mi...@apache.org.
Better ivar name


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4cc2d12f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4cc2d12f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4cc2d12f

Branch: refs/heads/gelf-layout-gc-free
Commit: 4cc2d12f39605b528ff202cbff380a0854376716
Parents: 19e6ecd
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 8 09:27:18 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 8 09:27:18 2016 -0600

----------------------------------------------------------------------
 .../src/test/java/org/apache/logging/log4j/junit/CleanFiles.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4cc2d12f/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
index 6713aea..6c0ac76 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
@@ -57,7 +57,7 @@ public class CleanFiles extends ExternalResource {
                 }
                 try {
                     Thread.sleep(200);
-                } catch (InterruptedException e) {
+                } catch (InterruptedException ignored) {
                 }
             }
         }