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/08 17:09:59 UTC
[1/2] logging-log4j2 git commit: Simplify test appender factories.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 3853df6ca -> 62f42bfd4
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/master
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
[2/2] logging-log4j2 git commit: Remove unused serialVersionUID.
Posted by ma...@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/master
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) {