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 c60cbca..2957168 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 @@ -63,10 +63,8 @@ import br.gov.frameworkdemoiselle.annotation.Name; import br.gov.frameworkdemoiselle.configuration.ConfigType; import br.gov.frameworkdemoiselle.configuration.Configuration; import br.gov.frameworkdemoiselle.configuration.ConfigurationException; -import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap; import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; -import br.gov.frameworkdemoiselle.util.Beans; import br.gov.frameworkdemoiselle.util.Reflections; import br.gov.frameworkdemoiselle.util.ResourceBundle; import br.gov.frameworkdemoiselle.util.Strings; @@ -85,8 +83,6 @@ public class ConfigurationLoader implements Serializable { private Logger logger; - private CoreBootstrap bootstrap; - /** * Loads a config class filling it with the corresponding values. * @@ -97,14 +93,9 @@ public class ConfigurationLoader implements Serializable { public void load(Object object) throws ConfigurationException { Class config = object.getClass(); - if (!getBootstrap().isAnnotatedType(config)) { - config = config.getSuperclass(); - getLogger().debug(getBundle().getString("proxy-detected", config, config.getClass().getSuperclass())); - } - getLogger().debug(getBundle().getString("loading-configuration-class", config.getName())); - for (Field field : Reflections.getNonStaticDeclaredFields(config)) { + for (Field field : Reflections.getNonStaticFields(config)) { loadField(field, object, config); } } @@ -414,14 +405,6 @@ public class ConfigurationLoader implements Serializable { return logger; } - private CoreBootstrap getBootstrap() { - if (bootstrap == null) { - bootstrap = Beans.getReference(CoreBootstrap.class); - } - - return bootstrap; - } - private class Key { private String prefix; diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Reflections.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Reflections.java index 507618a..711295d 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Reflections.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Reflections.java @@ -43,6 +43,7 @@ import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public final class Reflections { @@ -131,6 +132,17 @@ public final class Reflections { return fields.toArray(new Field[0]); } + public static List getNonStaticFields(Class type) { + List fields = new ArrayList(); + + if (type != null) { + fields.addAll(Arrays.asList(getNonStaticDeclaredFields(type))); + fields.addAll(getNonStaticFields(type.getSuperclass())); + } + + return fields; + } + public static T instantiate(Class clasz) { T object = null; try { -- libgit2 0.21.2