From ee28b5f421d99446242ae4fb4f8a742f913c203a Mon Sep 17 00:00:00 2001
From: Emerson Oliveira <emerson.sdoliveira@gmail.com>
Date: Mon, 1 Apr 2013 14:52:49 -0300
Subject: [PATCH] Aprimoramento para lançar exceção no caso do arquivo de configuração de um atributo anotado com @NotNull não existir

---
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java | 65 +++++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 26 deletions(-)

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 d858b01..6caaa06 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
@@ -39,13 +39,14 @@ package br.gov.frameworkdemoiselle.internal.configuration;
 
 import static br.gov.frameworkdemoiselle.configuration.ConfigType.SYSTEM;
 
-import java.io.FileNotFoundException;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
 
+import javax.validation.constraints.NotNull;
+
 import org.apache.commons.configuration.AbstractConfiguration;
 import org.apache.commons.configuration.FileConfiguration;
 import org.apache.commons.configuration.PropertiesConfiguration;
@@ -89,9 +90,12 @@ public class ConfigurationLoader implements Serializable {
 
 		loadType();
 		loadResource();
-		loadPrefix();
 		loadConfiguration();
-		loadFields();
+
+		if (this.configuration != null) {
+			loadPrefix();
+			loadFields();
+		}
 
 		validateValues();
 	}
@@ -104,37 +108,36 @@ public class ConfigurationLoader implements Serializable {
 	}
 
 	private void loadConfiguration() {
-		try {
-			AbstractConfiguration conf;
+		AbstractConfiguration conf;
 
-			switch (this.type) {
-				case SYSTEM:
-					conf = new SystemConfiguration();
-					break;
+		switch (this.type) {
+			case SYSTEM:
+				conf = new SystemConfiguration();
+				break;
 
-				case XML:
-					conf = new XMLConfiguration();
-					break;
+			case XML:
+				conf = new XMLConfiguration();
+				break;
 
-				default:
-					conf = new PropertiesConfiguration();
-					break;
-			}
+			default:
+				conf = new PropertiesConfiguration();
+				break;
+		}
 
-			conf.setDelimiterParsingDisabled(true);
+		conf.setDelimiterParsingDisabled(true);
 
-			if (conf instanceof FileConfiguration) {
-				((FileConfiguration) conf).setURL(Reflections.getResourceAsURL(this.resource));
-				((FileConfiguration) conf).load();
-			}
+		if (conf instanceof FileConfiguration) {
+			((FileConfiguration) conf).setURL(Reflections.getResourceAsURL(this.resource));
 
-			this.configuration = conf;
+			try {
+				((FileConfiguration) conf).load();
 
-		} catch (FileNotFoundException cause) {
-			cause.printStackTrace();
-		} catch (org.apache.commons.configuration.ConfigurationException e) {
-			e.printStackTrace();
+			} catch (org.apache.commons.configuration.ConfigurationException cause) {
+				conf = null;
+			}
 		}
+
+		this.configuration = conf;
 	}
 
 	private void loadResource() {
@@ -211,5 +214,15 @@ public class ConfigurationLoader implements Serializable {
 	}
 
 	private void validateValues() {
+		for (Field field : getFields()) {
+			validateValue(field);
+		}
+	}
+
+	private void validateValue(Field field) {
+		if (field.isAnnotationPresent(NotNull.class) && Reflections.getFieldValue(field, this.object) == null) {
+			throw new ConfigurationException("");
+			// TODO: Pegar mensagem do Bundle e verificar como as mensagens de log estão implementadas
+		}
 	}
 }
--
libgit2 0.21.2