From 3242ca5fc97d09766efb124e9b88fcd96db248e4 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Thu, 4 Apr 2013 09:08:18 -0300 Subject: [PATCH] Modificação na interface ConfigurationValueExtractor para receber um Configuration como parâmetro ao invés de DataConfiguration. --- impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/ConfigurationValueExtractor.java | 4 ++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationArrayValueExtractor.java | 6 ++++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationClassValueExtractor.java | 4 ++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java | 5 ++--- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationMapValueExtractor.java | 4 ++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationPrimitiveOrWrapperValueExtractor.java | 5 +++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationStringValueExtractor.java | 4 ++-- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/ConfigurationValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/ConfigurationValueExtractor.java index 7775558..a9074eb 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/ConfigurationValueExtractor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/ConfigurationValueExtractor.java @@ -38,11 +38,11 @@ package br.gov.frameworkdemoiselle.configuration; import java.lang.reflect.Field; -import org.apache.commons.configuration.DataConfiguration; +import org.apache.commons.configuration.Configuration; public interface ConfigurationValueExtractor { - Object getValue(String prefix, String key, Field field, DataConfiguration configuration, Object defaultValue); + Object getValue(String prefix, String key, Field field, Configuration configuration, Object defaultValue); boolean isSupported(Field field); } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationArrayValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationArrayValueExtractor.java index 94bc3c2..0fcea08 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationArrayValueExtractor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationArrayValueExtractor.java @@ -40,6 +40,7 @@ import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelecto import java.lang.reflect.Field; +import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.DataConfiguration; import br.gov.frameworkdemoiselle.annotation.Priority; @@ -49,8 +50,9 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor; public class ConfigurationArrayValueExtractor implements ConfigurationValueExtractor { @Override - public Object getValue(String prefix, String key, Field field, DataConfiguration configuration, Object defaultValue) { - return configuration.getArray(field.getType().getComponentType(), prefix + key, defaultValue); + public Object getValue(String prefix, String key, Field field, Configuration configuration, Object defaultValue) { + return new DataConfiguration(configuration).getArray(field.getType().getComponentType(), prefix + key, + defaultValue); } @Override diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationClassValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationClassValueExtractor.java index 957e3b1..fadea85 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationClassValueExtractor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationClassValueExtractor.java @@ -40,7 +40,7 @@ import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelecto import java.lang.reflect.Field; -import org.apache.commons.configuration.DataConfiguration; +import org.apache.commons.configuration.Configuration; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.configuration.ConfigurationException; @@ -51,7 +51,7 @@ import br.gov.frameworkdemoiselle.util.Reflections; public class ConfigurationClassValueExtractor implements ConfigurationValueExtractor { @Override - public Object getValue(String prefix, String key, Field field, DataConfiguration configuration, Object defaultValue) { + public Object getValue(String prefix, String key, Field field, Configuration configuration, Object defaultValue) { Object value = defaultValue; String canonicalName = configuration.getString(prefix + key); diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java index c5b4d30..d7b31e3 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java @@ -49,7 +49,6 @@ import javax.inject.Inject; import javax.validation.constraints.NotNull; import org.apache.commons.configuration.AbstractConfiguration; -import org.apache.commons.configuration.DataConfiguration; import org.apache.commons.configuration.FileConfiguration; import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.commons.configuration.SystemConfiguration; @@ -84,7 +83,7 @@ public class ConfigurationLoader implements Serializable { private String prefix; - private DataConfiguration configuration; + private org.apache.commons.configuration.Configuration configuration; private Set fields; @@ -163,7 +162,7 @@ public class ConfigurationLoader implements Serializable { } } - this.configuration = (conf == null ? null : new DataConfiguration(conf)); + this.configuration = conf; } private void loadExtractors() { diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationMapValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationMapValueExtractor.java index 0fae16d..d88aff0 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationMapValueExtractor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationMapValueExtractor.java @@ -45,7 +45,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.configuration.DataConfiguration; +import org.apache.commons.configuration.Configuration; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor; @@ -54,7 +54,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor; public class ConfigurationMapValueExtractor implements ConfigurationValueExtractor { @Override - public Object getValue(String prefix, String key, Field field, DataConfiguration configuration, Object defaultValue) { + public Object getValue(String prefix, String key, Field field, Configuration configuration, Object defaultValue) { @SuppressWarnings("unchecked") Map value = (Map) defaultValue; diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationPrimitiveOrWrapperValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationPrimitiveOrWrapperValueExtractor.java index 17871cf..6aa759c 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationPrimitiveOrWrapperValueExtractor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationPrimitiveOrWrapperValueExtractor.java @@ -42,6 +42,7 @@ import java.lang.reflect.Field; import java.util.HashSet; import java.util.Set; +import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConversionException; import org.apache.commons.configuration.DataConfiguration; import org.apache.commons.lang.ClassUtils; @@ -68,11 +69,11 @@ public class ConfigurationPrimitiveOrWrapperValueExtractor implements Configurat @Override @SuppressWarnings("unchecked") - public Object getValue(String prefix, String key, Field field, DataConfiguration configuration, Object defaultValue) { + public Object getValue(String prefix, String key, Field field, Configuration configuration, Object defaultValue) { Object value; try { - value = configuration.get(ClassUtils.primitiveToWrapper(field.getType()), prefix + key, defaultValue); + value = new DataConfiguration(configuration).get(ClassUtils.primitiveToWrapper(field.getType()), prefix + key, defaultValue); } catch (ConversionException cause) { value = defaultValue; diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationStringValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationStringValueExtractor.java index 2b27f56..be40e1f 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationStringValueExtractor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationStringValueExtractor.java @@ -40,7 +40,7 @@ import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelecto import java.lang.reflect.Field; -import org.apache.commons.configuration.DataConfiguration; +import org.apache.commons.configuration.Configuration; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor; @@ -49,7 +49,7 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor; public class ConfigurationStringValueExtractor implements ConfigurationValueExtractor { @Override - public Object getValue(String prefix, String key, Field field, DataConfiguration configuration, Object defaultValue) { + public Object getValue(String prefix, String key, Field field, Configuration configuration, Object defaultValue) { return configuration.getString(prefix + key, (String) defaultValue); } -- libgit2 0.21.2