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 2018/10/30 16:53:37 UTC
[10/13] logging-log4j2 git commit: Checkstyle: Remove trailing white
spaces on all lines.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategy.java
index f21a92d..223e0ed 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategy.java
@@ -1,79 +1,79 @@
-/*
- * 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.config;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.util.Supplier;
-
-/**
- * Interface for objects that know how to ensure delivery of log events to the appropriate appenders, even during and
- * after the configuration has been modified while the system is actively used.
- */
-public interface ReliabilityStrategy {
-
- /**
- * Logs an event.
- *
- * @param reconfigured supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
- * @param loggerName The name of the Logger.
- * @param fqcn The fully qualified class name of the caller.
- * @param marker A Marker or null if none is present.
- * @param level The event Level.
- * @param data The Message.
- * @param t A Throwable or null.
- */
- void log(Supplier<LoggerConfig> reconfigured, String loggerName, String fqcn, Marker marker, Level level,
- Message data, Throwable t);
-
- /**
- * Logs an event.
- *
- * @param reconfigured supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
- * @param event The log event.
- */
- void log(Supplier<LoggerConfig> reconfigured, LogEvent event);
-
- /**
- * For internal use by the ReliabilityStrategy; returns the LoggerConfig to use.
- *
- * @param next supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
- * @return the currently active LoggerConfig
- */
- LoggerConfig getActiveLoggerConfig(Supplier<LoggerConfig> next);
-
- /**
- * Called after a log event was logged.
- */
- void afterLogEvent();
-
- /**
- * Called before all appenders are stopped.
- */
- void beforeStopAppenders();
-
- /**
- * Called before the configuration is stopped.
- *
- * @param configuration the configuration that will be stopped
- */
- void beforeStopConfiguration(Configuration configuration);
-
-}
+/*
+ * 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.config;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.util.Supplier;
+
+/**
+ * Interface for objects that know how to ensure delivery of log events to the appropriate appenders, even during and
+ * after the configuration has been modified while the system is actively used.
+ */
+public interface ReliabilityStrategy {
+
+ /**
+ * Logs an event.
+ *
+ * @param reconfigured supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
+ * @param loggerName The name of the Logger.
+ * @param fqcn The fully qualified class name of the caller.
+ * @param marker A Marker or null if none is present.
+ * @param level The event Level.
+ * @param data The Message.
+ * @param t A Throwable or null.
+ */
+ void log(Supplier<LoggerConfig> reconfigured, String loggerName, String fqcn, Marker marker, Level level,
+ Message data, Throwable t);
+
+ /**
+ * Logs an event.
+ *
+ * @param reconfigured supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
+ * @param event The log event.
+ */
+ void log(Supplier<LoggerConfig> reconfigured, LogEvent event);
+
+ /**
+ * For internal use by the ReliabilityStrategy; returns the LoggerConfig to use.
+ *
+ * @param next supplies the next LoggerConfig if the strategy's LoggerConfig is no longer active
+ * @return the currently active LoggerConfig
+ */
+ LoggerConfig getActiveLoggerConfig(Supplier<LoggerConfig> next);
+
+ /**
+ * Called after a log event was logged.
+ */
+ void afterLogEvent();
+
+ /**
+ * Called before all appenders are stopped.
+ */
+ void beforeStopAppenders();
+
+ /**
+ * Called before the configuration is stopped.
+ *
+ * @param configuration the configuration that will be stopped
+ */
+ void beforeStopConfiguration(Configuration configuration);
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
index 953d96f..542cd75 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
@@ -39,7 +39,7 @@ public final class ReliabilityStrategyFactory {
* <p>
* Users may also use this system property to specify the fully qualified class name of a class that implements the
* {@code ReliabilityStrategy} and has a constructor that accepts a single {@code LoggerConfig} argument.
- *
+ *
* @param loggerConfig the LoggerConfig the resulting {@code ReliabilityStrategy} is associated with
* @return a ReliabilityStrategy that helps the specified LoggerConfig to log events reliably during or after a
* configuration change
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index b41b8e4..c0595d7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -58,7 +58,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
private static final String INDENT = " ";
private static final String EOL = System.lineSeparator();
-
+
private final Component root = new Component();
private Component loggers;
private Component appenders;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
index dc833f0..e688874 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
@@ -91,7 +91,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@code byte[]}.
- *
+ *
* The supported formats are:
* <ul>
* <li>0x0123456789ABCDEF</li>
@@ -394,7 +394,7 @@ public final class TypeConverters {
* Converts a String to a given class if a TypeConverter is available for that class. Falls back to the provided
* default value if the conversion is unsuccessful. However, if the default value is <em>also</em> invalid, then
* {@code null} is returned (along with a nasty status log message).
- *
+ *
* @param s
* the string to convert
* @param clazz
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
index 704ffd1..abe2aa9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
@@ -43,7 +43,7 @@ public class PluginManager {
/**
* Constructs a PluginManager for the plugin category name given.
- *
+ *
* @param category The plugin category name.
*/
public PluginManager(final String category) {
@@ -52,7 +52,7 @@ public class PluginManager {
/**
* Process annotated plugins.
- *
+ *
* @deprecated Use {@link org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor} instead. To do so,
* simply include {@code log4j-core} in your dependencies and make sure annotation processing is not
* disabled. By default, supported Java compilers will automatically use that plugin processor provided
@@ -69,7 +69,7 @@ public class PluginManager {
/**
* Adds a package name to be scanned for plugins. Must be invoked prior to plugins being collected.
- *
+ *
* @param p The package name. Ignored if {@code null} or empty.
*/
public static void addPackage(final String p) {
@@ -94,7 +94,7 @@ public class PluginManager {
/**
* Returns the type of a specified plugin.
- *
+ *
* @param name The name of the plugin.
* @return The plugin's type.
*/
@@ -104,7 +104,7 @@ public class PluginManager {
/**
* Returns all the matching plugins.
- *
+ *
* @return A Map containing the name of the plugin and its type.
*/
public Map<String, PluginType<?>> getPlugins() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
index 73b5fc0..1aa9a36 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
@@ -112,7 +112,7 @@ public class ResolverUtil {
/**
* Returns the matching resources.
- *
+ *
* @return A Set of URIs that match the criteria.
*/
public Set<URI> getResources() {
@@ -432,7 +432,7 @@ public class ResolverUtil {
/**
* Will be called repeatedly with candidate classes. Must return True if a class is to be included in the
* results, false otherwise.
- *
+ *
* @param type
* The Class to match against.
* @return true if the Class matches.
@@ -441,7 +441,7 @@ public class ResolverUtil {
/**
* Test for a resource.
- *
+ *
* @param resource
* The URI to the resource.
* @return true if the resource matches.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/ConstraintValidator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/ConstraintValidator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/ConstraintValidator.java
index 1d8c0c5..b9c697a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/ConstraintValidator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/ConstraintValidator.java
@@ -37,7 +37,7 @@ public interface ConstraintValidator<A extends Annotation> {
* Indicates if the given value is valid.
*
* @param name the name to use for error reporting
- * @param value the value to validate.
+ * @param value the value to validate.
* @return {@code true} if the given value is valid.
*/
boolean isValid(String name, Object value);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
index 560cbe3..089d1f2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
@@ -40,27 +40,27 @@ public abstract class AbstractPluginVisitor<A extends Annotation> implements Plu
protected static final Logger LOGGER = StatusLogger.getLogger();
/**
- *
+ *
*/
protected final Class<A> clazz;
/**
- *
+ *
*/
protected A annotation;
/**
- *
+ *
*/
protected String[] aliases;
/**
- *
+ *
*/
protected Class<?> conversionType;
/**
- *
+ *
*/
protected StrSubstitutor substitutor;
/**
- *
+ *
*/
protected Member member;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
index 3143259..f77707e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
@@ -184,9 +184,9 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory
if (props.size() > 0) {
builder.add(createRootLogger(props));
}
-
+
builder.setLoggerContext(loggerContext);
-
+
return builder.build(false);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
index 07d5740..6b0e79a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
@@ -182,7 +182,7 @@ public class XmlConfiguration extends AbstractConfiguration implements Reconfigu
/**
* Creates a new DocumentBuilder suitable for parsing a configuration file.
- *
+ *
* @param xIncludeAware enabled XInclude
* @return a new DocumentBuilder
* @throws ParserConfigurationException
@@ -206,7 +206,7 @@ public class XmlConfiguration extends AbstractConfiguration implements Reconfigu
setFeature(factory, "http://xml.org/sax/features/external-parameter-entities", false);
setFeature(factory, "http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
}
-
+
private static void setFeature(final DocumentBuilderFactory factory, final String featureName, final boolean value) {
try {
factory.setFeature(featureName, value);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
index 5e3c133..75071ea 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
@@ -69,21 +69,21 @@ public abstract class AbstractFilter extends AbstractLifeCycle implements Filter
/**
* Sets the Result to return when the filter does not match. The default is Result.DENY.
- * @param onMismatch the Result to return when the filter does not match.
+ * @param onMismatch the Result to return when the filter does not match.
* @return this
*/
public B setOnMismatch(final Result onMismatch) {
this.onMismatch = onMismatch;
return asBuilder();
}
-
+
@SuppressWarnings("unchecked")
public B asBuilder() {
return (B) this;
}
}
-
+
/**
* The onMatch Result.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
index 5024a21..d2368b3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
@@ -71,7 +71,7 @@ public abstract class AbstractFilterable extends AbstractLifeCycle implements Fi
/**
* Sets the filter.
- *
+ *
* @param filter The filter
* @return this
* @deprecated Use {@link #setFilter(Filter)}.
@@ -87,7 +87,7 @@ public abstract class AbstractFilterable extends AbstractLifeCycle implements Fi
* May be null.
*/
private volatile Filter filter;
-
+
@PluginElement("Properties")
private final Property[] propertyArray;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
index c2326ad..95df851 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
@@ -303,7 +303,7 @@ public final class BurstFilter extends AbstractFilter {
/**
* Sets the logging level to use.
- * @param level the logging level to use.
+ * @param level the logging level to use.
* @return this
*/
public Builder setLevel(final Level level) {
@@ -313,7 +313,7 @@ public final class BurstFilter extends AbstractFilter {
/**
* Sets the average number of events per second to allow.
- * @param rate the average number of events per second to allow. This must be a positive number.
+ * @param rate the average number of events per second to allow. This must be a positive number.
* @return this
*/
public Builder setRate(final float rate) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
index e6dd630..993d04b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.LogEvent;
/**
* Interface implemented by Classes that allow filtering to occur.
- *
+ *
* <p>
* Extends {@link LifeCycle} since filters have a life cycle.
* </p>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
index 1e47d4e..d06465f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
@@ -123,11 +123,11 @@ public final class ScriptFilter extends AbstractFilter {
/**
* Creates the ScriptFilter.
- * @param script The script to run. The script must return a boolean value. Either script or scriptFile must be
+ * @param script The script to run. The script must return a boolean value. Either script or scriptFile must be
* provided.
* @param match The action to take if a match occurs.
* @param mismatch The action to take if no match occurs.
- * @param configuration the configuration
+ * @param configuration the configuration
* @return A ScriptFilter.
*/
// TODO Consider refactoring to use AbstractFilter.AbstractFilterBuilder
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
index 44d42f9..2be5f5c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
@@ -36,7 +36,7 @@ public final class ExtendedClassInfo implements Serializable {
/**
* Constructs a new instance.
- *
+ *
* @param exact
* @param location
* @param version
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
index 017a690..ff5a6da 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
@@ -762,7 +762,7 @@ public class Log4jLogEvent implements LogEvent {
public static LogEvent createMemento(final LogEvent logEvent) {
return new Log4jLogEvent.Builder(logEvent).build();
}
-
+
/**
* Creates and returns a new immutable copy of this {@code Log4jLogEvent}.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ExtendedStackTraceElementMixIn.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ExtendedStackTraceElementMixIn.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ExtendedStackTraceElementMixIn.java
index 84df3d6..1aa3e4c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ExtendedStackTraceElementMixIn.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ExtendedStackTraceElementMixIn.java
@@ -76,7 +76,7 @@ abstract class ExtendedStackTraceElementMixIn implements Serializable {
@JsonProperty("method")
@JacksonXmlProperty(localName = "method", isAttribute = true)
public abstract String getMethodName();
-
+
@JsonIgnore
abstract StackTraceElement getStackTraceElement();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
index 950c2c8..85f2db9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
@@ -48,7 +48,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
</Parents>
</Marker>
* </pre>
- *
+ *
* @see Marker
*/
// Alternate for multiple Marker implementation.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/StackTraceElementMixIn.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/StackTraceElementMixIn.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/StackTraceElementMixIn.java
index 9a3b022..16e655e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/StackTraceElementMixIn.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/StackTraceElementMixIn.java
@@ -26,7 +26,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
* <p>
* <em>Consider this class private.</em>
* </p>
- *
+ *
* @see StackTraceElement
*/
@JsonIgnoreProperties("nativeMethod")
@@ -34,9 +34,9 @@ abstract class StackTraceElementMixIn {
@JsonCreator
StackTraceElementMixIn(
// @formatter:off
- @JsonProperty("class") final String declaringClass,
+ @JsonProperty("class") final String declaringClass,
@JsonProperty("method") final String methodName,
- @JsonProperty("file") final String fileName,
+ @JsonProperty("file") final String fileName,
@JsonProperty("line") final int lineNumber)
// @formatter:on
{
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
index 5a173ea..caaa433 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdmin.java
@@ -91,7 +91,7 @@ public class AsyncAppenderAdmin implements AsyncAppenderAdminMBean {
public String[] getAppenderRefs() {
return asyncAppender.getAppenderRefStrings();
}
-
+
/**
* Returns {@code true} if this AsyncAppender will take a snapshot of the stack with
* every log event to determine the class and method where the logging call
@@ -102,7 +102,7 @@ public class AsyncAppenderAdmin implements AsyncAppenderAdminMBean {
public boolean isIncludeLocation() {
return asyncAppender.isIncludeLocation();
}
-
+
/**
* Returns {@code true} if this AsyncAppender will block when the queue is full,
* or {@code false} if events are dropped when the queue is full.
@@ -112,7 +112,7 @@ public class AsyncAppenderAdmin implements AsyncAppenderAdminMBean {
public boolean isBlocking() {
return asyncAppender.isBlocking();
}
-
+
/**
* Returns the name of the appender that any errors are logged to or {@code null}.
* @return the name of the appender that any errors are logged to or {@code null}
@@ -121,12 +121,12 @@ public class AsyncAppenderAdmin implements AsyncAppenderAdminMBean {
public String getErrorRef() {
return asyncAppender.getErrorRef();
}
-
+
@Override
public int getQueueCapacity() {
return asyncAppender.getQueueCapacity();
}
-
+
@Override
public int getQueueRemainingCapacity() {
return asyncAppender.getQueueRemainingCapacity();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdminMBean.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdminMBean.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdminMBean.java
index 37dad2e..7348145 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdminMBean.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AsyncAppenderAdminMBean.java
@@ -27,7 +27,7 @@ public interface AsyncAppenderAdminMBean {
* <p>
* You can find all registered AsyncAppenderAdmin MBeans like this:
* </p>
- *
+ *
* <pre>
* MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
* String pattern = String.format(AsyncAppenderAdminMBean.PATTERN, "*", "*");
@@ -38,21 +38,21 @@ public interface AsyncAppenderAdminMBean {
* and appender name may be quoted. When AsyncAppenderAdmin MBeans are
* registered, their ObjectNames are created using this pattern as follows:
* </p>
- *
+ *
* <pre>
* String ctxName = Server.escape(loggerContext.getName());
* String appenderName = Server.escape(appender.getName());
* String name = String.format(PATTERN, ctxName, appenderName);
* ObjectName objectName = new ObjectName(name);
* </pre>
- *
+ *
* @see Server#escape(String)
*/
String PATTERN = Server.DOMAIN + ":type=%s,component=AsyncAppenders,name=%s";
/**
* Returns the name of the instrumented {@code AsyncAppender}.
- *
+ *
* @return the name of the AsyncAppender
*/
String getName();
@@ -60,7 +60,7 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns the result of calling {@code toString} on the {@code Layout}
* object of the instrumented {@code AsyncAppender}.
- *
+ *
* @return the {@code Layout} of the instrumented {@code AsyncAppender} as a
* string
*/
@@ -69,7 +69,7 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns how exceptions thrown on the instrumented {@code AsyncAppender}
* are handled.
- *
+ *
* @return {@code true} if any exceptions thrown by the AsyncAppender will
* be logged or {@code false} if such exceptions are re-thrown.
*/
@@ -78,7 +78,7 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns the result of calling {@code toString} on the error handler of
* this appender, or {@code "null"} if no error handler was set.
- *
+ *
* @return result of calling {@code toString} on the error handler of this
* appender, or {@code "null"}
*/
@@ -87,7 +87,7 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns a string description of all filters configured for the
* instrumented {@code AsyncAppender}.
- *
+ *
* @return a string description of all configured filters for this appender
*/
String getFilter();
@@ -95,7 +95,7 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns a String array with the appender refs configured for the
* instrumented {@code AsyncAppender}.
- *
+ *
* @return the appender refs for the instrumented {@code AsyncAppender}.
*/
String[] getAppenderRefs();
@@ -104,7 +104,7 @@ public interface AsyncAppenderAdminMBean {
* Returns {@code true} if this AsyncAppender will take a snapshot of the
* stack with every log event to determine the class and method where the
* logging call was made.
- *
+ *
* @return {@code true} if location is included with every event,
* {@code false} otherwise
*/
@@ -113,19 +113,19 @@ public interface AsyncAppenderAdminMBean {
/**
* Returns {@code true} if this AsyncAppender will block when the queue is
* full, or {@code false} if events are dropped when the queue is full.
- *
+ *
* @return whether this AsyncAppender will block or drop events when the
* queue is full.
*/
boolean isBlocking();
-
+
/**
* Returns the name of the appender that any errors are logged to or {@code null}.
* @return the name of the appender that any errors are logged to or {@code null}
*/
String getErrorRef();
-
+
int getQueueCapacity();
-
+
int getQueueRemainingCapacity();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
index fb41b04..53b6079 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
@@ -32,7 +32,7 @@ public class ContextSelectorAdmin implements ContextSelectorAdminMBean {
/**
* Constructs a new {@code ContextSelectorAdmin}.
- *
+ *
* @param contextName name of the LoggerContext under which to register this
* ContextSelectorAdmin. Note that the ContextSelector may be
* registered multiple times, once for each LoggerContext. In web
@@ -55,7 +55,7 @@ public class ContextSelectorAdmin implements ContextSelectorAdminMBean {
/**
* Returns the {@code ObjectName} of this mbean.
- *
+ *
* @return the {@code ObjectName}
* @see ContextSelectorAdminMBean#PATTERN
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java
index 7526982..6cb65d6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdminMBean.java
@@ -32,7 +32,7 @@ public interface LoggerContextAdminMBean {
* <p>
* You can find all registered LoggerContextAdmin MBeans like this:
* </p>
- *
+ *
* <pre>
* MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
* String pattern = String.format(LoggerContextAdminMBean.PATTERN, "*");
@@ -43,13 +43,13 @@ public interface LoggerContextAdminMBean {
* may be quoted. When LoggerContextAdmin MBeans are registered, their
* ObjectNames are created using this pattern as follows:
* </p>
- *
+ *
* <pre>
* String ctxName = Server.escape(loggerContext.getName());
* String name = String.format(PATTERN, ctxName);
* ObjectName objectName = new ObjectName(name);
* </pre>
- *
+ *
* @see Server#escape(String)
*/
String PATTERN = Server.DOMAIN + ":type=%s";
@@ -69,21 +69,21 @@ public interface LoggerContextAdminMBean {
/**
* Returns the status of the instrumented {@code LoggerContext}.
- *
+ *
* @return the LoggerContext status.
*/
String getStatus();
/**
* Returns the name of the instrumented {@code LoggerContext}.
- *
+ *
* @return the name of the instrumented {@code LoggerContext}.
*/
String getName();
/**
* Returns the configuration location URI as a String.
- *
+ *
* @return the configuration location
*/
String getConfigLocationUri();
@@ -91,7 +91,7 @@ public interface LoggerContextAdminMBean {
/**
* Sets the configuration location to the specified URI. This will cause the
* instrumented {@code LoggerContext} to reconfigure.
- *
+ *
* @param configLocation location of the configuration file in
* {@link java.net.URI} format.
* @throws URISyntaxException if the format of the specified
@@ -105,7 +105,7 @@ public interface LoggerContextAdminMBean {
* configuration file or the text that was last set with a call to
* {@code setConfigText}. If reading a file, this method assumes the file's
* character encoding is UTF-8.
- *
+ *
* @return the configuration text
* @throws IOException if a problem occurred reading the contents of the
* config file.
@@ -116,7 +116,7 @@ public interface LoggerContextAdminMBean {
* Returns the configuration text, which may be the contents of the
* configuration file or the text that was last set with a call to
* {@code setConfigText}.
- *
+ *
* @param charsetName the encoding to use to convert the file's bytes into
* the resulting string.
* @return the configuration text
@@ -129,7 +129,7 @@ public interface LoggerContextAdminMBean {
* Sets the configuration text. This does not replace the contents of the
* configuration file, but <em>does</em> cause the instrumented
* {@code LoggerContext} to be reconfigured with the specified text.
- *
+ *
* @param configText the configuration text in XML or JSON format
* @param charsetName name of the {@code Charset} used to convert the
* specified configText to bytes
@@ -140,7 +140,7 @@ public interface LoggerContextAdminMBean {
/**
* Returns the name of the Configuration of the instrumented LoggerContext.
- *
+ *
* @return the Configuration name
*/
String getConfigName();
@@ -148,7 +148,7 @@ public interface LoggerContextAdminMBean {
/**
* Returns the class name of the {@code Configuration} of the instrumented
* LoggerContext.
- *
+ *
* @return the class name of the {@code Configuration}.
*/
String getConfigClassName();
@@ -156,14 +156,14 @@ public interface LoggerContextAdminMBean {
/**
* Returns a string description of all Filters configured in the
* {@code Configuration} of the instrumented LoggerContext.
- *
+ *
* @return a string description of all Filters configured
*/
String getConfigFilter();
/**
* Returns a map with configured properties.
- *
+ *
* @return a map with configured properties.
*/
Map<String, String> getConfigProperties();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
index 15a9e56..b40d2f4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
@@ -34,28 +34,28 @@ public class RingBufferAdmin implements RingBufferAdminMBean {
return new RingBufferAdmin(ringBuffer, name);
}
- public static RingBufferAdmin forAsyncLoggerConfig(final RingBuffer<?> ringBuffer,
+ public static RingBufferAdmin forAsyncLoggerConfig(final RingBuffer<?> ringBuffer,
final String contextName, final String configName) {
final String ctxName = Server.escape(contextName);
final String cfgName = Server.escape(configName);
final String name = String.format(PATTERN_ASYNC_LOGGER_CONFIG, ctxName, cfgName);
return new RingBufferAdmin(ringBuffer, name);
}
-
+
protected RingBufferAdmin(final RingBuffer<?> ringBuffer, final String mbeanName) {
- this.ringBuffer = ringBuffer;
+ this.ringBuffer = ringBuffer;
try {
objectName = new ObjectName(mbeanName);
} catch (final Exception e) {
throw new IllegalStateException(e);
}
}
-
+
@Override
public long getBufferSize() {
return ringBuffer == null ? 0 : ringBuffer.getBufferSize();
}
-
+
@Override
public long getRemainingCapacity() {
return ringBuffer == null ? 0 : ringBuffer.remainingCapacity();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdminMBean.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdminMBean.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdminMBean.java
index 052dcc8..83a8278 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdminMBean.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdminMBean.java
@@ -35,7 +35,7 @@ public interface RingBufferAdminMBean {
* </pre>
*/
String PATTERN_ASYNC_LOGGER = Server.DOMAIN + ":type=%s,component=AsyncLoggerRingBuffer";
-
+
/**
* ObjectName pattern ({@value}) for RingBufferAdmin MBeans that instrument
* {@code AsyncLoggerConfig} ring buffers.
@@ -56,7 +56,7 @@ public interface RingBufferAdminMBean {
* Returns the number of slots that the ring buffer was configured with.
* Disruptor ring buffers are bounded-size data structures, this number does
* not change during the life of the ring buffer.
- *
+ *
* @return the number of slots that the ring buffer was configured with
*/
long getBufferSize();
@@ -64,7 +64,7 @@ public interface RingBufferAdminMBean {
/**
* Returns the number of available slots in the ring buffer. May vary wildly
* between invocations.
- *
+ *
* @return the number of available slots in the ring buffer
*/
long getRemainingCapacity();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdmin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdmin.java
index a602f4e..dbd7a6b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdmin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdmin.java
@@ -44,7 +44,7 @@ public class StatusLoggerAdmin extends NotificationBroadcasterSupport implements
/**
* Constructs a new {@code StatusLoggerAdmin} with the {@code Executor} to
* be used for sending {@code Notification}s asynchronously to listeners.
- *
+ *
* @param contextName name of the LoggerContext under which to register this
* StatusLoggerAdmin. Note that the StatusLogger may be
* registered multiple times, once for each LoggerContext. In web
@@ -132,7 +132,7 @@ public class StatusLoggerAdmin extends NotificationBroadcasterSupport implements
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.logging.log4j.status.StatusListener#log(org.apache.logging
* .log4j.status.StatusData)
@@ -150,7 +150,7 @@ public class StatusLoggerAdmin extends NotificationBroadcasterSupport implements
/**
* Returns the {@code ObjectName} of this mbean.
- *
+ *
* @return the {@code ObjectName}
* @see StatusLoggerAdminMBean#PATTERN
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java
index 91a6063..e6510e6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/StatusLoggerAdminMBean.java
@@ -68,7 +68,7 @@ public interface StatusLoggerAdminMBean {
* @return the ObjectName of this StatusLogger MBean
*/
ObjectName getObjectName();
-
+
/**
* Returns a list with the most recent {@code StatusData} objects in the
* status history. The list has up to 200 entries by default but the length
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
index e47b5e6..dee3cc9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
@@ -24,9 +24,9 @@ import org.apache.logging.log4j.core.config.Configuration;
/**
* A superclass for Comma-Separated Value (CSV) layouts.
- *
+ *
* Depends on Apache Commons CSV 1.2.
- *
+ *
* @since 2.4
*/
public abstract class AbstractCsvLayout extends AbstractStringLayout {
@@ -67,7 +67,7 @@ public abstract class AbstractCsvLayout extends AbstractStringLayout {
protected AbstractCsvLayout(final Configuration config, final Charset charset, final CSVFormat csvFormat,
final String header, final String footer) {
- super(config, charset,
+ super(config, charset,
PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(header).build(),
PatternLayout.newSerializerBuilder().setConfiguration(config).setPattern(footer).build());
this.format = csvFormat;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
index fe079fb..549bedd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
@@ -34,17 +34,17 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* A Comma-Separated Value (CSV) layout to log event parameters.
- * The event message is currently ignored.
- *
+ * The event message is currently ignored.
+ *
* <p>
* Best used with:
* </p>
* <p>
* {@code logger.debug(new ObjectArrayMessage(1, 2, "Bob"));}
* </p>
- *
+ *
* Depends on Apache Commons CSV 1.4.
- *
+ *
* @since 2.4
*/
@Plugin(name = "CsvParameterLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true)
@@ -70,7 +70,7 @@ public class CsvParameterLayout extends AbstractCsvLayout {
@PluginAttribute("nullString") final String nullString,
@PluginAttribute("recordSeparator") final String recordSeparator,
@PluginAttribute(value = "charset", defaultString = DEFAULT_CHARSET) final Charset charset,
- @PluginAttribute("header") final String header,
+ @PluginAttribute("header") final String header,
@PluginAttribute("footer") final String footer)
// @formatter:on
{
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
index 719af9d..d91e53a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
@@ -47,16 +47,16 @@ public class MarkerPatternSelector implements PatternSelector {
@PluginElement("PatternMatch")
private PatternMatch[] properties;
-
+
@PluginBuilderAttribute("defaultPattern")
private String defaultPattern;
-
- @PluginBuilderAttribute(value = "alwaysWriteExceptions")
+
+ @PluginBuilderAttribute(value = "alwaysWriteExceptions")
private boolean alwaysWriteExceptions = true;
-
+
@PluginBuilderAttribute(value = "disableAnsi")
private boolean disableAnsi;
-
+
@PluginBuilderAttribute(value = "noConsoleNoAnsi")
private boolean noConsoleNoAnsi;
@@ -107,7 +107,7 @@ public class MarkerPatternSelector implements PatternSelector {
}
}
-
+
private final Map<String, PatternFormatter[]> formatterMap = new HashMap<>();
private final Map<String, String> patternMap = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 35c6f4b..4172fcc 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
@@ -48,21 +48,21 @@ public class ScriptPatternSelector implements PatternSelector {
*/
public static class Builder implements org.apache.logging.log4j.core.util.Builder<ScriptPatternSelector> {
- @PluginElement("Script")
+ @PluginElement("Script")
private AbstractScript script;
-
- @PluginElement("PatternMatch")
+
+ @PluginElement("PatternMatch")
private PatternMatch[] properties;
-
- @PluginBuilderAttribute("defaultPattern")
+
+ @PluginBuilderAttribute("defaultPattern")
private String defaultPattern;
-
- @PluginBuilderAttribute("alwaysWriteExceptions")
+
+ @PluginBuilderAttribute("alwaysWriteExceptions")
private boolean alwaysWriteExceptions = true;
-
+
@PluginBuilderAttribute("disableAnsi")
private boolean disableAnsi;
-
+
@PluginBuilderAttribute("noConsoleNoAnsi")
private boolean noConsoleNoAnsi;
@@ -131,7 +131,7 @@ public class ScriptPatternSelector implements PatternSelector {
return this;
}
}
-
+
private final Map<String, PatternFormatter[]> formatterMap = new HashMap<>();
private final Map<String, String> patternMap = new HashMap<>();
@@ -204,7 +204,7 @@ public class ScriptPatternSelector implements PatternSelector {
/**
* Deprecated, use {@link #newBuilder()} instead.
- *
+ *
* @param script
* @param properties
* @param defaultPattern
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 97fcc3b..b6d58de 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
@@ -46,17 +46,17 @@ public final class SyslogLayout extends AbstractStringLayout {
/**
* Builds a SyslogLayout.
* <p>The main arguments are</p>
- * <ul>
+ * <ul>
* <li>facility: The Facility is used to try to classify the message.</li>
* <li>includeNewLine: If true a newline will be appended to the result.</li>
* <li>escapeNL: Pattern to use for replacing newlines.</li>
* <li>charset: The character set.</li>
- * </ul>
+ * </ul>
* @param <B> the builder type
*/
public static class Builder<B extends Builder<B>> extends AbstractStringLayout.Builder<B>
implements org.apache.logging.log4j.core.util.Builder<SyslogLayout> {
-
+
public Builder() {
super();
setCharset(StandardCharsets.UTF_8);
@@ -104,7 +104,7 @@ public final class SyslogLayout extends AbstractStringLayout {
}
}
-
+
@PluginBuilderFactory
public static <B extends Builder<B>> B newBuilder() {
return new Builder<B>().asBuilder();
@@ -123,7 +123,7 @@ public final class SyslogLayout extends AbstractStringLayout {
* Date format used if header = true.
*/
private final SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd HH:mm:ss", Locale.ENGLISH);
-
+
/**
* Host name used to identify messages from this appender.
*/
@@ -184,7 +184,7 @@ public final class SyslogLayout extends AbstractStringLayout {
* <li>Key: "formatType" Value: "logfilepatternreceiver" (format uses the keywords supported by
* LogFilePatternReceiver)</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting SyslogLayout
*/
@Override
@@ -199,7 +199,7 @@ public final class SyslogLayout extends AbstractStringLayout {
/**
* Creates a SyslogLayout.
- *
+ *
* @param facility The Facility is used to try to classify the message.
* @param includeNewLine If true a newline will be appended to the result.
* @param escapeNL Pattern to use for replacing newlines.
@@ -215,7 +215,7 @@ public final class SyslogLayout extends AbstractStringLayout {
/**
* Gets the facility.
- *
+ *
* @return the facility
*/
public Facility getFacility() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 b09add7..c9cd886 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
@@ -146,7 +146,7 @@ public final class XmlLayout extends AbstractJacksonLayout {
* <li>Key: "dtd" Value: "log4j-events.dtd"</li>
* <li>Key: "version" Value: "2.0"</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting XmlLayout
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 1d8576f..0245cd8 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
@@ -157,7 +157,7 @@ public final class YamlLayout extends AbstractJacksonLayout {
/**
* Creates a YAML Layout.
- *
+ *
* @param config
* The plugin configuration.
* @param locationInfo
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
index 1dba499..c76561c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
@@ -18,14 +18,14 @@ package org.apache.logging.log4j.core.lookup;
/**
* A default lookup for others to extend.
- *
+ *
* @since 2.1
*/
public abstract class AbstractLookup implements StrLookup {
/**
* Calls {@code lookup(null, key)} in the super class.
- *
+ *
* @see StrLookup#lookup(LogEvent, String)
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/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 a50de0d..34b2fd3 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
@@ -23,9 +23,9 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* A map-based lookup for main arguments.
- *
+ *
* See {@link #setMainArguments(String[])}.
- *
+ *
* @since 2.4
*/
@Plugin(name = "main", category = StrLookup.CATEGORY)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
index 320db49..fbbef22 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Looks-up markers.
- *
+ *
* @since 2.4
*/
@Plugin(name = "marker", category = StrLookup.CATEGORY)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
index f6d787a..bea4262 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
@@ -369,7 +369,7 @@ public abstract class StrMatcher {
}
return len;
}
-
+
@Override
public String toString() {
return super.toString() + Chars.SPACE + Arrays.toString(chars);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
index 5157365..76d3e46 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
@@ -34,12 +34,12 @@ public abstract class AbstractSocketManager extends OutputStreamManager {
* The Internet address of the host.
*/
protected final InetAddress inetAddress;
-
+
/**
* The name of the host.
*/
protected final String host;
-
+
/**
* The port on the host.
*/
@@ -55,7 +55,7 @@ public abstract class AbstractSocketManager extends OutputStreamManager {
* @param bufferSize The buffer size.
*/
public AbstractSocketManager(final String name, final OutputStream os, final InetAddress inetAddress,
- final String host, final int port, final Layout<? extends Serializable> layout, final boolean writeHeader,
+ final String host, final int port, final Layout<? extends Serializable> layout, final boolean writeHeader,
final int bufferSize) {
super(os, name, layout, writeHeader, bufferSize);
this.inetAddress = inetAddress;
@@ -69,7 +69,7 @@ public abstract class AbstractSocketManager extends OutputStreamManager {
* <li>Key: "port" Value: provided "port" param</li>
* <li>Key: "address" Value: provided "address" param</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting AbstractSocketManager
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
index 844c614..8f22c85 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
@@ -75,7 +75,7 @@ public class DatagramSocketManager extends AbstractSocketManager {
* <li>Key: "protocol" Value: "udp"</li>
* <li>Key: "direction" Value: "out"</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting DatagramSocketManager
*/
@Override
@@ -94,7 +94,7 @@ public class DatagramSocketManager extends AbstractSocketManager {
private final int port;
private final Layout<? extends Serializable> layout;
private final int bufferSize;
-
+
public FactoryData(final String host, final int port, final Layout<? extends Serializable> layout, final int bufferSize) {
this.host = host;
this.port = port;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
index a5eadf3..a03dc33 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
@@ -125,76 +125,76 @@ import org.apache.logging.log4j.util.EnglishEnums;
* </table>
*/
public enum Facility {
-
+
/** Kernel messages. */
KERN(0),
-
+
/** User level messages. */
USER(1),
-
+
/** Mail system. */
MAIL(2),
-
+
/** System daemons. */
DAEMON(3),
-
+
/** Security/Authorization messages. */
AUTH(4),
-
+
/** Messages generated by syslogd. */
SYSLOG(5),
-
+
/** Line printer subsystem. */
LPR(6),
-
+
/** Network news subsystem. */
NEWS(7),
-
+
/** UUCP subsystem. */
UUCP(8),
-
+
/** Clock daemon. */
CRON(9),
-
+
/** Security/Authorization messages. */
AUTHPRIV(10),
-
+
/** FTP daemon. */
FTP(11),
-
+
/** NTP subsystem. */
NTP(12),
-
+
/** Log audit. */
LOG_AUDIT(13),
-
+
/** Log alert. */
LOG_ALERT(14),
-
+
/** Clock daemon. */
CLOCK(15),
-
+
/** Local use 0. */
LOCAL0(16),
-
+
/** Local use 1. */
LOCAL1(17),
-
+
/** Local use 2. */
LOCAL2(18),
-
+
/** Local use 3. */
LOCAL3(19),
-
+
/** Local use 4. */
LOCAL4(20),
-
+
/** Local use 5. */
LOCAL5(21),
-
+
/** Local use 6. */
LOCAL6(22),
-
+
/** Local use 7. */
LOCAL7(23);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
index 22ab3aa..2670857 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
@@ -55,7 +55,7 @@ public class JndiManager extends AbstractManager {
/**
* Gets a named JndiManager using the default {@link javax.naming.InitialContext}.
- *
+ *
* @param name the name of the JndiManager instance to create or use if available
* @return a default JndiManager
*/
@@ -89,7 +89,7 @@ public class JndiManager extends AbstractManager {
/**
* Gets a JndiManager with the provided configuration information.
- *
+ *
* @param properties JNDI properties, usually created by calling {@link #createProperties(String, String, String, String, String, Properties)}.
* @return the JndiManager for the provided parameters.
* @see #createProperties(String, String, String, String, String, Properties)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
index 3d610bf..5f86c53 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
@@ -116,7 +116,7 @@ public class MulticastDnsAdvertiser implements Advertiser {
/**
* Unadvertise the previously advertised entity.
- *
+ *
* @param serviceInfo
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
index c7c6acc..decd996 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
@@ -49,7 +49,7 @@ public class Priority {
private static int toPriority(final Facility aFacility, final Severity aSeverity) {
return (aFacility.getCode() << 3) + aSeverity.getCode();
}
-
+
/**
* Returns the Facility.
* @return the Facility.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
index 8144e45..fe5d6f1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.net;
/**
* Enumerates the <a href="https://tools.ietf.org/html/rfc1349">RFC 1349</a> TOS field.
- *
+ *
* <ul>
* <li><code>IPTOS_LOWCOST (0x02)</code></li>
* <li><code>IPTOS_RELIABILITY (0x04)</code></li>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
index f01719e..074b34a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
@@ -164,7 +164,7 @@ public class SslSocketManager extends TcpSocketManager {
data.connectTimeoutMillis, data.reconnectDelayMillis, data.immediateFail, data.layout, data.bufferSize,
data.socketOptions);
}
-
+
@Override
Socket createSocket(final SslFactoryData data) throws IOException {
return SslSocketManager.createSocket(data.host, data.port, data.connectTimeoutMillis, data.sslConfiguration,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
index 4988202..c5967c0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
@@ -68,7 +68,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Constructs.
- *
+ *
* @param name
* The unique name of this connection.
* @param os
@@ -105,7 +105,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Constructs.
- *
+ *
* @param name
* The unique name of this connection.
* @param os
@@ -148,7 +148,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Obtains a TcpSocketManager.
- *
+ *
* @param host
* The host to connect to.
* @param port
@@ -172,7 +172,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Obtains a TcpSocketManager.
- *
+ *
* @param host
* The host to connect to.
* @param port
@@ -282,7 +282,7 @@ public class TcpSocketManager extends AbstractSocketManager {
* <li>Key: "protocol" Value: "tcp"</li>
* <li>Key: "direction" Value: "out"</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting TcpSocketManager
*/
@Override
@@ -422,7 +422,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Factory to create a TcpSocketManager.
- *
+ *
* @param <M>
* The manager type.
* @param <T>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
index b129184..5603e89 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
@@ -66,7 +66,7 @@ public class SslConfiguration {
this.trustStoreConfig.clearSecrets();
}
}
-
+
public SSLSocketFactory getSslSocketFactory() {
return sslContext.getSocketFactory();
}
@@ -219,7 +219,7 @@ public class SslConfiguration {
/**
* Creates an SslConfiguration from a KeyStoreConfiguration and a TrustStoreConfiguration.
- *
+ *
* @param protocol The protocol, see http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#SSLContext
* @param keyStoreConfig The KeyStoreConfiguration.
* @param trustStoreConfig The TrustStoreConfiguration.
@@ -229,7 +229,7 @@ public class SslConfiguration {
public static SslConfiguration createSSLConfiguration(
// @formatter:off
@PluginAttribute("protocol") final String protocol,
- @PluginElement("KeyStore") final KeyStoreConfiguration keyStoreConfig,
+ @PluginElement("KeyStore") final KeyStoreConfiguration keyStoreConfig,
@PluginElement("TrustStore") final TrustStoreConfiguration trustStoreConfig) {
// @formatter:on
return new SslConfiguration(protocol, keyStoreConfig, trustStoreConfig);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
index ca20335..2ef2bc3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.LogEvent;
* Parses the output from a text based layout into instances of {@link LogEvent}.
*/
public interface TextLogEventParser extends LogEventParser {
-
+
/**
* Parses a String, which is expected to contain exactly one log event.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
index 8ec9b7d..9485746 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
@@ -35,7 +35,7 @@ public final class ExtendedThrowablePatternConverter extends ThrowablePatternCon
/**
* Private constructor.
- *
+ *
* @param config
* @param options options, may be null.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
index 8377036..ea47a68 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
@@ -34,9 +34,9 @@ import org.fusesource.jansi.AnsiRenderer.Code;
/**
* Renders an input as ANSI escaped output.
- *
+ *
* Uses the JAnsi rendering syntax as the default to render a message into an ANSI escaped string.
- *
+ *
* The default syntax for embedded ANSI codes is:
*
* <pre>
@@ -54,28 +54,28 @@ import org.fusesource.jansi.AnsiRenderer.Code;
* <pre>
* @|bold,red Warning!|@
* </pre>
- *
+ *
* You can also define custom style names in the configuration with the syntax:
- *
+ *
* <pre>
* %message{ansi}{StyleName=value(,value)*( StyleName=value(,value)*)*}%n
* </pre>
- *
+ *
* For example:
- *
+ *
* <pre>
* %message{ansi}{WarningStyle=red,bold KeyStyle=white ValueStyle=blue}%n
* </pre>
- *
+ *
* The call site can look like this:
- *
+ *
* <pre>
* logger.info("@|KeyStyle {}|@ = @|ValueStyle {}|@", entry.getKey(), entry.getValue());
* </pre>
- *
+ *
* Note: This class originally copied and then heavily modified code from JAnsi's AnsiRenderer (which is licensed as
* Apache 2.0.)
- *
+ *
* @see AnsiRenderer
*/
public final class JAnsiTextRenderer implements TextRenderer {
@@ -254,7 +254,7 @@ public final class JAnsiTextRenderer implements TextRenderer {
/**
* Renders the given text with the given names which can be ANSI code names or Log4j style names.
- *
+ *
* @param text
* The text to render
* @param names
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
index 5233432..a29634d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.core.pattern;
Renders input unchanged.
*/
public final class PlainTextRenderer implements TextRenderer {
-
+
private static final PlainTextRenderer INSTANCE = new PlainTextRenderer();
public static PlainTextRenderer getInstance() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
index 2355c88..3a9e210 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
@@ -23,7 +23,7 @@ public interface TextRenderer {
/**
* Renders input text to an output.
- *
+ *
* @param input
* The input
* @param output
@@ -35,7 +35,7 @@ public interface TextRenderer {
/**
* Renders input text to an output.
- *
+ *
* @param input
* The input
* @param output
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
index 90f04fa..b78bff2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
@@ -26,7 +26,7 @@ public abstract class AbstractScript {
protected static final Logger LOGGER = StatusLogger.getLogger();
protected static final String DEFAULT_LANGUAGE = "JavaScript";
-
+
private final String language;
private final String scriptText;
private final String name;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
index b790eaf..b054e9a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
@@ -44,7 +44,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* Here is an example of an <code>env-entry</code>:
* </p>
* <blockquote>
- *
+ *
* <pre>
* <env-entry>
* <description>JNDI logging context name for this app</description>
@@ -53,7 +53,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* <env-entry-type>java.lang.String</env-entry-type>
* </env-entry>
* </pre>
- *
+ *
* </blockquote>
*
* <p>
@@ -66,7 +66,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* (ContextJNDISelector) will use this resource to automatically configure the log4j repository.
* </p>
** <blockquote>
- *
+ *
* <pre>
* <env-entry>
* <description>URL for configuring log4j context</description>
@@ -75,7 +75,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* <env-entry-type>java.lang.String</env-entry-type>
* </env-entry>
* </pre>
- *
+ *
* </blockquote>
*
* <p>