Repository: logging-log4j2 Updated Branches: refs/heads/master fd32b63f4 -> a1fb000e8
Simplify ListAppender plugin factory. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/939ef584 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/939ef584 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/939ef584 Branch: refs/heads/master Commit: 939ef584a029c2b053055a0f847ff8754d232b14 Parents: fd32b63 Author: Matt Sicker <[email protected]> Authored: Sun Sep 21 12:42:36 2014 -0500 Committer: Matt Sicker <[email protected]> Committed: Sun Sep 21 12:42:36 2014 -0500 ---------------------------------------------------------------------- .../log4j/test/appender/ListAppender.java | 22 +++++++------------- 1 file changed, 8 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/939ef584/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 0885aff..1e5fb94 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 @@ -31,6 +31,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.core.layout.SerializedLayout; /** @@ -44,7 +45,7 @@ public class ListAppender extends AbstractAppender { private static final long serialVersionUID = 1L; // Use CopyOnWriteArrayList? - + private final List<LogEvent> events = new ArrayList<LogEvent>(); private final List<String> messages = new ArrayList<String>(); @@ -163,21 +164,14 @@ public class ListAppender extends AbstractAppender { @PluginFactory public static ListAppender createAppender( - @PluginAttribute("name") final String name, - @PluginAttribute("entryPerNewLine") final String newLine, - @PluginAttribute("raw") final String raw, + @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, @PluginElement("Filter") final Filter filter) { - - if (name == null) { - LOGGER.error("No name provided for ListAppender"); - return null; - } - - final boolean nl = Boolean.parseBoolean(newLine); - final boolean r = Boolean.parseBoolean(raw); - - return new ListAppender(name, filter, layout, nl, r); + return new ListAppender(name, filter, layout, newLine, raw); } /**
