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:40:44 UTC
[01/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular: Rename AssembledConfiguration -> BuiltConfiguration.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 5de8dacea -> 24a7f432f
"assembler" -> "builder" vernacular: Rename AssembledConfiguration ->
BuiltConfiguration.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/50ab7ee0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/50ab7ee0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/50ab7ee0
Branch: refs/heads/master
Commit: 50ab7ee0b1fbb0ab060e9f7df29c882ad74a45a7
Parents: 18d52d6
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 13:47:38 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 13:47:38 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/CustomConfigurationFactory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/50ab7ee0/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 12b2ab7..d679953 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
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.config.ConfigurationSource;
import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
-import org.apache.logging.log4j.core.config.builder.impl.AssembledConfiguration;
+import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
import java.net.URI;
@@ -48,7 +48,7 @@ public class CustomConfigurationFactory extends ConfigurationFactory {
@Override
public Configuration getConfiguration(final String name, final URI configLocation) {
- ConfigurationBuilder<AssembledConfiguration> assembler = newConfigurationBuilder();
+ ConfigurationBuilder<BuiltConfiguration> assembler = newConfigurationBuilder();
assembler.setStatusLevel(Level.ERROR);
assembler.add(assembler.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
.addAttribute("level", Level.DEBUG));
[38/50] logging-log4j2 git commit: Add missing '@Override' annotation.
Posted by rg...@apache.org.
Add missing '@Override' annotation.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d4c9b3aa
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d4c9b3aa
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d4c9b3aa
Branch: refs/heads/master
Commit: d4c9b3aa26a5af764fb852769305ac4d5f9ba8f8
Parents: 49fa817
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:58:42 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:58:42 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/api/AppenderComponentBuilder.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d4c9b3aa/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
index fdeb242..f96c8fc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
@@ -39,5 +39,6 @@ public interface AppenderComponentBuilder extends ComponentBuilder<AppenderCompo
* Returns the name of the Appender.
* @return the name of the Appender.
*/
+ @Override
String getName();
}
[44/50] logging-log4j2 git commit: "assembler" -> "builder".
Posted by rg...@apache.org.
"assembler" -> "builder".
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/70b549af
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/70b549af
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/70b549af
Branch: refs/heads/master
Commit: 70b549af1ac60e5e39a03314b7296fe5d44791c4
Parents: 71bc7c2
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 15:32:09 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 15:32:09 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/TestConfigurator.java | 27 ++++++++++----------
1 file changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/70b549af/log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java
index 3aa3f89..359af76 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java
@@ -361,29 +361,28 @@ public class TestConfigurator {
}
@Test
- public void testAssembler() throws Exception {
- ConfigurationBuilder<BuiltConfiguration> assembler = ConfigurationBuilderFactory.newConfigurationBuilder();
- assembler.setStatusLevel(Level.ERROR);
- assembler.setConfigurationName("BuilderTest");
- assembler.add(assembler.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
+ public void testBuilder() throws Exception {
+ ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
+ builder.setStatusLevel(Level.ERROR);
+ builder.setConfigurationName("BuilderTest");
+ builder.add(builder.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
.addAttribute("level", Level.DEBUG));
- AppenderComponentBuilder appenderAssembler = assembler.newAppender("Stdout", "CONSOLE").addAttribute("target",
+ AppenderComponentBuilder appenderBuilder = builder.newAppender("Stdout", "CONSOLE").addAttribute("target",
ConsoleAppender.Target.SYSTEM_OUT);
- appenderAssembler.add(assembler.newLayout("PatternLayout").
+ appenderBuilder.add(builder.newLayout("PatternLayout").
addAttribute("pattern", "%d [%t] %-5level: %msg%n%throwable"));
- appenderAssembler.add(assembler.newFilter("MarkerFilter", Filter.Result.DENY,
+ appenderBuilder.add(builder.newFilter("MarkerFilter", Filter.Result.DENY,
Filter.Result.NEUTRAL).addAttribute("marker", "FLOW"));
- assembler.add(appenderAssembler);
- assembler.add(assembler.newLogger("org.apache.logging.log4j", Level.DEBUG).
- add(assembler.newAppenderRef("Stdout")).
+ builder.add(appenderBuilder);
+ builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG).
+ add(builder.newAppenderRef("Stdout")).
addAttribute("additivity", false));
- assembler.add(assembler.newRootLogger(Level.ERROR).add(assembler.newAppenderRef("Stdout")));
- ctx = Configurator.initialize(assembler.build());
+ builder.add(builder.newRootLogger(Level.ERROR).add(builder.newAppenderRef("Stdout")));
+ ctx = Configurator.initialize(builder.build());
final Configuration config = ctx.getConfiguration();
assertNotNull("No configuration", config);
assertEquals("Unexpected Configuration", "BuilderTest", config.getName());
assertThat(config.getAppenders(), hasSize(equalTo(1)));
-
}
}
[15/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular.
Posted by rg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3d7f4cea
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3d7f4cea
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3d7f4cea
Branch: refs/heads/master
Commit: 3d7f4cea20006728ce6d9446f8e469a4b167edc6
Parents: 426d729
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 21:50:29 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 21:50:29 2015 -0700
----------------------------------------------------------------------
.../builder/CustomConfigurationFactory.java | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3d7f4cea/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 d679953..9f2968a 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
@@ -48,20 +48,20 @@ public class CustomConfigurationFactory extends ConfigurationFactory {
@Override
public Configuration getConfiguration(final String name, final URI configLocation) {
- ConfigurationBuilder<BuiltConfiguration> assembler = newConfigurationBuilder();
- assembler.setStatusLevel(Level.ERROR);
- assembler.add(assembler.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
+ ConfigurationBuilder<BuiltConfiguration> builder = newConfigurationBuilder();
+ builder.setStatusLevel(Level.ERROR);
+ builder.add(builder.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
.addAttribute("level", Level.DEBUG));
- AppenderComponentBuilder appenderAssembler = assembler.newAppender("Stdout", "CONSOLE").addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
- appenderAssembler.add(assembler.newLayout("PatternLayout").
+ AppenderComponentBuilder appenderAssembler = builder.newAppender("Stdout", "CONSOLE").addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
+ appenderAssembler.add(builder.newLayout("PatternLayout").
addAttribute("pattern", "%d [%t] %-5level: %msg%n%throwable"));
- appenderAssembler.add(assembler.newFilter("MarkerFilter", Filter.Result.DENY,
+ appenderAssembler.add(builder.newFilter("MarkerFilter", Filter.Result.DENY,
Filter.Result.NEUTRAL).addAttribute("marker", "FLOW"));
- assembler.add(appenderAssembler);
- assembler.add(assembler.newLogger("org.apache.logging.log4j", Level.DEBUG).
- add(assembler.newAppenderRef("Stdout")).
+ builder.add(appenderAssembler);
+ builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG).
+ add(builder.newAppenderRef("Stdout")).
addAttribute("additivity", false));
- assembler.add(assembler.newRootLogger(Level.ERROR).add(assembler.newAppenderRef("Stdout")));
- return assembler.build();
+ builder.add(builder.newRootLogger(Level.ERROR).add(builder.newAppenderRef("Stdout")));
+ return builder.build();
}
}
[39/50] logging-log4j2 git commit: Reset sys prop at the end of the
test. Use specific static imports instead of *.
Posted by rg...@apache.org.
Reset sys prop at the end of the test. Use specific static imports
instead of *.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1f8d5454
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1f8d5454
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1f8d5454
Branch: refs/heads/master
Commit: 1f8d545498d73e1a03c69ae196b92256a0d57679
Parents: d4c9b3a
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 15:04:26 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 15:04:26 2015 -0700
----------------------------------------------------------------------
.../builder/ConfigurationAssemblerTest.java | 46 +++++++++++---------
1 file changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f8d5454/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
index 332e86a..e6df9d7 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
@@ -16,6 +16,12 @@
*/
package org.apache.logging.log4j.core.config.builder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.Appender;
@@ -23,16 +29,11 @@ import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
-
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.filter.ThresholdFilter;
import org.junit.Test;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
/**
*
*/
@@ -40,20 +41,25 @@ public class ConfigurationAssemblerTest {
@Test
public void doConfigure() throws Exception {
- System.setProperty(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY, "org.apache.logging.log4j.core.config.builder.CustomConfigurationFactory");
- Configuration config = ((LoggerContext)LogManager.getContext(false)).getConfiguration();
- assertNotNull("No configuration created", config);
- assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED);
- Map<String, Appender> appenders = config.getAppenders();
- assertNotNull(appenders);
- assertTrue("Incorrect number of Appenders: " + appenders.size(), appenders.size() == 1);
- Map<String, LoggerConfig> loggers = config.getLoggers();
- assertNotNull(loggers);
- assertTrue("Incorrect number of LoggerConfigs: " + loggers.size(), loggers.size() == 2);
- Filter filter = config.getFilter();
- assertNotNull("No Filter", filter);
- assertTrue("Not a Threshold Filter", filter instanceof ThresholdFilter);
- Logger logger = LogManager.getLogger(getClass());
- logger.info("Welcome to Log4j!");
+ try {
+ System.setProperty(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY,
+ "org.apache.logging.log4j.core.config.builder.CustomConfigurationFactory");
+ Configuration config = ((LoggerContext) LogManager.getContext(false)).getConfiguration();
+ assertNotNull("No configuration created", config);
+ assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED);
+ Map<String, Appender> appenders = config.getAppenders();
+ assertNotNull(appenders);
+ assertTrue("Incorrect number of Appenders: " + appenders.size(), appenders.size() == 1);
+ Map<String, LoggerConfig> loggers = config.getLoggers();
+ assertNotNull(loggers);
+ assertTrue("Incorrect number of LoggerConfigs: " + loggers.size(), loggers.size() == 2);
+ Filter filter = config.getFilter();
+ assertNotNull("No Filter", filter);
+ assertTrue("Not a Threshold Filter", filter instanceof ThresholdFilter);
+ Logger logger = LogManager.getLogger(getClass());
+ logger.info("Welcome to Log4j!");
+ } finally {
+ System.getProperties().remove(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY);
+ }
}
}
[46/50] logging-log4j2 git commit: "assembler" -> "builder".
Posted by rg...@apache.org.
"assembler" -> "builder".
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f6c55463
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f6c55463
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f6c55463
Branch: refs/heads/master
Commit: f6c55463c7369c84d7dc729d28239c9f3366beb0
Parents: b31d310
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 15:38:55 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 15:38:55 2015 -0700
----------------------------------------------------------------------
.../core/config/builder/impl/DefaultConfigurationBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f6c55463/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 9a0a7ff..e795bfc 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
@@ -59,7 +59,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
public DefaultConfigurationBuilder() {
this((Class<T>) BuiltConfiguration.class);
- root.addAttribute("name", "Assembled");
+ root.addAttribute("name", "Built");
}
public DefaultConfigurationBuilder(final Class<T> clazz) {
[02/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular.
Posted by rg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/51e49235
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/51e49235
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/51e49235
Branch: refs/heads/master
Commit: 51e4923526672f28d9593985993985e849d2a2da
Parents: 50ab7ee
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 13:47:54 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 13:47:54 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/builder/impl/BuiltConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/51e49235/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
index 53ef869..fd4ddf0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
@@ -33,7 +33,7 @@ import java.util.Arrays;
import java.util.List;
/**
- * This is the general version of the Configuration created by the Assembler. It may be extended to
+ * This is the general version of the Configuration created by the Builder. It may be extended to
* enhance its functionality.
*/
public class BuiltConfiguration extends AbstractConfiguration {
[30/50] logging-log4j2 git commit: In the class
DefaultComponentBuilder,
make the type of builder passed in the ctor match the result type of the
getBuilder() method. This means introducing a type parameter ("CB") to the
class DefaultComponentBuilder. Al
Posted by rg...@apache.org.
In the class DefaultComponentBuilder, make the type of builder passed in
the ctor match the result type of the getBuilder() method. This means
introducing a type parameter ("CB") to the class
DefaultComponentBuilder. All subclasses use the same type for this
(DefaultConfigurationBuilder<? extends Configuration>) so we capture
that type in a new class DefaultComponentAndConfigurationBuilder which
all other ComponentBuilders subclass.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/021f7d19
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/021f7d19
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/021f7d19
Branch: refs/heads/master
Commit: 021f7d1983de65a6614f435bdb55b0794a18277c
Parents: 100c2ac
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:35:25 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:35:25 2015 -0700
----------------------------------------------------------------------
.../impl/DefaultAppenderComponentBuilder.java | 4 +-
.../DefaultAppenderRefComponentBuilder.java | 4 +-
...DefaultComponentAndConfigurationBuilder.java | 45 ++++++++++++++++++++
.../builder/impl/DefaultComponentBuilder.java | 13 +++---
.../DefaultCompositeFilterComponentBuilder.java | 5 ++-
.../impl/DefaultConfigurationBuilder.java | 11 -----
.../DefaultCustomLevelComponentBuilder.java | 4 +-
.../impl/DefaultFilterComponentBuilder.java | 4 +-
.../impl/DefaultLayoutComponentBuilder.java | 4 +-
.../impl/DefaultLoggerComponentBuilder.java | 4 +-
.../impl/DefaultRootLoggerComponentBuilder.java | 4 +-
11 files changed, 69 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/021f7d19/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
index f6e5452..10c5d51 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
@@ -24,8 +24,8 @@ import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
/**
* Holds the Appender Component attributes and subcomponents.
*/
-class DefaultAppenderComponentBuilder extends DefaultComponentBuilder<AppenderComponentBuilder> implements
- AppenderComponentBuilder {
+class DefaultAppenderComponentBuilder extends DefaultComponentAndConfigurationBuilder<AppenderComponentBuilder>
+ implements AppenderComponentBuilder {
public DefaultAppenderComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String name,
String type) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/021f7d19/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
index a503d9d..19f7b17 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
@@ -23,8 +23,8 @@ import org.apache.logging.log4j.core.config.builder.api.FilterComponentBuilder;
/**
* Holds the Appender Component attributes and subcomponents.
*/
-class DefaultAppenderRefComponentBuilder extends DefaultComponentBuilder<AppenderRefComponentBuilder> implements
- AppenderRefComponentBuilder {
+class DefaultAppenderRefComponentBuilder extends DefaultComponentAndConfigurationBuilder<AppenderRefComponentBuilder>
+ implements AppenderRefComponentBuilder {
public DefaultAppenderRefComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
String ref) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/021f7d19/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentAndConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentAndConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentAndConfigurationBuilder.java
new file mode 100644
index 0000000..d4c2b36
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentAndConfigurationBuilder.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.config.builder.impl;
+
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.builder.api.ComponentBuilder;
+
+/**
+ * Extends {@code DefaultComponentBuilder} to specify
+ * {@code DefaultConfigurationBuilder<? extends Configuration>} as the
+ * {@code ConfigurationBuilder} type.
+ */
+class DefaultComponentAndConfigurationBuilder<T extends ComponentBuilder<T>>
+ extends DefaultComponentBuilder<T, DefaultConfigurationBuilder<? extends Configuration>> {
+
+ DefaultComponentAndConfigurationBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String name,
+ String type, String value) {
+ super(builder, name, type, value);
+ }
+
+ DefaultComponentAndConfigurationBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String name,
+ String type) {
+ super(builder, name, type);
+ }
+
+ public DefaultComponentAndConfigurationBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
+ String type) {
+ super(builder, type);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/021f7d19/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
index a84b03a..a4609fe 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
@@ -31,24 +31,25 @@ import java.util.Map;
* Generic component that captures attributes and Components in preparation for assembling the Appender's
* Component.
*/
-class DefaultComponentBuilder<T extends ComponentBuilder<T>> implements ComponentBuilder<T> {
+class DefaultComponentBuilder<T extends ComponentBuilder<T>, CB extends ConfigurationBuilder<? extends Configuration>>
+ implements ComponentBuilder<T> {
- private ConfigurationBuilder<? extends Configuration> builder;
+ private CB builder;
private String type;
private Map<String, String> attributes = new HashMap<>();
private List<Component> components = new ArrayList<>();
private String name;
private String value;
- public DefaultComponentBuilder(ConfigurationBuilder<? extends Configuration> builder, String type) {
+ public DefaultComponentBuilder(CB builder, String type) {
this(builder, null, type, null);
}
- public DefaultComponentBuilder(ConfigurationBuilder<? extends Configuration> builder, String name, String type) {
+ public DefaultComponentBuilder(CB builder, String name, String type) {
this(builder, name, type, null);
}
- public DefaultComponentBuilder(ConfigurationBuilder<? extends Configuration> builder, String name, String type,
+ public DefaultComponentBuilder(CB builder, String name, String type,
String value) {
this.type = type;
this.builder = builder;
@@ -104,7 +105,7 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>> implements Componen
}
@Override
- public ConfigurationBuilder<? extends Configuration> getBuilder() {
+ public CB getBuilder() {
return builder;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/021f7d19/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
index a66cd8c..95d17f3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
@@ -23,8 +23,9 @@ import org.apache.logging.log4j.core.config.builder.api.FilterComponentBuilder;
/**
*
*/
-class DefaultCompositeFilterComponentBuilder extends DefaultComponentBuilder<CompositeFilterComponentBuilder> implements
- CompositeFilterComponentBuilder {
+class DefaultCompositeFilterComponentBuilder
+ extends DefaultComponentAndConfigurationBuilder<CompositeFilterComponentBuilder>
+ implements CompositeFilterComponentBuilder {
public DefaultCompositeFilterComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
String onMatch, String onMisMatch) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/021f7d19/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 8d023d4..c225a9d 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
@@ -124,14 +124,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- @SuppressWarnings("unchecked")
public ConfigurationBuilder<T> addProperty(String key, String value) {
properties.addComponent(newComponent(key, "Property", value).build());
return this;
}
@Override
- @SuppressWarnings({"unchecked"})
public T build() {
T configuration;
try {
@@ -211,13 +209,11 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- @SuppressWarnings("rawtypes")
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, String onMatch, String onMisMatch) {
return new DefaultFilterComponentBuilder(this, type, onMatch, onMisMatch);
}
@@ -255,7 +251,6 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
* @return this builder instance
*/
@Override
- @SuppressWarnings("unchecked")
public ConfigurationBuilder<T> setConfigurationName(String name) {
this.name = name;
return this;
@@ -268,42 +263,36 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
* @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> 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;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/021f7d19/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
index 28c2632..378582b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
@@ -22,8 +22,8 @@ import org.apache.logging.log4j.core.config.builder.api.CustomLevelComponentBuil
/**
*
*/
-class DefaultCustomLevelComponentBuilder extends DefaultComponentBuilder<CustomLevelComponentBuilder> implements
- CustomLevelComponentBuilder {
+class DefaultCustomLevelComponentBuilder extends DefaultComponentAndConfigurationBuilder<CustomLevelComponentBuilder>
+ implements CustomLevelComponentBuilder {
public DefaultCustomLevelComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
String name, int level) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/021f7d19/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
index f67e1f6..362b3ec 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
@@ -22,8 +22,8 @@ import org.apache.logging.log4j.core.config.builder.api.FilterComponentBuilder;
/**
*
*/
-class DefaultFilterComponentBuilder extends DefaultComponentBuilder<FilterComponentBuilder> implements
- FilterComponentBuilder {
+class DefaultFilterComponentBuilder extends DefaultComponentAndConfigurationBuilder<FilterComponentBuilder>
+ implements FilterComponentBuilder {
public DefaultFilterComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String type,
String onMatch, String onMisMatch) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/021f7d19/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
index 55b14df..275f7db 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
@@ -22,8 +22,8 @@ import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
/**
*
*/
-class DefaultLayoutComponentBuilder extends DefaultComponentBuilder<LayoutComponentBuilder> implements
- LayoutComponentBuilder {
+class DefaultLayoutComponentBuilder extends DefaultComponentAndConfigurationBuilder<LayoutComponentBuilder>
+ implements LayoutComponentBuilder {
public DefaultLayoutComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String type) {
super(builder, type);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/021f7d19/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
index 39451a4..7c5f4dc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
@@ -24,8 +24,8 @@ import org.apache.logging.log4j.core.config.builder.api.LoggerComponentBuilder;
/**
*
*/
-class DefaultLoggerComponentBuilder extends DefaultComponentBuilder<LoggerComponentBuilder> implements
- LoggerComponentBuilder {
+class DefaultLoggerComponentBuilder extends DefaultComponentAndConfigurationBuilder<LoggerComponentBuilder>
+ implements LoggerComponentBuilder {
/**
* Configure a logger.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/021f7d19/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
index 26b9967..19f84c5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
@@ -24,8 +24,8 @@ import org.apache.logging.log4j.core.config.builder.api.RootLoggerComponentBuild
/**
*
*/
-class DefaultRootLoggerComponentBuilder extends DefaultComponentBuilder<RootLoggerComponentBuilder> implements
- RootLoggerComponentBuilder {
+class DefaultRootLoggerComponentBuilder extends DefaultComponentAndConfigurationBuilder<RootLoggerComponentBuilder>
+ implements RootLoggerComponentBuilder {
/**
* Configure the root logger.
[08/50] logging-log4j2 git commit: More Generics clean ups.
Posted by rg...@apache.org.
More Generics clean ups.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/04e4c9f4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/04e4c9f4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/04e4c9f4
Branch: refs/heads/master
Commit: 04e4c9f41c4076127b4fcc6e23b98a73e55369cf
Parents: 8eac2e3
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 19:52:24 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 19:52:24 2015 -0700
----------------------------------------------------------------------
.../core/config/builder/impl/DefaultConfigurationBuilder.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/04e4c9f4/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 ed6fc6e..3af3b90 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
@@ -65,15 +65,15 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
private static final String LOG4J_ASYNC_LOGGERS = "Log4jContextSelector";
public DefaultConfigurationBuilder() {
- this(BuiltConfiguration.class);
+ this((Class<T>) BuiltConfiguration.class);
root.addAttribute("name", "Assembled");
}
- public <B extends BuiltConfiguration> DefaultConfigurationBuilder(Class<B> clazz) {
+ public DefaultConfigurationBuilder(Class<T> clazz) {
if (clazz == null) {
throw new IllegalArgumentException("A Configuration class must be provided");
}
- this.clazz = (Class<T>) clazz;
+ this.clazz = clazz;
List<Component> components = root.getComponents();
properties = new Component("Properties");
components.add(properties);
[50/50] logging-log4j2 git commit: LOG4J2-635 & LOG4J2-952
Posted by rg...@apache.org.
LOG4J2-635 & LOG4J2-952
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/24a7f432
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/24a7f432
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/24a7f432
Branch: refs/heads/master
Commit: 24a7f432f89dc3bd80792b6af10b3bd32e00b8c4
Parents: ab4f5a5
Author: Ralph Goers <rg...@nextiva.com>
Authored: Mon Sep 7 17:40:16 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Mon Sep 7 17:40:16 2015 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/24a7f432/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a11ea10..d695814 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,12 @@
</properties>
<body>
<release version="2.4" date="2015-MM-DD" description="GA Release 2.4">
+ <action issue="LOG4J2-635" dev="rgoers" type="add">
+ Add support for configuration via Properties.
+ </action>
+ <action issue="LOG4J2-952" dev="rgoers" type="add">
+ Add ConfigurationBuilder.
+ </action>
<action issue="LOG4J2-1017" dev="ggregory" type="update">
Update Java platform from Java 6 to 7. From this version onwards, log4j 2 requires Java 7.
</action>
[45/50] logging-log4j2 git commit: Remove unused static var.
Posted by rg...@apache.org.
Remove unused static var.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b31d310c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b31d310c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b31d310c
Branch: refs/heads/master
Commit: b31d310ccca40cd8dd2ff525e0859e1c9714ae03
Parents: 70b549a
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 15:36:09 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 15:36:09 2015 -0700
----------------------------------------------------------------------
.../config/builder/impl/DefaultConfigurationBuilder.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b31d310c/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 96890ee..9a0a7ff 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
@@ -41,14 +41,6 @@ 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;
[20/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular.
Posted by rg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a6901256
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a6901256
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a6901256
Branch: refs/heads/master
Commit: a6901256566607b9bd5333fb4aff267e6d4d6215
Parents: e408163
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:07:37 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:07:37 2015 -0700
----------------------------------------------------------------------
.../impl/DefaultConfigurationBuilder.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a6901256/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 75b433d..3d84b0d 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
@@ -89,40 +89,40 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(AppenderComponentBuilder assembler) {
- appenders.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> add(AppenderComponentBuilder builder) {
+ appenders.getComponents().add(builder.build());
return this;
}
@Override
- public ConfigurationBuilder<T> add(CustomLevelComponentBuilder assembler) {
- customLevels.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> add(CustomLevelComponentBuilder builder) {
+ customLevels.getComponents().add(builder.build());
return this;
}
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(FilterComponentBuilder assembler) {
- filters.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> add(FilterComponentBuilder builder) {
+ filters.getComponents().add(builder.build());
return this;
}
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(LoggerComponentBuilder assembler) {
- loggers.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> add(LoggerComponentBuilder builder) {
+ loggers.getComponents().add(builder.build());
return this;
}
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(RootLoggerComponentBuilder assembler) {
+ public ConfigurationBuilder<T> add(RootLoggerComponentBuilder builder) {
for (Component c : loggers.getComponents()) {
if (c.getPluginType().equals("root")) {
throw new ConfigurationException("root Logger was previously defined");
}
}
- loggers.getComponents().add(assembler.build());
+ loggers.getComponents().add(builder.build());
return this;
}
[26/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular.
Posted by rg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/43a445ee
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/43a445ee
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/43a445ee
Branch: refs/heads/master
Commit: 43a445ee320726713d31cdffe2c18620e7ae982a
Parents: 0a56f89
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 13:49:55 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 13:49:55 2015 -0700
----------------------------------------------------------------------
.../impl/DefaultAppenderComponentBuilder.java | 12 ++++++------
.../DefaultAppenderRefComponentBuilder.java | 8 ++++----
.../builder/impl/DefaultComponentBuilder.java | 4 ++--
.../DefaultCompositeFilterComponentBuilder.java | 8 ++++----
.../DefaultCustomLevelComponentBuilder.java | 4 ++--
.../impl/DefaultFilterComponentBuilder.java | 4 ++--
.../impl/DefaultLayoutComponentBuilder.java | 4 ++--
.../impl/DefaultLoggerComponentBuilder.java | 20 ++++++++++----------
.../impl/DefaultRootLoggerComponentBuilder.java | 20 ++++++++++----------
9 files changed, 42 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/43a445ee/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
index 6240bd8..f6e5452 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
@@ -27,20 +27,20 @@ import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
class DefaultAppenderComponentBuilder extends DefaultComponentBuilder<AppenderComponentBuilder> implements
AppenderComponentBuilder {
- public DefaultAppenderComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> assembler, String name,
+ public DefaultAppenderComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String name,
String type) {
- super(assembler, name, type);
+ super(builder, name, type);
}
@Override
- public AppenderComponentBuilder add(LayoutComponentBuilder assembler) {
- addComponent(assembler);
+ public AppenderComponentBuilder add(LayoutComponentBuilder builder) {
+ addComponent(builder);
return this;
}
@Override
- public AppenderComponentBuilder add(FilterComponentBuilder assembler) {
- addComponent(assembler);
+ public AppenderComponentBuilder add(FilterComponentBuilder builder) {
+ addComponent(builder);
return this;
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/43a445ee/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
index a95e53b..a503d9d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
@@ -26,16 +26,16 @@ import org.apache.logging.log4j.core.config.builder.api.FilterComponentBuilder;
class DefaultAppenderRefComponentBuilder extends DefaultComponentBuilder<AppenderRefComponentBuilder> implements
AppenderRefComponentBuilder {
- public DefaultAppenderRefComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> assembler,
+ public DefaultAppenderRefComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
String ref) {
- super(assembler, "AppenderRef");
+ super(builder, "AppenderRef");
addAttribute("ref", ref);
}
@Override
- public AppenderRefComponentBuilder add(FilterComponentBuilder assembler) {
- addComponent(assembler);
+ public AppenderRefComponentBuilder add(FilterComponentBuilder builder) {
+ addComponent(builder);
return this;
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/43a445ee/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
index d0b877f..142b28f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
@@ -102,8 +102,8 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>> implements Componen
@Override
@SuppressWarnings("unchecked")
- public T addComponent(ComponentBuilder<?> assembler) {
- components.add(assembler.build());
+ public T addComponent(ComponentBuilder<?> builder) {
+ components.add(builder.build());
return (T) this;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/43a445ee/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
index bf94dc4..a66cd8c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
@@ -26,16 +26,16 @@ import org.apache.logging.log4j.core.config.builder.api.FilterComponentBuilder;
class DefaultCompositeFilterComponentBuilder extends DefaultComponentBuilder<CompositeFilterComponentBuilder> implements
CompositeFilterComponentBuilder {
- public DefaultCompositeFilterComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> assembler,
+ public DefaultCompositeFilterComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
String onMatch, String onMisMatch) {
- super(assembler, "Filters");
+ super(builder, "Filters");
addAttribute("onMatch", onMatch);
addAttribute("onMisMatch", onMisMatch);
}
@Override
- public CompositeFilterComponentBuilder add(FilterComponentBuilder assembler) {
- addComponent(assembler);
+ public CompositeFilterComponentBuilder add(FilterComponentBuilder builder) {
+ addComponent(builder);
return this;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/43a445ee/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
index bb2f78c..28c2632 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
@@ -25,9 +25,9 @@ import org.apache.logging.log4j.core.config.builder.api.CustomLevelComponentBuil
class DefaultCustomLevelComponentBuilder extends DefaultComponentBuilder<CustomLevelComponentBuilder> implements
CustomLevelComponentBuilder {
- public DefaultCustomLevelComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> assembler,
+ public DefaultCustomLevelComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
String name, int level) {
- super(assembler, name, "CustomLevel");
+ super(builder, name, "CustomLevel");
addAttribute("level", Integer.toString(level));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/43a445ee/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
index b4d69c7..f67e1f6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
@@ -25,9 +25,9 @@ import org.apache.logging.log4j.core.config.builder.api.FilterComponentBuilder;
class DefaultFilterComponentBuilder extends DefaultComponentBuilder<FilterComponentBuilder> implements
FilterComponentBuilder {
- public DefaultFilterComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> assembler, String type,
+ public DefaultFilterComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String type,
String onMatch, String onMisMatch) {
- super(assembler, type);
+ super(builder, type);
addAttribute("onMatch", onMatch);
addAttribute("onMisMatch", onMisMatch);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/43a445ee/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
index 0343bb6..55b14df 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
class DefaultLayoutComponentBuilder extends DefaultComponentBuilder<LayoutComponentBuilder> implements
LayoutComponentBuilder {
- public DefaultLayoutComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> assembler, String type) {
- super(assembler, type);
+ public DefaultLayoutComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String type) {
+ super(builder, type);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/43a445ee/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
index 4821ba0..39451a4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
@@ -29,38 +29,38 @@ class DefaultLoggerComponentBuilder extends DefaultComponentBuilder<LoggerCompon
/**
* Configure a logger.
- * @param assembler
+ * @param builder
* @param name
* @param level
*/
- public DefaultLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> assembler, String name,
+ public DefaultLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String name,
String level) {
- super(assembler, name, "Logger");
+ super(builder, name, "Logger");
addAttribute("level", level);
}
/**
* Configure a logger.
- * @param assembler
+ * @param builder
* @param name
* @param level
* @param type
*/
- public DefaultLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> assembler, String name,
+ public DefaultLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String name,
String level, String type) {
- super(assembler, name, type);
+ super(builder, name, type);
addAttribute("level", level);
}
@Override
- public LoggerComponentBuilder add(AppenderRefComponentBuilder assembler) {
- addComponent(assembler);
+ public LoggerComponentBuilder add(AppenderRefComponentBuilder builder) {
+ addComponent(builder);
return this;
}
@Override
- public LoggerComponentBuilder add(FilterComponentBuilder assembler) {
- addComponent(assembler);
+ public LoggerComponentBuilder add(FilterComponentBuilder builder) {
+ addComponent(builder);
return this;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/43a445ee/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
index af9ac76..26b9967 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
@@ -29,37 +29,37 @@ class DefaultRootLoggerComponentBuilder extends DefaultComponentBuilder<RootLogg
/**
* Configure the root logger.
- * @param assembler
+ * @param builder
* @param level
*/
- public DefaultRootLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> assembler,
+ public DefaultRootLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
String level) {
- super(assembler, "", "Root");
+ super(builder, "", "Root");
addAttribute("level", level);
}
/**
* Configure the root logger.
- * @param assembler
+ * @param builder
* @param level
* @param type
*/
- public DefaultRootLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> assembler,
+ public DefaultRootLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
String level, String type) {
- super(assembler, "", type);
+ super(builder, "", type);
addAttribute("level", level);
}
@Override
- public RootLoggerComponentBuilder add(AppenderRefComponentBuilder assembler) {
- addComponent(assembler);
+ public RootLoggerComponentBuilder add(AppenderRefComponentBuilder builder) {
+ addComponent(builder);
return this;
}
@Override
- public RootLoggerComponentBuilder add(FilterComponentBuilder assembler) {
- addComponent(assembler);
+ public RootLoggerComponentBuilder add(FilterComponentBuilder builder) {
+ addComponent(builder);
return this;
}
}
\ No newline at end of file
[06/50] logging-log4j2 git commit: Eliminate more Generics compiler
warnings. Probably more refinements needed...
Posted by rg...@apache.org.
Eliminate more Generics compiler warnings. Probably more refinements
needed...
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/be2344f0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/be2344f0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/be2344f0
Branch: refs/heads/master
Commit: be2344f0efbef9d40ba7a6f4fa14a41a9815474c
Parents: 8cb0ac5
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 17:46:26 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 17:46:26 2015 -0700
----------------------------------------------------------------------
.../core/config/builder/api/ComponentBuilder.java | 2 +-
.../config/builder/api/ConfigurationBuilder.java | 3 +--
.../builder/impl/DefaultComponentBuilder.java | 2 +-
.../builder/impl/DefaultConfigurationBuilder.java | 16 ++++++++--------
4 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/be2344f0/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
index 82bb670..a162f79 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.util.Builder;
* Builds arbitrary components and is the base type for the provided components.
*/
@SuppressWarnings("rawtypes")
-public interface ComponentBuilder<T extends ComponentBuilder> extends Builder<Component> {
+public interface ComponentBuilder<T extends ComponentBuilder<T>> extends Builder<Component> {
/**
* Adds a String attribute.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/be2344f0/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index cb6cb8c..c578451 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -151,8 +151,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* @param value The value of the component.
* @return The ComponentBuilder.
*/
- @SuppressWarnings("rawtypes")
- ComponentBuilder<ComponentBuilder> newComponent(String name, String pluginName, String value);
+ ComponentBuilder<?> newComponent(String name, String pluginName, String value);
/**
* Returns an Asssembler for creating CustomLevels
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/be2344f0/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
index e960096..31d5dfe 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
@@ -32,7 +32,7 @@ import java.util.Map;
* Component.
*/
@SuppressWarnings("rawtypes")
-class DefaultComponentBuilder<T extends ComponentBuilder> implements ComponentBuilder<T> {
+class DefaultComponentBuilder<T extends ComponentBuilder<T>> implements ComponentBuilder<T> {
private ConfigurationBuilder<? extends Configuration> builder;
private String type;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/be2344f0/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 99ae765..6bf558f 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
@@ -46,7 +46,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
private Component filters;
private Component properties;
private Component customLevels;
- private final Class<?> clazz;
+ private final Class<? extends BuiltConfiguration> clazz;
private ConfigurationSource source;
private int monitorInterval = 0;
private Level level = null;
@@ -69,7 +69,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
root.addAttribute("name", "Assembled");
}
- public <T extends BuiltConfiguration> DefaultConfigurationBuilder(Class<T> clazz) {
+ public <B extends BuiltConfiguration> DefaultConfigurationBuilder(Class<B> clazz) {
if (clazz == null) {
throw new IllegalArgumentException("A Configuration class must be provided");
}
@@ -207,13 +207,13 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
@Override
- public ComponentBuilder<ComponentBuilder<?>> newComponent(String name, String type) {
+ public ComponentBuilder<?> newComponent(String name, String type) {
return new DefaultComponentBuilder<>(this, name, type);
}
@Override
@SuppressWarnings({"unchecked", "rawtypes"})
- public ComponentBuilder<ComponentBuilder> newComponent(String name, String type, String value) {
+ public ComponentBuilder<?> newComponent(String name, String type, String value) {
return new DefaultComponentBuilder<>(this, name, type, value);
}
@@ -281,15 +281,15 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({"unchecked"})
public T build() {
BuiltConfiguration configuration;
try {
if (source == null) {
source = ConfigurationSource.NULL_SOURCE;
}
- Constructor constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
- configuration = (BuiltConfiguration) constructor.newInstance(source, root);
+ Constructor<? extends BuiltConfiguration> constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
+ configuration = constructor.newInstance(source, root);
configuration.setMonitorInterval(monitorInterval);
if (name != null) {
configuration.setName(name);
@@ -311,6 +311,6 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
configuration.getStatusConfiguration().initialize();
configuration.initialize();
- return (T)configuration;
+ return (T) configuration;
}
}
[04/50] logging-log4j2 git commit: Make Javadoc consistent.
Posted by rg...@apache.org.
Make Javadoc consistent.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/33fb7b17
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/33fb7b17
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/33fb7b17
Branch: refs/heads/master
Commit: 33fb7b17e69231d30912464b96af3a9209eaf66a
Parents: d7f703e
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 16:57:49 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 16:57:49 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/api/ComponentBuilder.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/33fb7b17/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
index 17e0faa..82bb670 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.util.Builder;
public interface ComponentBuilder<T extends ComponentBuilder> extends Builder<Component> {
/**
- * Adds an attribute to the component.
+ * Adds a String attribute.
* @param key The attribute key.
* @param value The value of the attribute.
* @return The ComponentBuilder.
@@ -35,7 +35,7 @@ public interface ComponentBuilder<T extends ComponentBuilder> extends Builder<Co
T addAttribute(String key, String value);
/**
- * Adds a logging Level attribute to the component.
+ * Adds a logging Level attribute.
* @param key The attribute key.
* @param level The logging Level.
* @return The ComponentBuilder.
@@ -43,7 +43,7 @@ public interface ComponentBuilder<T extends ComponentBuilder> extends Builder<Co
T addAttribute(String key, Level level);
/**
- * Adds an enumeration.
+ * Adds an enumeration attribute.
* @param key The attribute key.
* @param value The enumeration.
* @return The ComponentBuilder.
[29/50] logging-log4j2 git commit: Centralize attribute writes into
one method.
Posted by rg...@apache.org.
Centralize attribute writes into one method.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/100c2ac9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/100c2ac9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/100c2ac9
Branch: refs/heads/master
Commit: 100c2ac935b74d2d88a79e1e6ef47f7b4267045e
Parents: 4001a30
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:16:33 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:16:33 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/impl/DefaultComponentBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/100c2ac9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
index 89e9f56..a84b03a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
@@ -113,7 +113,7 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>> implements Componen
return name;
}
- private T put(String key, String value) {
+ protected T put(String key, String value) {
attributes.put(key, value);
return (T) this;
}
[48/50] logging-log4j2 git commit: LOG4J2-952 - Document
ConfigurationBuilder and PropertiesConfiguration
Posted by rg...@apache.org.
LOG4J2-952 - Document ConfigurationBuilder and PropertiesConfiguration
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b288e2c2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b288e2c2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b288e2c2
Branch: refs/heads/master
Commit: b288e2c28ea0ff601afd11a3cb23e5bdeb146154
Parents: f2daf72
Author: Ralph Goers <rg...@nextiva.com>
Authored: Mon Sep 7 17:29:24 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Mon Sep 7 17:29:24 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/util/PropertiesUtil.java | 33 +++++++
.../builder/api/AppenderComponentBuilder.java | 1 +
.../api/AppenderRefComponentBuilder.java | 1 +
.../core/config/builder/api/Component.java | 1 +
.../config/builder/api/ComponentBuilder.java | 3 +-
.../api/CompositeFilterComponentBuilder.java | 1 +
.../builder/api/ConfigurationBuilder.java | 7 ++
.../api/ConfigurationBuilderFactory.java | 3 +-
.../api/CustomLevelComponentBuilder.java | 3 +-
.../builder/api/FilterComponentBuilder.java | 3 +-
.../builder/api/LayoutComponentBuilder.java | 3 +-
.../builder/api/LoggerComponentBuilder.java | 1 +
.../builder/api/RootLoggerComponentBuilder.java | 1 +
.../config/builder/impl/BuiltConfiguration.java | 26 ++++++
.../impl/DefaultConfigurationBuilder.java | 12 +++
.../properties/PropertiesConfiguration.java | 1 +
.../PropertiesConfigurationFactory.java | 8 +-
.../logging/log4j/core/util/PropertiesUtil.java | 42 ---------
.../log4j/core/util/PropertiesUtilTest.java | 17 ++++
src/site/site.xml | 2 +
src/site/xdoc/manual/configuration.xml.vm | 77 ++++++++++++++++-
src/site/xdoc/manual/customconfig.xml | 90 +++++++++++++++++++-
22 files changed, 284 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
index 04e94e1..ab283b1 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
@@ -19,6 +19,8 @@ package org.apache.logging.log4j.util;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Properties;
import org.apache.logging.log4j.Logger;
@@ -237,4 +239,35 @@ public final class PropertiesUtil {
return new Properties();
}
}
+
+ /**
+ * Extracts properties that start with or are equals to the specific prefix and returns them in a
+ * new Properties object with the prefix removed.
+ * @param properties The Properties to evaluate.
+ * @param prefix The prefix to extract.
+ * @return The subset of properties.
+ */
+ public static Properties extractSubset(Properties properties, String prefix) {
+ Properties subset = new Properties();
+
+ if (prefix == null || prefix.length() == 0) {
+ return subset;
+ }
+
+ String prefixToMatch = prefix.charAt(prefix.length() - 1) != '.' ? prefix + '.' : prefix;
+
+ List<String> keys = new ArrayList<>();
+
+ for (String key : properties.stringPropertyNames()) {
+ if (key.startsWith(prefixToMatch)) {
+ subset.setProperty(key.substring(prefixToMatch.length()), properties.getProperty(key));
+ keys.add(key);
+ }
+ }
+ for (String key : keys) {
+ properties.remove(key);
+ }
+
+ return subset;
+ }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
index bf23937..4d8f6bd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.config.builder.api;
/**
* Builder for constructing Appender Components.
+ * @since 2.4
*/
public interface AppenderComponentBuilder extends ComponentBuilder<AppenderComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
index e874b73..a98de90 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.config.builder.api;
/**
* Assembler for constructing AppenderRef Components.
+ * @since 2.4
*/
public interface AppenderRefComponentBuilder extends ComponentBuilder<AppenderRefComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
index 55d29b5..bd84e1f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
@@ -24,6 +24,7 @@ import java.util.Map;
/**
* Container for building Configurations. This class is not normally directly manipulated by users
* of the Assembler API.
+ * @Since 2.4
*/
public class Component {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
index 60e42b2..873c52f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
@@ -22,7 +22,8 @@ import org.apache.logging.log4j.core.util.Builder;
/**
* Builds arbitrary components and is the base type for the provided components.
- * @param <T> The ComponentBuilder's own type for fluent APIs
+ * @param <T> The ComponentBuilder's own type for fluent APIs.
+ * @since 2.4
*/
public interface ComponentBuilder<T extends ComponentBuilder<T>> extends Builder<Component> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
index 73116cb..b0877d3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
@@ -25,6 +25,7 @@ public interface CompositeFilterComponentBuilder extends ComponentBuilder<Compos
* Add a FilterComponent.
* @param assembler The FilterComponentBuilder with all of its attributes and sub-components set.
* @return The CompositeFilterComponentBuilder.
+ * @since 2.4
*/
CompositeFilterComponentBuilder add(FilterComponentBuilder assembler);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index c2ec498..2bb84e2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -25,6 +25,7 @@ import org.apache.logging.log4j.core.util.Builder;
/**
* Interface for building logging configurations.
* @param <T> The Configuration type created by this builder.
+ * @since 2.4
*/
public interface ConfigurationBuilder<T extends Configuration> extends Builder<T> {
@@ -199,6 +200,12 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
*/
RootLoggerComponentBuilder newRootLogger(String level);
+ /**
+ * Set the Advertiser Plugin name.
+ * @param advertiser The Advertiser Plugin name.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> setAdvertiser(String advertiser);
/**
* Sets the name of the configuration.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
index 4418d38..c58b229 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
@@ -21,7 +21,8 @@ import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
import org.apache.logging.log4j.core.config.builder.impl.DefaultConfigurationBuilder;
/**
- *
+ * Provides methods to create ConfigurationBuilders.
+ * @since 2.4
*/
public class ConfigurationBuilderFactory {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CustomLevelComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CustomLevelComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CustomLevelComponentBuilder.java
index 38230e2..de9a073 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CustomLevelComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CustomLevelComponentBuilder.java
@@ -17,7 +17,8 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Assembler for constructing CustomLevel Components
+ * Assembler for constructing CustomLevel Components.
+ * @since 2.4
*/
public interface CustomLevelComponentBuilder extends ComponentBuilder<CustomLevelComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterComponentBuilder.java
index 232fd5e..f65bfdd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterComponentBuilder.java
@@ -17,7 +17,8 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Assembler for constructing Filter Components
+ * Assembler for constructing Filter Components.
+ * @since 2.4
*/
public interface FilterComponentBuilder extends ComponentBuilder<FilterComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LayoutComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LayoutComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LayoutComponentBuilder.java
index ef893ac..e2eb7b5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LayoutComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LayoutComponentBuilder.java
@@ -17,7 +17,8 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Assembler for constructing Layout Components
+ * Assembler for constructing Layout Components.
+ * @since 2.4
*/
public interface LayoutComponentBuilder extends ComponentBuilder<LayoutComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
index 4dcbf00..fcca42b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.config.builder.api;
/**
* Assembler for constructing Logger Components.
+ * @since 2.4
*/
public interface LoggerComponentBuilder extends ComponentBuilder<LoggerComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
index 4c7a681..324eb99 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.config.builder.api;
/**
* Assembler for constructing the root Logger Components.
+ * @since 2.4
*/
public interface RootLoggerComponentBuilder extends ComponentBuilder<RootLoggerComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
index 0b838d2..06135e8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
@@ -29,6 +29,8 @@ import org.apache.logging.log4j.core.config.status.StatusConfiguration;
import org.apache.logging.log4j.core.util.Patterns;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
@@ -46,6 +48,7 @@ public class BuiltConfiguration extends AbstractConfiguration {
private Component filtersComponent;
private Component propertiesComponent;
private Component customLevelsComponent;
+ private String contentType = "text";
public BuiltConfiguration(final ConfigurationSource source, final Component rootComponent) {
super(source);
@@ -98,6 +101,29 @@ public class BuiltConfiguration extends AbstractConfiguration {
root = null;
}
+ public String getContentType() {
+ return this.contentType;
+ }
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
+
+ public void createAdvertiser(final String advertiserString, final ConfigurationSource configSource) {
+ byte[] buffer = null;
+ try {
+ if (configSource != null) {
+ InputStream is = configSource.getInputStream();
+ if (is != null) {
+ buffer = toByteArray(is);
+ }
+ }
+ } catch (IOException ioe) {
+ LOGGER.warn("Unable to read configuration source " + configSource.toString());
+ }
+ super.createAdvertiser(advertiserString, configSource, buffer, contentType);
+ }
+
public StatusConfiguration getStatusConfiguration() {
return statusConfig;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/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 e795bfc..386226a 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
@@ -32,6 +32,7 @@ import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.LoggerComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.RootLoggerComponentBuilder;
+import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.util.List;
@@ -54,6 +55,8 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
private String verbosity = null;
private String packages = null;
private String shutdownFlag = null;
+ private String advertiser = null;
+ private byte[] buffer = null;
private String name = null;
@@ -146,6 +149,9 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
if (shutdownFlag != null) {
configuration.setShutdownHook(shutdownFlag);
}
+ if (advertiser != null) {
+ configuration.createAdvertiser(advertiser, source);
+ }
} catch (final Exception ex) {
throw new IllegalArgumentException("Invalid Configuration class specified", ex);
}
@@ -236,6 +242,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
return new DefaultRootLoggerComponentBuilder(this, level);
}
+ @Override
+ public ConfigurationBuilder<T> setAdvertiser(final String advertiser) {
+ this.advertiser = advertiser;
+ return this;
+ }
+
/**
* Set the name of the configuration.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
index ae0e49c..19dbbf3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
@@ -26,6 +26,7 @@ import java.io.IOException;
/**
* Configuration created from a properties file.
+ * @since 2.4
*/
public class PropertiesConfiguration extends BuiltConfiguration implements Reconfigurable {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/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 092afd1..1dfb19c 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
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.LoggerComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.RootLoggerComponentBuilder;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.util.PropertiesUtil;
+import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.Strings;
import java.io.IOException;
@@ -39,10 +39,12 @@ import java.util.Properties;
/**
* Creates a PropertiesConfiguration from a properties file.
+ * @since 2.4
*/
@Plugin(name = "PropertiesConfigurationFactory", category = ConfigurationFactory.CATEGORY)
@Order(8)
public class PropertiesConfigurationFactory extends ConfigurationFactory {
+ private static final String ADVERTISER_KEY = "advertiser";
private static final String STATUS_KEY = "status";
private static final String SHUTDOWN_HOOK = "shutdownHook";
private static final String VERBOSE = "verbose";
@@ -92,6 +94,10 @@ public class PropertiesConfigurationFactory extends ConfigurationFactory {
if (value != null) {
builder.setMonitorInterval(value);
}
+ value = properties.getProperty(ADVERTISER_KEY);
+ if (value != null) {
+ builder.setAdvertiser(value);
+ }
Properties props = PropertiesUtil.extractSubset(properties, "property");
for (String key : props.stringPropertyNames()) {
builder.addProperty(key, props.getProperty(key));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/main/java/org/apache/logging/log4j/core/util/PropertiesUtil.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/PropertiesUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/PropertiesUtil.java
deleted file mode 100644
index c43ce93..0000000
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/PropertiesUtil.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.apache.logging.log4j.core.util;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-/**
- *
- */
-public class PropertiesUtil {
-
- /**
- * Extracts properties that start with or are equals to the specific prefix and returns them in a
- * new Properties object with the prefix removed.
- * @param properties The Properties to evaluate.
- * @param prefix The prefix to extract.
- * @return The subset of properties.
- */
- public static Properties extractSubset(Properties properties, String prefix) {
- Properties subset = new Properties();
-
- if (prefix == null || prefix.length() == 0) {
- return subset;
- }
-
- String prefixToMatch = prefix.charAt(prefix.length() - 1) != '.' ? prefix + '.' : prefix;
-
- List<String> keys = new ArrayList<>();
-
- for (String key : properties.stringPropertyNames()) {
- if (key.startsWith(prefixToMatch)) {
- subset.setProperty(key.substring(prefixToMatch.length()), properties.getProperty(key));
- keys.add(key);
- }
- }
- for (String key : keys) {
- properties.remove(key);
- }
-
- return subset;
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/log4j-core/src/test/java/org/apache/logging/log4j/core/util/PropertiesUtilTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/PropertiesUtilTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/PropertiesUtilTest.java
index 0fc6f20..5df1a68 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/PropertiesUtilTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/PropertiesUtilTest.java
@@ -1,5 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
package org.apache.logging.log4j.core.util;
+import org.apache.logging.log4j.util.PropertiesUtil;
import org.junit.Test;
import java.io.FileInputStream;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 3bbf745..23095d4 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -67,6 +67,7 @@
<item name="Configuration Syntax" href="/manual/configuration.html#ConfigurationSyntax" />
<item name="XML Syntax" href="/manual/configuration.html#XML"/>
<item name="JSON Syntax" href="/manual/configuration.html#JSON"/>
+ <item name="Properties Syntax" href="/manual/configuration.html#Properties"/>
<item name="Configuring Loggers" href="/manual/configuration.html#Loggers"/>
<item name="Configuring Appenders" href="/manual/configuration.html#Appenders"/>
<item name="Configuring Filters" href="/manual/configuration.html#Filters"/>
@@ -184,6 +185,7 @@
<item name="Extending Log4j Configuration" href="/manual/customconfig.html" collapse="true">
<item name="ConfigurationFactory" href="/manual/customconfig.html#ConfigurationFactory"/>
+ <item name="ConfigurationBuilder" href="/manual/customconfig.html#ConfigurationBuilder"/>
<item name="Manual" href="/manual/customconfig.html#AddingToCurrent"/>
</item>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/src/site/xdoc/manual/configuration.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/configuration.xml.vm b/src/site/xdoc/manual/configuration.xml.vm
index a4c0e20..054dcd3 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -359,8 +359,6 @@ public class Bar {
as the action being performed for a specific user, route output to Flume or a log reporting system,
etc. Being able to do this requires understanding the syntax of the configuration files.
</p>
- <a name="XML"/>
- <h4>Configuration with XML</h4>
<p>
The configuration element in the XML file accepts several attributes:
</p>
@@ -807,6 +805,81 @@ public class Bar {
</Configuration>
]]></pre>
+ <a name="Properties"/>
+ <h4>Configuration with Properties</h4>
+ <p>
+ As of version 2.4, Log4j now supports configuration via properties files. Note that the property
+ syntax is NOT the same as the syntax used in Log4j 1. Like the XML and JSON configurations, properties
+ configurations define the configuration in terms of plugins and attributes to the plugins.
+ </p>
+ <p>
+ The properties configuration requires that you list the identifiers of the appenders, filters and loggers,
+ in a comma separated list in properties with those names. Each of those components will then be expected
+ to be defined in sets of properties that begin with <i>component.identifier</i>. The identifier does not
+ have to match the name of the component being defined but must uniquely identify all the attributes and
+ subcomponents that are part of the component. Each individual component MUST have a "type" attribute
+ specified that identifies the component's Plugin type.
+ </p>
+ <p>
+ Unlike the base components, when creating subcomponents you cannot specify an element containing a list of
+ identifiers. Instead, you must define the wrapper element with its type as is shown in the policies
+ definition in the rolling file appender below. You then define each of the subcomponents below that
+ wrapper element, as the TimeBasedTriggeringPolicy and SizeBasedTriggeringPolicy are defined below.
+ </p>
+ <p>
+ Properties configuration files support the advertiser, monitorInterval, name, packages, shutdownHook,
+ status, and verbose attrbutes. See <a href="#ConfigurationSyntax">Configuration Syntax</a> for the
+ definitions of these attributes.
+ </p>
+ <pre class="prettyprint linenums">
+status = error
+name = PropertiesConfig
+
+property.filename = target/rolling/rollingtest.log
+
+filters = threshold
+
+filter.threshold.type = ThresholdFilter
+filter.threshold.level = debug
+
+appenders = console, rolling, list
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %m%n
+
+appender.rolling.type = RollingFile
+appender.rolling.name = RollingFile
+appender.rolling.fileName = ${filename}
+appender.rolling.filePattern = target/rolling2/test1-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz
+appender.rolling.layout.type = PatternLayout
+appender.rolling.layout.pattern = %d %p %C{1.} [%t] %m%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 2
+appender.rolling.policies.time.modulate = true
+appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size=100MB
+
+appender.list.type = List
+appender.list.name = List
+appender.list.filters = threshold
+appender.list.filter.threshold.type = ThresholdFilter
+appender.list.filter.threshold.level = error
+
+loggers = rolling
+
+logger.rolling.name = org.apache.logging.log4j.core.appender.rolling
+logger.rolling.level = debug
+logger.rolling.additivity = false
+logger.rolling.appenderRefs = rolling
+logger.rolling.appenderRef.rolling.ref = RollingFile
+
+rootLogger.level = info
+rootLogger.appenderRefs = stdout
+rootLogger.appenderRef.stdout.ref = STDOUT
+ </pre>
</subsection>
<a name="PropertySubstitution"/>
<subsection name="Property Substitution">
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b288e2c2/src/site/xdoc/manual/customconfig.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/customconfig.xml b/src/site/xdoc/manual/customconfig.xml
index 52da59a..76fb13d 100644
--- a/src/site/xdoc/manual/customconfig.xml
+++ b/src/site/xdoc/manual/customconfig.xml
@@ -35,7 +35,7 @@
The easiest way to create a custom Configuration is to extend one of the standard Configuration classes
(XMLConfiguration, JSONConfiguration) and then create a new ConfigurationFactory for the extended class.
After the standard configuration completes the custom configuration can be added to it.
- </p>
+ </p>>
<p>
The example below shows how to extend XMLConfiguration to manually add an Appender and a LoggerConfig
to the configuration.
@@ -89,9 +89,95 @@ public class MyXMLConfiguration extends XMLConfiguration {
addLogger("org.apache.logging.log4j", loggerConfig);
}
}</pre>
+ <p>
+ Another way to create a ConfigurationFactory is to use the <a href="#ConfigurationBuilder">ConfigurationBuilder</a>.
+ This will cause the Configuration to automatically be hooked into Log4j when the LoggerContext is created.
+ In the example below, because it specifies a supported type of "*" it will override any configuration files provided.
+ </p>
+ <pre class="prettyprint linenum"><![CDATA[
+@Plugin(name = "CustomConfigurationFactory", category = ConfigurationFactory.CATEGORY)
+@Order(50)
+public class CustomConfigurationFactory extends ConfigurationFactory {
+
+ static Configuration addTestFixtures(final String name, ConfigurationBuilder<BuiltConfiguration> builder) {
+ builder.setConfigurationName(name);
+ builder.setStatusLevel(Level.ERROR);
+ builder.add(builder.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL).
+ addAttribute("level", Level.DEBUG));
+ AppenderComponentBuilder appenderBuilder = builder.newAppender("Stdout", "CONSOLE").
+ addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
+ appenderBuilder.add(builder.newLayout("PatternLayout").
+ addAttribute("pattern", "%d [%t] %-5level: %msg%n%throwable"));
+ appenderBuilder.add(builder.newFilter("MarkerFilter", Filter.Result.DENY,
+ Filter.Result.NEUTRAL).addAttribute("marker", "FLOW"));
+ builder.add(appenderBuilder);
+ builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG).
+ add(builder.newAppenderRef("Stdout")).
+ addAttribute("additivity", false));
+ builder.add(builder.newRootLogger(Level.ERROR).add(builder.newAppenderRef("Stdout")));
+ return builder.build();
+ }
+
+ @Override
+ public Configuration getConfiguration(ConfigurationSource source) {
+ return getConfiguration(source.toString(), null);
+ }
+
+ @Override
+ public Configuration getConfiguration(final String name, final URI configLocation) {
+ ConfigurationBuilder<BuiltConfiguration> builder = newConfigurationBuilder();
+ return addTestFixtures(name, builder);
+ }
+
+ @Override
+ protected String[] getSupportedTypes() {
+ return new String[] {"*"};
+ }
+}]]></pre>
</subsection>
+ <a name="ConfigurationBuilder"/>
+ <subsection name="ConfigurationBuilder">
+ <p>
+ Starting with release 2.4, Log4j provides a ConfigurationBuilder and a set of component builders that
+ allow a Configuration to be created fairly easily. The component builders construct component definitions
+ that are added to the ConfigurationBuilder. Once all the definitions have been collected all the actual
+ configuration objects are constructed. This Configuration may then be passed to the Configurator to set
+ up the Log4j configuration.
+ </p>
+ <p>
+ The ConfigurationBuilder is aware of the base components that can be cofigured such as Loggers, Appenders,
+ Filter, Properties, etc. However, it does know what components can be configured on specific components
+ such as the RollingFileAppender vs the RoutingAppender. As an example, when creating an appender
+ builder.newFilter() can be called to create a Filter and then the add method can be called on the
+ AppenderComponentBuilder to add the Filter to the Appender. However, the configuration builder doesn't
+ know anything about triggering policies. For these, builder.newComponent() must be used.
+ </p>
+ <p>
+ Using the Configurator in this manner allows the application control over when Log4j is initialized.
+ However, should any logging be attempted before Configurator.initialize() is called then the
+ default configuration will be used for those log events.
+ </p>
+ <pre class="prettyprint linenum"><![CDATA[
+ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
+builder.setStatusLevel(Level.ERROR);
+builder.setConfigurationName("BuilderTest");
+builder.add(builder.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
+ .addAttribute("level", Level.DEBUG));
+AppenderComponentBuilder appenderBuilder = builder.newAppender("Stdout", "CONSOLE").addAttribute("target",
+ ConsoleAppender.Target.SYSTEM_OUT);
+appenderBuilder.add(builder.newLayout("PatternLayout").
+ addAttribute("pattern", "%d [%t] %-5level: %msg%n%throwable"));
+appenderBuilder.add(builder.newFilter("MarkerFilter", Filter.Result.DENY, Filter.Result.NEUTRAL).
+ addAttribute("marker", "FLOW"));
+builder.add(appenderBuilder);
+builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG).
+ add(builder.newAppenderRef("Stdout")).addAttribute("additivity", false));
+builder.add(builder.newRootLogger(Level.ERROR).add(builder.newAppenderRef("Stdout")));
+ctx = Configurator.initialize(builder.build());
+]]></pre>
+ </subsection>
<a name="AddingToCurrent"/>
- <subsection name="Programatically Adding to the Current Configuration">
+ <subsection name="Programatically Adding to the Current Configuration">
<p>
Applications sometimes have the need to customize logging separate from the actual configuration.
Log4j allows this although it suffers from a few limitations:
[37/50] logging-log4j2 git commit: Use final.
Posted by rg...@apache.org.
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/49fa817c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/49fa817c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/49fa817c
Branch: refs/heads/master
Commit: 49fa817c35aa5b915f424335c6bde8a657b6ccb0
Parents: dbe1157
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:57:40 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:57:40 2015 -0700
----------------------------------------------------------------------
.../core/config/builder/api/Component.java | 10 +--
.../api/ConfigurationBuilderFactory.java | 2 +-
.../config/builder/impl/BuiltConfiguration.java | 26 ++++----
.../impl/DefaultAppenderComponentBuilder.java | 8 +--
.../DefaultAppenderRefComponentBuilder.java | 6 +-
...DefaultComponentAndConfigurationBuilder.java | 12 ++--
.../builder/impl/DefaultComponentBuilder.java | 26 ++++----
.../DefaultCompositeFilterComponentBuilder.java | 6 +-
.../impl/DefaultConfigurationBuilder.java | 70 ++++++++++----------
.../DefaultCustomLevelComponentBuilder.java | 4 +-
.../impl/DefaultFilterComponentBuilder.java | 4 +-
.../impl/DefaultLayoutComponentBuilder.java | 2 +-
.../impl/DefaultLoggerComponentBuilder.java | 12 ++--
.../impl/DefaultRootLoggerComponentBuilder.java | 12 ++--
14 files changed, 100 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
index 6d5556a..55d29b5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
@@ -32,15 +32,15 @@ public class Component {
private final String pluginType;
private final String value;
- public Component(String pluginType) {
+ public Component(final String pluginType) {
this(pluginType, null, null);
}
- public Component(String pluginType, String name) {
+ public Component(final String pluginType, final String name) {
this(pluginType, name, null);
}
- public Component(String pluginType, String name, String value) {
+ public Component(final String pluginType, final String name, final String value) {
this.pluginType = pluginType;
this.value = value;
if (name != null && name.length() > 0) {
@@ -54,11 +54,11 @@ public class Component {
}
- public String addAttribute(String key, String value) {
+ public String addAttribute(final String key, final String value) {
return attributes.put(key, value);
}
- public void addComponent(Component component) {
+ public void addComponent(final Component component) {
components.add(component);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
index da1b81c..4418d38 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
@@ -33,7 +33,7 @@ public class ConfigurationBuilderFactory {
return new DefaultConfigurationBuilder<>();
}
- public static <T extends BuiltConfiguration> ConfigurationBuilder<T> newConfigurationBuilder(Class<T> clazz) {
+ public static <T extends BuiltConfiguration> ConfigurationBuilder<T> newConfigurationBuilder(final Class<T> clazz) {
return new DefaultConfigurationBuilder<>(clazz);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
index fd4ddf0..0b838d2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
@@ -47,10 +47,10 @@ public class BuiltConfiguration extends AbstractConfiguration {
private Component propertiesComponent;
private Component customLevelsComponent;
- public BuiltConfiguration(ConfigurationSource source, Component rootComponent) {
+ public BuiltConfiguration(final ConfigurationSource source, final Component rootComponent) {
super(source);
statusConfig = new StatusConfiguration().withVerboseClasses(VERBOSE_CLASSES).withStatus(getDefaultStatus());
- for (Component component : rootComponent.getComponents()) {
+ for (final Component component : rootComponent.getComponents()) {
switch (component.getPluginType()) {
case "Loggers": {
loggersComponent = component;
@@ -79,7 +79,7 @@ public class BuiltConfiguration extends AbstractConfiguration {
@Override
public void setup() {
- List<Node> children = rootNode.getChildren();
+ final List<Node> children = rootNode.getChildren();
if (propertiesComponent.getComponents().size() > 0) {
children.add(convertToNode(rootNode, propertiesComponent));
}
@@ -102,17 +102,17 @@ public class BuiltConfiguration extends AbstractConfiguration {
return statusConfig;
}
- public void setPluginPackages(String packages) {
+ public void setPluginPackages(final String packages) {
pluginPackages.addAll(Arrays.asList(packages.split(Patterns.COMMA_SEPARATOR)));
}
- public void setShutdownHook(String flag) {
+ public void setShutdownHook(final String flag) {
isShutdownHookEnabled = !"disable".equalsIgnoreCase(flag);
}
- public void setMonitorInterval(int intervalSeconds) {
+ public void setMonitorInterval(final int intervalSeconds) {
if (this instanceof Reconfigurable && intervalSeconds > 0) {
- ConfigurationSource configSource = getConfigurationSource();
+ final ConfigurationSource configSource = getConfigurationSource();
if (configSource != null) {
final File configFile = configSource.getFile();
if (intervalSeconds > 0 && configFile != null) {
@@ -126,14 +126,14 @@ public class BuiltConfiguration extends AbstractConfiguration {
return pluginManager;
}
- protected Node convertToNode(Node parent, Component component) {
- String name = component.getPluginType();
- PluginType<?> pluginType = pluginManager.getPluginType(name);
- Node node = new Node(parent, name, pluginType);
+ protected Node convertToNode(final Node parent, final Component component) {
+ final String name = component.getPluginType();
+ final PluginType<?> pluginType = pluginManager.getPluginType(name);
+ final Node node = new Node(parent, name, pluginType);
node.getAttributes().putAll(component.getAttributes());
node.setValue(component.getValue());
- List<Node> children = node.getChildren();
- for (Component child : component.getComponents()) {
+ final List<Node> children = node.getChildren();
+ for (final Component child : component.getComponents()) {
children.add(convertToNode(node, child));
}
return node;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
index cdaeb96..e66e835 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
@@ -27,18 +27,18 @@ import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
class DefaultAppenderComponentBuilder extends DefaultComponentAndConfigurationBuilder<AppenderComponentBuilder>
implements AppenderComponentBuilder {
- public DefaultAppenderComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String name,
- String type) {
+ public DefaultAppenderComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder, final String name,
+ final String type) {
super(builder, name, type);
}
@Override
- public AppenderComponentBuilder add(LayoutComponentBuilder builder) {
+ public AppenderComponentBuilder add(final LayoutComponentBuilder builder) {
return addComponent(builder);
}
@Override
- public AppenderComponentBuilder add(FilterComponentBuilder builder) {
+ public AppenderComponentBuilder add(final FilterComponentBuilder builder) {
return addComponent(builder);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
index 7ee5f0f..1016624 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
@@ -26,15 +26,15 @@ import org.apache.logging.log4j.core.config.builder.api.FilterComponentBuilder;
class DefaultAppenderRefComponentBuilder extends DefaultComponentAndConfigurationBuilder<AppenderRefComponentBuilder>
implements AppenderRefComponentBuilder {
- public DefaultAppenderRefComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
- String ref) {
+ public DefaultAppenderRefComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder,
+ final String ref) {
super(builder, "AppenderRef");
addAttribute("ref", ref);
}
@Override
- public AppenderRefComponentBuilder add(FilterComponentBuilder builder) {
+ public AppenderRefComponentBuilder add(final FilterComponentBuilder builder) {
return addComponent(builder);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentAndConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentAndConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentAndConfigurationBuilder.java
index d4c2b36..44e71b5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentAndConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentAndConfigurationBuilder.java
@@ -27,18 +27,18 @@ import org.apache.logging.log4j.core.config.builder.api.ComponentBuilder;
class DefaultComponentAndConfigurationBuilder<T extends ComponentBuilder<T>>
extends DefaultComponentBuilder<T, DefaultConfigurationBuilder<? extends Configuration>> {
- DefaultComponentAndConfigurationBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String name,
- String type, String value) {
+ DefaultComponentAndConfigurationBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder, final String name,
+ final String type, final String value) {
super(builder, name, type, value);
}
- DefaultComponentAndConfigurationBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String name,
- String type) {
+ DefaultComponentAndConfigurationBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder, final String name,
+ final String type) {
super(builder, name, type);
}
- public DefaultComponentAndConfigurationBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
- String type) {
+ public DefaultComponentAndConfigurationBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder,
+ final String type) {
super(builder, type);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
index 9c7ed59..af313fb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
@@ -41,16 +41,16 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>, CB extends Configur
private String name;
private String value;
- public DefaultComponentBuilder(CB builder, String type) {
+ public DefaultComponentBuilder(final CB builder, final String type) {
this(builder, null, type, null);
}
- public DefaultComponentBuilder(CB builder, String name, String type) {
+ public DefaultComponentBuilder(final CB builder, final String name, final String type) {
this(builder, name, type, null);
}
- public DefaultComponentBuilder(CB builder, String name, String type,
- String value) {
+ public DefaultComponentBuilder(final CB builder, final String name, final String type,
+ final String value) {
this.type = type;
this.builder = builder;
this.name = name;
@@ -58,47 +58,47 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>, CB extends Configur
}
@Override
- public T addAttribute(String key, boolean value) {
+ public T addAttribute(final String key, final boolean value) {
return put(key, Boolean.toString(value));
}
@Override
- public T addAttribute(String key, Enum<?> value) {
+ public T addAttribute(final String key, final Enum<?> value) {
return put(key, value.name());
}
@Override
- public T addAttribute(String key, int value) {
+ public T addAttribute(final String key, final int value) {
return put(key, Integer.toString(value));
}
@Override
- public T addAttribute(String key, Level level) {
+ public T addAttribute(final String key, final Level level) {
return put(key, level.toString());
}
@Override
- public T addAttribute(String key, Object value) {
+ public T addAttribute(final String key, final Object value) {
return put(key, value.toString());
}
@Override
- public T addAttribute(String key, String value) {
+ public T addAttribute(final String key, final String value) {
return put(key, value);
}
@Override
@SuppressWarnings("unchecked")
- public T addComponent(ComponentBuilder<?> builder) {
+ public T addComponent(final ComponentBuilder<?> builder) {
components.add(builder.build());
return (T) this;
}
@Override
public Component build() {
- Component component = new Component(type, name, value);
+ final Component component = new Component(type, name, value);
component.getAttributes().putAll(attributes);
component.getComponents().addAll(components);
return component;
@@ -114,7 +114,7 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>, CB extends Configur
return name;
}
- protected T put(String key, String value) {
+ protected T put(final String key, final String value) {
attributes.put(key, value);
return (T) this;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
index b9bb80d..f1d50e9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
@@ -27,15 +27,15 @@ class DefaultCompositeFilterComponentBuilder
extends DefaultComponentAndConfigurationBuilder<CompositeFilterComponentBuilder>
implements CompositeFilterComponentBuilder {
- public DefaultCompositeFilterComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
- String onMatch, String onMisMatch) {
+ public DefaultCompositeFilterComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder,
+ final String onMatch, final String onMisMatch) {
super(builder, "Filters");
addAttribute("onMatch", onMatch);
addAttribute("onMisMatch", onMisMatch);
}
@Override
- public CompositeFilterComponentBuilder add(FilterComponentBuilder builder) {
+ public CompositeFilterComponentBuilder add(final FilterComponentBuilder builder) {
return addComponent(builder);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/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 fb76f8a..96890ee 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
@@ -70,12 +70,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
root.addAttribute("name", "Assembled");
}
- public DefaultConfigurationBuilder(Class<T> clazz) {
+ public DefaultConfigurationBuilder(final Class<T> clazz) {
if (clazz == null) {
throw new IllegalArgumentException("A Configuration class must be provided");
}
this.clazz = clazz;
- List<Component> components = root.getComponents();
+ final List<Component> components = root.getComponents();
properties = new Component("Properties");
components.add(properties);
customLevels = new Component("CustomLevels");
@@ -88,34 +88,34 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
components.add(loggers);
}
- protected ConfigurationBuilder<T> add(Component parent, ComponentBuilder<?> builder) {
+ protected ConfigurationBuilder<T> add(final Component parent, final ComponentBuilder<?> builder) {
parent.getComponents().add(builder.build());
return this;
}
@Override
- public ConfigurationBuilder<T> add(AppenderComponentBuilder builder) {
+ public ConfigurationBuilder<T> add(final AppenderComponentBuilder builder) {
return add(appenders, builder);
}
@Override
- public ConfigurationBuilder<T> add(CustomLevelComponentBuilder builder) {
+ public ConfigurationBuilder<T> add(final CustomLevelComponentBuilder builder) {
return add(customLevels, builder);
}
@Override
- public ConfigurationBuilder<T> add(FilterComponentBuilder builder) {
+ public ConfigurationBuilder<T> add(final FilterComponentBuilder builder) {
return add(filters, builder);
}
@Override
- public ConfigurationBuilder<T> add(LoggerComponentBuilder builder) {
+ public ConfigurationBuilder<T> add(final LoggerComponentBuilder builder) {
return add(loggers, builder);
}
@Override
- public ConfigurationBuilder<T> add(RootLoggerComponentBuilder builder) {
- for (Component c : loggers.getComponents()) {
+ public ConfigurationBuilder<T> add(final RootLoggerComponentBuilder builder) {
+ for (final Component c : loggers.getComponents()) {
if (c.getPluginType().equals("root")) {
throw new ConfigurationException("Root Logger was previously defined");
}
@@ -124,7 +124,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public ConfigurationBuilder<T> addProperty(String key, String value) {
+ public ConfigurationBuilder<T> addProperty(final String key, final String value) {
properties.addComponent(newComponent(key, "Property", value).build());
return this;
}
@@ -136,7 +136,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
if (source == null) {
source = ConfigurationSource.NULL_SOURCE;
}
- Constructor<T> constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
+ final Constructor<T> constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
configuration = constructor.newInstance(source, root);
configuration.setMonitorInterval(monitorInterval);
if (name != null) {
@@ -154,7 +154,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
if (shutdownFlag != null) {
configuration.setShutdownHook(shutdownFlag);
}
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new IllegalArgumentException("Invalid Configuration class specified", ex);
}
configuration.getStatusConfiguration().initialize();
@@ -163,84 +163,84 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public AppenderComponentBuilder newAppender(String name, String type) {
+ public AppenderComponentBuilder newAppender(final String name, final String type) {
return new DefaultAppenderComponentBuilder(this, name, type);
}
@Override
- public AppenderRefComponentBuilder newAppenderRef(String ref) {
+ public AppenderRefComponentBuilder newAppenderRef(final String ref) {
return new DefaultAppenderRefComponentBuilder(this, ref);
}
@Override
- public LoggerComponentBuilder newAsyncLogger(String name, Level level) {
+ public LoggerComponentBuilder newAsyncLogger(final String name, final Level level) {
return new DefaultLoggerComponentBuilder(this, name, level.toString(), "AsyncLogger");
}
@Override
- public LoggerComponentBuilder newAsyncLogger(String name, String level) {
+ public LoggerComponentBuilder newAsyncLogger(final String name, final String level) {
return new DefaultLoggerComponentBuilder(this, name, level, "AsyncLogger");
}
@Override
- public RootLoggerComponentBuilder newAsyncRootLogger(Level level) {
+ public RootLoggerComponentBuilder newAsyncRootLogger(final Level level) {
return new DefaultRootLoggerComponentBuilder(this, level.toString(), "AsyncRoot");
}
@Override
- public RootLoggerComponentBuilder newAsyncRootLogger(String level) {
+ public RootLoggerComponentBuilder newAsyncRootLogger(final String level) {
return new DefaultRootLoggerComponentBuilder(this, level, "AsyncRoot");
}
@Override
- public <B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(String name, String type) {
+ public <B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(final String name, final String type) {
return new DefaultComponentBuilder<>(this, name, type);
}
@Override
- public <B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(String name, String type, String value) {
+ public <B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(final String name, final String type, final String value) {
return new DefaultComponentBuilder<>(this, name, type, value);
}
@Override
- public CustomLevelComponentBuilder newCustomLevel(String name, int level) {
+ public CustomLevelComponentBuilder newCustomLevel(final String name, final int level) {
return new DefaultCustomLevelComponentBuilder(this, name, level);
}
@Override
- public FilterComponentBuilder newFilter(String type, Filter.Result onMatch, Filter.Result onMisMatch) {
+ public FilterComponentBuilder newFilter(final String type, final Filter.Result onMatch, final Filter.Result onMisMatch) {
return new DefaultFilterComponentBuilder(this, type, onMatch.name(), onMisMatch.name());
}
@Override
- public FilterComponentBuilder newFilter(String type, String onMatch, String onMisMatch) {
+ public FilterComponentBuilder newFilter(final String type, final String onMatch, final String onMisMatch) {
return new DefaultFilterComponentBuilder(this, type, onMatch, onMisMatch);
}
@Override
- public LayoutComponentBuilder newLayout(String type) {
+ public LayoutComponentBuilder newLayout(final String type) {
return new DefaultLayoutComponentBuilder(this, type);
}
@Override
- public LoggerComponentBuilder newLogger(String name, Level level) {
+ public LoggerComponentBuilder newLogger(final String name, final Level level) {
return new DefaultLoggerComponentBuilder(this, name, level.toString());
}
@Override
- public LoggerComponentBuilder newLogger(String name, String level) {
+ public LoggerComponentBuilder newLogger(final String name, final String level) {
return new DefaultLoggerComponentBuilder(this, name, level);
}
@Override
- public RootLoggerComponentBuilder newRootLogger(Level level) {
+ public RootLoggerComponentBuilder newRootLogger(final Level level) {
return new DefaultRootLoggerComponentBuilder(this, level.toString());
}
@Override
- public RootLoggerComponentBuilder newRootLogger(String level) {
+ public RootLoggerComponentBuilder newRootLogger(final String level) {
return new DefaultRootLoggerComponentBuilder(this, level);
}
@@ -251,7 +251,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
* @return this builder instance
*/
@Override
- public ConfigurationBuilder<T> setConfigurationName(String name) {
+ public ConfigurationBuilder<T> setConfigurationName(final String name) {
this.name = name;
return this;
}
@@ -263,37 +263,37 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
* @return this builder instance
*/
@Override
- public ConfigurationBuilder<T> setConfigurationSource(ConfigurationSource configurationSource) {
+ public ConfigurationBuilder<T> setConfigurationSource(final ConfigurationSource configurationSource) {
source = configurationSource;
return this;
}
@Override
- public ConfigurationBuilder<T> setMonitorInterval(String intervalSeconds) {
+ public ConfigurationBuilder<T> setMonitorInterval(final String intervalSeconds) {
monitorInterval = Integer.parseInt(intervalSeconds);
return this;
}
@Override
- public ConfigurationBuilder<T> setPackages(String packages) {
+ public ConfigurationBuilder<T> setPackages(final String packages) {
this.packages = packages;
return this;
}
@Override
- public ConfigurationBuilder<T> setShutdownHook(String flag) {
+ public ConfigurationBuilder<T> setShutdownHook(final String flag) {
this.shutdownFlag = flag;
return this;
}
@Override
- public ConfigurationBuilder<T> setStatusLevel(Level level) {
+ public ConfigurationBuilder<T> setStatusLevel(final Level level) {
this.level = level;
return this;
}
@Override
- public ConfigurationBuilder<T> setVerbosity(String verbosity) {
+ public ConfigurationBuilder<T> setVerbosity(final String verbosity) {
this.verbosity = verbosity;
return this;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
index 378582b..94f2637 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java
@@ -25,8 +25,8 @@ import org.apache.logging.log4j.core.config.builder.api.CustomLevelComponentBuil
class DefaultCustomLevelComponentBuilder extends DefaultComponentAndConfigurationBuilder<CustomLevelComponentBuilder>
implements CustomLevelComponentBuilder {
- public DefaultCustomLevelComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
- String name, int level) {
+ public DefaultCustomLevelComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder,
+ final String name, final int level) {
super(builder, name, "CustomLevel");
addAttribute("level", Integer.toString(level));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
index 362b3ec..437dcc4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java
@@ -25,8 +25,8 @@ import org.apache.logging.log4j.core.config.builder.api.FilterComponentBuilder;
class DefaultFilterComponentBuilder extends DefaultComponentAndConfigurationBuilder<FilterComponentBuilder>
implements FilterComponentBuilder {
- public DefaultFilterComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String type,
- String onMatch, String onMisMatch) {
+ public DefaultFilterComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder, final String type,
+ final String onMatch, final String onMisMatch) {
super(builder, type);
addAttribute("onMatch", onMatch);
addAttribute("onMisMatch", onMisMatch);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
index 275f7db..a1c9794 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLayoutComponentBuilder.java
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
class DefaultLayoutComponentBuilder extends DefaultComponentAndConfigurationBuilder<LayoutComponentBuilder>
implements LayoutComponentBuilder {
- public DefaultLayoutComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String type) {
+ public DefaultLayoutComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder, final String type) {
super(builder, type);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
index f72c76a..047b51d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
@@ -33,8 +33,8 @@ class DefaultLoggerComponentBuilder extends DefaultComponentAndConfigurationBuil
* @param name
* @param level
*/
- public DefaultLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String name,
- String level) {
+ public DefaultLoggerComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder, final String name,
+ final String level) {
super(builder, name, "Logger");
addAttribute("level", level);
}
@@ -46,19 +46,19 @@ class DefaultLoggerComponentBuilder extends DefaultComponentAndConfigurationBuil
* @param level
* @param type
*/
- public DefaultLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder, String name,
- String level, String type) {
+ public DefaultLoggerComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder, final String name,
+ final String level, final String type) {
super(builder, name, type);
addAttribute("level", level);
}
@Override
- public LoggerComponentBuilder add(AppenderRefComponentBuilder builder) {
+ public LoggerComponentBuilder add(final AppenderRefComponentBuilder builder) {
return addComponent(builder);
}
@Override
- public LoggerComponentBuilder add(FilterComponentBuilder builder) {
+ public LoggerComponentBuilder add(final FilterComponentBuilder builder) {
return addComponent(builder);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49fa817c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
index be266df..e3e39e6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
@@ -32,8 +32,8 @@ class DefaultRootLoggerComponentBuilder extends DefaultComponentAndConfiguration
* @param builder
* @param level
*/
- public DefaultRootLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
- String level) {
+ public DefaultRootLoggerComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder,
+ final String level) {
super(builder, "", "Root");
addAttribute("level", level);
}
@@ -44,20 +44,20 @@ class DefaultRootLoggerComponentBuilder extends DefaultComponentAndConfiguration
* @param level
* @param type
*/
- public DefaultRootLoggerComponentBuilder(DefaultConfigurationBuilder<? extends Configuration> builder,
- String level, String type) {
+ public DefaultRootLoggerComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder,
+ final String level, final String type) {
super(builder, "", type);
addAttribute("level", level);
}
@Override
- public RootLoggerComponentBuilder add(AppenderRefComponentBuilder builder) {
+ public RootLoggerComponentBuilder add(final AppenderRefComponentBuilder builder) {
return addComponent(builder);
}
@Override
- public RootLoggerComponentBuilder add(FilterComponentBuilder builder) {
+ public RootLoggerComponentBuilder add(final FilterComponentBuilder builder) {
return addComponent(builder);
}
}
\ No newline at end of file
[28/50] logging-log4j2 git commit: Refactor common pattern into a new
method.
Posted by rg...@apache.org.
Refactor common pattern into a new method.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4001a30c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4001a30c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4001a30c
Branch: refs/heads/master
Commit: 4001a30cf2c851f411cc3cc6fa813734351e9601
Parents: c4e780e
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:16:03 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:16:03 2015 -0700
----------------------------------------------------------------------
.../impl/DefaultConfigurationBuilder.java | 23 +++++++++-----------
1 file changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4001a30c/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 dc14647..8d023d4 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
@@ -86,32 +86,30 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
loggers = new Component("Loggers");
components.add(loggers);
}
+
+ protected ConfigurationBuilder<T> add(Component parent, ComponentBuilder<?> builder) {
+ parent.getComponents().add(builder.build());
+ return this;
+ }
@Override
- @SuppressWarnings("unchecked")
public ConfigurationBuilder<T> add(AppenderComponentBuilder builder) {
- appenders.getComponents().add(builder.build());
- return this;
+ return add(appenders, builder);
}
@Override
public ConfigurationBuilder<T> add(CustomLevelComponentBuilder builder) {
- customLevels.getComponents().add(builder.build());
- return this;
+ return add(customLevels, builder);
}
@Override
- @SuppressWarnings("unchecked")
public ConfigurationBuilder<T> add(FilterComponentBuilder builder) {
- filters.getComponents().add(builder.build());
- return this;
+ return add(filters, builder);
}
@Override
- @SuppressWarnings("unchecked")
public ConfigurationBuilder<T> add(LoggerComponentBuilder builder) {
- loggers.getComponents().add(builder.build());
- return this;
+ return add(loggers, builder);
}
@Override
@@ -122,8 +120,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
throw new ConfigurationException("root Logger was previously defined");
}
}
- loggers.getComponents().add(builder.build());
- return this;
+ return add(loggers, builder);
}
@Override
[07/50] logging-log4j2 git commit: More Generics clean ups.
Posted by rg...@apache.org.
More Generics clean ups.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8eac2e3d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8eac2e3d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8eac2e3d
Branch: refs/heads/master
Commit: 8eac2e3d90787dd1856aa52a1cd7dc61bd3a73a3
Parents: be2344f
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 19:20:35 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 19:20:35 2015 -0700
----------------------------------------------------------------------
.../config/builder/impl/DefaultConfigurationBuilder.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8eac2e3d/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 6bf558f..ed6fc6e 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
@@ -46,7 +46,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
private Component filters;
private Component properties;
private Component customLevels;
- private final Class<? extends BuiltConfiguration> clazz;
+ private final Class<T> clazz;
private ConfigurationSource source;
private int monitorInterval = 0;
private Level level = null;
@@ -73,7 +73,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
if (clazz == null) {
throw new IllegalArgumentException("A Configuration class must be provided");
}
- this.clazz = clazz;
+ this.clazz = (Class<T>) clazz;
List<Component> components = root.getComponents();
properties = new Component("Properties");
components.add(properties);
@@ -283,12 +283,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
@Override
@SuppressWarnings({"unchecked"})
public T build() {
- BuiltConfiguration configuration;
+ T configuration;
try {
if (source == null) {
source = ConfigurationSource.NULL_SOURCE;
}
- Constructor<? extends BuiltConfiguration> constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
+ Constructor<T> constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
configuration = constructor.newInstance(source, root);
configuration.setMonitorInterval(monitorInterval);
if (name != null) {
@@ -311,6 +311,6 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
configuration.getStatusConfiguration().initialize();
configuration.initialize();
- return (T) configuration;
+ return configuration;
}
}
[09/50] logging-log4j2 git commit: More Generics clean ups.
Posted by rg...@apache.org.
More Generics clean ups.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b40e336e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b40e336e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b40e336e
Branch: refs/heads/master
Commit: b40e336e632195ec21f22bc77c61fada2363fe83
Parents: 04e4c9f
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 19:54:55 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 19:54:55 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/impl/DefaultComponentBuilder.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b40e336e/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
index 31d5dfe..d0b877f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
@@ -31,7 +31,6 @@ import java.util.Map;
* Generic component that captures attributes and Components in preparation for assembling the Appender's
* Component.
*/
-@SuppressWarnings("rawtypes")
class DefaultComponentBuilder<T extends ComponentBuilder<T>> implements ComponentBuilder<T> {
private ConfigurationBuilder<? extends Configuration> builder;
[19/50] logging-log4j2 git commit: Sort members.
Posted by rg...@apache.org.
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;
}
}
[11/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular.
Posted by rg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e4df4bb6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e4df4bb6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e4df4bb6
Branch: refs/heads/master
Commit: e4df4bb61d9c8f3762bc7e1a7b82e282abab3611
Parents: 8ef30a1
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 21:43:50 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 21:43:50 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/builder/api/ComponentBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e4df4bb6/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
index 1c64bae..c06f064 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
@@ -89,7 +89,7 @@ public interface ComponentBuilder<T extends ComponentBuilder<T>> extends Builder
/**
* Retrieves the ConfigurationBuilder.
- * @return The ConfiguratonAssembler.
+ * @return The ConfigurationBuilder.
*/
ConfigurationBuilder<? extends Configuration> getBuilder();
}
[36/50] logging-log4j2 git commit: Add final modifier to private
fields.
Posted by rg...@apache.org.
Add final modifier to private fields.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/dbe11579
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/dbe11579
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/dbe11579
Branch: refs/heads/master
Commit: dbe11579d473ea85b59ba9e4a3fa43010d465b3f
Parents: 215fd05
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:57:10 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:57:10 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/impl/DefaultComponentBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dbe11579/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
index a4609fe..9c7ed59 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
@@ -36,8 +36,8 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>, CB extends Configur
private CB builder;
private String type;
- private Map<String, String> attributes = new HashMap<>();
- private List<Component> components = new ArrayList<>();
+ private final Map<String, String> attributes = new HashMap<>();
+ private final List<Component> components = new ArrayList<>();
private String name;
private String value;
[35/50] logging-log4j2 git commit: Remove obsolete @SuppressWarnings.
Posted by rg...@apache.org.
Remove obsolete @SuppressWarnings.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/215fd05d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/215fd05d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/215fd05d
Branch: refs/heads/master
Commit: 215fd05d60eec67d5c8f8a72d52d83f8342b1534
Parents: 28326c7
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:55:45 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:55:45 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/builder/api/ComponentBuilder.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/215fd05d/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
index 8f51540..60e42b2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
@@ -24,7 +24,6 @@ import org.apache.logging.log4j.core.util.Builder;
* Builds arbitrary components and is the base type for the provided components.
* @param <T> The ComponentBuilder's own type for fluent APIs
*/
-@SuppressWarnings("rawtypes")
public interface ComponentBuilder<T extends ComponentBuilder<T>> extends Builder<Component> {
/**
[33/50] logging-log4j2 git commit: Remove obsolete @SuppressWarnings.
Posted by rg...@apache.org.
Remove obsolete @SuppressWarnings.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2400152c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2400152c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2400152c
Branch: refs/heads/master
Commit: 2400152caa61201b8fbb0db4b99caf1b6ad3be87
Parents: 24d18ce
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:55:07 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:55:07 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/impl/DefaultConfigurationBuilder.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2400152c/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 f2ef2e7..804a4a9 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
@@ -114,7 +114,6 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- @SuppressWarnings("unchecked")
public ConfigurationBuilder<T> add(RootLoggerComponentBuilder builder) {
for (Component c : loggers.getComponents()) {
if (c.getPluginType().equals("root")) {
[12/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular.
Posted by rg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e4f005d1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e4f005d1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e4f005d1
Branch: refs/heads/master
Commit: e4f005d16658dc402fd9d218f0cb34573678c949
Parents: e4df4bb
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 21:46:56 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 21:46:56 2015 -0700
----------------------------------------------------------------------
.../builder/api/ConfigurationBuilder.java | 32 ++++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e4f005d1/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index c578451..65f0ca8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -121,7 +121,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
ConfigurationBuilder<T> addProperty(String key, String value);
/**
- * Returns an Assembler for creating Appenders.
+ * Returns a builder for creating Appenders.
* @param name The name of the Appender.
* @param pluginName The Plugin type of the Appender.
* @return the AppenderComponentBuilder.
@@ -130,14 +130,14 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
/**
- * Returns an Assembler for creating AppenderRefs.
+ * Returns a builder for creating AppenderRefs.
* @param ref The name of the Appender being referenced.
* @return the AppenderRefComponentBuilder.
*/
AppenderRefComponentBuilder newAppenderRef(String ref);
/**
- * Returns an Assembler for creating generic components.
+ * Returns a builder for creating generic components.
* @param name The name of the component (may be null).
* @param pluginName The Plugin type of the component.
* @return The ComponentBuilder.
@@ -145,7 +145,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
ComponentBuilder<?> newComponent(String name, String pluginName);
/**
- * Returns an Assembler for creating generic components.
+ * Returns a builder for creating generic components.
* @param name The name of the component (may be null).
* @param pluginName The Plugin type of the component.
* @param value The value of the component.
@@ -154,7 +154,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
ComponentBuilder<?> newComponent(String name, String pluginName, String value);
/**
- * Returns an Asssembler for creating CustomLevels
+ * Returns a builder for creating CustomLevels
* @param name The name of the custom level.
* @param level The integer value to be assigned to the level.
* @return The CustomLevelComponentBuilder.
@@ -162,7 +162,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
CustomLevelComponentBuilder newCustomLevel(String name, int level);
/**
- * Returns an Asssembler for creating Filters.
+ * Returns a builder for creating Filters.
* @param pluginName The Plugin type of the Filter.
* @param onMatch "ACCEPT", "DENY", or "NEUTRAL"
* @param onMisMatch "ACCEPT", "DENY", or "NEUTRAL"
@@ -171,7 +171,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
FilterComponentBuilder newFilter(String pluginName, Filter.Result onMatch, Filter.Result onMisMatch);
/**
- * Returns an Asssembler for creating Filters.
+ * Returns a builder for creating Filters.
* @param pluginName The Plugin type of the Filter.
* @param onMatch "ACCEPT", "DENY", or "NEUTRAL"
* @param onMisMatch "ACCEPT", "DENY", or "NEUTRAL"
@@ -180,14 +180,14 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
FilterComponentBuilder newFilter(String pluginName, String onMatch, String onMisMatch);
/**
- * Returns an Assembler for creating Layouts.
+ * Returns a builder for creating Layouts.
* @param type The Plugin type of the Layout.
* @return The LayoutComponentBuilder.
*/
LayoutComponentBuilder newLayout(String pluginName);
/**
- * Returns an Assembler for creating Loggers.
+ * Returns a builder for creating Loggers.
* @param name The name of the Logger.
* @param level The logging Level to be assigned to the Logger.
* @return The LoggerComponentBuilder.
@@ -196,7 +196,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
/**
- * Returns an Assembler for creating Loggers.
+ * Returns a builder for creating Loggers.
* @param name The name of the Logger.
* @param level The logging Level to be assigned to the Logger.
* @return The LoggerComponentBuilder.
@@ -204,7 +204,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
LoggerComponentBuilder newLogger(String name, String level);
/**
- * Returns an Assembler for creating Async Loggers.
+ * Returns a builder for creating Async Loggers.
* @param name The name of the Logger.
* @param level The logging Level to be assigned to the Logger.
* @return The LoggerComponentBuilder.
@@ -212,7 +212,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
LoggerComponentBuilder newAsyncLogger(String name, Level level);
/**
- * Returns an Assembler for creating Async Loggers.
+ * Returns a builder for creating Async Loggers.
* @param name The name of the Logger.
* @param level The logging Level to be assigned to the Logger.
* @return The LoggerComponentBuilder.
@@ -220,14 +220,14 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
LoggerComponentBuilder newAsyncLogger(String name, String level);
/**
- * Returns an Assembler for creating the root Logger.
+ * Returns a builder for creating the root Logger.
* @param level The logging Level to be assigned to the root Logger.
* @return The RootLoggerComponentBuilder.
*/
RootLoggerComponentBuilder newRootLogger(Level level);
/**
- * Returns an Assembler for creating the root Logger.
+ * Returns a builder for creating the root Logger.
* @param level The logging Level to be assigned to the root Logger.
* @return The RootLoggerComponentBuilder.
*/
@@ -235,7 +235,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
/**
- * Returns an Assembler for creating the async root Logger.
+ * Returns a builder for creating the async root Logger.
* @param level The logging Level to be assigned to the root Logger.
* @return The RootLoggerComponentBuilder.
*/
@@ -243,7 +243,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
/**
- * Returns an Assembler for creating the async root Logger.
+ * Returns a builder for creating the async root Logger.
* @param level The logging Level to be assigned to the root Logger.
* @return The RootLoggerComponentBuilder.
*/
[22/50] logging-log4j2 git commit: Javadoc: Use the active voice.
Posted by rg...@apache.org.
Javadoc: Use the active voice.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/92947ffa
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/92947ffa
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/92947ffa
Branch: refs/heads/master
Commit: 92947ffa87c8c66bb77766669a391bad56b3e3c6
Parents: 4f09bf0
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:19:21 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:19:21 2015 -0700
----------------------------------------------------------------------
.../core/config/builder/api/AppenderComponentBuilder.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/92947ffa/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
index 47a30d1..ab4ec12 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
@@ -22,21 +22,21 @@ package org.apache.logging.log4j.core.config.builder.api;
public interface AppenderComponentBuilder extends ComponentBuilder<AppenderComponentBuilder> {
/**
- * Add a Layout to the Appender component.
+ * Adds a Layout to the Appender component.
* @param assembler The LayoutComponentBuilder with all of its attributes set.
* @return this Assembler.
*/
AppenderComponentBuilder add(LayoutComponentBuilder assembler);
/**
- * Add a Filter to the Appender component.
+ * Adds a Filter to the Appender component.
* @param assembler The FilterComponentBuilder with all of its attributes and sub components set.
* @return this Assembler.
*/
AppenderComponentBuilder add(FilterComponentBuilder assembler);
/**
- * Return the name of the Appender.
+ * Returns the name of the Appender.
* @return the name of the Appender.
*/
String getName();
[41/50] logging-log4j2 git commit: Extract meat of test for reuse.
Posted by rg...@apache.org.
Extract meat of test for reuse.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4efaa3da
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4efaa3da
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4efaa3da
Branch: refs/heads/master
Commit: 4efaa3da3b58a96ea9c0373180b772e4635c89ff
Parents: 1223e55
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 15:11:02 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 15:11:02 2015 -0700
----------------------------------------------------------------------
.../builder/ConfigurationAssemblerTest.java | 34 +++++++++++---------
1 file changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4efaa3da/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
index 27b5357..5e2bbd5 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
@@ -46,23 +46,27 @@ public class ConfigurationAssemblerTest {
System.setProperty(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY,
"org.apache.logging.log4j.core.config.builder.CustomConfigurationFactory");
Configuration config = ((LoggerContext) LogManager.getContext(false)).getConfiguration();
- assertNotNull(config.getName());
- assertFalse(config.getName().isEmpty());
- assertNotNull("No configuration created", config);
- assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED);
- Map<String, Appender> appenders = config.getAppenders();
- assertNotNull(appenders);
- assertTrue("Incorrect number of Appenders: " + appenders.size(), appenders.size() == 1);
- Map<String, LoggerConfig> loggers = config.getLoggers();
- assertNotNull(loggers);
- assertTrue("Incorrect number of LoggerConfigs: " + loggers.size(), loggers.size() == 2);
- Filter filter = config.getFilter();
- assertNotNull("No Filter", filter);
- assertTrue("Not a Threshold Filter", filter instanceof ThresholdFilter);
- Logger logger = LogManager.getLogger(getClass());
- logger.info("Welcome to Log4j!");
+ validate(config);
} finally {
System.getProperties().remove(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY);
}
}
+
+ private void validate(Configuration config) {
+ assertNotNull(config.getName());
+ assertFalse(config.getName().isEmpty());
+ assertNotNull("No configuration created", config);
+ assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED);
+ Map<String, Appender> appenders = config.getAppenders();
+ assertNotNull(appenders);
+ assertTrue("Incorrect number of Appenders: " + appenders.size(), appenders.size() == 1);
+ Map<String, LoggerConfig> loggers = config.getLoggers();
+ assertNotNull(loggers);
+ assertTrue("Incorrect number of LoggerConfigs: " + loggers.size(), loggers.size() == 2);
+ Filter filter = config.getFilter();
+ assertNotNull("No Filter", filter);
+ assertTrue("Not a Threshold Filter", filter instanceof ThresholdFilter);
+ Logger logger = LogManager.getLogger(getClass());
+ logger.info("Welcome to Log4j!");
+ }
}
[42/50] logging-log4j2 git commit: Better test name.
Posted by rg...@apache.org.
Better test name.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5b38cca0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5b38cca0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5b38cca0
Branch: refs/heads/master
Commit: 5b38cca0642b5a5edbd6c53e7015d3c551ffc786
Parents: 4efaa3d
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 15:11:43 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 15:11:43 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/ConfigurationAssemblerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b38cca0/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
index 5e2bbd5..5b6993e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
public class ConfigurationAssemblerTest {
@Test
- public void doConfigure() throws Exception {
+ public void testCustomConfigurationFactory() throws Exception {
try {
System.setProperty(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY,
"org.apache.logging.log4j.core.config.builder.CustomConfigurationFactory");
[16/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular.
Posted by rg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ea02c3cd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ea02c3cd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ea02c3cd
Branch: refs/heads/master
Commit: ea02c3cd2a7889cb208dfbd7091df479acd02eaa
Parents: 3d7f4ce
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 21:51:30 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 21:51:30 2015 -0700
----------------------------------------------------------------------
.../core/config/builder/CustomConfigurationFactory.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ea02c3cd/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 9f2968a..319ccfe 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
@@ -52,12 +52,12 @@ public class CustomConfigurationFactory extends ConfigurationFactory {
builder.setStatusLevel(Level.ERROR);
builder.add(builder.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
.addAttribute("level", Level.DEBUG));
- AppenderComponentBuilder appenderAssembler = builder.newAppender("Stdout", "CONSOLE").addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
- appenderAssembler.add(builder.newLayout("PatternLayout").
+ AppenderComponentBuilder appenderBuilder = builder.newAppender("Stdout", "CONSOLE").addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
+ appenderBuilder.add(builder.newLayout("PatternLayout").
addAttribute("pattern", "%d [%t] %-5level: %msg%n%throwable"));
- appenderAssembler.add(builder.newFilter("MarkerFilter", Filter.Result.DENY,
+ appenderBuilder.add(builder.newFilter("MarkerFilter", Filter.Result.DENY,
Filter.Result.NEUTRAL).addAttribute("marker", "FLOW"));
- builder.add(appenderAssembler);
+ builder.add(appenderBuilder);
builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG).
add(builder.newAppenderRef("Stdout")).
addAttribute("additivity", false));
[31/50] logging-log4j2 git commit: Eat own fluent god food.
Posted by rg...@apache.org.
Eat own fluent god food.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/821cd5ad
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/821cd5ad
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/821cd5ad
Branch: refs/heads/master
Commit: 821cd5ad84d81f55adec2b3c6b15c87e7d83170c
Parents: 021f7d1
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:50:13 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:50:13 2015 -0700
----------------------------------------------------------------------
.../config/builder/impl/DefaultAppenderComponentBuilder.java | 6 ++----
.../builder/impl/DefaultAppenderRefComponentBuilder.java | 3 +--
.../builder/impl/DefaultCompositeFilterComponentBuilder.java | 3 +--
.../config/builder/impl/DefaultLoggerComponentBuilder.java | 6 ++----
.../config/builder/impl/DefaultRootLoggerComponentBuilder.java | 6 ++----
5 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/821cd5ad/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
index 10c5d51..cdaeb96 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderComponentBuilder.java
@@ -34,13 +34,11 @@ class DefaultAppenderComponentBuilder extends DefaultComponentAndConfigurationBu
@Override
public AppenderComponentBuilder add(LayoutComponentBuilder builder) {
- addComponent(builder);
- return this;
+ return addComponent(builder);
}
@Override
public AppenderComponentBuilder add(FilterComponentBuilder builder) {
- addComponent(builder);
- return this;
+ return addComponent(builder);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/821cd5ad/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
index 19f7b17..7ee5f0f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultAppenderRefComponentBuilder.java
@@ -35,7 +35,6 @@ class DefaultAppenderRefComponentBuilder extends DefaultComponentAndConfiguratio
@Override
public AppenderRefComponentBuilder add(FilterComponentBuilder builder) {
- addComponent(builder);
- return this;
+ return addComponent(builder);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/821cd5ad/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
index 95d17f3..b9bb80d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java
@@ -36,8 +36,7 @@ class DefaultCompositeFilterComponentBuilder
@Override
public CompositeFilterComponentBuilder add(FilterComponentBuilder builder) {
- addComponent(builder);
- return this;
+ return addComponent(builder);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/821cd5ad/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
index 7c5f4dc..f72c76a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultLoggerComponentBuilder.java
@@ -54,13 +54,11 @@ class DefaultLoggerComponentBuilder extends DefaultComponentAndConfigurationBuil
@Override
public LoggerComponentBuilder add(AppenderRefComponentBuilder builder) {
- addComponent(builder);
- return this;
+ return addComponent(builder);
}
@Override
public LoggerComponentBuilder add(FilterComponentBuilder builder) {
- addComponent(builder);
- return this;
+ return addComponent(builder);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/821cd5ad/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
index 19f84c5..be266df 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultRootLoggerComponentBuilder.java
@@ -52,14 +52,12 @@ class DefaultRootLoggerComponentBuilder extends DefaultComponentAndConfiguration
@Override
public RootLoggerComponentBuilder add(AppenderRefComponentBuilder builder) {
- addComponent(builder);
- return this;
+ return addComponent(builder);
}
@Override
public RootLoggerComponentBuilder add(FilterComponentBuilder builder) {
- addComponent(builder);
- return this;
+ return addComponent(builder);
}
}
\ No newline at end of file
[17/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular.
Posted by rg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/21f2c1fb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/21f2c1fb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/21f2c1fb
Branch: refs/heads/master
Commit: 21f2c1fb1f6345e7216a92fc4485a6085f452a6f
Parents: ea02c3c
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 21:52:43 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 21:52:43 2015 -0700
----------------------------------------------------------------------
.../builder/api/ConfigurationBuilder.java | 46 ++++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/21f2c1fb/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index 4a3ff3a..48db86a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -30,92 +30,92 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
/**
* Sets the name of the configuration.
* @param name the name of the {@link Configuration}. By default is {@code "Constructed"}.
- * @return this Assembler instance.
+ * @return this builder instance.
*/
ConfigurationBuilder<T> setConfigurationName(String name);
/**
* Sets the configuration source, if one exists.
* @param configurationSource the ConfigurationSource.
- * @return this Assembler instance.
+ * @return this builder instance.
*/
ConfigurationBuilder<T> setConfigurationSource(ConfigurationSource configurationSource);
/**
* Sets the level of the StatusLogger.
* @param level The logging level.
- * @return this Assembler instance.
+ * @return this builder instance.
*/
ConfigurationBuilder<T> setStatusLevel(Level level);
/**
* Sets whether the logging should include constructing Plugins.
* @param verbosity "disable" will hide messages from plugin construction.
- * @return this Assembler instance.
+ * @return this builder instance.
*/
ConfigurationBuilder<T> setVerbosity(String verbosity);
/**
* Sets the list of packages to search for plugins.
* @param packages The comma separated list of packages.
- * @return this Assembler instance.
+ * @return this builder instance.
*/
ConfigurationBuilder<T> setPackages(String packages);
/**
* Sets whether the shutdown hook should be disabled.
* @param flag "disable" will prevent the shutdown hook from being set.
- * @return this Assembler instance.
+ * @return this builder instance.
*/
ConfigurationBuilder<T> setShutdownHook(String flag);
/**
* Sets the interval at which the configuration file should be checked for changes.
* @param intervalSeconds The number of seconds that should pass between checks of the configuration file.
- * @return this Assembler instance.
+ * @return this builder instance.
*/
ConfigurationBuilder<T> setMonitorInterval(String intervalSeconds);
/**
* Adds an AppenderComponent.
- * @param assembler The AppenderComponentBuilder with all of its attributes and sub components set.
- * @return this Assembler instance.
+ * @param builder The AppenderComponentBuilder with all of its attributes and sub components set.
+ * @return this builder instance.
*/
- ConfigurationBuilder<T> add(AppenderComponentBuilder assembler);
+ ConfigurationBuilder<T> add(AppenderComponentBuilder builder);
/**
* Adds a CustomLevel component.
- * @param assembler The CustomLevelComponentBuilder with all of its attributes set.
- * @return this Assembler instance.
+ * @param builder The CustomLevelComponentBuilder with all of its attributes set.
+ * @return this builder instance.
*/
- ConfigurationBuilder<T> add(CustomLevelComponentBuilder assembler);
+ ConfigurationBuilder<T> add(CustomLevelComponentBuilder builder);
/**
* Adds a Logger component.
- * @param assembler The LoggerComponentBuilder with all of its attributes and sub components set.
- * @return this Assembler instance.
+ * @param builder The LoggerComponentBuilder with all of its attributes and sub components set.
+ * @return this builder instance.
*/
- ConfigurationBuilder<T> add(LoggerComponentBuilder assembler);
+ ConfigurationBuilder<T> add(LoggerComponentBuilder builder);
/**
* Adds the root Logger component.
- * @param assembler The RootLoggerComponentBuilder with all of its attributes and sub components set.
- * @return this Assembler instance.
+ * @param builder The RootLoggerComponentBuilder with all of its attributes and sub components set.
+ * @return this builder instance.
*/
- ConfigurationBuilder<T> add(RootLoggerComponentBuilder assembler);
+ ConfigurationBuilder<T> add(RootLoggerComponentBuilder builder);
/**
* Adds a Filter component.
- * @param assembler the FilterComponentBuilder with all of its attributes and sub components set.
- * @return this Assembler instance.
+ * @param builder the FilterComponentBuilder with all of its attributes and sub components set.
+ * @return this builder instance.
*/
- ConfigurationBuilder<T> add(FilterComponentBuilder assembler);
+ ConfigurationBuilder<T> add(FilterComponentBuilder builder);
/**
* Adds a Property key and value.
* @param key The property key.
* @param value The property value.
- * @return this Assembler instance.
+ * @return this builder instance.
*/
ConfigurationBuilder<T> addProperty(String key, String value);
[40/50] logging-log4j2 git commit: Test config name.
Posted by rg...@apache.org.
Test config name.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1223e551
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1223e551
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1223e551
Branch: refs/heads/master
Commit: 1223e551292880f13ea72713cd734611d29acf29
Parents: 1f8d545
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 15:10:13 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 15:10:13 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/ConfigurationAssemblerTest.java | 3 +++
.../log4j/core/config/builder/CustomConfigurationFactory.java | 1 +
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1223e551/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
index e6df9d7..27b5357 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.config.builder;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -45,6 +46,8 @@ public class ConfigurationAssemblerTest {
System.setProperty(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY,
"org.apache.logging.log4j.core.config.builder.CustomConfigurationFactory");
Configuration config = ((LoggerContext) LogManager.getContext(false)).getConfiguration();
+ assertNotNull(config.getName());
+ assertFalse(config.getName().isEmpty());
assertNotNull("No configuration created", config);
assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED);
Map<String, Appender> appenders = config.getAppenders();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1223e551/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 319ccfe..4cd288b 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
@@ -49,6 +49,7 @@ public class CustomConfigurationFactory extends ConfigurationFactory {
@Override
public Configuration getConfiguration(final String name, final URI configLocation) {
ConfigurationBuilder<BuiltConfiguration> builder = newConfigurationBuilder();
+ builder.setConfigurationName(name);
builder.setStatusLevel(Level.ERROR);
builder.add(builder.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
.addAttribute("level", Level.DEBUG));
[24/50] logging-log4j2 git commit: Fix command line compilation on
Oracle Java 7 (was fine in Eclipse's Java 7 support and command line Java 8).
Posted by rg...@apache.org.
Fix command line compilation on Oracle Java 7 (was fine in Eclipse's
Java 7 support and command line Java 8).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/61372420
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/61372420
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/61372420
Branch: refs/heads/master
Commit: 613724203c7bca5ebef3edebfc61fca6c97503b4
Parents: 5874110
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 09:22:55 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 09:22:55 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/api/ConfigurationBuilder.java | 4 ++--
.../core/config/builder/impl/DefaultConfigurationBuilder.java | 6 ++----
.../core/config/properties/PropertiesConfigurationFactory.java | 4 ++--
3 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/61372420/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index c3921a3..74e9bb6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -121,7 +121,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* @param pluginName The Plugin type of the component.
* @return The ComponentBuilder.
*/
- ComponentBuilder<?> newComponent(String name, String pluginName);
+ <B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(String name, String pluginName);
/**
* Returns a builder for creating generic components.
@@ -130,7 +130,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* @param value The value of the component.
* @return The ComponentBuilder.
*/
- ComponentBuilder<?> newComponent(String name, String pluginName, String value);
+ <B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(String name, String pluginName, String value);
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/61372420/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 3d84b0d..dc14647 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
@@ -198,14 +198,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public ComponentBuilder<?> newComponent(String name, String type) {
+ public <B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(String name, String type) {
return new DefaultComponentBuilder<>(this, name, type);
}
-
@Override
- @SuppressWarnings({"unchecked", "rawtypes"})
- public ComponentBuilder<?> newComponent(String name, String type, String value) {
+ public <B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(String name, String type, String value) {
return new DefaultComponentBuilder<>(this, name, type, value);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/61372420/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 bdb07c6..092afd1 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
@@ -313,7 +313,7 @@ public class PropertiesConfigurationFactory extends ConfigurationFactory {
return layoutBuilder;
}
- private ComponentBuilder<?> createComponent(ComponentBuilder<?> parent, String key, Properties properties) {
+ private <B extends ComponentBuilder<B>> ComponentBuilder<B> createComponent(ComponentBuilder<?> parent, String key, Properties properties) {
String name = properties.getProperty(CONFIG_NAME);
if (name != null) {
properties.remove(CONFIG_NAME);
@@ -323,7 +323,7 @@ public class PropertiesConfigurationFactory extends ConfigurationFactory {
throw new ConfigurationException("No type attribute provided for component " + key);
}
properties.remove(CONFIG_TYPE);
- ComponentBuilder<?> componentBuilder = parent.getBuilder().newComponent(name, type);
+ ComponentBuilder<B> componentBuilder = parent.getBuilder().newComponent(name, type);
processRemainingProperties(componentBuilder, name, properties);
return componentBuilder;
}
[34/50] logging-log4j2 git commit: Better exception message.
Posted by rg...@apache.org.
Better exception message.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/28326c7d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/28326c7d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/28326c7d
Branch: refs/heads/master
Commit: 28326c7dc17a0ec3e1b968d232ba15639396f027
Parents: 2400152
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:55:31 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:55:31 2015 -0700
----------------------------------------------------------------------
.../core/config/builder/impl/DefaultConfigurationBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/28326c7d/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 804a4a9..fb76f8a 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
@@ -117,7 +117,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
public ConfigurationBuilder<T> add(RootLoggerComponentBuilder builder) {
for (Component c : loggers.getComponents()) {
if (c.getPluginType().equals("root")) {
- throw new ConfigurationException("root Logger was previously defined");
+ throw new ConfigurationException("Root Logger was previously defined");
}
}
return add(loggers, builder);
[23/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular.
Posted by rg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5874110e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5874110e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5874110e
Branch: refs/heads/master
Commit: 5874110eb17706053e954ba0c0ed75b42f7f094a
Parents: 92947ff
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:19:47 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:19:47 2015 -0700
----------------------------------------------------------------------
.../config/builder/api/AppenderComponentBuilder.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5874110e/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
index ab4ec12..fdeb242 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
@@ -23,17 +23,17 @@ public interface AppenderComponentBuilder extends ComponentBuilder<AppenderCompo
/**
* Adds a Layout to the Appender component.
- * @param assembler The LayoutComponentBuilder with all of its attributes set.
- * @return this Assembler.
+ * @param builder The LayoutComponentBuilder with all of its attributes set.
+ * @return this builder.
*/
- AppenderComponentBuilder add(LayoutComponentBuilder assembler);
+ AppenderComponentBuilder add(LayoutComponentBuilder builder);
/**
* Adds a Filter to the Appender component.
- * @param assembler The FilterComponentBuilder with all of its attributes and sub components set.
- * @return this Assembler.
+ * @param builder The FilterComponentBuilder with all of its attributes and sub components set.
+ * @return this builder.
*/
- AppenderComponentBuilder add(FilterComponentBuilder assembler);
+ AppenderComponentBuilder add(FilterComponentBuilder builder);
/**
* Returns the name of the Appender.
[21/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular.
Posted by rg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4f09bf0c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4f09bf0c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4f09bf0c
Branch: refs/heads/master
Commit: 4f09bf0ccd437ee73caa03467af449e2af36ea83
Parents: a690125
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:19:02 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:19:02 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/api/AppenderComponentBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4f09bf0c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
index e433df6..47a30d1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Assembler for constructing Appenders.
+ * Builder for constructing Appenders.
*/
public interface AppenderComponentBuilder extends ComponentBuilder<AppenderComponentBuilder> {
[25/50] logging-log4j2 git commit: More precise Javadoc.
Posted by rg...@apache.org.
More precise Javadoc.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0a56f89a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0a56f89a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0a56f89a
Branch: refs/heads/master
Commit: 0a56f89a9083dfafa0ba7ba077eca02a4d3d7965
Parents: 6137242
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 09:25:01 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 09:25:01 2015 -0700
----------------------------------------------------------------------
.../builder/api/ConfigurationBuilder.java | 32 ++++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0a56f89a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index 74e9bb6..de1b4cc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -74,14 +74,14 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* Returns a builder for creating Appenders.
* @param name The name of the Appender.
* @param pluginName The Plugin type of the Appender.
- * @return the AppenderComponentBuilder.
+ * @return A new AppenderComponentBuilder.
*/
AppenderComponentBuilder newAppender(String name, String pluginName);
/**
* Returns a builder for creating AppenderRefs.
* @param ref The name of the Appender being referenced.
- * @return the AppenderRefComponentBuilder.
+ * @return A new AppenderRefComponentBuilder.
*/
AppenderRefComponentBuilder newAppenderRef(String ref);
@@ -89,7 +89,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* Returns a builder for creating Async Loggers.
* @param name The name of the Logger.
* @param level The logging Level to be assigned to the Logger.
- * @return The LoggerComponentBuilder.
+ * @return A new LoggerComponentBuilder.
*/
LoggerComponentBuilder newAsyncLogger(String name, Level level);
@@ -97,21 +97,21 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* Returns a builder for creating Async Loggers.
* @param name The name of the Logger.
* @param level The logging Level to be assigned to the Logger.
- * @return The LoggerComponentBuilder.
+ * @return A new LoggerComponentBuilder.
*/
LoggerComponentBuilder newAsyncLogger(String name, String level);
/**
* Returns a builder for creating the async root Logger.
* @param level The logging Level to be assigned to the root Logger.
- * @return The RootLoggerComponentBuilder.
+ * @return A new RootLoggerComponentBuilder.
*/
RootLoggerComponentBuilder newAsyncRootLogger(Level level);
/**
* Returns a builder for creating the async root Logger.
* @param level The logging Level to be assigned to the root Logger.
- * @return The RootLoggerComponentBuilder.
+ * @return A new RootLoggerComponentBuilder.
*/
RootLoggerComponentBuilder newAsyncRootLogger(String level);
@@ -119,7 +119,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* Returns a builder for creating generic components.
* @param name The name of the component (may be null).
* @param pluginName The Plugin type of the component.
- * @return The ComponentBuilder.
+ * @return A new ComponentBuilder.
*/
<B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(String name, String pluginName);
@@ -128,7 +128,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* @param name The name of the component (may be null).
* @param pluginName The Plugin type of the component.
* @param value The value of the component.
- * @return The ComponentBuilder.
+ * @return A new ComponentBuilder.
*/
<B extends ComponentBuilder<B>> ComponentBuilder<B> newComponent(String name, String pluginName, String value);
@@ -137,7 +137,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* Returns a builder for creating CustomLevels
* @param name The name of the custom level.
* @param level The integer value to be assigned to the level.
- * @return The CustomLevelComponentBuilder.
+ * @return A new CustomLevelComponentBuilder.
*/
CustomLevelComponentBuilder newCustomLevel(String name, int level);
@@ -146,7 +146,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* @param pluginName The Plugin type of the Filter.
* @param onMatch "ACCEPT", "DENY", or "NEUTRAL"
* @param onMisMatch "ACCEPT", "DENY", or "NEUTRAL"
- * @return The FilterComponentBuilder.
+ * @return A new FilterComponentBuilder.
*/
FilterComponentBuilder newFilter(String pluginName, Filter.Result onMatch, Filter.Result onMisMatch);
@@ -155,14 +155,14 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* @param pluginName The Plugin type of the Filter.
* @param onMatch "ACCEPT", "DENY", or "NEUTRAL"
* @param onMisMatch "ACCEPT", "DENY", or "NEUTRAL"
- * @return The FilterComponentBuilder.
+ * @return A new FilterComponentBuilder.
*/
FilterComponentBuilder newFilter(String pluginName, String onMatch, String onMisMatch);
/**
* Returns a builder for creating Layouts.
* @param type The Plugin type of the Layout.
- * @return The LayoutComponentBuilder.
+ * @return A new LayoutComponentBuilder.
*/
LayoutComponentBuilder newLayout(String pluginName);
@@ -170,7 +170,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* Returns a builder for creating Loggers.
* @param name The name of the Logger.
* @param level The logging Level to be assigned to the Logger.
- * @return The LoggerComponentBuilder.
+ * @return A new LoggerComponentBuilder.
*/
LoggerComponentBuilder newLogger(String name, Level level);
@@ -178,21 +178,21 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
* Returns a builder for creating Loggers.
* @param name The name of the Logger.
* @param level The logging Level to be assigned to the Logger.
- * @return The LoggerComponentBuilder.
+ * @return A new LoggerComponentBuilder.
*/
LoggerComponentBuilder newLogger(String name, String level);
/**
* Returns a builder for creating the root Logger.
* @param level The logging Level to be assigned to the root Logger.
- * @return The RootLoggerComponentBuilder.
+ * @return A new RootLoggerComponentBuilder.
*/
RootLoggerComponentBuilder newRootLogger(Level level);
/**
* Returns a builder for creating the root Logger.
* @param level The logging Level to be assigned to the root Logger.
- * @return The RootLoggerComponentBuilder.
+ * @return A new RootLoggerComponentBuilder.
*/
RootLoggerComponentBuilder newRootLogger(String level);
[27/50] logging-log4j2 git commit: Centralize attribute writes into
one method.
Posted by rg...@apache.org.
Centralize attribute writes into one method.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c4e780ef
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c4e780ef
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c4e780ef
Branch: refs/heads/master
Commit: c4e780ef27c4d3f7a6aab81d04e726dea18e0c8d
Parents: 43a445e
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:07:44 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:07:44 2015 -0700
----------------------------------------------------------------------
.../builder/impl/DefaultComponentBuilder.java | 59 +++++++++-----------
1 file changed, 26 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c4e780ef/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
index 142b28f..89e9f56 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
@@ -57,47 +57,35 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>> implements Componen
}
@Override
- @SuppressWarnings("unchecked")
- public T addAttribute(String key, Level level) {
- attributes.put(key, level.toString());
- return (T) this;
+ public T addAttribute(String key, boolean value) {
+ return put(key, Boolean.toString(value));
}
-
+
@Override
- @SuppressWarnings("unchecked")
- public T addAttribute(String key, String value) {
- attributes.put(key, value);
- return (T) this;
- }
-
-
- @Override
- @SuppressWarnings("unchecked")
public T addAttribute(String key, Enum<?> value) {
- attributes.put(key, value.name());
- return (T) this;
+ return put(key, value.name());
}
@Override
- @SuppressWarnings("unchecked")
public T addAttribute(String key, int value) {
- attributes.put(key, Integer.toString(value));
- return (T) this;
+ return put(key, Integer.toString(value));
}
@Override
- @SuppressWarnings("unchecked")
- public T addAttribute(String key, boolean value) {
- attributes.put(key, Boolean.toString(value));
- return (T) this;
+ public T addAttribute(String key, Level level) {
+ return put(key, level.toString());
}
@Override
- @SuppressWarnings("unchecked")
public T addAttribute(String key, Object value) {
- attributes.put(key, value.toString());
- return (T) this;
+ return put(key, value.toString());
+ }
+
+
+ @Override
+ public T addAttribute(String key, String value) {
+ return put(key, value);
}
@Override
@@ -108,8 +96,11 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>> implements Componen
}
@Override
- public String getName() {
- return name;
+ public Component build() {
+ Component component = new Component(type, name, value);
+ component.getAttributes().putAll(attributes);
+ component.getComponents().addAll(components);
+ return component;
}
@Override
@@ -118,10 +109,12 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>> implements Componen
}
@Override
- public Component build() {
- Component component = new Component(type, name, value);
- component.getAttributes().putAll(attributes);
- component.getComponents().addAll(components);
- return component;
+ public String getName() {
+ return name;
+ }
+
+ private T put(String key, String value) {
+ attributes.put(key, value);
+ return (T) this;
}
}
[43/50] logging-log4j2 git commit: Test building and initializing
programatically without a CustomConfigurationFactory.
Posted by rg...@apache.org.
Test building and initializing programatically without a
CustomConfigurationFactory.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/71bc7c24
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/71bc7c24
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/71bc7c24
Branch: refs/heads/master
Commit: 71bc7c245810e3549123cf9aedca667f28bf2c34
Parents: 5b38cca
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 15:25:35 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 15:25:35 2015 -0700
----------------------------------------------------------------------
.../builder/ConfigurationAssemblerTest.java | 14 +++++++++
.../builder/CustomConfigurationFactory.java | 30 +++++++++++---------
2 files changed, 31 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/71bc7c24/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
index 5b6993e..f938824 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
@@ -31,7 +31,11 @@ import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.config.Configurator;
import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
+import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory;
+import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
import org.apache.logging.log4j.core.filter.ThresholdFilter;
import org.junit.Test;
@@ -41,6 +45,15 @@ import org.junit.Test;
public class ConfigurationAssemblerTest {
@Test
+ public void testBuildConfiguration() throws Exception {
+ final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
+ CustomConfigurationFactory.addTestFixtures("config name", builder);
+ Configuration configuration = builder.build();
+ Configurator.initialize(configuration);
+ validate(configuration);
+ }
+
+ @Test
public void testCustomConfigurationFactory() throws Exception {
try {
System.setProperty(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY,
@@ -53,6 +66,7 @@ public class ConfigurationAssemblerTest {
}
private void validate(Configuration config) {
+ assertNotNull(config);
assertNotNull(config.getName());
assertFalse(config.getName().isEmpty());
assertNotNull("No configuration created", config);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/71bc7c24/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 4cd288b..5656e5c 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
@@ -36,19 +36,7 @@ import java.net.URI;
//@Order(50)
public class CustomConfigurationFactory extends ConfigurationFactory {
- @Override
- protected String[] getSupportedTypes() {
- return new String[] {"*"};
- }
-
- @Override
- public Configuration getConfiguration(ConfigurationSource source) {
- return getConfiguration(source.toString(), null);
- }
-
- @Override
- public Configuration getConfiguration(final String name, final URI configLocation) {
- ConfigurationBuilder<BuiltConfiguration> builder = newConfigurationBuilder();
+ static Configuration addTestFixtures(final String name, ConfigurationBuilder<BuiltConfiguration> builder) {
builder.setConfigurationName(name);
builder.setStatusLevel(Level.ERROR);
builder.add(builder.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
@@ -65,4 +53,20 @@ public class CustomConfigurationFactory extends ConfigurationFactory {
builder.add(builder.newRootLogger(Level.ERROR).add(builder.newAppenderRef("Stdout")));
return builder.build();
}
+
+ @Override
+ public Configuration getConfiguration(ConfigurationSource source) {
+ return getConfiguration(source.toString(), null);
+ }
+
+ @Override
+ public Configuration getConfiguration(final String name, final URI configLocation) {
+ ConfigurationBuilder<BuiltConfiguration> builder = newConfigurationBuilder();
+ return addTestFixtures(name, builder);
+ }
+
+ @Override
+ protected String[] getSupportedTypes() {
+ return new String[] {"*"};
+ }
}
[03/50] logging-log4j2 git commit: Important Javadoc clarification.
Posted by rg...@apache.org.
Important Javadoc clarification.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d7f703e2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d7f703e2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d7f703e2
Branch: refs/heads/master
Commit: d7f703e22cdc7139e0df2e6bc9487f7da53f75f1
Parents: 51e4923
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 16:53:42 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 16:53:42 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/builder/api/ComponentBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d7f703e2/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
index 8d48a82..17e0faa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
@@ -77,7 +77,7 @@ public interface ComponentBuilder<T extends ComponentBuilder> extends Builder<Co
/**
* Adds a sub component.
* @param builder The Assembler for the subcomponent with all of its attributes and sub-components set.
- * @return The ComponentBuilder.
+ * @return This ComponentBuilder (<em>not</em> the argument).
*/
T addComponent(ComponentBuilder<?> builder);
[47/50] logging-log4j2 git commit: LOG4J2-952 Improve class comments
Posted by rg...@apache.org.
LOG4J2-952 Improve class comments
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f2daf72b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f2daf72b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f2daf72b
Branch: refs/heads/master
Commit: f2daf72baecfe0e1e8dbec39ef22ed6bce51c0a6
Parents: f6c5546
Author: Ralph Goers <rg...@nextiva.com>
Authored: Tue Sep 1 14:11:30 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Wed Sep 2 22:04:30 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/api/AppenderComponentBuilder.java | 2 +-
.../log4j/core/config/builder/api/AppenderRefComponentBuilder.java | 2 +-
.../core/config/builder/api/CompositeFilterComponentBuilder.java | 2 +-
.../log4j/core/config/builder/api/CustomLevelComponentBuilder.java | 2 +-
.../log4j/core/config/builder/api/FilterComponentBuilder.java | 2 +-
.../log4j/core/config/builder/api/LayoutComponentBuilder.java | 2 +-
.../log4j/core/config/builder/api/LoggerComponentBuilder.java | 2 +-
.../log4j/core/config/builder/api/RootLoggerComponentBuilder.java | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f2daf72b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
index f96c8fc..bf23937 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Builder for constructing Appenders.
+ * Builder for constructing Appender Components.
*/
public interface AppenderComponentBuilder extends ComponentBuilder<AppenderComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f2daf72b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
index 840b386..e874b73 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Assembler for constructing AppenderRefs.
+ * Assembler for constructing AppenderRef Components.
*/
public interface AppenderRefComponentBuilder extends ComponentBuilder<AppenderRefComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f2daf72b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
index 67b0614..73116cb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Wraps multiple filter assemblers.
+ * Wraps multiple Filter Comnponent builders.
*/
public interface CompositeFilterComponentBuilder extends ComponentBuilder<CompositeFilterComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f2daf72b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CustomLevelComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CustomLevelComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CustomLevelComponentBuilder.java
index 8ce5801..38230e2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CustomLevelComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CustomLevelComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Assembler for constructing Filters
+ * Assembler for constructing CustomLevel Components
*/
public interface CustomLevelComponentBuilder extends ComponentBuilder<CustomLevelComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f2daf72b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterComponentBuilder.java
index f543f33..232fd5e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Assembler for constructing Filters
+ * Assembler for constructing Filter Components
*/
public interface FilterComponentBuilder extends ComponentBuilder<FilterComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f2daf72b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LayoutComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LayoutComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LayoutComponentBuilder.java
index 5668264..ef893ac 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LayoutComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LayoutComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Assembler for constructing Layouts
+ * Assembler for constructing Layout Components
*/
public interface LayoutComponentBuilder extends ComponentBuilder<LayoutComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f2daf72b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
index 58e7caa..4dcbf00 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Assembler for constructing Loggers.
+ * Assembler for constructing Logger Components.
*/
public interface LoggerComponentBuilder extends ComponentBuilder<LoggerComponentBuilder> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f2daf72b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
index 7db6ef6..4c7a681 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Assembler for constructing the root Logger.
+ * Assembler for constructing the root Logger Components.
*/
public interface RootLoggerComponentBuilder extends ComponentBuilder<RootLoggerComponentBuilder> {
[32/50] logging-log4j2 git commit: Javadocs.
Posted by rg...@apache.org.
Javadocs.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/24d18cec
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/24d18cec
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/24d18cec
Branch: refs/heads/master
Commit: 24d18cec9fa53413ec94ba2ae27e0b1633b710a6
Parents: 821cd5a
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 14:53:58 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 14:53:58 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/builder/api/ComponentBuilder.java | 1 +
.../log4j/core/config/builder/api/ConfigurationBuilder.java | 5 ++++-
.../core/config/builder/impl/DefaultConfigurationBuilder.java | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/24d18cec/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
index c06f064..8f51540 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
@@ -22,6 +22,7 @@ import org.apache.logging.log4j.core.util.Builder;
/**
* Builds arbitrary components and is the base type for the provided components.
+ * @param <T> The ComponentBuilder's own type for fluent APIs
*/
@SuppressWarnings("rawtypes")
public interface ComponentBuilder<T extends ComponentBuilder<T>> extends Builder<Component> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/24d18cec/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index de1b4cc..c2ec498 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -24,6 +24,7 @@ import org.apache.logging.log4j.core.util.Builder;
/**
* Interface for building logging configurations.
+ * @param <T> The Configuration type created by this builder.
*/
public interface ConfigurationBuilder<T extends Configuration> extends Builder<T> {
@@ -117,6 +118,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
/**
* Returns a builder for creating generic components.
+ * @param <B> ComponentBuilder target type
* @param name The name of the component (may be null).
* @param pluginName The Plugin type of the component.
* @return A new ComponentBuilder.
@@ -125,6 +127,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
/**
* Returns a builder for creating generic components.
+ * @param <B> ComponentBuilder target type
* @param name The name of the component (may be null).
* @param pluginName The Plugin type of the component.
* @param value The value of the component.
@@ -161,7 +164,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
/**
* Returns a builder for creating Layouts.
- * @param type The Plugin type of the Layout.
+ * @param pluginName The Plugin type of the Layout.
* @return A new LayoutComponentBuilder.
*/
LayoutComponentBuilder newLayout(String pluginName);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/24d18cec/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 c225a9d..f2ef2e7 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
@@ -36,6 +36,7 @@ import java.lang.reflect.Constructor;
import java.util.List;
/**
+ * @param <T> The BuiltConfiguration type.
*
*/
public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implements ConfigurationBuilder<T> {
[13/50] logging-log4j2 git commit: Javadoc clean up.
Posted by rg...@apache.org.
Javadoc clean up.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/af25d450
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/af25d450
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/af25d450
Branch: refs/heads/master
Commit: af25d4501fb2d3e5c34b9d83bc3d53e2e676e5c3
Parents: e4f005d
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 21:47:17 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 21:47:17 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/builder/api/ConfigurationBuilder.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/af25d450/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index 65f0ca8..cbfaedc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -29,7 +29,6 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
/**
* Set the name of the configuration.
- *
* @param name the name of the {@link Configuration}. By default is {@code "Constructed"}.
* @return this Assembler instance.
*/
[49/50] logging-log4j2 git commit: Merge branch 'LOG4J2-952'
Posted by rg...@apache.org.
Merge branch 'LOG4J2-952'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ab4f5a54
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ab4f5a54
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ab4f5a54
Branch: refs/heads/master
Commit: ab4f5a5484da9f54154d957b8e31d6ff98f3fd10
Parents: 5de8dac b288e2c
Author: Ralph Goers <rg...@nextiva.com>
Authored: Mon Sep 7 17:31:57 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Mon Sep 7 17:31:57 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/util/PropertiesUtil.java | 33 ++
.../logging/log4j/core/AbstractLifeCycle.java | 5 +
.../apache/logging/log4j/core/LifeCycle.java | 4 +
.../core/config/AbstractConfiguration.java | 26 +-
.../log4j/core/config/ConfigurationFactory.java | 3 +-
.../logging/log4j/core/config/Configurator.java | 40 ++-
.../builder/api/AppenderComponentBuilder.java | 45 +++
.../api/AppenderRefComponentBuilder.java | 31 ++
.../core/config/builder/api/Component.java | 81 +++++
.../config/builder/api/ComponentBuilder.java | 96 +++++
.../api/CompositeFilterComponentBuilder.java | 31 ++
.../builder/api/ConfigurationBuilder.java | 260 ++++++++++++++
.../api/ConfigurationBuilderFactory.java | 40 +++
.../api/CustomLevelComponentBuilder.java | 25 ++
.../builder/api/FilterComponentBuilder.java | 25 ++
.../builder/api/LayoutComponentBuilder.java | 25 ++
.../builder/api/LoggerComponentBuilder.java | 38 ++
.../builder/api/RootLoggerComponentBuilder.java | 38 ++
.../config/builder/impl/BuiltConfiguration.java | 167 +++++++++
.../impl/DefaultAppenderComponentBuilder.java | 44 +++
.../DefaultAppenderRefComponentBuilder.java | 40 +++
...DefaultComponentAndConfigurationBuilder.java | 45 +++
.../builder/impl/DefaultComponentBuilder.java | 121 +++++++
.../DefaultCompositeFilterComponentBuilder.java | 42 +++
.../impl/DefaultConfigurationBuilder.java | 304 ++++++++++++++++
.../DefaultCustomLevelComponentBuilder.java | 33 ++
.../impl/DefaultFilterComponentBuilder.java | 34 ++
.../impl/DefaultLayoutComponentBuilder.java | 31 ++
.../impl/DefaultLoggerComponentBuilder.java | 64 ++++
.../impl/DefaultRootLoggerComponentBuilder.java | 63 ++++
.../visitors/PluginAttributeVisitor.java | 2 +-
.../visitors/PluginBuilderAttributeVisitor.java | 2 +-
.../properties/PropertiesConfiguration.java | 56 +++
.../PropertiesConfigurationFactory.java | 353 +++++++++++++++++++
.../log4j/core/impl/Log4jContextFactory.java | 27 ++
.../log4j/core/net/server/JmsServer.java | 4 +
.../apache/logging/log4j/core/util/Builder.java | 14 +-
.../util/DefaultShutdownCallbackRegistry.java | 4 +
.../routing/PropertiesRoutingAppenderTest.java | 79 +++++
.../log4j/core/config/TestConfigurator.java | 30 ++
.../builder/ConfigurationAssemblerTest.java | 86 +++++
.../builder/CustomConfigurationFactory.java | 72 ++++
.../properties/PropertiesConfigurationTest.java | 60 ++++
.../properties/RollingFilePropertiesTest.java | 59 ++++
.../log4j/core/util/PropertiesUtilTest.java | 42 +++
.../src/test/resources/log4j-rolling.properties | 62 ++++
.../src/test/resources/log4j-routing.properties | 69 ++++
.../test/resources/log4j2-properties.properties | 46 +++
src/site/site.xml | 2 +
src/site/xdoc/manual/configuration.xml.vm | 77 +++-
src/site/xdoc/manual/customconfig.xml | 90 ++++-
51 files changed, 3050 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab4f5a54/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
----------------------------------------------------------------------
[10/50] logging-log4j2 git commit: Javadoc.
Posted by rg...@apache.org.
Javadoc.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8ef30a1b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8ef30a1b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8ef30a1b
Branch: refs/heads/master
Commit: 8ef30a1b0dcbe839c81d3d6fb7b62425e2a3cb37
Parents: b40e336
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 21:43:27 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 21:43:27 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/api/ComponentBuilder.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8ef30a1b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
index a162f79..1c64bae 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ComponentBuilder.java
@@ -30,7 +30,7 @@ public interface ComponentBuilder<T extends ComponentBuilder<T>> extends Builder
* Adds a String attribute.
* @param key The attribute key.
* @param value The value of the attribute.
- * @return The ComponentBuilder.
+ * @return This ComponentBuilder.
*/
T addAttribute(String key, String value);
@@ -38,7 +38,7 @@ public interface ComponentBuilder<T extends ComponentBuilder<T>> extends Builder
* Adds a logging Level attribute.
* @param key The attribute key.
* @param level The logging Level.
- * @return The ComponentBuilder.
+ * @return This ComponentBuilder.
*/
T addAttribute(String key, Level level);
@@ -46,7 +46,7 @@ public interface ComponentBuilder<T extends ComponentBuilder<T>> extends Builder
* Adds an enumeration attribute.
* @param key The attribute key.
* @param value The enumeration.
- * @return The ComponentBuilder.
+ * @return This ComponentBuilder.
*/
T addAttribute(String key, Enum<?> value);
@@ -54,7 +54,7 @@ public interface ComponentBuilder<T extends ComponentBuilder<T>> extends Builder
* Adds an integer attribute.
* @param key The attribute key.
* @param value The integer value.
- * @return The ComponentBuilder.
+ * @return This ComponentBuilder.
*/
T addAttribute(String key, int value);
@@ -62,7 +62,7 @@ public interface ComponentBuilder<T extends ComponentBuilder<T>> extends Builder
* Adds a boolean attribute.
* @param key The attribute key.
* @param value The integer value.
- * @return The ComponentBuilder.
+ * @return This ComponentBuilder.
*/
T addAttribute(String key, boolean value);
@@ -70,7 +70,7 @@ public interface ComponentBuilder<T extends ComponentBuilder<T>> extends Builder
* Adds an Object attribute.
* @param key The attribute key.
* @param value The integer value.
- * @return The ComponentBuilder.
+ * @return This ComponentBuilder.
*/
T addAttribute(String key, Object value);
[14/50] logging-log4j2 git commit: Javadoc: Use the active voice.
Posted by rg...@apache.org.
Javadoc: Use the active voice.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/426d729f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/426d729f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/426d729f
Branch: refs/heads/master
Commit: 426d729f387cd69e3b503c378215d2a5e3af25ad
Parents: af25d45
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 21:48:04 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 21:48:04 2015 -0700
----------------------------------------------------------------------
.../builder/api/ConfigurationBuilder.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/426d729f/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index cbfaedc..4a3ff3a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -28,42 +28,42 @@ import org.apache.logging.log4j.core.util.Builder;
public interface ConfigurationBuilder<T extends Configuration> extends Builder<T> {
/**
- * Set the name of the configuration.
+ * Sets the name of the configuration.
* @param name the name of the {@link Configuration}. By default is {@code "Constructed"}.
* @return this Assembler instance.
*/
ConfigurationBuilder<T> setConfigurationName(String name);
/**
- * Set the configuration source, if one exists.
+ * Sets the configuration source, if one exists.
* @param configurationSource the ConfigurationSource.
* @return this Assembler instance.
*/
ConfigurationBuilder<T> setConfigurationSource(ConfigurationSource configurationSource);
/**
- * Set the level of the StatusLogger.
+ * Sets the level of the StatusLogger.
* @param level The logging level.
* @return this Assembler instance.
*/
ConfigurationBuilder<T> setStatusLevel(Level level);
/**
- * Set whether the logging should include constructing Plugins.
+ * Sets whether the logging should include constructing Plugins.
* @param verbosity "disable" will hide messages from plugin construction.
* @return this Assembler instance.
*/
ConfigurationBuilder<T> setVerbosity(String verbosity);
/**
- * Set the list of packages to search for plugins.
+ * Sets the list of packages to search for plugins.
* @param packages The comma separated list of packages.
* @return this Assembler instance.
*/
ConfigurationBuilder<T> setPackages(String packages);
/**
- * Set whether the shutdown hook should be disabled.
+ * Sets whether the shutdown hook should be disabled.
* @param flag "disable" will prevent the shutdown hook from being set.
* @return this Assembler instance.
*/
@@ -91,28 +91,28 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
ConfigurationBuilder<T> add(CustomLevelComponentBuilder assembler);
/**
- * Add a Logger component.
+ * Adds a Logger component.
* @param assembler The LoggerComponentBuilder with all of its attributes and sub components set.
* @return this Assembler instance.
*/
ConfigurationBuilder<T> add(LoggerComponentBuilder assembler);
/**
- * Add the root Logger component.
+ * Adds the root Logger component.
* @param assembler The RootLoggerComponentBuilder with all of its attributes and sub components set.
* @return this Assembler instance.
*/
ConfigurationBuilder<T> add(RootLoggerComponentBuilder assembler);
/**
- * Add a Filter component.
+ * Adds a Filter component.
* @param assembler the FilterComponentBuilder with all of its attributes and sub components set.
* @return this Assembler instance.
*/
ConfigurationBuilder<T> add(FilterComponentBuilder assembler);
/**
- * Add a Property key and value.
+ * Adds a Property key and value.
* @param key The property key.
* @param value The property value.
* @return this Assembler instance.
[18/50] logging-log4j2 git commit: Sort members.
Posted by rg...@apache.org.
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/6f75a924
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6f75a924
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6f75a924
Branch: refs/heads/master
Commit: 6f75a924a84be10b7e8555758e73bbc907b7b389
Parents: 21f2c1f
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:05:48 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:05:48 2015 -0700
----------------------------------------------------------------------
.../builder/api/ConfigurationBuilder.java | 164 +++++++++----------
1 file changed, 82 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6f75a924/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index 48db86a..c3921a3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -28,55 +28,6 @@ import org.apache.logging.log4j.core.util.Builder;
public interface ConfigurationBuilder<T extends Configuration> extends Builder<T> {
/**
- * Sets the name of the configuration.
- * @param name the name of the {@link Configuration}. By default is {@code "Constructed"}.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setConfigurationName(String name);
-
- /**
- * Sets the configuration source, if one exists.
- * @param configurationSource the ConfigurationSource.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setConfigurationSource(ConfigurationSource configurationSource);
-
- /**
- * Sets the level of the StatusLogger.
- * @param level The logging level.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setStatusLevel(Level level);
-
- /**
- * Sets whether the logging should include constructing Plugins.
- * @param verbosity "disable" will hide messages from plugin construction.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setVerbosity(String verbosity);
-
- /**
- * Sets the list of packages to search for plugins.
- * @param packages The comma separated list of packages.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setPackages(String packages);
-
- /**
- * Sets whether the shutdown hook should be disabled.
- * @param flag "disable" will prevent the shutdown hook from being set.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setShutdownHook(String flag);
-
- /**
- * Sets the interval at which the configuration file should be checked for changes.
- * @param intervalSeconds The number of seconds that should pass between checks of the configuration file.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setMonitorInterval(String intervalSeconds);
-
- /**
* Adds an AppenderComponent.
* @param builder The AppenderComponentBuilder with all of its attributes and sub components set.
* @return this builder instance.
@@ -91,6 +42,13 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
ConfigurationBuilder<T> add(CustomLevelComponentBuilder builder);
/**
+ * Adds a Filter component.
+ * @param builder the FilterComponentBuilder with all of its attributes and sub components set.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> add(FilterComponentBuilder builder);
+
+ /**
* Adds a Logger component.
* @param builder The LoggerComponentBuilder with all of its attributes and sub components set.
* @return this builder instance.
@@ -105,13 +63,6 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
ConfigurationBuilder<T> add(RootLoggerComponentBuilder builder);
/**
- * Adds a Filter component.
- * @param builder the FilterComponentBuilder with all of its attributes and sub components set.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> add(FilterComponentBuilder builder);
-
- /**
* Adds a Property key and value.
* @param key The property key.
* @param value The property value.
@@ -127,7 +78,6 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
*/
AppenderComponentBuilder newAppender(String name, String pluginName);
-
/**
* Returns a builder for creating AppenderRefs.
* @param ref The name of the Appender being referenced.
@@ -136,6 +86,36 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
AppenderRefComponentBuilder newAppenderRef(String ref);
/**
+ * Returns a builder for creating Async Loggers.
+ * @param name The name of the Logger.
+ * @param level The logging Level to be assigned to the Logger.
+ * @return The LoggerComponentBuilder.
+ */
+ LoggerComponentBuilder newAsyncLogger(String name, Level level);
+
+ /**
+ * Returns a builder for creating Async Loggers.
+ * @param name The name of the Logger.
+ * @param level The logging Level to be assigned to the Logger.
+ * @return The LoggerComponentBuilder.
+ */
+ LoggerComponentBuilder newAsyncLogger(String name, String level);
+
+ /**
+ * Returns a builder for creating the async root Logger.
+ * @param level The logging Level to be assigned to the root Logger.
+ * @return The RootLoggerComponentBuilder.
+ */
+ RootLoggerComponentBuilder newAsyncRootLogger(Level level);
+
+ /**
+ * Returns a builder for creating the async root Logger.
+ * @param level The logging Level to be assigned to the root Logger.
+ * @return The RootLoggerComponentBuilder.
+ */
+ RootLoggerComponentBuilder newAsyncRootLogger(String level);
+
+ /**
* Returns a builder for creating generic components.
* @param name The name of the component (may be null).
* @param pluginName The Plugin type of the component.
@@ -152,6 +132,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
*/
ComponentBuilder<?> newComponent(String name, String pluginName, String value);
+
/**
* Returns a builder for creating CustomLevels
* @param name The name of the custom level.
@@ -193,7 +174,6 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
*/
LoggerComponentBuilder newLogger(String name, Level level);
-
/**
* Returns a builder for creating Loggers.
* @param name The name of the Logger.
@@ -203,22 +183,6 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
LoggerComponentBuilder newLogger(String name, String level);
/**
- * Returns a builder for creating Async Loggers.
- * @param name The name of the Logger.
- * @param level The logging Level to be assigned to the Logger.
- * @return The LoggerComponentBuilder.
- */
- LoggerComponentBuilder newAsyncLogger(String name, Level level);
-
- /**
- * Returns a builder for creating Async Loggers.
- * @param name The name of the Logger.
- * @param level The logging Level to be assigned to the Logger.
- * @return The LoggerComponentBuilder.
- */
- LoggerComponentBuilder newAsyncLogger(String name, String level);
-
- /**
* Returns a builder for creating the root Logger.
* @param level The logging Level to be assigned to the root Logger.
* @return The RootLoggerComponentBuilder.
@@ -234,17 +198,53 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
/**
- * Returns a builder for creating the async root Logger.
- * @param level The logging Level to be assigned to the root Logger.
- * @return The RootLoggerComponentBuilder.
+ * Sets the name of the configuration.
+ * @param name the name of the {@link Configuration}. By default is {@code "Constructed"}.
+ * @return this builder instance.
*/
- RootLoggerComponentBuilder newAsyncRootLogger(Level level);
+ ConfigurationBuilder<T> setConfigurationName(String name);
+
+ /**
+ * Sets the configuration source, if one exists.
+ * @param configurationSource the ConfigurationSource.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> setConfigurationSource(ConfigurationSource configurationSource);
+ /**
+ * Sets the interval at which the configuration file should be checked for changes.
+ * @param intervalSeconds The number of seconds that should pass between checks of the configuration file.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> setMonitorInterval(String intervalSeconds);
/**
- * Returns a builder for creating the async root Logger.
- * @param level The logging Level to be assigned to the root Logger.
- * @return The RootLoggerComponentBuilder.
+ * Sets the list of packages to search for plugins.
+ * @param packages The comma separated list of packages.
+ * @return this builder instance.
*/
- RootLoggerComponentBuilder newAsyncRootLogger(String level);
+ ConfigurationBuilder<T> setPackages(String packages);
+
+ /**
+ * Sets whether the shutdown hook should be disabled.
+ * @param flag "disable" will prevent the shutdown hook from being set.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> setShutdownHook(String flag);
+
+
+ /**
+ * Sets the level of the StatusLogger.
+ * @param level The logging level.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> setStatusLevel(Level level);
+
+
+ /**
+ * Sets whether the logging should include constructing Plugins.
+ * @param verbosity "disable" will hide messages from plugin construction.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> setVerbosity(String verbosity);
}
[05/50] logging-log4j2 git commit: "assembler" -> "builder"
vernacular.
Posted by rg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8cb0ac56
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8cb0ac56
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8cb0ac56
Branch: refs/heads/master
Commit: 8cb0ac56719e715a825e224838cbd397fd1e12c5
Parents: 33fb7b1
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 17:27:06 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 17:27:06 2015 -0700
----------------------------------------------------------------------
.../builder/impl/DefaultComponentBuilder.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8cb0ac56/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
index bcad74a..e960096 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
@@ -34,25 +34,25 @@ import java.util.Map;
@SuppressWarnings("rawtypes")
class DefaultComponentBuilder<T extends ComponentBuilder> implements ComponentBuilder<T> {
- private ConfigurationBuilder<? extends Configuration> assembler;
+ private ConfigurationBuilder<? extends Configuration> builder;
private String type;
private Map<String, String> attributes = new HashMap<>();
private List<Component> components = new ArrayList<>();
private String name;
private String value;
- public DefaultComponentBuilder(ConfigurationBuilder<? extends Configuration> assembler, String type) {
- this(assembler, null, type, null);
+ public DefaultComponentBuilder(ConfigurationBuilder<? extends Configuration> builder, String type) {
+ this(builder, null, type, null);
}
- public DefaultComponentBuilder(ConfigurationBuilder<? extends Configuration> assembler, String name, String type) {
- this(assembler, name, type, null);
+ public DefaultComponentBuilder(ConfigurationBuilder<? extends Configuration> builder, String name, String type) {
+ this(builder, name, type, null);
}
- public DefaultComponentBuilder(ConfigurationBuilder<? extends Configuration> assembler, String name, String type,
+ public DefaultComponentBuilder(ConfigurationBuilder<? extends Configuration> builder, String name, String type,
String value) {
this.type = type;
- this.assembler = assembler;
+ this.builder = builder;
this.name = name;
this.value = value;
}
@@ -115,7 +115,7 @@ class DefaultComponentBuilder<T extends ComponentBuilder> implements ComponentBu
@Override
public ConfigurationBuilder<? extends Configuration> getBuilder() {
- return assembler;
+ return builder;
}
@Override