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 <[email protected]> Authored: Tue Sep 1 14:07:44 2015 -0700 Committer: ggregory <[email protected]> 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; } }
