"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 <[email protected]> Authored: Tue Sep 1 13:49:55 2015 -0700 Committer: ggregory <[email protected]> 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
