You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/06/07 08:58:45 UTC
[15/50] [abbrv] logging-log4j2 git commit: Use final.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
index e188efa..0eaa9f6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
@@ -69,13 +69,13 @@ public class DefaultMergeStrategy implements MergeStrategy {
*/
@Override
public void mergeRootProperties(final Node rootNode, final AbstractConfiguration configuration) {
- for (Map.Entry<String, String> attribute : configuration.getRootNode().getAttributes().entrySet()) {
+ for (final Map.Entry<String, String> attribute : configuration.getRootNode().getAttributes().entrySet()) {
boolean isFound = false;
- for (Map.Entry<String, String> targetAttribute : rootNode.getAttributes().entrySet()) {
+ for (final Map.Entry<String, String> targetAttribute : rootNode.getAttributes().entrySet()) {
if (targetAttribute.getKey().equalsIgnoreCase(attribute.getKey())) {
if (attribute.getKey().equalsIgnoreCase(STATUS)) {
- Level targetLevel = Level.getLevel(targetAttribute.getValue().toUpperCase());
- Level sourceLevel = Level.getLevel(attribute.getValue().toUpperCase());
+ final Level targetLevel = Level.getLevel(targetAttribute.getValue().toUpperCase());
+ final Level sourceLevel = Level.getLevel(attribute.getValue().toUpperCase());
if (targetLevel != null && sourceLevel != null) {
if (sourceLevel.isLessSpecificThan(targetLevel)) {
targetAttribute.setValue(attribute.getValue());
@@ -86,8 +86,8 @@ public class DefaultMergeStrategy implements MergeStrategy {
}
} else {
if (attribute.getKey().equalsIgnoreCase("monitorInterval")) {
- int sourceInterval = Integer.parseInt(attribute.getValue());
- int targetInterval = Integer.parseInt(targetAttribute.getValue());
+ final int sourceInterval = Integer.parseInt(attribute.getValue());
+ final int targetInterval = Integer.parseInt(targetAttribute.getValue());
if (targetInterval == 0 || sourceInterval < targetInterval) {
targetAttribute.setValue(attribute.getValue());
}
@@ -113,10 +113,10 @@ public class DefaultMergeStrategy implements MergeStrategy {
*/
@Override
public void mergConfigurations(final Node target, final Node source, final PluginManager pluginManager) {
- for (Node sourceChildNode : source.getChildren()) {
- boolean isFilter = isFilterNode(sourceChildNode);
+ for (final Node sourceChildNode : source.getChildren()) {
+ final boolean isFilter = isFilterNode(sourceChildNode);
boolean isMerged = false;
- for (Node targetChildNode : target.getChildren()) {
+ for (final Node targetChildNode : target.getChildren()) {
if (isFilter) {
if (isFilterNode(targetChildNode)) {
updateFilterNode(target, targetChildNode, sourceChildNode, pluginManager);
@@ -135,8 +135,8 @@ public class DefaultMergeStrategy implements MergeStrategy {
case PROPERTIES:
case SCRIPTS:
case APPENDERS: {
- for (Node node : sourceChildNode.getChildren()) {
- for (Node targetNode : targetChildNode.getChildren()) {
+ for (final Node node : sourceChildNode.getChildren()) {
+ for (final Node targetNode : targetChildNode.getChildren()) {
if (targetNode.getAttributes().get(NAME).equals(node.getAttributes().get(NAME))) {
targetChildNode.getChildren().remove(targetNode);
break;
@@ -148,18 +148,18 @@ public class DefaultMergeStrategy implements MergeStrategy {
break;
}
case LOGGERS: {
- Map<String, Node> targetLoggers = new HashMap<>();
- for (Node node : targetChildNode.getChildren()) {
+ final Map<String, Node> targetLoggers = new HashMap<>();
+ for (final Node node : targetChildNode.getChildren()) {
targetLoggers.put(node.getName(), node);
}
- for (Node node : sourceChildNode.getChildren()) {
- Node targetNode = getLoggerNode(targetChildNode, node.getAttributes().get(NAME));
- Node loggerNode = new Node(targetChildNode, node.getName(), node.getType());
+ for (final Node node : sourceChildNode.getChildren()) {
+ final Node targetNode = getLoggerNode(targetChildNode, node.getAttributes().get(NAME));
+ final Node loggerNode = new Node(targetChildNode, node.getName(), node.getType());
if (targetNode != null) {
- for (Node sourceLoggerChild : node.getChildren()) {
+ for (final Node sourceLoggerChild : node.getChildren()) {
if (isFilterNode(sourceLoggerChild)) {
boolean foundFilter = false;
- for (Node targetChild : targetNode.getChildren()) {
+ for (final Node targetChild : targetNode.getChildren()) {
if (isFilterNode(targetChild)) {
updateFilterNode(loggerNode, targetChild, sourceLoggerChild,
pluginManager);
@@ -168,23 +168,23 @@ public class DefaultMergeStrategy implements MergeStrategy {
}
}
if (!foundFilter) {
- Node childNode = new Node(loggerNode, sourceLoggerChild.getName(),
+ final Node childNode = new Node(loggerNode, sourceLoggerChild.getName(),
sourceLoggerChild.getType());
targetNode.getChildren().add(childNode);
}
} else {
- Node childNode = new Node(loggerNode, sourceLoggerChild.getName(),
+ final Node childNode = new Node(loggerNode, sourceLoggerChild.getName(),
sourceLoggerChild.getType());
childNode.getAttributes().putAll(sourceLoggerChild.getAttributes());
if (childNode.getName().equalsIgnoreCase("AppenderRef")) {
- for (Node targetChild : targetNode.getChildren()) {
+ for (final Node targetChild : targetNode.getChildren()) {
if (isSameReference(targetChild, childNode)) {
targetNode.getChildren().remove(targetChild);
break;
}
}
} else {
- for (Node targetChild : targetNode.getChildren()) {
+ for (final Node targetChild : targetNode.getChildren()) {
if (isSameName(targetChild, childNode)) {
targetNode.getChildren().remove(targetChild);
break;
@@ -223,8 +223,8 @@ public class DefaultMergeStrategy implements MergeStrategy {
}
private Node getLoggerNode(final Node parentNode, final String name) {
- for (Node node : parentNode.getChildren()) {
- String nodeName = node.getAttributes().get(NAME);
+ for (final Node node : parentNode.getChildren()) {
+ final String nodeName = node.getAttributes().get(NAME);
if (name == null && nodeName == null) {
return node;
}
@@ -238,19 +238,19 @@ public class DefaultMergeStrategy implements MergeStrategy {
private void updateFilterNode(final Node target, final Node targetChildNode, final Node sourceChildNode,
final PluginManager pluginManager) {
if (CompositeFilter.class.isAssignableFrom(targetChildNode.getType().getPluginClass())) {
- Node node = new Node(targetChildNode, sourceChildNode.getName(), sourceChildNode.getType());
+ final Node node = new Node(targetChildNode, sourceChildNode.getName(), sourceChildNode.getType());
node.getChildren().addAll(sourceChildNode.getChildren());
node.getAttributes().putAll(sourceChildNode.getAttributes());
targetChildNode.getChildren().add(node);
} else {
- PluginType pluginType = pluginManager.getPluginType(FILTERS);
- Node filtersNode = new Node(targetChildNode, FILTERS, pluginType);
- Node node = new Node(filtersNode, sourceChildNode.getName(), sourceChildNode.getType());
+ final PluginType pluginType = pluginManager.getPluginType(FILTERS);
+ final Node filtersNode = new Node(targetChildNode, FILTERS, pluginType);
+ final Node node = new Node(filtersNode, sourceChildNode.getName(), sourceChildNode.getType());
node.getAttributes().putAll(sourceChildNode.getAttributes());
- List<Node> children = filtersNode.getChildren();
+ final List<Node> children = filtersNode.getChildren();
children.add(targetChildNode);
children.add(node);
- List<Node> nodes = target.getChildren();
+ final List<Node> nodes = target.getChildren();
nodes.remove(targetChildNode);
nodes.add(filtersNode);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
index 0efef68..427fa6d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
@@ -90,7 +90,7 @@ public class JsonConfiguration extends AbstractConfiguration implements Reconfig
if (intervalSeconds > 0) {
getWatchManager().setIntervalSeconds(intervalSeconds);
if (configFile != null) {
- FileWatcher watcher = new ConfiguratonFileWatcher(this, listeners);
+ final FileWatcher watcher = new ConfiguratonFileWatcher(this, listeners);
getWatchManager().watchFile(configFile, watcher);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/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 66f9bba..0f159ff 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
@@ -78,8 +78,8 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory
@Override
public PropertiesConfiguration build() {
- Map<String, String> rootProps = new HashMap<>();
- for (String key : rootProperties.stringPropertyNames()) {
+ final Map<String, String> rootProps = new HashMap<>();
+ for (final String key : rootProperties.stringPropertyNames()) {
if (!key.contains(".")) {
builder.addRootProperty(key, rootProperties.getProperty(key));
}
@@ -120,11 +120,11 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory
}
}
- String filterProp = rootProperties.getProperty("filters");
+ final String filterProp = rootProperties.getProperty("filters");
if (filterProp != null) {
- String[] filterNames = filterProp.split(",");
- for (String filterName : filterNames) {
- String name = filterName.trim();
+ final String[] filterNames = filterProp.split(",");
+ for (final String filterName : filterNames) {
+ final String name = filterName.trim();
builder.add(createFilter(name, PropertiesUtil.extractSubset(rootProperties, "filter." + name)));
}
} else {
@@ -136,11 +136,11 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory
}
}
- String appenderProp = rootProperties.getProperty("appenders");
+ final String appenderProp = rootProperties.getProperty("appenders");
if (appenderProp != null) {
- String[] appenderNames = appenderProp.split(",");
- for (String appenderName : appenderNames) {
- String name = appenderName.trim();
+ final String[] appenderNames = appenderProp.split(",");
+ for (final String appenderName : appenderNames) {
+ final String name = appenderName.trim();
builder.add(createAppender(appenderName.trim(),
PropertiesUtil.extractSubset(rootProperties, "appender." + name)));
}
@@ -152,11 +152,11 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory
}
}
- String loggerProp = rootProperties.getProperty("loggers");
+ final String loggerProp = rootProperties.getProperty("loggers");
if (loggerProp != null) {
- String[] loggerNames = loggerProp.split(",");
- for (String loggerName : loggerNames) {
- String name = loggerName.trim();
+ final String[] loggerNames = loggerProp.split(",");
+ for (final String loggerName : loggerNames) {
+ final String name = loggerName.trim();
if (!name.equals(LoggerConfig.ROOT)) {
builder.add(createLogger(name, PropertiesUtil.extractSubset(rootProperties, "logger." +
name)));
@@ -332,7 +332,7 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory
final Properties properties) {
while (properties.size() > 0) {
final String propertyName = properties.stringPropertyNames().iterator().next();
- int index = propertyName.indexOf('.');
+ final int index = propertyName.indexOf('.');
if (index > 0) {
final String prefix = propertyName.substring(0, index);
final Properties componentProperties = PropertiesUtil.extractSubset(properties, prefix);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
index 63cb323..8eda63a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
@@ -46,7 +46,7 @@ public class PropertiesConfigurationFactory extends ConfigurationFactory {
final Properties properties = new Properties();
try {
properties.load(configStream);
- } catch (IOException ioe) {
+ } catch (final IOException ioe) {
throw new ConfigurationException("Unable to load " + source.toString(), ioe);
}
return new PropertiesConfigurationBuilder().setConfigurationSource(source)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/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 ea1c12b..ea3f753 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
@@ -95,7 +95,7 @@ public class XmlConfiguration extends AbstractConfiguration implements Reconfigu
document = documentBuilder.parse(source);
} catch (final Exception e) {
// LOG4J2-1127
- Throwable throwable = Throwables.getRootCause(e);
+ final Throwable throwable = Throwables.getRootCause(e);
if (throwable instanceof UnsupportedOperationException) {
LOGGER.warn(
"The DocumentBuilder {} does not support an operation: {}."
@@ -134,7 +134,7 @@ public class XmlConfiguration extends AbstractConfiguration implements Reconfigu
if (intervalSeconds > 0) {
getWatchManager().setIntervalSeconds(intervalSeconds);
if (configFile != null) {
- FileWatcher watcher = new ConfiguratonFileWatcher(this, listeners);
+ final FileWatcher watcher = new ConfiguratonFileWatcher(this, listeners);
getWatchManager().watchFile(configFile, watcher);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/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 8c78d1d..f5b18f5 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
@@ -153,7 +153,7 @@ public final class BurstFilter extends AbstractFilter {
* Clear the history. Used for unit testing.
*/
public void clear() {
- for (LogDelay delay : history) {
+ for (final LogDelay delay : history) {
history.remove(delay);
available.add(delay);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
index 3933fa0..2b0a400 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
@@ -57,10 +57,10 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable
return this;
}
if (filter instanceof CompositeFilter) {
- int size = this.filters.length + ((CompositeFilter) filter).size();
+ final int size = this.filters.length + ((CompositeFilter) filter).size();
final Filter[] copy = Arrays.copyOf(this.filters, size);
- int index = this.filters.length;
- for (Filter currentFilter : ((CompositeFilter) filter).filters) {
+ final int index = this.filters.length;
+ for (final Filter currentFilter : ((CompositeFilter) filter).filters) {
copy[index] = currentFilter;
}
return new CompositeFilter(copy);
@@ -81,7 +81,7 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable
// which is OK since removing a filter should not be on the critical path.
final List<Filter> filterList = new ArrayList<>(Arrays.asList(this.filters));
if (filter instanceof CompositeFilter) {
- for (Filter currentFilter : ((CompositeFilter) filter).filters) {
+ for (final Filter currentFilter : ((CompositeFilter) filter).filters) {
filterList.remove(currentFilter);
}
} else {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/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 7607f26..12fb1ac 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
@@ -61,7 +61,7 @@ public final class ScriptFilter extends AbstractFilter {
@Override
public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
final Object... params) {
- SimpleBindings bindings = new SimpleBindings();
+ final SimpleBindings bindings = new SimpleBindings();
bindings.put("logger", logger);
bindings.put("level", level);
bindings.put("marker", marker);
@@ -70,14 +70,14 @@ public final class ScriptFilter extends AbstractFilter {
bindings.put("throwable", null);
bindings.putAll(configuration.getProperties());
bindings.put("substitutor", configuration.getStrSubstitutor());
- Object object = configuration.getScriptManager().execute(script.getName(), bindings);
+ final Object object = configuration.getScriptManager().execute(script.getName(), bindings);
return object == null || !Boolean.TRUE.equals(object) ? onMismatch : onMatch;
}
@Override
public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg,
final Throwable t) {
- SimpleBindings bindings = new SimpleBindings();
+ final SimpleBindings bindings = new SimpleBindings();
bindings.put("logger", logger);
bindings.put("level", level);
bindings.put("marker", marker);
@@ -86,14 +86,14 @@ public final class ScriptFilter extends AbstractFilter {
bindings.put("throwable", t);
bindings.putAll(configuration.getProperties());
bindings.put("substitutor", configuration.getStrSubstitutor());
- Object object = configuration.getScriptManager().execute(script.getName(), bindings);
+ final Object object = configuration.getScriptManager().execute(script.getName(), bindings);
return object == null || !Boolean.TRUE.equals(object) ? onMismatch : onMatch;
}
@Override
public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg,
final Throwable t) {
- SimpleBindings bindings = new SimpleBindings();
+ final SimpleBindings bindings = new SimpleBindings();
bindings.put("logger", logger);
bindings.put("level", level);
bindings.put("marker", marker);
@@ -102,17 +102,17 @@ public final class ScriptFilter extends AbstractFilter {
bindings.put("throwable", t);
bindings.putAll(configuration.getProperties());
bindings.put("substitutor", configuration.getStrSubstitutor());
- Object object = configuration.getScriptManager().execute(script.getName(), bindings);
+ final Object object = configuration.getScriptManager().execute(script.getName(), bindings);
return object == null || !Boolean.TRUE.equals(object) ? onMismatch : onMatch;
}
@Override
public Result filter(final LogEvent event) {
- SimpleBindings bindings = new SimpleBindings();
+ final SimpleBindings bindings = new SimpleBindings();
bindings.put("logEvent", event);
bindings.putAll(configuration.getProperties());
bindings.put("substitutor", configuration.getStrSubstitutor());
- Object object = configuration.getScriptManager().execute(script.getName(), bindings);
+ final Object object = configuration.getScriptManager().execute(script.getName(), bindings);
return object == null || !Boolean.TRUE.equals(object) ? onMismatch : onMatch;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
index 41d22d6..123cb6c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
@@ -127,7 +127,7 @@ public final class TimeFilter extends AbstractFilter {
stf.setTimeZone(TimeZone.getTimeZone("UTC"));
try {
return stf.parse(timestamp).getTime();
- } catch (ParseException e) {
+ } catch (final ParseException e) {
LOGGER.warn("Error parsing TimeFilter timestamp value {}", timestamp, e);
return defaultValue;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/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 b504838..12b1204 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
@@ -258,9 +258,9 @@ public class Log4jContextFactory implements LoggerContextFactory, ShutdownCallba
if (ctx.getState() == LifeCycle.State.INITIALIZED) {
if ((configLocations != null && !configLocations.isEmpty())) {
ContextAnchor.THREAD_CONTEXT.set(ctx);
- List<AbstractConfiguration> configurations = new ArrayList<>(configLocations.size());
- for (URI configLocation : configLocations) {
- Configuration currentReadConfiguration = ConfigurationFactory.getInstance()
+ final List<AbstractConfiguration> configurations = new ArrayList<>(configLocations.size());
+ for (final URI configLocation : configLocations) {
+ final Configuration currentReadConfiguration = ConfigurationFactory.getInstance()
.getConfiguration(name, configLocation);
if (currentReadConfiguration instanceof AbstractConfiguration) {
configurations.add((AbstractConfiguration) currentReadConfiguration);
@@ -270,7 +270,7 @@ public class Log4jContextFactory implements LoggerContextFactory, ShutdownCallba
configLocation);
}
}
- CompositeConfiguration compositeConfiguration = new CompositeConfiguration(configurations);
+ final CompositeConfiguration compositeConfiguration = new CompositeConfiguration(configurations);
LOGGER.debug("Starting LoggerContext[name={}] from configurations at {}", ctx.getName(),
configLocations);
ctx.start(compositeConfiguration);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/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 d7588a6..7efc8dd 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
@@ -120,7 +120,7 @@ public class Log4jLogEvent implements LogEvent {
// Avoid unnecessarily initializing thrownProxy, threadName and source if possible
if (other instanceof Log4jLogEvent) {
- Log4jLogEvent evt = (Log4jLogEvent) other;
+ final Log4jLogEvent evt = (Log4jLogEvent) other;
this.thrownProxy = evt.thrownProxy;
this.source = evt.source;
this.threadId = evt.threadId;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/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 b89dc04..fc44acc 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
@@ -191,7 +191,7 @@ public class MutableLogEvent implements LogEvent, ReusableMessage {
public void setMessage(final Message msg) {
if (msg instanceof ReusableMessage) {
- ReusableMessage reusable = (ReusableMessage) msg;
+ final ReusableMessage reusable = (ReusableMessage) msg;
reusable.formatTo(getMessageTextForWriting());
if (parameters != null) {
parameters = reusable.swapParameters(parameters);
@@ -282,7 +282,7 @@ public class MutableLogEvent implements LogEvent, ReusableMessage {
if (message != null) {
return message;
}
- Object[] params = parameters == null ? new Object[0] : Arrays.copyOf(parameters, parameterCount);
+ final Object[] params = parameters == null ? new Object[0] : Arrays.copyOf(parameters, parameterCount);
return new ParameterizedMessage(messageText.toString(), params);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
index b679fcd..13a14f9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
@@ -143,7 +143,7 @@ public final class GelfLayout extends AbstractStringLayout {
@Override
public byte[] toByteArray(final LogEvent event) {
- StringBuilder text = toText(event, getStringBuilder(), false);
+ final StringBuilder text = toText(event, getStringBuilder(), false);
final byte[] bytes = getBytes(text.toString());
return compressionType != CompressionType.OFF && bytes.length > compressionThreshold ? compress(bytes) : bytes;
}
@@ -226,11 +226,11 @@ public final class GelfLayout extends AbstractStringLayout {
}
builder.append("\"short_message\":\"");
- Message message = event.getMessage();
+ final Message message = event.getMessage();
if (message instanceof CharSequence) {
JsonUtils.quoteAsString(((CharSequence)message), builder);
} else if (gcFree && message instanceof StringBuilderFormattable) {
- StringBuilder messageBuffer = getMessageStringBuilder();
+ final StringBuilder messageBuffer = getMessageStringBuilder();
((StringBuilderFormattable)message).formatTo(messageBuffer);
JsonUtils.quoteAsString(messageBuffer, builder);
} else {
@@ -264,7 +264,7 @@ public final class GelfLayout extends AbstractStringLayout {
if (timeMillis < 1000) {
return "0";
}
- StringBuilder builder = getTimestampStringBuilder();
+ final StringBuilder builder = getTimestampStringBuilder();
builder.append(timeMillis);
builder.insert(builder.length() - 3, '.');
return builder;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/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 1a98313..5295899 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
@@ -55,31 +55,31 @@ public class MarkerPatternSelector implements PatternSelector {
final boolean alwaysWriteExceptions, final boolean noConsoleNoAnsi,
final Configuration config) {
final PatternParser parser = PatternLayout.createPatternParser(config);
- for (PatternMatch property : properties) {
+ for (final PatternMatch property : properties) {
try {
- List<PatternFormatter> list = parser.parse(property.getPattern(), alwaysWriteExceptions, noConsoleNoAnsi);
+ final List<PatternFormatter> list = parser.parse(property.getPattern(), alwaysWriteExceptions, noConsoleNoAnsi);
formatterMap.put(property.getKey(), list.toArray(new PatternFormatter[list.size()]));
patternMap.put(property.getKey(), property.getPattern());
- } catch (RuntimeException ex) {
+ } catch (final RuntimeException ex) {
throw new IllegalArgumentException("Cannot parse pattern '" + property.getPattern() + "'", ex);
}
}
try {
- List<PatternFormatter> list = parser.parse(defaultPattern, alwaysWriteExceptions, noConsoleNoAnsi);
+ final List<PatternFormatter> list = parser.parse(defaultPattern, alwaysWriteExceptions, noConsoleNoAnsi);
defaultFormatters = list.toArray(new PatternFormatter[list.size()]);
this.defaultPattern = defaultPattern;
- } catch (RuntimeException ex) {
+ } catch (final RuntimeException ex) {
throw new IllegalArgumentException("Cannot parse pattern '" + defaultPattern + "'", ex);
}
}
@Override
public PatternFormatter[] getFormatters(final LogEvent event) {
- Marker marker = event.getMarker();
+ final Marker marker = event.getMarker();
if (marker == null) {
return defaultFormatters;
}
- for (String key : formatterMap.keySet()) {
+ for (final String key : formatterMap.keySet()) {
if (marker.isInstanceOf(key)) {
return formatterMap.get(key);
}
@@ -106,9 +106,9 @@ public class MarkerPatternSelector implements PatternSelector {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
boolean first = true;
- for (Map.Entry<String, String> entry : patternMap.entrySet()) {
+ for (final Map.Entry<String, String> entry : patternMap.entrySet()) {
if (!first) {
sb.append(", ");
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/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 67466be..1e854dd 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
@@ -298,7 +298,7 @@ public final class PatternLayout extends AbstractStringLayout {
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append(super.toString());
builder.append("[formatters=");
builder.append(Arrays.toString(formatters));
@@ -343,7 +343,7 @@ public final class PatternLayout extends AbstractStringLayout {
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append(super.toString());
builder.append("[patternSelector=");
builder.append(patternSelector);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/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 01ade28..b74f3b1 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
@@ -64,35 +64,35 @@ public class ScriptPatternSelector implements PatternSelector {
config.getScriptManager().addScript(script);
}
final PatternParser parser = PatternLayout.createPatternParser(config);
- for (PatternMatch property : properties) {
+ for (final PatternMatch property : properties) {
try {
- List<PatternFormatter> list = parser.parse(property.getPattern(), alwaysWriteExceptions, noConsoleNoAnsi);
+ final List<PatternFormatter> list = parser.parse(property.getPattern(), alwaysWriteExceptions, noConsoleNoAnsi);
formatterMap.put(property.getKey(), list.toArray(new PatternFormatter[list.size()]));
patternMap.put(property.getKey(), property.getPattern());
- } catch (RuntimeException ex) {
+ } catch (final RuntimeException ex) {
throw new IllegalArgumentException("Cannot parse pattern '" + property.getPattern() + "'", ex);
}
}
try {
- List<PatternFormatter> list = parser.parse(defaultPattern, alwaysWriteExceptions, noConsoleNoAnsi);
+ final List<PatternFormatter> list = parser.parse(defaultPattern, alwaysWriteExceptions, noConsoleNoAnsi);
defaultFormatters = list.toArray(new PatternFormatter[list.size()]);
this.defaultPattern = defaultPattern;
- } catch (RuntimeException ex) {
+ } catch (final RuntimeException ex) {
throw new IllegalArgumentException("Cannot parse pattern '" + defaultPattern + "'", ex);
}
}
@Override
public PatternFormatter[] getFormatters(final LogEvent event) {
- SimpleBindings bindings = new SimpleBindings();
+ final SimpleBindings bindings = new SimpleBindings();
bindings.putAll(configuration.getProperties());
bindings.put("substitutor", configuration.getStrSubstitutor());
bindings.put("logEvent", event);
- Object object = configuration.getScriptManager().execute(script.getName(), bindings);
+ final Object object = configuration.getScriptManager().execute(script.getName(), bindings);
if (object == null) {
return defaultFormatters;
}
- PatternFormatter[] patternFormatter = formatterMap.get(object.toString());
+ final PatternFormatter[] patternFormatter = formatterMap.get(object.toString());
return patternFormatter == null ? defaultFormatters : patternFormatter;
}
@@ -126,9 +126,9 @@ public class ScriptPatternSelector implements PatternSelector {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
boolean first = true;
- for (Map.Entry<String, String> entry : patternMap.entrySet()) {
+ for (final Map.Entry<String, String> entry : patternMap.entrySet()) {
if (!first) {
sb.append(", ");
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java
index 8778acb..0b9bf92 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java
@@ -80,7 +80,7 @@ public class TextEncoderHelper {
boolean endOfInput = true;
do {
charBuf.clear(); // reset character buffer position to zero, limit to capacity
- int copied = copy(text, start, charBuf);
+ final int copied = copy(text, start, charBuf);
start += copied;
todoChars -= copied;
endOfInput = todoChars <= 0;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/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 2a74a46..6eafaae 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
@@ -58,7 +58,7 @@ public final class ExtendedThrowablePatternConverter extends ThrowablePatternCon
*/
@Override
public void format(final LogEvent event, final StringBuilder toAppendTo) {
- ThrowableProxy proxy = event.getThrownProxy();
+ final ThrowableProxy proxy = event.getThrownProxy();
final Throwable throwable = event.getThrown();
if ((throwable != null || proxy != null) && options.anyLines()) {
if (proxy == null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
index 4565e21..1315663 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
@@ -61,7 +61,7 @@ public final class MessagePatternConverter extends LogEventPatternConverter {
public void format(final LogEvent event, final StringBuilder toAppendTo) {
final Message msg = event.getMessage();
if (msg instanceof StringBuilderFormattable) {
- int offset = toAppendTo.length();
+ final int offset = toAppendTo.length();
((StringBuilderFormattable) msg).formatTo(toAppendTo);
// TODO can we optimize this?
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
index 317842d..ce7ff64 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java
@@ -58,7 +58,7 @@ public final class RootThrowablePatternConverter extends ThrowablePatternConvert
*/
@Override
public void format(final LogEvent event, final StringBuilder toAppendTo) {
- ThrowableProxy proxy = event.getThrownProxy();
+ final ThrowableProxy proxy = event.getThrownProxy();
final Throwable throwable = event.getThrown();
if (throwable != null && options.anyLines()) {
if (proxy == null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverter.java
index 9a58f79..8824f9e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverter.java
@@ -76,7 +76,7 @@ public final class VariablesNotEmptyReplacementConverter extends LogEventPattern
int emptyVars = 0;
int vars = 0;
for (final PatternFormatter formatter : formatters) {
- int start = buf.length();
+ final int start = buf.length();
formatter.format(event, buf);
final boolean isVariable = formatter.getConverter().isVariable();
vars += isVariable ? 1 : 0;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
index 31f11d9..84f8a8f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
@@ -81,9 +81,9 @@ public class ScriptFile extends AbstractScript {
final URI uri = NetUtils.toURI(filePathOrUri);
final File file = FileUtils.fileFromUri(uri);
if (language == null && file != null) {
- String fileExtension = FileUtils.getFileExtension(file);
+ final String fileExtension = FileUtils.getFileExtension(file);
if (fileExtension != null) {
- ExtensionLanguageMapping mapping = ExtensionLanguageMapping.getByExtension(fileExtension);
+ final ExtensionLanguageMapping mapping = ExtensionLanguageMapping.getByExtension(fileExtension);
if (mapping != null) {
language = mapping.getLanguage();
}
@@ -99,12 +99,12 @@ public class ScriptFile extends AbstractScript {
try (final Reader reader = new InputStreamReader(
file != null ? new FileInputStream(file) : uri.toURL().openStream(), actualCharset)) {
scriptText = IOUtils.toString(reader);
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.error("{}: language={}, path={}, actualCharset={}", e.getClass().getSimpleName(),
language, filePathOrUri, actualCharset);
return null;
}
- Path path = file != null ? Paths.get(file.toURI()) : Paths.get(uri);
+ final Path path = file != null ? Paths.get(file.toURI()) : Paths.get(uri);
if (path == null) {
LOGGER.error("Unable to convert {} to a Path", uri.toString());
return null;
@@ -114,7 +114,7 @@ public class ScriptFile extends AbstractScript {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
if (!(getName().equals(filePath.toString()))) {
sb.append("name=").append(getName()).append(", ");
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
index 1cad47c..62b82c2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
@@ -108,8 +108,8 @@ public class ScriptManager implements FileWatcher, Serializable {
}
if (script instanceof ScriptFile) {
- ScriptFile scriptFile = (ScriptFile)script;
- Path path = scriptFile.getPath();
+ final ScriptFile scriptFile = (ScriptFile)script;
+ final Path path = scriptFile.getPath();
if (scriptFile.isWatched() && path != null) {
watchManager.watchFile(path.toFile(), this);
}
@@ -117,19 +117,19 @@ public class ScriptManager implements FileWatcher, Serializable {
}
public AbstractScript getScript(final String name) {
- ScriptRunner runner = scripts.get(name);
+ final ScriptRunner runner = scripts.get(name);
return runner != null ? runner.getScript() : null;
}
@Override
public void fileModified(final File file) {
- ScriptRunner runner = scripts.get(file.toString());
+ final ScriptRunner runner = scripts.get(file.toString());
if (runner == null) {
logger.info("{} is not a running script");
return;
}
- ScriptEngine engine = runner.getScriptEngine();
- AbstractScript script = runner.getScript();
+ final ScriptEngine engine = runner.getScriptEngine();
+ final AbstractScript script = runner.getScript();
if (engine.getFactory().getParameter(KEY_THREADING) == null) {
scripts.put(script.getName(), new ThreadLocalScriptRunner(script));
} else {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
index d70da09..974efbd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
@@ -41,14 +41,14 @@ public class ScriptRef extends AbstractScript {
@Override
public String getLanguage() {
- AbstractScript script = this.scriptManager.getScript(getName());
+ final AbstractScript script = this.scriptManager.getScript(getName());
return script != null ? script.getLanguage() : null;
}
@Override
public String getScriptText() {
- AbstractScript script = this.scriptManager.getScript(getName());
+ final AbstractScript script = this.scriptManager.getScript(getName());
return script != null ? script.getScriptText() : null;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
index 2c0bfe4..542f8d9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
@@ -282,14 +282,14 @@ public final class CronExpression {
* expression
*/
public boolean isSatisfiedBy(final Date date) {
- Calendar testDateCal = Calendar.getInstance(getTimeZone());
+ final Calendar testDateCal = Calendar.getInstance(getTimeZone());
testDateCal.setTime(date);
testDateCal.set(Calendar.MILLISECOND, 0);
- Date originalDate = testDateCal.getTime();
+ final Date originalDate = testDateCal.getTime();
testDateCal.add(Calendar.SECOND, -1);
- Date timeAfter = getTimeAfter(testDateCal.getTime());
+ final Date timeAfter = getTimeAfter(testDateCal.getTime());
return ((timeAfter != null) && (timeAfter.equals(originalDate)));
}
@@ -318,7 +318,7 @@ public final class CronExpression {
long difference = 1000;
//move back to the nearest second so differences will be accurate
- Calendar adjustCal = Calendar.getInstance(getTimeZone());
+ final Calendar adjustCal = Calendar.getInstance(getTimeZone());
adjustCal.setTime(date);
adjustCal.set(Calendar.MILLISECOND, 0);
Date lastDate = adjustCal.getTime();
@@ -388,7 +388,7 @@ public final class CronExpression {
try {
new CronExpression(cronExpression);
- } catch (ParseException pe) {
+ } catch (final ParseException pe) {
return false;
}
@@ -436,11 +436,11 @@ public final class CronExpression {
int exprOn = SECOND;
- StringTokenizer exprsTok = new StringTokenizer(expression, " \t",
+ final StringTokenizer exprsTok = new StringTokenizer(expression, " \t",
false);
while (exprsTok.hasMoreTokens() && exprOn <= YEAR) {
- String expr = exprsTok.nextToken().trim();
+ final String expr = exprsTok.nextToken().trim();
// throw an exception if L is used with other days of the month
if (exprOn == DAY_OF_MONTH && expr.indexOf('L') != -1 && expr.length() > 1 && expr.contains(",")) {
@@ -454,9 +454,9 @@ public final class CronExpression {
throw new ParseException("Support for specifying multiple \"nth\" days is not implemented.", -1);
}
- StringTokenizer vTok = new StringTokenizer(expr, ",");
+ final StringTokenizer vTok = new StringTokenizer(expr, ",");
while (vTok.hasMoreTokens()) {
- String v = vTok.nextToken();
+ final String v = vTok.nextToken();
storeExpressionVals(0, v, exprOn);
}
@@ -472,12 +472,12 @@ public final class CronExpression {
storeExpressionVals(0, "*", YEAR);
}
- TreeSet<Integer> dow = getSet(DAY_OF_WEEK);
- TreeSet<Integer> dom = getSet(DAY_OF_MONTH);
+ final TreeSet<Integer> dow = getSet(DAY_OF_WEEK);
+ final TreeSet<Integer> dom = getSet(DAY_OF_MONTH);
// Copying the logic from the UnsupportedOperationException below
- boolean dayOfMSpec = !dom.contains(NO_SPEC);
- boolean dayOfWSpec = !dow.contains(NO_SPEC);
+ final boolean dayOfMSpec = !dom.contains(NO_SPEC);
+ final boolean dayOfWSpec = !dow.contains(NO_SPEC);
if (!dayOfMSpec || dayOfWSpec) {
if (!dayOfWSpec || dayOfMSpec) {
@@ -485,9 +485,9 @@ public final class CronExpression {
"Support for specifying both a day-of-week AND a day-of-month parameter is not implemented.", 0);
}
}
- } catch (ParseException pe) {
+ } catch (final ParseException pe) {
throw pe;
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ParseException("Illegal cron expression format ("
+ e.toString() + ")", 0);
}
@@ -546,7 +546,7 @@ public final class CronExpression {
if (nthdayOfWeek < 1 || nthdayOfWeek > 5) {
throw new Exception();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ParseException(
"A numeric value between 1 and 5 must follow the '#' option",
i);
@@ -582,7 +582,7 @@ public final class CronExpression {
i);
}
if (type == DAY_OF_WEEK && !lastdayOfMonth) {
- int val = daysOfMonth.last();
+ final int val = daysOfMonth.last();
if (val == NO_SPEC_INT) {
throw new ParseException(
"'?' can only be specfied for Day-of-Month -OR- Day-of-Week.",
@@ -646,7 +646,7 @@ public final class CronExpression {
if (type == DAY_OF_MONTH && s.length() > i) {
c = s.charAt(i);
if (c == '-') {
- ValueSet vs = getValue(0, s, i + 1);
+ final ValueSet vs = getValue(0, s, i + 1);
lastdayOffset = vs.value;
if (lastdayOffset > 30) {
throw new ParseException("Offset from last day must be <= 30", i + 1);
@@ -670,7 +670,7 @@ public final class CronExpression {
} else {
c = s.charAt(i);
if (c >= '0' && c <= '9') {
- ValueSet vs = getValue(val, s, i);
+ final ValueSet vs = getValue(val, s, i);
val = vs.value;
i = vs.pos;
}
@@ -706,7 +706,7 @@ public final class CronExpression {
} else {
throw new ParseException("'L' option is not valid here. (pos=" + i + ")", i);
}
- TreeSet<Integer> set = getSet(type);
+ final TreeSet<Integer> set = getSet(type);
set.add(val);
i++;
return i;
@@ -721,7 +721,7 @@ public final class CronExpression {
if (val > 31) {
throw new ParseException("The 'W' option does not make sense with values larger than 31 (max number of days in a month)", i);
}
- TreeSet<Integer> set = getSet(type);
+ final TreeSet<Integer> set = getSet(type);
set.add(val);
i++;
return i;
@@ -737,13 +737,13 @@ public final class CronExpression {
if (nthdayOfWeek < 1 || nthdayOfWeek > 5) {
throw new Exception();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ParseException(
"A numeric value between 1 and 5 must follow the '#' option",
i);
}
- TreeSet<Integer> set = getSet(type);
+ final TreeSet<Integer> set = getSet(type);
set.add(val);
i++;
return i;
@@ -752,7 +752,7 @@ public final class CronExpression {
if (c == '-') {
i++;
c = s.charAt(i);
- int v = Integer.parseInt(String.valueOf(c));
+ final int v = Integer.parseInt(String.valueOf(c));
end = v;
i++;
if (i >= s.length()) {
@@ -761,14 +761,14 @@ public final class CronExpression {
}
c = s.charAt(i);
if (c >= '0' && c <= '9') {
- ValueSet vs = getValue(v, s, i);
+ final ValueSet vs = getValue(v, s, i);
end = vs.value;
i = vs.pos;
}
if (i < s.length() && ((c = s.charAt(i)) == '/')) {
i++;
c = s.charAt(i);
- int v2 = Integer.parseInt(String.valueOf(c));
+ final int v2 = Integer.parseInt(String.valueOf(c));
i++;
if (i >= s.length()) {
addToSet(val, end, v2, type);
@@ -776,8 +776,8 @@ public final class CronExpression {
}
c = s.charAt(i);
if (c >= '0' && c <= '9') {
- ValueSet vs = getValue(v2, s, i);
- int v3 = vs.value;
+ final ValueSet vs = getValue(v2, s, i);
+ final int v3 = vs.value;
addToSet(val, end, v3, type);
i = vs.pos;
return i;
@@ -794,7 +794,7 @@ public final class CronExpression {
if (c == '/') {
i++;
c = s.charAt(i);
- int v2 = Integer.parseInt(String.valueOf(c));
+ final int v2 = Integer.parseInt(String.valueOf(c));
i++;
if (i >= s.length()) {
addToSet(val, end, v2, type);
@@ -802,8 +802,8 @@ public final class CronExpression {
}
c = s.charAt(i);
if (c >= '0' && c <= '9') {
- ValueSet vs = getValue(v2, s, i);
- int v3 = vs.value;
+ final ValueSet vs = getValue(v2, s, i);
+ final int v3 = vs.value;
addToSet(val, end, v3, type);
i = vs.pos;
return i;
@@ -822,7 +822,7 @@ public final class CronExpression {
}
public String getExpressionSummary() {
- StringBuilder buf = new StringBuilder();
+ final StringBuilder buf = new StringBuilder();
buf.append("seconds: ");
buf.append(getExpressionSetSummary(seconds));
@@ -870,13 +870,13 @@ public final class CronExpression {
return "*";
}
- StringBuilder buf = new StringBuilder();
+ final StringBuilder buf = new StringBuilder();
- Iterator<Integer> itr = set.iterator();
+ final Iterator<Integer> itr = set.iterator();
boolean first = true;
while (itr.hasNext()) {
- Integer iVal = itr.next();
- String val = iVal.toString();
+ final Integer iVal = itr.next();
+ final String val = iVal.toString();
if (!first) {
buf.append(",");
}
@@ -896,13 +896,13 @@ public final class CronExpression {
return "*";
}
- StringBuilder buf = new StringBuilder();
+ final StringBuilder buf = new StringBuilder();
- Iterator<Integer> itr = list.iterator();
+ final Iterator<Integer> itr = list.iterator();
boolean first = true;
while (itr.hasNext()) {
- Integer iVal = itr.next();
- String val = iVal.toString();
+ final Integer iVal = itr.next();
+ final String val = iVal.toString();
if (!first) {
buf.append(",");
}
@@ -932,7 +932,7 @@ public final class CronExpression {
protected void addToSet(final int val, final int end, int incr, final int type)
throws ParseException {
- TreeSet<Integer> set = getSet(type);
+ final TreeSet<Integer> set = getSet(type);
if (type == SECOND || type == MINUTE) {
if ((val < 0 || val > 59 || end > 59) && (val != ALL_SPEC_INT)) {
@@ -1099,7 +1099,7 @@ public final class CronExpression {
protected ValueSet getValue(final int v, final String s, int i) {
char c = s.charAt(i);
- StringBuilder s1 = new StringBuilder(String.valueOf(v));
+ final StringBuilder s1 = new StringBuilder(String.valueOf(v));
while (c >= '0' && c <= '9') {
s1.append(c);
i++;
@@ -1108,7 +1108,7 @@ public final class CronExpression {
}
c = s.charAt(i);
}
- ValueSet val = new ValueSet();
+ final ValueSet val = new ValueSet();
val.pos = (i < s.length()) ? i : i + 1;
val.value = Integer.parseInt(s1.toString());
@@ -1116,13 +1116,13 @@ public final class CronExpression {
}
protected int getNumericValue(final String s, final int i) {
- int endOfVal = findNextWhiteSpace(i, s);
- String val = s.substring(i, endOfVal);
+ final int endOfVal = findNextWhiteSpace(i, s);
+ final String val = s.substring(i, endOfVal);
return Integer.parseInt(val);
}
protected int getMonthNumber(final String s) {
- Integer integer = monthMap.get(s);
+ final Integer integer = monthMap.get(s);
if (integer == null) {
return -1;
@@ -1132,7 +1132,7 @@ public final class CronExpression {
}
protected int getDayOfWeekNumber(final String s) {
- Integer integer = dayMap.get(s);
+ final Integer integer = dayMap.get(s);
if (integer == null) {
return -1;
@@ -1150,7 +1150,7 @@ public final class CronExpression {
public Date getTimeAfter(Date afterTime) {
// Computation is based on Gregorian year only.
- Calendar cl = new java.util.GregorianCalendar(getTimeZone());
+ final Calendar cl = new java.util.GregorianCalendar(getTimeZone());
// move ahead one second, since we're computing the time *after* the
// given time
@@ -1236,8 +1236,8 @@ public final class CronExpression {
int tmon = mon;
// get day...................................................
- boolean dayOfMSpec = !daysOfMonth.contains(NO_SPEC);
- boolean dayOfWSpec = !daysOfWeek.contains(NO_SPEC);
+ final boolean dayOfMSpec = !daysOfMonth.contains(NO_SPEC);
+ final boolean dayOfWSpec = !daysOfWeek.contains(NO_SPEC);
if (dayOfMSpec && !dayOfWSpec) { // get day by day of month rule
st = daysOfMonth.tailSet(day);
if (lastdayOfMonth) {
@@ -1259,7 +1259,7 @@ public final class CronExpression {
day = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
day -= lastdayOffset;
- java.util.Calendar tcal = java.util.Calendar.getInstance(getTimeZone());
+ final java.util.Calendar tcal = java.util.Calendar.getInstance(getTimeZone());
tcal.set(Calendar.SECOND, 0);
tcal.set(Calendar.MINUTE, 0);
tcal.set(Calendar.HOUR_OF_DAY, 0);
@@ -1267,8 +1267,8 @@ public final class CronExpression {
tcal.set(Calendar.MONTH, mon - 1);
tcal.set(Calendar.YEAR, cl.get(Calendar.YEAR));
- int ldom = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
- int dow = tcal.get(Calendar.DAY_OF_WEEK);
+ final int ldom = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+ final int dow = tcal.get(Calendar.DAY_OF_WEEK);
if (dow == Calendar.SATURDAY && day == 1) {
day += 2;
@@ -1285,7 +1285,7 @@ public final class CronExpression {
tcal.set(Calendar.HOUR_OF_DAY, hr);
tcal.set(Calendar.DAY_OF_MONTH, day);
tcal.set(Calendar.MONTH, mon - 1);
- Date nTime = tcal.getTime();
+ final Date nTime = tcal.getTime();
if (nTime.before(afterTime)) {
day = 1;
mon++;
@@ -1295,7 +1295,7 @@ public final class CronExpression {
t = day;
day = daysOfMonth.first();
- java.util.Calendar tcal = java.util.Calendar.getInstance(getTimeZone());
+ final java.util.Calendar tcal = java.util.Calendar.getInstance(getTimeZone());
tcal.set(Calendar.SECOND, 0);
tcal.set(Calendar.MINUTE, 0);
tcal.set(Calendar.HOUR_OF_DAY, 0);
@@ -1303,8 +1303,8 @@ public final class CronExpression {
tcal.set(Calendar.MONTH, mon - 1);
tcal.set(Calendar.YEAR, cl.get(Calendar.YEAR));
- int ldom = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
- int dow = tcal.get(Calendar.DAY_OF_WEEK);
+ final int ldom = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+ final int dow = tcal.get(Calendar.DAY_OF_WEEK);
if (dow == Calendar.SATURDAY && day == 1) {
day += 2;
@@ -1322,7 +1322,7 @@ public final class CronExpression {
tcal.set(Calendar.HOUR_OF_DAY, hr);
tcal.set(Calendar.DAY_OF_MONTH, day);
tcal.set(Calendar.MONTH, mon - 1);
- Date nTime = tcal.getTime();
+ final Date nTime = tcal.getTime();
if (nTime.before(afterTime)) {
day = daysOfMonth.first();
mon++;
@@ -1331,7 +1331,7 @@ public final class CronExpression {
t = day;
day = st.first();
// make sure we don't over-run a short month, such as february
- int lastDay = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+ final int lastDay = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
if (day > lastDay) {
day = daysOfMonth.first();
mon++;
@@ -1354,9 +1354,9 @@ public final class CronExpression {
} else if (dayOfWSpec && !dayOfMSpec) { // get day by day of week rule
if (lastdayOfWeek) { // are we looking for the last XXX day of
// the month?
- int dow = daysOfWeek.first(); // desired
+ final int dow = daysOfWeek.first(); // desired
// d-o-w
- int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
+ final int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
int daysToAdd = 0;
if (cDow < dow) {
daysToAdd = dow - cDow;
@@ -1365,7 +1365,7 @@ public final class CronExpression {
daysToAdd = dow + (7 - cDow);
}
- int lDay = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+ final int lDay = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
if (day + daysToAdd > lDay) { // did we already miss the
// last one?
@@ -1397,9 +1397,9 @@ public final class CronExpression {
} else if (nthdayOfWeek != 0) {
// are we looking for the Nth XXX day in the month?
- int dow = daysOfWeek.first(); // desired
+ final int dow = daysOfWeek.first(); // desired
// d-o-w
- int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
+ final int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
int daysToAdd = 0;
if (cDow < dow) {
daysToAdd = dow - cDow;
@@ -1440,7 +1440,7 @@ public final class CronExpression {
continue;
}
} else {
- int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
+ final int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
int dow = daysOfWeek.first(); // desired
// d-o-w
st = daysOfWeek.tailSet(cDow);
@@ -1456,7 +1456,7 @@ public final class CronExpression {
daysToAdd = dow + (7 - cDow);
}
- int lDay = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+ final int lDay = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
if (day + daysToAdd > lDay) { // will we pass the end of
// the month?
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
index 258773f..5a1c839 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
@@ -94,7 +94,7 @@ public final class FileUtils {
}
public static String getFileExtension(final File file) {
- String fileName = file.getName();
+ final String fileName = file.getName();
if (fileName.lastIndexOf(".") != -1 && fileName.lastIndexOf(".") != 0) {
return fileName.substring(fileName.lastIndexOf(".") + 1);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java
index 685d12f..74fe079 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java
@@ -57,7 +57,7 @@ public final class JsonUtils {
while (inPtr < inputLen) {
tight_loop:
while (true) {
- char c = input.charAt(inPtr);
+ final char c = input.charAt(inPtr);
if (c < escCodeCount && escCodes[c] != 0) {
break tight_loop;
}
@@ -67,9 +67,9 @@ public final class JsonUtils {
}
}
// something to escape; 2 or 6-char variant?
- char d = input.charAt(inPtr++);
- int escCode = escCodes[d];
- int length = (escCode < 0)
+ final char d = input.charAt(inPtr++);
+ final int escCode = escCodes[d];
+ final int length = (escCode < 0)
? _appendNumeric(d, qbuf)
: _appendNamed(escCode, qbuf);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringEncoder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringEncoder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringEncoder.java
index a9c3548..bd82c28 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringEncoder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringEncoder.java
@@ -45,7 +45,7 @@ public final class StringEncoder {
final Charset actual = charset != null ? charset : Charset.defaultCharset();
try { // LOG4J2-935: String.getBytes(String) gives better performance
return str.getBytes(actual.name());
- } catch (UnsupportedEncodingException e) {
+ } catch (final UnsupportedEncodingException e) {
return str.getBytes(actual);
}
}
@@ -74,7 +74,7 @@ public final class StringEncoder {
public static int encodeIsoChars(final CharSequence charArray, int charIndex, final byte[] byteArray, int byteIndex, final int length) {
int i = 0;
for (; i < length; i++) {
- char c = charArray.charAt(charIndex++);
+ final char c = charArray.charAt(charIndex++);
if (c > 255) {
break;
}
@@ -89,11 +89,11 @@ public final class StringEncoder {
int length = Math.min(charLength, byteArray.length);
int charDoneIndex = charOffset + length;
while (charOffset < charDoneIndex) {
- int done = encodeIsoChars(charArray, charOffset, byteArray, byteOffset, length);
+ final int done = encodeIsoChars(charArray, charOffset, byteArray, byteOffset, length);
charOffset += done;
byteOffset += done;
if (done != length) {
- char c = charArray.charAt(charOffset++);
+ final char c = charArray.charAt(charOffset++);
if ((Character.isHighSurrogate(c)) && (charOffset < charDoneIndex)
&& (Character.isLowSurrogate(charArray.charAt(charOffset)))) {
if (charLength > byteArray.length) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
index 746c2d5..1004f81 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
@@ -80,8 +80,8 @@ public class WatchManager extends AbstractLifeCycle {
}
public Map<File, FileWatcher> getWatchers() {
- Map<File, FileWatcher> map = new HashMap<>();
- for (Map.Entry<File, FileMonitor> entry : watchers.entrySet()) {
+ final Map<File, FileWatcher> map = new HashMap<>();
+ for (final Map.Entry<File, FileMonitor> entry : watchers.entrySet()) {
map.put(entry.getKey(), entry.getValue().fileWatcher);
}
return map;
@@ -91,10 +91,10 @@ public class WatchManager extends AbstractLifeCycle {
@Override
public void run() {
- for (Map.Entry<File, FileMonitor> entry : watchers.entrySet()) {
- File file = entry.getKey();
- FileMonitor fileMonitor = entry.getValue();
- long lastModfied = file.lastModified();
+ for (final Map.Entry<File, FileMonitor> entry : watchers.entrySet()) {
+ final File file = entry.getKey();
+ final FileMonitor fileMonitor = entry.getValue();
+ final long lastModfied = file.lastModified();
if (fileModified(fileMonitor, lastModfied)) {
logger.info("File {} was modified", file.toString());
fileMonitor.lastModified = lastModfied;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
index e36bba1..25a5127 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
@@ -266,7 +266,7 @@ public class FixedDateFormat {
// 28 bytes (allows immediate JVM inlining: <= -XX:MaxInlineSize=35 bytes)
public String format(final long time) {
final char[] result = new char[length << 1]; // double size for locales with lengthy DateFormatSymbols
- int written = format(time, result, 0);
+ final int written = format(time, result, 0);
return new String(result, 0, written);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTestUtil.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTestUtil.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTestUtil.java
index af12699..1394b9f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTestUtil.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTestUtil.java
@@ -48,7 +48,7 @@ public class GcFreeLoggingTestUtil {
assertTrue("Constants.ENABLE_DIRECT_ENCODERS", Constants.ENABLE_DIRECT_ENCODERS);
assertFalse("Constants.IS_WEB_APP", Constants.IS_WEB_APP);
- MyCharSeq myCharSeq = new MyCharSeq();
+ final MyCharSeq myCharSeq = new MyCharSeq();
MarkerManager.getMarker("test"); // initial creation, value is cached
// initialize LoggerContext etc.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/Log4j1222Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/Log4j1222Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/Log4j1222Test.java
index 7e88f77..1e3f5d5 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/Log4j1222Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/Log4j1222Test.java
@@ -55,7 +55,7 @@ public class Log4j1222Test
if (((TestLogger) Holder.LOGGER).getEntries().size() == 0) {
System.out.println("Logger contains no messages");
}
- for (String msg : ((TestLogger) Holder.LOGGER).getEntries()) {
+ for (final String msg : ((TestLogger) Holder.LOGGER).getEntries()) {
System.out.println(msg);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java
index 722c5a1..64589ae 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java
@@ -92,7 +92,7 @@ public class LogEventTest {
final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
final ObjectInputStream ois = new ObjectInputStream(bais);
- LogEvent actual = (LogEvent) ois.readObject();
+ final LogEvent actual = (LogEvent) ois.readObject();
assertNotEquals("Different event: nanoTime", copy, actual);
assertNotEquals("Different nanoTime", copy.getNanoTime(), actual.getNanoTime());
assertEquals("deserialized nanoTime is zero", 0, actual.getNanoTime());
@@ -119,7 +119,7 @@ public class LogEventTest {
final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
final ObjectInputStream ois = new ObjectInputStream(bais);
- LogEvent actual = (LogEvent) ois.readObject();
+ final LogEvent actual = (LogEvent) ois.readObject();
assertEquals("both zero nanoTime", event2, actual);
}