You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2015/09/08 02:41:02 UTC
[19/50] logging-log4j2 git commit: Sort members.
Sort members.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e408163d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e408163d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e408163d
Branch: refs/heads/master
Commit: e408163dd292c4e747d155a4ed9782bea125690f
Parents: 6f75a92
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:07:10 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:07:10 2015 -0700
----------------------------------------------------------------------
.../impl/DefaultConfigurationBuilder.java | 252 +++++++++----------
1 file changed, 126 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e408163d/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 3af3b90..75b433d 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
@@ -40,6 +40,14 @@ import java.util.List;
*/
public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implements ConfigurationBuilder<T> {
+ /**
+ * The key with which Apache Log4j loads the selector class.
+ *
+ * @see <a href=
+ * "http://logging.apache.org/log4j/2.0/manual/async.html">
+ * Async Loggers</a>
+ */
+ private static final String LOG4J_ASYNC_LOGGERS = "Log4jContextSelector";
private final Component root = new Component();
private Component loggers;
private Component appenders;
@@ -53,16 +61,8 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
private String verbosity = null;
private String packages = null;
private String shutdownFlag = null;
- private String name = null;
- /**
- * The key with which Apache Log4j loads the selector class.
- *
- * @see <a href=
- * "http://logging.apache.org/log4j/2.0/manual/async.html">
- * Async Loggers</a>
- */
- private static final String LOG4J_ASYNC_LOGGERS = "Log4jContextSelector";
+ private String name = null;
public DefaultConfigurationBuilder() {
this((Class<T>) BuiltConfiguration.class);
@@ -87,77 +87,23 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
components.add(loggers);
}
- /**
- * Set the name of the configuration.
- *
- * @param name the name of the {@link Configuration}. By default is {@code "Assembled"}.
- * @return this builder instance
- */
- @Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setConfigurationName(String name) {
- this.name = name;
- return this;
- }
-
- /**
- * Set the ConfigurationSource.
- *
- * @param configurationSource the {@link ConfigurationSource).}
- * @return this builder instance
- */
- @Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setConfigurationSource(ConfigurationSource configurationSource) {
- source = configurationSource;
- return this;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setMonitorInterval(String intervalSeconds) {
- monitorInterval = Integer.parseInt(intervalSeconds);
- return this;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setStatusLevel(Level level) {
- this.level = level;
- return this;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setVerbosity(String verbosity) {
- this.verbosity = verbosity;
- return this;
- }
-
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setPackages(String packages) {
- this.packages = packages;
+ public ConfigurationBuilder<T> add(AppenderComponentBuilder assembler) {
+ appenders.getComponents().add(assembler.build());
return this;
}
@Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setShutdownHook(String flag) {
- this.shutdownFlag = flag;
+ public ConfigurationBuilder<T> add(CustomLevelComponentBuilder assembler) {
+ customLevels.getComponents().add(assembler.build());
return this;
}
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(AppenderComponentBuilder assembler) {
- appenders.getComponents().add(assembler.build());
- return this;
- }
-
- @Override
- public ConfigurationBuilder<T> add(CustomLevelComponentBuilder assembler) {
- customLevels.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> add(FilterComponentBuilder assembler) {
+ filters.getComponents().add(assembler.build());
return this;
}
@@ -182,16 +128,43 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(FilterComponentBuilder assembler) {
- filters.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> addProperty(String key, String value) {
+ properties.addComponent(newComponent(key, "Property", value).build());
return this;
}
@Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> addProperty(String key, String value) {
- properties.addComponent(newComponent(key, "Property", value).build());
- return this;
+ @SuppressWarnings({"unchecked"})
+ public T build() {
+ T configuration;
+ try {
+ if (source == null) {
+ source = ConfigurationSource.NULL_SOURCE;
+ }
+ Constructor<T> constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
+ configuration = constructor.newInstance(source, root);
+ configuration.setMonitorInterval(monitorInterval);
+ if (name != null) {
+ configuration.setName(name);
+ }
+ if (level != null) {
+ configuration.getStatusConfiguration().withStatus(level);
+ }
+ if (verbosity != null) {
+ configuration.getStatusConfiguration().withVerbosity(verbosity);
+ }
+ if (packages != null) {
+ configuration.setPluginPackages(packages);
+ }
+ if (shutdownFlag != null) {
+ configuration.setShutdownHook(shutdownFlag);
+ }
+ } catch (Exception ex) {
+ throw new IllegalArgumentException("Invalid Configuration class specified", ex);
+ }
+ configuration.getStatusConfiguration().initialize();
+ configuration.initialize();
+ return configuration;
}
@Override
@@ -199,24 +172,44 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
return new DefaultAppenderComponentBuilder(this, name, type);
}
-
@Override
public AppenderRefComponentBuilder newAppenderRef(String ref) {
return new DefaultAppenderRefComponentBuilder(this, ref);
}
+ @Override
+ public LoggerComponentBuilder newAsyncLogger(String name, Level level) {
+ return new DefaultLoggerComponentBuilder(this, name, level.toString(), "AsyncLogger");
+ }
+
+ @Override
+ public LoggerComponentBuilder newAsyncLogger(String name, String level) {
+ return new DefaultLoggerComponentBuilder(this, name, level, "AsyncLogger");
+ }
+
+ @Override
+ public RootLoggerComponentBuilder newAsyncRootLogger(Level level) {
+ return new DefaultRootLoggerComponentBuilder(this, level.toString(), "AsyncRoot");
+ }
+
+ @Override
+ public RootLoggerComponentBuilder newAsyncRootLogger(String level) {
+ return new DefaultRootLoggerComponentBuilder(this, level, "AsyncRoot");
+ }
@Override
public ComponentBuilder<?> newComponent(String name, String type) {
return new DefaultComponentBuilder<>(this, name, type);
}
+
@Override
@SuppressWarnings({"unchecked", "rawtypes"})
public ComponentBuilder<?> newComponent(String name, String type, String value) {
return new DefaultComponentBuilder<>(this, name, type, value);
}
+
@Override
public CustomLevelComponentBuilder newCustomLevel(String name, int level) {
return new DefaultCustomLevelComponentBuilder(this, name, level);
@@ -224,15 +217,14 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
@Override
@SuppressWarnings("rawtypes")
- public FilterComponentBuilder newFilter(String type, String onMatch, String onMisMatch) {
- return new DefaultFilterComponentBuilder(this, type, onMatch, onMisMatch);
+ public FilterComponentBuilder newFilter(String type, Filter.Result onMatch, Filter.Result onMisMatch) {
+ return new DefaultFilterComponentBuilder(this, type, onMatch.name(), onMisMatch.name());
}
-
@Override
@SuppressWarnings("rawtypes")
- public FilterComponentBuilder newFilter(String type, Filter.Result onMatch, Filter.Result onMisMatch) {
- return new DefaultFilterComponentBuilder(this, type, onMatch.name(), onMisMatch.name());
+ public FilterComponentBuilder newFilter(String type, String onMatch, String onMisMatch) {
+ return new DefaultFilterComponentBuilder(this, type, onMatch, onMisMatch);
}
@Override
@@ -240,10 +232,6 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
return new DefaultLayoutComponentBuilder(this, type);
}
- @Override
- public LoggerComponentBuilder newLogger(String name, String level) {
- return new DefaultLoggerComponentBuilder(this, name, level);
- }
@Override
public LoggerComponentBuilder newLogger(String name, Level level) {
@@ -251,13 +239,13 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public LoggerComponentBuilder newAsyncLogger(String name, String level) {
- return new DefaultLoggerComponentBuilder(this, name, level, "AsyncLogger");
+ public LoggerComponentBuilder newLogger(String name, String level) {
+ return new DefaultLoggerComponentBuilder(this, name, level);
}
@Override
- public LoggerComponentBuilder newAsyncLogger(String name, Level level) {
- return new DefaultLoggerComponentBuilder(this, name, level.toString(), "AsyncLogger");
+ public RootLoggerComponentBuilder newRootLogger(Level level) {
+ return new DefaultRootLoggerComponentBuilder(this, level.toString());
}
@Override
@@ -265,52 +253,64 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
return new DefaultRootLoggerComponentBuilder(this, level);
}
+ /**
+ * Set the name of the configuration.
+ *
+ * @param name the name of the {@link Configuration}. By default is {@code "Assembled"}.
+ * @return this builder instance
+ */
@Override
- public RootLoggerComponentBuilder newRootLogger(Level level) {
- return new DefaultRootLoggerComponentBuilder(this, level.toString());
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setConfigurationName(String name) {
+ this.name = name;
+ return this;
}
+ /**
+ * Set the ConfigurationSource.
+ *
+ * @param configurationSource the {@link ConfigurationSource).}
+ * @return this builder instance
+ */
@Override
- public RootLoggerComponentBuilder newAsyncRootLogger(String level) {
- return new DefaultRootLoggerComponentBuilder(this, level, "AsyncRoot");
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setConfigurationSource(ConfigurationSource configurationSource) {
+ source = configurationSource;
+ return this;
}
@Override
- public RootLoggerComponentBuilder newAsyncRootLogger(Level level) {
- return new DefaultRootLoggerComponentBuilder(this, level.toString(), "AsyncRoot");
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setMonitorInterval(String intervalSeconds) {
+ monitorInterval = Integer.parseInt(intervalSeconds);
+ return this;
}
@Override
- @SuppressWarnings({"unchecked"})
- public T build() {
- T configuration;
- try {
- if (source == null) {
- source = ConfigurationSource.NULL_SOURCE;
- }
- Constructor<T> constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
- configuration = constructor.newInstance(source, root);
- configuration.setMonitorInterval(monitorInterval);
- if (name != null) {
- configuration.setName(name);
- }
- if (level != null) {
- configuration.getStatusConfiguration().withStatus(level);
- }
- if (verbosity != null) {
- configuration.getStatusConfiguration().withVerbosity(verbosity);
- }
- if (packages != null) {
- configuration.setPluginPackages(packages);
- }
- if (shutdownFlag != null) {
- configuration.setShutdownHook(shutdownFlag);
- }
- } catch (Exception ex) {
- throw new IllegalArgumentException("Invalid Configuration class specified", ex);
- }
- configuration.getStatusConfiguration().initialize();
- configuration.initialize();
- return configuration;
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setPackages(String packages) {
+ this.packages = packages;
+ return this;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setShutdownHook(String flag) {
+ this.shutdownFlag = flag;
+ return this;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setStatusLevel(Level level) {
+ this.level = level;
+ return this;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setVerbosity(String verbosity) {
+ this.verbosity = verbosity;
+ return this;
}
}