Tratando ambiguidade dos extratores de configuração

Cleverson Sacramento
1 parent 8937b13e
Showing 7 changed files with 65 additions and 23 deletions Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationArrayValueExtractor.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationClassValueExtractor.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationMapValueExtractor.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationPrimitiveOrWrapperValueExtractor.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationStringValueExtractor.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java
@@ -36,17 +36,20 @@
  */
 package br.gov.frameworkdemoiselle.internal.configuration;
+import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+
 import java.lang.reflect.Field;
 import org.apache.commons.configuration.DataConfiguration;
+import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
+@Priority(EXTENSIONS_L1_PRIORITY)
 public class ConfigurationArrayValueExtractor 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, DataConfiguration configuration, Object defaultValue) {
 		return configuration.getArray(field.getType().getComponentType(), prefix + key, defaultValue);
 	}
@@ -36,19 +36,22 @@
  */
 package br.gov.frameworkdemoiselle.internal.configuration;
+import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+
 import java.lang.reflect.Field;
 import org.apache.commons.configuration.DataConfiguration;
+import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
 import br.gov.frameworkdemoiselle.util.Reflections;
+@Priority(EXTENSIONS_L1_PRIORITY)
 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, DataConfiguration configuration, Object defaultValue) {
 		Object value = defaultValue;
 		String canonicalName = configuration.getString(prefix + key);
@@ -41,8 +41,9 @@ import static br.gov.frameworkdemoiselle.configuration.ConfigType.SYSTEM;
 import java.io.Serializable;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 import javax.inject.Inject;
 import javax.validation.constraints.NotNull;
@@ -61,6 +62,7 @@ import br.gov.frameworkdemoiselle.configuration.Configuration;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
 import br.gov.frameworkdemoiselle.internal.bootstrap.ConfigurationBootstrap;
+import br.gov.frameworkdemoiselle.internal.implementation.StrategySelector;
 import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.Reflections;
@@ -84,9 +86,9 @@ public class ConfigurationLoader implements Serializable {
 	private DataConfiguration configuration;
-	private List<Field> fields;
+	private Set<Field> fields;
-	private List<ConfigurationValueExtractor> extractors;
+	private Set<ConfigurationValueExtractor> extractors;
 	@Inject
 	private ConfigurationBootstrap bootstrap;
@@ -165,7 +167,7 @@ public class ConfigurationLoader implements Serializable {
 	}
 	private void loadExtractors() {
-		this.extractors = new ArrayList<ConfigurationValueExtractor>();
+		this.extractors = new HashSet<ConfigurationValueExtractor>();
 		for (Class<? extends ConfigurationValueExtractor> extractorClass : this.bootstrap.getCache()) {
 			this.extractors.add(Beans.getReference(extractorClass));
@@ -191,9 +193,9 @@ public class ConfigurationLoader implements Serializable {
 		}
 	}
-	private List<Field> getFields() {
+	private Set<Field> getFields() {
 		if (this.fields == null) {
-			this.fields = Reflections.getNonStaticFields(this.object.getClass());
+			this.fields = new HashSet<Field>(Reflections.getNonStaticFields(this.object.getClass()));
 		}
 		return this.fields;
@@ -211,16 +213,23 @@ public class ConfigurationLoader implements Serializable {
 	}
 	private Object getValue(Field field, Class<?> type, String key, Object defaultValue) {
-		Object value = null;
+		Collection<ConfigurationValueExtractor> candidates = new HashSet<ConfigurationValueExtractor>();
 		for (ConfigurationValueExtractor extractor : this.extractors) {
 			if (extractor.isSupported(field)) {
-				value = extractor.getValue(this.prefix, key, field, configuration, defaultValue);
-				break;
+				candidates.add(extractor);
 			}
 		}
-		return value;
+		ConfigurationValueExtractor elected = StrategySelector.getInstance(ConfigurationValueExtractor.class,
+				candidates);
+
+		if (elected == null) {
+			// TODO lançar exceção informando que nenhum extrator foi encontrado para o field e ensinar como implementar
+			// um extrator personalizado.
+		}
+
+		return elected.getValue(this.prefix, key, field, configuration, defaultValue);
 	}
 	private String getKey(Field field) {
@@ -36,6 +36,8 @@
  */
 package br.gov.frameworkdemoiselle.internal.configuration;
+import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -45,13 +47,14 @@ import java.util.regex.Pattern;
 import org.apache.commons.configuration.DataConfiguration;
+import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
+@Priority(EXTENSIONS_L1_PRIORITY)
 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, DataConfiguration configuration, Object defaultValue) {
 		@SuppressWarnings("unchecked")
 		Map<String, Object> value = (Map<String, Object>) defaultValue;
@@ -36,6 +36,8 @@
  */
 package br.gov.frameworkdemoiselle.internal.configuration;
+import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+
 import java.lang.reflect.Field;
 import java.util.HashSet;
 import java.util.Set;
@@ -44,8 +46,10 @@ import org.apache.commons.configuration.ConversionException;
 import org.apache.commons.configuration.DataConfiguration;
 import org.apache.commons.lang.ClassUtils;
+import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
+@Priority(EXTENSIONS_L1_PRIORITY)
 public class ConfigurationPrimitiveOrWrapperValueExtractor implements ConfigurationValueExtractor {
 	private static final Set<Object> wrappers = new HashSet<Object>();
@@ -64,8 +68,7 @@ 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, DataConfiguration configuration, Object defaultValue) {
 		Object value;
 		try {
@@ -36,17 +36,20 @@
  */
 package br.gov.frameworkdemoiselle.internal.configuration;
+import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
+
 import java.lang.reflect.Field;
 import org.apache.commons.configuration.DataConfiguration;
+import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
+@Priority(EXTENSIONS_L1_PRIORITY)
 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, DataConfiguration configuration, Object defaultValue) {
 		return configuration.getString(prefix + key, (String) defaultValue);
 	}
@@ -40,7 +40,10 @@ import static br.gov.frameworkdemoiselle.annotation.Priority.MIN_PRIORITY;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
@@ -72,7 +75,22 @@ public final class StrategySelector implements Serializable {
 		return bundle;
 	}
-	public static <T> Class<? extends T> getClass(Class<T> type, List<Class<? extends T>> options)
+	@SuppressWarnings("unchecked")
+	public static <T> T getInstance(Class<T> type, Collection<? extends T> options) throws ConfigurationException {
+
+		Map<Class<? extends T>, T> map = new HashMap<Class<? extends T>, T>();
+
+		for (T instance : options) {
+			if (instance != null) {
+				map.put((Class<T>) instance.getClass(), instance);
+			}
+		}
+
+		Class<? extends T> elected = getClass(type, map.keySet());
+		return map.get(elected);
+	}
+
+	public static <T> Class<? extends T> getClass(Class<T> type, Collection<Class<? extends T>> options)
 			throws ConfigurationException {
 		Class<? extends T> selected = null;
@@ -88,7 +106,7 @@ public final class StrategySelector implements Serializable {
 	}
 	private static <T> void checkForAmbiguity(Class<T> type, Class<? extends T> selected,
-			List<Class<? extends T>> options) throws ConfigurationException {
+			Collection<Class<? extends T>> options) throws ConfigurationException {
 		int selectedPriority = getPriority(selected);
 		List<Class<? extends T>> ambiguous = new ArrayList<Class<? extends T>>();