Use final. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/aedbbba8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/aedbbba8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/aedbbba8
Branch: refs/heads/LOG4J2-1528 Commit: aedbbba8c105d5951159c8702c49a279a8c40436 Parents: 7225909 Author: Gary Gregory <ggreg...@apache.org> Authored: Fri Aug 26 08:32:50 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Fri Aug 26 08:32:50 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/log4j/config/Log4j1ConfigurationFactory.java | 2 +- .../test/java/org/apache/log4j/BasicConfigurationFactory.java | 4 ++-- .../apache/logging/log4j/core/config/ConfigurationFactory.java | 2 +- .../logging/log4j/core/config/yaml/YamlConfigurationFactory.java | 2 +- .../org/apache/logging/log4j/core/BasicConfigurationFactory.java | 4 ++-- .../log4j/core/config/builder/CustomConfigurationFactory.java | 4 ++-- .../logging/log4j/configuration/CustomConfigurationFactory.java | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aedbbba8/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java index a974ed5..0a6bf2a 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java @@ -40,7 +40,7 @@ public class Log4j1ConfigurationFactory extends ConfigurationFactory { private static final String[] SUFFIXES = {".properties"}; @Override - public Configuration getConfiguration(LoggerContext loggerContext, final ConfigurationSource source) { + public Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) { final ConfigurationBuilder<BuiltConfiguration> builder; try (final InputStream configStream = source.getInputStream()) { builder = new Log4j1ConfigurationParser().buildConfigurationBuilder(configStream); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aedbbba8/log4j-1.2-api/src/test/java/org/apache/log4j/BasicConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/BasicConfigurationFactory.java b/log4j-1.2-api/src/test/java/org/apache/log4j/BasicConfigurationFactory.java index aabc1c1..d231d82 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/BasicConfigurationFactory.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/BasicConfigurationFactory.java @@ -37,12 +37,12 @@ public class BasicConfigurationFactory extends ConfigurationFactory { } @Override - public Configuration getConfiguration(LoggerContext loggerContext, final ConfigurationSource source) { + public Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) { return new BasicConfiguration(loggerContext); } @Override - public Configuration getConfiguration(LoggerContext loggerContext, final String name, final URI configLocation) { + public Configuration getConfiguration(final LoggerContext loggerContext, final String name, final URI configLocation) { return new BasicConfiguration(loggerContext); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aedbbba8/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java index af19a0c..946bd5e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java @@ -225,7 +225,7 @@ public abstract class ConfigurationFactory extends ConfigurationBuilderFactory { return true; } - public abstract Configuration getConfiguration(LoggerContext loggerContext, ConfigurationSource source); + public abstract Configuration getConfiguration(final LoggerContext loggerContext, ConfigurationSource source); /** * Returns the Configuration. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aedbbba8/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java index 5d7b1f5..b4beb45 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java @@ -59,7 +59,7 @@ public class YamlConfigurationFactory extends ConfigurationFactory { } @Override - public Configuration getConfiguration(LoggerContext loggerContext, final ConfigurationSource source) { + public Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) { if (!isActive) { return null; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aedbbba8/log4j-core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java index 6c6f56a..d028921 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/BasicConfigurationFactory.java @@ -31,7 +31,7 @@ import org.apache.logging.log4j.core.config.LoggerConfig; public class BasicConfigurationFactory extends ConfigurationFactory { @Override - public Configuration getConfiguration(LoggerContext loggerContext, final String name, final URI configLocation) { + public Configuration getConfiguration(final LoggerContext loggerContext, final String name, final URI configLocation) { return new BasicConfiguration(); } @@ -41,7 +41,7 @@ public class BasicConfigurationFactory extends ConfigurationFactory { } @Override - public Configuration getConfiguration(LoggerContext loggerContext, final ConfigurationSource source) { + public Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) { return null; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aedbbba8/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java index 126b0f9..d4567bc 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java @@ -58,12 +58,12 @@ public class CustomConfigurationFactory extends ConfigurationFactory { } @Override - public Configuration getConfiguration(LoggerContext loggerContext, final ConfigurationSource source) { + public Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) { return getConfiguration(null, source.toString(), null); } @Override - public Configuration getConfiguration(LoggerContext loggerContext, final String name, final URI configLocation) { + public Configuration getConfiguration(final LoggerContext loggerContext, final String name, final URI configLocation) { final ConfigurationBuilder<BuiltConfiguration> builder = newConfigurationBuilder(); return addTestFixtures(name, builder); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aedbbba8/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java b/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java index 642abe4..53b70c7 100644 --- a/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java +++ b/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java @@ -43,12 +43,12 @@ public class CustomConfigurationFactory extends ConfigurationFactory { * @return The Configuration. */ @Override - public Configuration getConfiguration(LoggerContext loggerContext, final ConfigurationSource source) { + public Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) { return new CustomConfiguration(loggerContext, source); } @Override - public Configuration getConfiguration(LoggerContext loggerContext, final String name, final URI configLocation) { + public Configuration getConfiguration(final LoggerContext loggerContext, final String name, final URI configLocation) { return new CustomConfiguration(loggerContext); }