http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java index ca6bd9b..d28753d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevelConfig.java @@ -42,7 +42,7 @@ public final class CustomLevelConfig { /** * Creates a CustomLevelConfig object. This also defines the Level object with a call to * {@link Level#forName(String, int)}. - * + * * @param levelName name of the custom level. * @param intLevel the intLevel that determines where this level resides relative to the built-in levels * @return A CustomLevelConfig object. @@ -60,7 +60,7 @@ public final class CustomLevelConfig { /** * Returns the custom level name. - * + * * @return the custom level name */ public String getLevelName() { @@ -70,7 +70,7 @@ public final class CustomLevelConfig { /** * Returns the custom level intLevel that determines the strength of the custom level relative to the built-in * levels. - * + * * @return the custom level intLevel */ public int getIntLevel() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevels.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevels.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevels.java index 0b43858..db6eab3 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevels.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CustomLevels.java @@ -40,7 +40,7 @@ public final class CustomLevels { /** * Create a CustomLevels object to contain all the CustomLevelConfigs. - * + * * @param customLevels An array of CustomLevelConfigs. * @return A CustomLevels object. */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java index cbedf7c..973eb27 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java @@ -28,12 +28,12 @@ public class DefaultConfiguration extends AbstractConfiguration { * The name of the default configuration. */ public static final String DEFAULT_NAME = "Default"; - + /** * The System Property used to specify the logging level. */ public static final String DEFAULT_LEVEL = "org.apache.logging.log4j.level"; - + /** * The default Pattern used for the default Layout. */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.java index 18fcae4..f6e32f5 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.java @@ -38,7 +38,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy { /* * (non-Javadoc) - * + * * @see org.apache.logging.log4j.core.config.ReliabilityStrategy#log(org.apache.logging.log4j.util.Supplier, * java.lang.String, java.lang.String, org.apache.logging.log4j.Marker, org.apache.logging.log4j.Level, * org.apache.logging.log4j.message.Message, java.lang.Throwable) @@ -51,7 +51,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy { /* * (non-Javadoc) - * + * * @see org.apache.logging.log4j.core.config.ReliabilityStrategy#log(org.apache.logging.log4j.util.Supplier, * org.apache.logging.log4j.core.LogEvent) */ @@ -62,7 +62,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy { /* * (non-Javadoc) - * + * * @see * org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeLogEvent(org.apache.logging.log4j.core.config. * LoggerConfig, org.apache.logging.log4j.util.Supplier) @@ -74,7 +74,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy { /* * (non-Javadoc) - * + * * @see org.apache.logging.log4j.core.config.ReliabilityStrategy#afterLogEvent() */ @Override @@ -84,7 +84,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy { /* * (non-Javadoc) - * + * * @see org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeStopAppenders() */ @Override @@ -94,7 +94,7 @@ public class DefaultReliabilityStrategy implements ReliabilityStrategy { /* * (non-Javadoc) - * + * * @see * org.apache.logging.log4j.core.config.ReliabilityStrategy#beforeStopConfiguration(org.apache.logging.log4j.core * .config.Configuration) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java index 1022f2d..97cebe0 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java @@ -442,7 +442,7 @@ public class LoggerConfig extends AbstractFilterable { return reliabilityStrategy; } - private void processLogEvent(final LogEvent event, LoggerConfigPredicate predicate) { + private void processLogEvent(final LogEvent event, final LoggerConfigPredicate predicate) { event.setIncludeLocation(isIncludeLocation()); if (predicate.allow(this)) { callAppenders(event); @@ -598,19 +598,19 @@ public class LoggerConfig extends AbstractFilterable { protected enum LoggerConfigPredicate { ALL() { @Override - boolean allow(LoggerConfig config) { + boolean allow(final LoggerConfig config) { return true; } }, ASYNCHRONOUS_ONLY() { @Override - boolean allow(LoggerConfig config) { + boolean allow(final LoggerConfig config) { return config instanceof AsyncLoggerConfig; } }, SYNCHRONOUS_ONLY() { @Override - boolean allow(LoggerConfig config) { + boolean allow(final LoggerConfig config) { return !ASYNCHRONOUS_ONLY.allow(config); } }; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java index cb4731e..137fba8 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Property.java @@ -36,7 +36,7 @@ public final class Property { * @since 2.11.2 */ public static final Property[] EMPTY_ARRAY = new Property[0]; - + private static final Logger LOGGER = StatusLogger.getLogger(); private final String name; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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 27d8710..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; @@ -356,12 +356,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement } @Override - public LoggerComponentBuilder newAsyncLogger(String name) { + public LoggerComponentBuilder newAsyncLogger(final String name) { return new DefaultLoggerComponentBuilder(this, name, null, "AsyncLogger"); } @Override - public LoggerComponentBuilder newAsyncLogger(String name, boolean includeLocation) { + public LoggerComponentBuilder newAsyncLogger(final String name, final boolean includeLocation) { return new DefaultLoggerComponentBuilder(this, name, null, "AsyncLogger", includeLocation); } @@ -391,7 +391,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement } @Override - public RootLoggerComponentBuilder newAsyncRootLogger(boolean includeLocation) { + public RootLoggerComponentBuilder newAsyncRootLogger(final boolean includeLocation) { return new DefaultRootLoggerComponentBuilder(this, null, "AsyncRoot", includeLocation); } @@ -464,12 +464,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement } @Override - public LoggerComponentBuilder newLogger(String name) { + public LoggerComponentBuilder newLogger(final String name) { return new DefaultLoggerComponentBuilder(this, name, null); } @Override - public LoggerComponentBuilder newLogger(String name, boolean includeLocation) { + public LoggerComponentBuilder newLogger(final String name, final boolean includeLocation) { return new DefaultLoggerComponentBuilder(this, name, null, includeLocation); } @@ -499,7 +499,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement } @Override - public RootLoggerComponentBuilder newRootLogger(boolean includeLocation) { + public RootLoggerComponentBuilder newRootLogger(final boolean includeLocation) { return new DefaultRootLoggerComponentBuilder(this, null, includeLocation); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java index 063059a..9b6b11a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java @@ -38,7 +38,6 @@ import org.apache.logging.log4j.core.util.FileWatcher; import org.apache.logging.log4j.core.util.Loader; import org.apache.logging.log4j.core.util.Patterns; import org.apache.logging.log4j.core.util.WatchManager; -import org.apache.logging.log4j.util.LoaderUtil; import org.apache.logging.log4j.util.PropertiesUtil; /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/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/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java index 443c612..f726a3a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java @@ -23,7 +23,6 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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 4c61d33..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 @@ -64,14 +64,14 @@ public abstract class AbstractFilterable extends AbstractLifeCycle implements Fi return asBuilder(); } - public B setPropertyArray(Property[] properties) { + public B setPropertyArray(final Property[] properties) { this.propertyArray = properties; return asBuilder(); } /** * 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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java index 70b548d..a7a7aaa 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java @@ -117,7 +117,7 @@ public class ContextDataFactory { public static StringMap createContextData(final Map<String, String> context) { final StringMap contextData = createContextData(context.size()); - for (Entry<String, String> entry : context.entrySet()) { + for (final Entry<String, String> entry : context.entrySet()) { contextData.putValue(entry.getKey(), entry.getValue()); } return contextData; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/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/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java index 42bd52a..9aa1da5 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java @@ -37,7 +37,6 @@ import org.apache.logging.log4j.core.util.Loader; import org.apache.logging.log4j.core.util.ShutdownCallbackRegistry; import org.apache.logging.log4j.spi.LoggerContextFactory; import org.apache.logging.log4j.status.StatusLogger; -import org.apache.logging.log4j.util.LoaderUtil; import org.apache.logging.log4j.util.PropertiesUtil; /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/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 6ee9e1c..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 @@ -85,7 +85,7 @@ public class Log4jLogEvent implements LogEvent { private String loggerName; private Message message; private Throwable thrown; - private MutableInstant instant = new MutableInstant(); + private final MutableInstant instant = new MutableInstant(); private ThrowableProxy thrownProxy; private StringMap contextData = createContextData((List<Property>) null); private ThreadContext.ContextStack contextStack = ThreadContext.getImmutableStack(); @@ -417,7 +417,7 @@ public class Log4jLogEvent implements LogEvent { final String threadName, final int threadPriority, final StackTraceElement source, final long timestampMillis, final int nanoOfMillisecond, final long nanoTime) { this(loggerName, marker, loggerFQCN, level, message, thrown, thrownProxy, contextData, contextStack, threadId, threadName, threadPriority, source, nanoTime); - long millis = message instanceof TimestampMessage + final long millis = message instanceof TimestampMessage ? ((TimestampMessage) message).getTimestamp() : timestampMillis; instant.initFromEpochMilli(millis, nanoOfMillisecond); @@ -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/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java index c867ce4..3cfcb3d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java @@ -36,7 +36,7 @@ public final class MementoMessage implements Message, StringBuilderFormattable { private final String format; private final Object[] parameters; - public MementoMessage(String formattedMessage, String format, Object[] parameters) { + public MementoMessage(final String formattedMessage, final String format, final Object[] parameters) { this.formattedMessage = formattedMessage; this.format = format; this.parameters = parameters; @@ -68,7 +68,7 @@ public final class MementoMessage implements Message, StringBuilderFormattable { } @Override - public void formatTo(StringBuilder buffer) { + public void formatTo(final StringBuilder buffer) { buffer.append(formattedMessage); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java index 3e0d388..7b8f671 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java @@ -45,7 +45,7 @@ public class MutableLogEvent implements LogEvent, ReusableMessage, ParameterVisi private int threadPriority; private long threadId; - private MutableInstant instant = new MutableInstant(); + private final MutableInstant instant = new MutableInstant(); private long nanoTime; private short parameterCount; private boolean includeLocation; @@ -256,7 +256,7 @@ public class MutableLogEvent implements LogEvent, ReusableMessage, ParameterVisi } @Override - public <S> void forEachParameter(ParameterConsumer<S> action, S state) { + public <S> void forEachParameter(final ParameterConsumer<S> action, final S state) { if (parameters != null) { for (short i = 0; i < parameterCount; i++) { action.accept(parameters[i], i, state); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java index dd5cf62..9f4cc17 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java @@ -98,7 +98,7 @@ public class ReusableLogEventFactory implements LogEventFactory { */ public static void release(final LogEvent logEvent) { // LOG4J2-1583 if (logEvent instanceof MutableLogEvent) { - MutableLogEvent mutableLogEvent = (MutableLogEvent) logEvent; + final MutableLogEvent mutableLogEvent = (MutableLogEvent) logEvent; mutableLogEvent.clear(); mutableLogEvent.reserved = false; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java index c948a0c..1c043af 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java @@ -298,7 +298,7 @@ public class ThrowableProxy implements Serializable { * * @param value New value of commonElementCount. */ - void setCommonElementCount(int value) { + void setCommonElementCount(final int value) { this.commonElementCount = value; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java index d86d2bb..f13943a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java @@ -53,13 +53,13 @@ class ThrowableProxyRenderer { } private static void formatCause(final StringBuilder sb, final String prefix, final ThrowableProxy cause, - final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, String lineSeparator) { + final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) { formatThrowableProxy(sb, prefix, CAUSED_BY_LABEL, cause, ignorePackages, textRenderer, suffix, lineSeparator); } private static void formatThrowableProxy(final StringBuilder sb, final String prefix, final String causeLabel, final ThrowableProxy throwableProxy, final List<String> ignorePackages, - final TextRenderer textRenderer, final String suffix, String lineSeparator) { + final TextRenderer textRenderer, final String suffix, final String lineSeparator) { if (throwableProxy == null) { return; } @@ -75,7 +75,7 @@ class ThrowableProxyRenderer { } private static void formatSuppressed(final StringBuilder sb, final String prefix, final ThrowableProxy[] suppressedProxies, - final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, String lineSeparator) { + final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) { if (suppressedProxies == null) { return; } @@ -86,7 +86,7 @@ class ThrowableProxyRenderer { private static void formatElements(final StringBuilder sb, final String prefix, final int commonCount, final StackTraceElement[] causedTrace, final ExtendedStackTraceElement[] extStackTrace, - final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, String lineSeparator) { + final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) { if (ignorePackages == null || ignorePackages.isEmpty()) { for (final ExtendedStackTraceElement element : extStackTrace) { formatEntry(element, sb, prefix, textRenderer, suffix, lineSeparator); @@ -126,7 +126,7 @@ class ThrowableProxyRenderer { } private static void appendSuppressedCount(final StringBuilder sb, final String prefix, final int count, - final TextRenderer textRenderer, final String suffix, String lineSeparator) { + final TextRenderer textRenderer, final String suffix, final String lineSeparator) { textRenderer.render(prefix, sb, "Prefix"); if (count == 1) { textRenderer.render("\t... ", sb, "Suppressed"); @@ -140,7 +140,7 @@ class ThrowableProxyRenderer { } private static void formatEntry(final ExtendedStackTraceElement extStackTraceElement, final StringBuilder sb, - final String prefix, final TextRenderer textRenderer, final String suffix, String lineSeparator) { + final String prefix, final TextRenderer textRenderer, final String suffix, final String lineSeparator) { textRenderer.render(prefix, sb, "Prefix"); textRenderer.render("\tat ", sb, "At"); extStackTraceElement.renderOn(sb, textRenderer); @@ -170,7 +170,7 @@ class ThrowableProxyRenderer { * @param suffix Append this to the end of each stack frame. * @param lineSeparator The end-of-line separator. */ - static void formatExtendedStackTraceTo(ThrowableProxy src, final StringBuilder sb, final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) { + static void formatExtendedStackTraceTo(final ThrowableProxy src, final StringBuilder sb, final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) { textRenderer.render(src.getName(), sb, "Name"); textRenderer.render(": ", sb, "NameMessageSeparator"); textRenderer.render(src.getMessage(), sb, "Message"); @@ -193,7 +193,7 @@ class ThrowableProxyRenderer { * @param lineSeparator The end-of-line separator. */ static void formatCauseStackTrace(final ThrowableProxy src, final StringBuilder sb, final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) { - ThrowableProxy causeProxy = src.getCauseProxy(); + final ThrowableProxy causeProxy = src.getCauseProxy(); if (causeProxy != null) { formatWrapper(sb, causeProxy, ignorePackages, textRenderer, suffix, lineSeparator); sb.append(WRAPPED_BY_LABEL); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/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/a8a7e7c9/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java index d764d55..2e6f652 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java @@ -177,7 +177,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout { * * @return this builder */ - public B setAdditionalFields(KeyValuePair[] additionalFields) { + public B setAdditionalFields(final KeyValuePair[] additionalFields) { this.additionalFields = additionalFields; return asBuilder(); } @@ -231,7 +231,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout { final ResolvableKeyValuePair[] resolvableFields = new ResolvableKeyValuePair[additionalFields.length]; for (int i = 0; i < additionalFields.length; i++) { - ResolvableKeyValuePair resolvable = resolvableFields[i] = new ResolvableKeyValuePair(additionalFields[i]); + final ResolvableKeyValuePair resolvable = resolvableFields[i] = new ResolvableKeyValuePair(additionalFields[i]); // Validate if (config == null && resolvable.valueNeedsLookup) { @@ -271,7 +271,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout { protected Object wrapLogEvent(final LogEvent event) { if (additionalFields.length > 0) { // Construct map for serialization - note that we are intentionally using original LogEvent - Map<String, String> additionalFieldsMap = resolveAdditionalFields(event); + final Map<String, String> additionalFieldsMap = resolveAdditionalFields(event); // This class combines LogEvent with AdditionalFields during serialization return new LogEventWithAdditionalFields(event, additionalFieldsMap); } else { @@ -280,13 +280,13 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout { } } - private Map<String, String> resolveAdditionalFields(LogEvent logEvent) { + private Map<String, String> resolveAdditionalFields(final LogEvent logEvent) { // Note: LinkedHashMap retains order final Map<String, String> additionalFieldsMap = new LinkedHashMap<>(additionalFields.length); final StrSubstitutor strSubstitutor = configuration.getStrSubstitutor(); // Go over each field - for (ResolvableKeyValuePair pair : additionalFields) { + for (final ResolvableKeyValuePair pair : additionalFields) { if (pair.valueNeedsLookup) { // Resolve value additionalFieldsMap.put(pair.key, strSubstitutor.replace(logEvent, pair.value)); @@ -316,7 +316,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout { private final Object logEvent; private final Map<String, String> additionalFields; - public LogEventWithAdditionalFields(Object logEvent, Map<String, String> additionalFields) { + public LogEventWithAdditionalFields(final Object logEvent, final Map<String, String> additionalFields) { this.logEvent = logEvent; this.additionalFields = additionalFields; } @@ -339,7 +339,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout { final String value; final boolean valueNeedsLookup; - ResolvableKeyValuePair(KeyValuePair pair) { + ResolvableKeyValuePair(final KeyValuePair pair) { this.key = pair.getKey(); this.value = pair.getValue(); this.valueNeedsLookup = AbstractJacksonLayout.valueNeedsLookup(this.value); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/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/a8a7e7c9/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 607ec43..fbbd597 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 @@ -126,7 +126,7 @@ public final class JsonLayout extends AbstractJacksonLayout { } @Override - public B setAdditionalFields(KeyValuePair[] additionalFields) { + public B setAdditionalFields(final KeyValuePair[] additionalFields) { this.additionalFields = additionalFields; return asBuilder(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/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/a8a7e7c9/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 57cbb9c..15e176e 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 @@ -551,9 +551,9 @@ public final class PatternLayout extends AbstractStringLayout { } private boolean useAnsiEscapeCodes() { - PropertiesUtil propertiesUtil = PropertiesUtil.getProperties(); - boolean isPlatformSupportsAnsi = !propertiesUtil.isOsWindows(); - boolean isJansiRequested = !propertiesUtil.getBooleanProperty("log4j.skipJansi", true); + final PropertiesUtil propertiesUtil = PropertiesUtil.getProperties(); + final boolean isPlatformSupportsAnsi = !propertiesUtil.isOsWindows(); + final boolean isJansiRequested = !propertiesUtil.getBooleanProperty("log4j.skipJansi", true); return isPlatformSupportsAnsi || isJansiRequested; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8a7e7c9/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 bd5fb95..f019e84 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 @@ -391,7 +391,7 @@ public final class Rfc5424Layout extends AbstractStringLayout { if (isStructured) { if (message instanceof MessageCollectionMessage) { - for (StructuredDataMessage data : ((StructuredDataCollectionMessage)message)) { + for (final StructuredDataMessage data : ((StructuredDataCollectionMessage)message)) { addStructuredData(sdElements, data); } } else {
