From c8dc5e0c5628f6e554b43b40531ae15415ebfb40 Mon Sep 17 00:00:00 2001
From: Emerson Oliveira <emerson.sdoliveira@gmail.com>
Date: Thu, 11 Apr 2013 09:17:34 -0300
Subject: [PATCH] Adicionada na classe ConfigurationLoader a funcionalidade que permite a utilização dos validadores de atributo da especificação Bean Validation (JSR 303). Foi adicionada ao pom a dependência para a implementação de referência dessa especificação (Hibernate Validator) para realização de testes.

---
 impl/core/pom.xml                                                                                   |  5 +++++
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java | 26 ++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/impl/core/pom.xml b/impl/core/pom.xml
index d618d17..3366900 100755
--- a/impl/core/pom.xml
+++ b/impl/core/pom.xml
@@ -206,6 +206,11 @@
 			<artifactId>weld-se-core</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 		<!--
 		<dependency>
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java
index 308267d..88e3828 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java
@@ -43,8 +43,14 @@ import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
 
 import org.apache.commons.configuration.AbstractConfiguration;
 import org.apache.commons.configuration.FileConfiguration;
@@ -275,10 +281,22 @@ public class ConfigurationLoader implements Serializable {
 		}
 	}
 
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private void validateValue(Field field, Object value) {
-		if (field.isAnnotationPresent(NotNull.class) && value == null) {
-			throw new ConfigurationException(getBundle().getString("configuration-attribute-is-mandatory",
-					this.prefix + getKey(field), this.resource), new NullPointerException());
+		ValidatorFactory dfv = Validation.buildDefaultValidatorFactory();
+		Validator validator = dfv.getValidator();
+
+		Set violations = validator.validateProperty(this.object, field.getName());
+		
+		StringBuffer message = new StringBuffer();
+
+		if (!violations.isEmpty()) {
+			for (Iterator iter = violations.iterator(); iter.hasNext();) {
+				ConstraintViolation violation = (ConstraintViolation)iter.next();
+				message.append(field.toGenericString() + " " + violation.getMessage() + "\n");
+			}
+			
+			throw new ConfigurationException(message.toString(), new ConstraintViolationException(violations));
 		}
 	}
 
--
libgit2 0.21.2