You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/11/12 00:27:44 UTC
logging-log4j2 git commit: Remove "defaultBoolean = false" from
Plugin annotations since that is already the default.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 0a592aa12 -> 264f5f412
Remove "defaultBoolean = false" from Plugin annotations since that is
already the default.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/264f5f41
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/264f5f41
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/264f5f41
Branch: refs/heads/master
Commit: 264f5f412917792bd8bd921523df68b871167185
Parents: 0a592aa
Author: Gary Gregory <gg...@apache.org>
Authored: Fri Nov 11 16:27:32 2016 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Fri Nov 11 16:27:32 2016 -0800
----------------------------------------------------------------------
.../apache/log4j/layout/Log4j1XmlLayout.java | 4 +-
.../log4j/core/appender/SyslogAppender.java | 4 +-
.../appender/mom/jeromq/JeroMqAppender.java | 370 +++++++++----------
.../appender/rolling/action/DeleteAction.java | 4 +-
.../logging/log4j/core/layout/HtmlLayout.java | 2 +-
.../logging/log4j/core/layout/JsonLayout.java | 12 +-
.../logging/log4j/core/layout/LoggerFields.java | 2 +-
.../log4j/core/layout/PatternLayout.java | 2 +-
.../log4j/core/layout/Rfc5424Layout.java | 4 +-
.../core/layout/ScriptPatternSelector.java | 2 +-
.../logging/log4j/core/layout/SyslogLayout.java | 2 +-
.../logging/log4j/core/layout/XmlLayout.java | 8 +-
.../logging/log4j/core/layout/YamlLayout.java | 4 +-
13 files changed, 210 insertions(+), 210 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
index 4bd3a15..2343c4e 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
@@ -46,8 +46,8 @@ public final class Log4j1XmlLayout extends AbstractStringLayout {
@PluginFactory
public static Log4j1XmlLayout createLayout(
// @formatter:off
- @PluginAttribute(value = "locationInfo", defaultBoolean = false) final boolean locationInfo,
- @PluginAttribute(value = "properties", defaultBoolean = false) final boolean properties
+ @PluginAttribute(value = "locationInfo") final boolean locationInfo,
+ @PluginAttribute(value = "properties") final boolean properties
// @formatter:on
) {
return new Log4j1XmlLayout(locationInfo, properties);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
index 5dca691..6d9f162 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
@@ -114,7 +114,7 @@ public class SyslogAppender extends SocketAppender {
@PluginAttribute("mdcId") final String mdcId,
@PluginAttribute("mdcPrefix") final String mdcPrefix,
@PluginAttribute("eventPrefix") final String eventPrefix,
- @PluginAttribute(value = "newLine", defaultBoolean = false) final boolean newLine,
+ @PluginAttribute(value = "newLine") final boolean newLine,
@PluginAttribute("newLineEscape") final String escapeNL,
@PluginAttribute("appName") final String appName,
@PluginAttribute("messageId") final String msgId,
@@ -127,7 +127,7 @@ public class SyslogAppender extends SocketAppender {
@PluginAttribute(value = "charset", defaultString = "UTF-8") final Charset charsetName,
@PluginAttribute("exceptionPattern") final String exceptionPattern,
@PluginElement("LoggerFields") final LoggerFields[] loggerFields,
- @PluginAttribute(value = "advertise", defaultBoolean = false) final boolean advertise) {
+ @PluginAttribute(value = "advertise") final boolean advertise) {
// @formatter:on
final Protocol protocol = EnglishEnums.valueOf(Protocol.class, protocolStr);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/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 96b2f57..aa78fad 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
@@ -1,185 +1,185 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-
-package org.apache.logging.log4j.core.appender.mom.jeromq;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.appender.AbstractAppender;
-import org.apache.logging.log4j.core.config.Node;
-import org.apache.logging.log4j.core.config.Property;
-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.PatternLayout;
-import org.apache.logging.log4j.util.Strings;
-
-/**
- * Sends log events to one or more ZeroMQ (JeroMQ) endpoints.
- * <p>
- * Requires the JeroMQ jar (LGPL as of 0.3.5)
- * </p>
- */
-// TODO
-// Some methods are synchronized because a ZMQ.Socket is not thread-safe
-// Using a ThreadLocal for the publisher hangs tests on shutdown. There must be
-// some issue on threads owning certain resources as opposed to others.
-@Plugin(name = "JeroMQ", category = Node.CATEGORY, elementType = Appender.ELEMENT_TYPE, printObject = true)
-public final class JeroMqAppender extends AbstractAppender {
-
- private static final int DEFAULT_BACKLOG = 100;
-
- private static final int DEFAULT_IVL = 100;
-
- private static final int DEFAULT_RCV_HWM = 1000;
-
- private static final int DEFAULT_SND_HWM = 1000;
-
- private final JeroMqManager manager;
- private final List<String> endpoints;
- private int sendRcFalse;
- private int sendRcTrue;
-
- private JeroMqAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
- final boolean ignoreExceptions, final List<String> endpoints, final long affinity, final long backlog,
- final boolean delayAttachOnConnect, final byte[] identity, final boolean ipv4Only, final long linger,
- final long maxMsgSize, final long rcvHwm, final long receiveBufferSize, final int receiveTimeOut,
- final long reconnectIVL, final long reconnectIVLMax, final long sendBufferSize, final int sendTimeOut,
- final long sndHWM, final int tcpKeepAlive, final long tcpKeepAliveCount, final long tcpKeepAliveIdle,
- final long tcpKeepAliveInterval, final boolean xpubVerbose) {
- super(name, filter, layout, ignoreExceptions);
- this.manager = JeroMqManager.getJeroMqManager(name, affinity, backlog, delayAttachOnConnect, identity, ipv4Only,
- linger, maxMsgSize, rcvHwm, receiveBufferSize, receiveTimeOut, reconnectIVL, reconnectIVLMax,
- sendBufferSize, sendTimeOut, sndHWM, tcpKeepAlive, tcpKeepAliveCount, tcpKeepAliveIdle,
- tcpKeepAliveInterval, xpubVerbose, endpoints);
- this.endpoints = endpoints;
- }
-
- // The ZMQ.Socket class has other set methods that we do not cover because
- // they throw unsupported operation exceptions.
- @PluginFactory
- public static JeroMqAppender createAppender(
- // @formatter:off
- @Required(message = "No name provided for JeroMqAppender") @PluginAttribute("name") final String name,
- @PluginElement("Layout") Layout<?> layout,
- @PluginElement("Filter") final Filter filter,
- @PluginElement("Properties") final Property[] properties,
- // Super attributes
- @PluginAttribute("ignoreExceptions") final boolean ignoreExceptions,
- // ZMQ attributes; defaults picked from zmq.Options.
- @PluginAttribute(value = "affinity", defaultLong = 0) final long affinity,
- @PluginAttribute(value = "backlog", defaultLong = DEFAULT_BACKLOG) final long backlog,
- @PluginAttribute(value = "delayAttachOnConnect", defaultBoolean = false) final boolean delayAttachOnConnect,
- @PluginAttribute(value = "identity") final byte[] identity,
- @PluginAttribute(value = "ipv4Only", defaultBoolean = true) final boolean ipv4Only,
- @PluginAttribute(value = "linger", defaultLong = -1) final long linger,
- @PluginAttribute(value = "maxMsgSize", defaultLong = -1) final long maxMsgSize,
- @PluginAttribute(value = "rcvHwm", defaultLong = DEFAULT_RCV_HWM) final long rcvHwm,
- @PluginAttribute(value = "receiveBufferSize", defaultLong = 0) final long receiveBufferSize,
- @PluginAttribute(value = "receiveTimeOut", defaultLong = -1) final int receiveTimeOut,
- @PluginAttribute(value = "reconnectIVL", defaultLong = DEFAULT_IVL) final long reconnectIVL,
- @PluginAttribute(value = "reconnectIVLMax", defaultLong = 0) final long reconnectIVLMax,
- @PluginAttribute(value = "sendBufferSize", defaultLong = 0) final long sendBufferSize,
- @PluginAttribute(value = "sendTimeOut", defaultLong = -1) final int sendTimeOut,
- @PluginAttribute(value = "sndHwm", defaultLong = DEFAULT_SND_HWM) final long sndHwm,
- @PluginAttribute(value = "tcpKeepAlive", defaultInt = -1) final int tcpKeepAlive,
- @PluginAttribute(value = "tcpKeepAliveCount", defaultLong = -1) final long tcpKeepAliveCount,
- @PluginAttribute(value = "tcpKeepAliveIdle", defaultLong = -1) final long tcpKeepAliveIdle,
- @PluginAttribute(value = "tcpKeepAliveInterval", defaultLong = -1) final long tcpKeepAliveInterval,
- @PluginAttribute(value = "xpubVerbose", defaultBoolean = false) final boolean xpubVerbose
- // @formatter:on
- ) {
- if (layout == null) {
- layout = PatternLayout.createDefaultLayout();
- }
- List<String> endpoints;
- if (properties == null) {
- endpoints = new ArrayList<>(0);
- } else {
- endpoints = new ArrayList<>(properties.length);
- for (final Property property : properties) {
- if ("endpoint".equalsIgnoreCase(property.getName())) {
- final String value = property.getValue();
- if (Strings.isNotEmpty(value)) {
- endpoints.add(value);
- }
- }
- }
- }
- LOGGER.debug("Creating JeroMqAppender with name={}, filter={}, layout={}, ignoreExceptions={}, endpoints={}",
- name, filter, layout, ignoreExceptions, endpoints);
- return new JeroMqAppender(name, filter, layout, ignoreExceptions, endpoints, affinity, backlog,
- delayAttachOnConnect, identity, ipv4Only, linger, maxMsgSize, rcvHwm, receiveBufferSize,
- receiveTimeOut, reconnectIVL, reconnectIVLMax, sendBufferSize, sendTimeOut, sndHwm, tcpKeepAlive,
- tcpKeepAliveCount, tcpKeepAliveIdle, tcpKeepAliveInterval, xpubVerbose);
- }
-
- @Override
- public synchronized void append(final LogEvent event) {
- final Layout<? extends Serializable> layout = getLayout();
- final byte[] formattedMessage = layout.toByteArray(event);
- if (manager.send(getLayout().toByteArray(event))) {
- sendRcTrue++;
- } else {
- sendRcFalse++;
- LOGGER.error("Appender {} could not send message {} to JeroMQ {}", getName(), sendRcFalse, formattedMessage);
- }
- }
-
- @Override
- public boolean stop(final long timeout, final TimeUnit timeUnit) {
- setStopping();
- boolean stopped = super.stop(timeout, timeUnit, false);
- stopped &= manager.stop(timeout, timeUnit);
- setStopped();
- return stopped;
- }
-
- // not public, handy for testing
- int getSendRcFalse() {
- return sendRcFalse;
- }
-
- // not public, handy for testing
- int getSendRcTrue() {
- return sendRcTrue;
- }
-
- // not public, handy for testing
- void resetSendRcs() {
- sendRcTrue = sendRcFalse = 0;
- }
-
- @Override
- public String toString() {
- return "JeroMqAppender{" +
- "name=" + getName() +
- ", state=" + getState() +
- ", manager=" + manager +
- ", endpoints=" + endpoints +
- '}';
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+
+package org.apache.logging.log4j.core.appender.mom.jeromq;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.appender.AbstractAppender;
+import org.apache.logging.log4j.core.config.Node;
+import org.apache.logging.log4j.core.config.Property;
+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.PatternLayout;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Sends log events to one or more ZeroMQ (JeroMQ) endpoints.
+ * <p>
+ * Requires the JeroMQ jar (LGPL as of 0.3.5)
+ * </p>
+ */
+// TODO
+// Some methods are synchronized because a ZMQ.Socket is not thread-safe
+// Using a ThreadLocal for the publisher hangs tests on shutdown. There must be
+// some issue on threads owning certain resources as opposed to others.
+@Plugin(name = "JeroMQ", category = Node.CATEGORY, elementType = Appender.ELEMENT_TYPE, printObject = true)
+public final class JeroMqAppender extends AbstractAppender {
+
+ private static final int DEFAULT_BACKLOG = 100;
+
+ private static final int DEFAULT_IVL = 100;
+
+ private static final int DEFAULT_RCV_HWM = 1000;
+
+ private static final int DEFAULT_SND_HWM = 1000;
+
+ private final JeroMqManager manager;
+ private final List<String> endpoints;
+ private int sendRcFalse;
+ private int sendRcTrue;
+
+ private JeroMqAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
+ final boolean ignoreExceptions, final List<String> endpoints, final long affinity, final long backlog,
+ final boolean delayAttachOnConnect, final byte[] identity, final boolean ipv4Only, final long linger,
+ final long maxMsgSize, final long rcvHwm, final long receiveBufferSize, final int receiveTimeOut,
+ final long reconnectIVL, final long reconnectIVLMax, final long sendBufferSize, final int sendTimeOut,
+ final long sndHWM, final int tcpKeepAlive, final long tcpKeepAliveCount, final long tcpKeepAliveIdle,
+ final long tcpKeepAliveInterval, final boolean xpubVerbose) {
+ super(name, filter, layout, ignoreExceptions);
+ this.manager = JeroMqManager.getJeroMqManager(name, affinity, backlog, delayAttachOnConnect, identity, ipv4Only,
+ linger, maxMsgSize, rcvHwm, receiveBufferSize, receiveTimeOut, reconnectIVL, reconnectIVLMax,
+ sendBufferSize, sendTimeOut, sndHWM, tcpKeepAlive, tcpKeepAliveCount, tcpKeepAliveIdle,
+ tcpKeepAliveInterval, xpubVerbose, endpoints);
+ this.endpoints = endpoints;
+ }
+
+ // The ZMQ.Socket class has other set methods that we do not cover because
+ // they throw unsupported operation exceptions.
+ @PluginFactory
+ public static JeroMqAppender createAppender(
+ // @formatter:off
+ @Required(message = "No name provided for JeroMqAppender") @PluginAttribute("name") final String name,
+ @PluginElement("Layout") Layout<?> layout,
+ @PluginElement("Filter") final Filter filter,
+ @PluginElement("Properties") final Property[] properties,
+ // Super attributes
+ @PluginAttribute("ignoreExceptions") final boolean ignoreExceptions,
+ // ZMQ attributes; defaults picked from zmq.Options.
+ @PluginAttribute(value = "affinity", defaultLong = 0) final long affinity,
+ @PluginAttribute(value = "backlog", defaultLong = DEFAULT_BACKLOG) final long backlog,
+ @PluginAttribute(value = "delayAttachOnConnect") final boolean delayAttachOnConnect,
+ @PluginAttribute(value = "identity") final byte[] identity,
+ @PluginAttribute(value = "ipv4Only", defaultBoolean = true) final boolean ipv4Only,
+ @PluginAttribute(value = "linger", defaultLong = -1) final long linger,
+ @PluginAttribute(value = "maxMsgSize", defaultLong = -1) final long maxMsgSize,
+ @PluginAttribute(value = "rcvHwm", defaultLong = DEFAULT_RCV_HWM) final long rcvHwm,
+ @PluginAttribute(value = "receiveBufferSize", defaultLong = 0) final long receiveBufferSize,
+ @PluginAttribute(value = "receiveTimeOut", defaultLong = -1) final int receiveTimeOut,
+ @PluginAttribute(value = "reconnectIVL", defaultLong = DEFAULT_IVL) final long reconnectIVL,
+ @PluginAttribute(value = "reconnectIVLMax", defaultLong = 0) final long reconnectIVLMax,
+ @PluginAttribute(value = "sendBufferSize", defaultLong = 0) final long sendBufferSize,
+ @PluginAttribute(value = "sendTimeOut", defaultLong = -1) final int sendTimeOut,
+ @PluginAttribute(value = "sndHwm", defaultLong = DEFAULT_SND_HWM) final long sndHwm,
+ @PluginAttribute(value = "tcpKeepAlive", defaultInt = -1) final int tcpKeepAlive,
+ @PluginAttribute(value = "tcpKeepAliveCount", defaultLong = -1) final long tcpKeepAliveCount,
+ @PluginAttribute(value = "tcpKeepAliveIdle", defaultLong = -1) final long tcpKeepAliveIdle,
+ @PluginAttribute(value = "tcpKeepAliveInterval", defaultLong = -1) final long tcpKeepAliveInterval,
+ @PluginAttribute(value = "xpubVerbose") final boolean xpubVerbose
+ // @formatter:on
+ ) {
+ if (layout == null) {
+ layout = PatternLayout.createDefaultLayout();
+ }
+ List<String> endpoints;
+ if (properties == null) {
+ endpoints = new ArrayList<>(0);
+ } else {
+ endpoints = new ArrayList<>(properties.length);
+ for (final Property property : properties) {
+ if ("endpoint".equalsIgnoreCase(property.getName())) {
+ final String value = property.getValue();
+ if (Strings.isNotEmpty(value)) {
+ endpoints.add(value);
+ }
+ }
+ }
+ }
+ LOGGER.debug("Creating JeroMqAppender with name={}, filter={}, layout={}, ignoreExceptions={}, endpoints={}",
+ name, filter, layout, ignoreExceptions, endpoints);
+ return new JeroMqAppender(name, filter, layout, ignoreExceptions, endpoints, affinity, backlog,
+ delayAttachOnConnect, identity, ipv4Only, linger, maxMsgSize, rcvHwm, receiveBufferSize,
+ receiveTimeOut, reconnectIVL, reconnectIVLMax, sendBufferSize, sendTimeOut, sndHwm, tcpKeepAlive,
+ tcpKeepAliveCount, tcpKeepAliveIdle, tcpKeepAliveInterval, xpubVerbose);
+ }
+
+ @Override
+ public synchronized void append(final LogEvent event) {
+ final Layout<? extends Serializable> layout = getLayout();
+ final byte[] formattedMessage = layout.toByteArray(event);
+ if (manager.send(getLayout().toByteArray(event))) {
+ sendRcTrue++;
+ } else {
+ sendRcFalse++;
+ LOGGER.error("Appender {} could not send message {} to JeroMQ {}", getName(), sendRcFalse, formattedMessage);
+ }
+ }
+
+ @Override
+ public boolean stop(final long timeout, final TimeUnit timeUnit) {
+ setStopping();
+ boolean stopped = super.stop(timeout, timeUnit, false);
+ stopped &= manager.stop(timeout, timeUnit);
+ setStopped();
+ return stopped;
+ }
+
+ // not public, handy for testing
+ int getSendRcFalse() {
+ return sendRcFalse;
+ }
+
+ // not public, handy for testing
+ int getSendRcTrue() {
+ return sendRcTrue;
+ }
+
+ // not public, handy for testing
+ void resetSendRcs() {
+ sendRcTrue = sendRcFalse = 0;
+ }
+
+ @Override
+ public String toString() {
+ return "JeroMqAppender{" +
+ "name=" + getName() +
+ ", state=" + getState() +
+ ", manager=" + manager +
+ ", endpoints=" + endpoints +
+ '}';
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
index 1d0b75a..4499478 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
@@ -199,9 +199,9 @@ public class DeleteAction extends AbstractPathAction {
public static DeleteAction createDeleteAction(
// @formatter:off
@PluginAttribute("basePath") final String basePath, //
- @PluginAttribute(value = "followLinks", defaultBoolean = false) final boolean followLinks,
+ @PluginAttribute(value = "followLinks") final boolean followLinks,
@PluginAttribute(value = "maxDepth", defaultInt = 1) final int maxDepth,
- @PluginAttribute(value = "testMode", defaultBoolean = false) final boolean testMode,
+ @PluginAttribute(value = "testMode") final boolean testMode,
@PluginElement("PathSorter") final PathSorter sorterParameter,
@PluginElement("PathConditions") final PathCondition[] pathConditions,
@PluginElement("ScriptCondition") final ScriptCondition scriptCondition,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
index 6cd64d3..3dcbd2b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
@@ -336,7 +336,7 @@ public final class HtmlLayout extends AbstractStringLayout {
*/
@PluginFactory
public static HtmlLayout createLayout(
- @PluginAttribute(value = "locationInfo", defaultBoolean = false) final boolean locationInfo,
+ @PluginAttribute(value = "locationInfo") final boolean locationInfo,
@PluginAttribute(value = "title", defaultString = DEFAULT_TITLE) final String title,
@PluginAttribute("contentType") String contentType,
@PluginAttribute(value = "charset", defaultString = "UTF-8") final Charset charset,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
index df1d4ea..993572b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
@@ -906,12 +906,12 @@ public final class JsonLayout extends AbstractJacksonLayout {
public static JsonLayout createLayout(
// @formatter:off
@PluginConfiguration final Configuration config,
- @PluginAttribute(value = "locationInfo", defaultBoolean = false) final boolean locationInfo,
- @PluginAttribute(value = "properties", defaultBoolean = false) final boolean properties,
- @PluginAttribute(value = "propertiesAsList", defaultBoolean = false) final boolean propertiesAsList,
- @PluginAttribute(value = "complete", defaultBoolean = false) final boolean complete,
- @PluginAttribute(value = "compact", defaultBoolean = false) final boolean compact,
- @PluginAttribute(value = "eventEol", defaultBoolean = false) final boolean eventEol,
+ @PluginAttribute(value = "locationInfo") final boolean locationInfo,
+ @PluginAttribute(value = "properties") final boolean properties,
+ @PluginAttribute(value = "propertiesAsList") final boolean propertiesAsList,
+ @PluginAttribute(value = "complete") final boolean complete,
+ @PluginAttribute(value = "compact") final boolean compact,
+ @PluginAttribute(value = "eventEol") final boolean eventEol,
@PluginAttribute(value = "header", defaultString = DEFAULT_HEADER) final String headerPattern,
@PluginAttribute(value = "footer", defaultString = DEFAULT_FOOTER) final String footerPattern,
@PluginAttribute(value = "charset", defaultString = "UTF-8") final Charset charset,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
index e57c270..b01dc5e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
@@ -74,7 +74,7 @@ public final class LoggerFields {
@PluginElement("LoggerFields") final KeyValuePair[] keyValuePairs,
@PluginAttribute("sdId") final String sdId,
@PluginAttribute("enterpriseId") final String enterpriseId,
- @PluginAttribute(value = "discardIfAllFieldsAreEmpty", defaultBoolean = false) final boolean discardIfAllFieldsAreEmpty) {
+ @PluginAttribute(value = "discardIfAllFieldsAreEmpty") final boolean discardIfAllFieldsAreEmpty) {
final Map<String, String> map = new HashMap<>();
for (final KeyValuePair keyValuePair : keyValuePairs) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index 2c235f4..5eb9f3c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -250,7 +250,7 @@ public final class PatternLayout extends AbstractStringLayout {
// LOG4J2-783 use platform default by default, so do not specify defaultString for charset
@PluginAttribute(value = "charset") final Charset charset,
@PluginAttribute(value = "alwaysWriteExceptions", defaultBoolean = true) final boolean alwaysWriteExceptions,
- @PluginAttribute(value = "noConsoleNoAnsi", defaultBoolean = false) final boolean noConsoleNoAnsi,
+ @PluginAttribute(value = "noConsoleNoAnsi") final boolean noConsoleNoAnsi,
@PluginAttribute("header") final String headerPattern,
@PluginAttribute("footer") final String footerPattern) {
return newBuilder()
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
index cde4b36..1ce81bd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
@@ -640,7 +640,7 @@ public final class Rfc5424Layout extends AbstractStringLayout {
@PluginAttribute(value = "mdcId", defaultString = DEFAULT_MDCID) final String mdcId,
@PluginAttribute("mdcPrefix") final String mdcPrefix,
@PluginAttribute("eventPrefix") final String eventPrefix,
- @PluginAttribute(value = "newLine", defaultBoolean = false) final boolean newLine,
+ @PluginAttribute(value = "newLine") final boolean newLine,
@PluginAttribute("newLineEscape") final String escapeNL,
@PluginAttribute("appName") final String appName,
@PluginAttribute("messageId") final String msgId,
@@ -649,7 +649,7 @@ public final class Rfc5424Layout extends AbstractStringLayout {
@PluginAttribute("mdcRequired") final String required,
@PluginAttribute("exceptionPattern") final String exceptionPattern,
// RFC 5425
- @PluginAttribute(value = "useTlsMessageFormat", defaultBoolean = false) final boolean useTlsMessageFormat,
+ @PluginAttribute(value = "useTlsMessageFormat") final boolean useTlsMessageFormat,
@PluginElement("LoggerFields") final LoggerFields[] loggerFields,
@PluginConfiguration final Configuration config) {
// @formatter:on
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
index 1167a3d..e542297 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
@@ -208,7 +208,7 @@ public class ScriptPatternSelector implements PatternSelector {
@PluginElement("PatternMatch") final PatternMatch[] properties,
@PluginAttribute("defaultPattern") String defaultPattern,
@PluginAttribute(value = "alwaysWriteExceptions", defaultBoolean = true) final boolean alwaysWriteExceptions,
- @PluginAttribute(value = "noConsoleNoAnsi", defaultBoolean = false) final boolean noConsoleNoAnsi,
+ @PluginAttribute(value = "noConsoleNoAnsi") final boolean noConsoleNoAnsi,
@PluginConfiguration final Configuration configuration) {
final Builder builder = newBuilder();
builder.withScript(script);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
index d53bc15..5d20c31 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
@@ -140,7 +140,7 @@ public final class SyslogLayout extends AbstractStringLayout {
@PluginFactory
public static SyslogLayout createLayout(
@PluginAttribute(value = "facility", defaultString = "LOCAL0") final Facility facility,
- @PluginAttribute(value = "newLine", defaultBoolean = false) final boolean includeNewLine,
+ @PluginAttribute(value = "newLine") final boolean includeNewLine,
@PluginAttribute("newLineEscape") final String escapeNL,
@PluginAttribute(value = "charset", defaultString = "UTF-8") final Charset charset) {
return new SyslogLayout(facility, includeNewLine, escapeNL, charset);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
index d83e814..bdc96b0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
@@ -281,10 +281,10 @@ public final class XmlLayout extends AbstractJacksonLayout {
@PluginFactory
public static XmlLayout createLayout(
// @formatter:off
- @PluginAttribute(value = "locationInfo", defaultBoolean = false) final boolean locationInfo,
- @PluginAttribute(value = "properties", defaultBoolean = false) final boolean properties,
- @PluginAttribute(value = "complete", defaultBoolean = false) final boolean complete,
- @PluginAttribute(value = "compact", defaultBoolean = false) final boolean compact,
+ @PluginAttribute(value = "locationInfo") final boolean locationInfo,
+ @PluginAttribute(value = "properties") final boolean properties,
+ @PluginAttribute(value = "complete") final boolean complete,
+ @PluginAttribute(value = "compact") final boolean compact,
@PluginAttribute(value = "charset", defaultString = "UTF-8") final Charset charset,
@PluginAttribute(value = "includeStacktrace", defaultBoolean = true) final boolean includeStacktrace)
// @formatter:on
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/264f5f41/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
index 52837c8..61d6ad8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
@@ -794,8 +794,8 @@ public final class YamlLayout extends AbstractJacksonLayout {
public static AbstractJacksonLayout createLayout(
// @formatter:off
@PluginConfiguration final Configuration config,
- @PluginAttribute(value = "locationInfo", defaultBoolean = false) final boolean locationInfo,
- @PluginAttribute(value = "properties", defaultBoolean = false) final boolean properties,
+ @PluginAttribute(value = "locationInfo") final boolean locationInfo,
+ @PluginAttribute(value = "properties") final boolean properties,
@PluginAttribute(value = "header", defaultString = DEFAULT_HEADER) final String headerPattern,
@PluginAttribute(value = "footer", defaultString = DEFAULT_FOOTER) final String footerPattern,
@PluginAttribute(value = "charset", defaultString = "UTF-8") final Charset charset,