Merge branch '2.4.0' of git@github.com:demoiselle/framework.git into 2.4.0

Cleverson Sacramento
2 parents daacc597 3129d685
Showing 27 changed files with 352 additions and 91 deletions Show diff stats
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/ignored/AbstractIgnoredFieldConfig.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/ignored/ConfigurationIgnoredFieldTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/AbstractNamedFieldConfig.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/named/ConfigurationNamedFieldTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/AbstractNotNullFieldConfig.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/ConfigurationNotNullFieldTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/PropertyWithoutFileConfig.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithEmptyFieldConfig.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithFilledFieldConfig.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutFileConfig.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/field/notnull/XMLWithoutNotNullField.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/ConfigurationPrefixTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/ExistentPrefix.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/MissingPrefix.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PrefixEndingWithDot.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyMissingPrefix.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyPrefixEndingWithDot.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/PropertyPrefixEndingWithoutDot.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/XMLMissingPrefix.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/configuration/prefix/XMLPrefixEndingWithDot.java
@@ -41,13 +41,9 @@ import br.gov.frameworkdemoiselle.annotation.Ignore;
 public abstract class AbstractIgnoredFieldConfig {
  
 	@Ignore
-	private int ignoredInt;
+	private int ignoredAttribute;
  
-	public int getIgnoredInt() {
-		return ignoredInt;
-	}
-
-	public void setIgnoredInt(int ignoredInt) {
-		this.ignoredInt = ignoredInt;
+	public int getIgnoredAttribute() {
+		return ignoredAttribute;
 	}
 }
@@ -78,11 +78,11 @@ public class ConfigurationIgnoredFieldTest extends AbstractConfigurationTest {
 	}
  
 	@Test
-	public void loadIgnoredInt() {
+	public void loadIgnoredAttribute() {
 		int expected = 0;
  
-		assertEquals(expected, filledFieldConfig.getIgnoredInt());
-		assertEquals(expected, noFileConfig.getIgnoredInt());
-		assertEquals(expected, emptyFieldsConfig.getIgnoredInt());
+		assertEquals(expected, filledFieldConfig.getIgnoredAttribute());
+		assertEquals(expected, noFileConfig.getIgnoredAttribute());
+		assertEquals(expected, emptyFieldsConfig.getIgnoredAttribute());
 	}
 }
@@ -41,35 +41,23 @@ import br.gov.frameworkdemoiselle.annotation.Name;
 public abstract class AbstractNamedFieldConfig {
  
 	@Name("main.int")
-	private int intUniqueName;
+	private int uniqueNameAttribute;
  
 	@Name("nonexistent.property")
-	private int intNotPresent;
+	private int notPresentAttribute;
  
 	@Name("attribute.without.file")
-	private int intNamedWithoutFile;
+	private int namedWithoutFileAttribute;
  
-	public int getIntUniqueName() {
-		return intUniqueName;
+	public int intUniqueNameAttribute() {
+		return uniqueNameAttribute;
 	}
  
-	public void setIntUniqueName(int intUniqueName) {
-		this.intUniqueName = intUniqueName;
+	public int intNotPresentAttribute() {
+		return notPresentAttribute;
 	}
  
-	public int getIntNotPresent() {
-		return intNotPresent;
-	}
-
-	public void setIntNotPresent(int intNotPresent) {
-		this.intNotPresent = intNotPresent;
-	}
-
-	public int getIntNamedWithoutFile() {
-		return intNamedWithoutFile;
-	}
-
-	public void setIntNamedWithoutFile(int intNamedWithoutFile) {
-		this.intNamedWithoutFile = intNamedWithoutFile;
+	public int intNamedWithoutFileAttribute() {
+		return namedWithoutFileAttribute;
 	}
 }
@@ -76,19 +76,19 @@ public class ConfigurationNamedFieldTest extends AbstractConfigurationTest {
  
 	@Test
 	public void loadNamedConfigFromPropertyWithName() {
-		assertEquals(1, propertyNamed.getIntUniqueName());
-		assertEquals(1, xmlNamed.getIntUniqueName());
+		assertEquals(1, propertyNamed.intUniqueNameAttribute());
+		assertEquals(1, xmlNamed.intUniqueNameAttribute());
 	}
  
 	@Test
 	public void loadNamedConfigFromNonexistentProperty() {
-		assertEquals(0, propertyNamed.getIntNotPresent());
-		assertEquals(0, xmlNamed.getIntNotPresent());
+		assertEquals(0, propertyNamed.intNotPresentAttribute());
+		assertEquals(0, xmlNamed.intNotPresentAttribute());
 	}
  
 	@Test
 	public void loadNamedConfigFromPropertyWithoutField() {
-		assertEquals(0, propertyNamed.getIntNamedWithoutFile());
-		assertEquals(0, xmlNamed.getIntNamedWithoutFile());
+		assertEquals(0, propertyNamed.intNamedWithoutFileAttribute());
+		assertEquals(0, xmlNamed.intNamedWithoutFileAttribute());
 	}
 }
@@ -41,9 +41,9 @@ import javax.validation.constraints.NotNull;
 public abstract class AbstractNotNullFieldConfig {
  
 	@NotNull
-	private Integer integerNotNull;
+	private Integer attibuteNotNull;
  
-	public Integer getIntegerNotNull() {
-		return integerNotNull;
+	public Integer getAttributeNotNull() {
+		return attibuteNotNull;
 	}
 }
@@ -59,16 +59,28 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
 public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest {
  
 	@Inject
-	private PropertyWithFilledFieldConfig filledFieldConfig;
+	private PropertyWithFilledFieldConfig propertyFilledFieldConfig;
  
 	@Inject
-	private PropertyWithEmptyFieldConfig emptyFieldsConfig;
+	private PropertyWithEmptyFieldConfig propertyEmptyFieldsConfig;
  
 	@Inject
-	private PropertyWithoutNotNullField withoutNotNullField;
+	private PropertyWithoutNotNullField propertyWithoutNotNullField;
  
 	@Inject
-	private PropertyWithoutFileConfig noFileConfig;
+	private PropertyWithoutFileConfig propertyNoFileConfig;
+
+	@Inject
+	private XMLWithFilledFieldConfig xmlFilledFieldConfig;
+
+	@Inject
+	private XMLWithEmptyFieldConfig xmlEmptyFieldsConfig;
+
+	@Inject
+	private XMLWithoutNotNullField xmlWithoutNotNullField;
+
+	@Inject
+	private XMLWithoutFileConfig xmlNoFileConfig;
  
 	@Deployment
 	public static JavaArchive createDeployment() {
@@ -85,22 +97,40 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest {
 				.addAsResource(
 						new FileAsset(new File(
 								"src/test/resources/configuration/field/notnull/without-field.properties")),
-						"without-field.properties");
+						"without-field.properties")
+				.addAsResource(
+						new FileAsset(new File("src/test/resources/configuration/field/notnull/demoiselle.xml")),
+						"demoiselle.xml")
+				.addAsResource(
+						new FileAsset(new File("src/test/resources/configuration/field/notnull/empty-field.xml")),
+						"empty-field.xml")
+				.addAsResource(
+						new FileAsset(new File(
+								"src/test/resources/configuration/field/notnull/without-field.xml")),
+						"without-field.xml");
  
 		return deployment;
 	}
  
 	@Test
-	public void loadFieldNotNullFromFilledProperty() {
+	public void loadFieldNotNullFromFilledFile() {
 		Integer expected = 1;
  
-		assertEquals(expected, filledFieldConfig.getIntegerNotNull());
+		assertEquals(expected, propertyFilledFieldConfig.getAttributeNotNull());
+		assertEquals(expected, xmlFilledFieldConfig.getAttributeNotNull());
 	}
  
 	@Test
 	public void loadFieldNotNullFromEmptyProperty() {
 		try {
-			emptyFieldsConfig.getIntegerNotNull();
+			propertyEmptyFieldsConfig.getAttributeNotNull();
+			fail();
+		} catch (ConfigurationException cause) {
+			Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
+		}
+
+		try {
+			xmlEmptyFieldsConfig.getAttributeNotNull();
 			fail();
 		} catch (ConfigurationException cause) {
 			Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
@@ -110,7 +140,14 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest {
 	@Test
 	public void loadFieldFromPropertyFileWithoutNotNullField() {
 		try {
-			withoutNotNullField.getIntegerNotNull();
+			propertyWithoutNotNullField.getAttributeNotNull();
+			fail();
+		} catch (ConfigurationException cause) {
+			Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
+		}
+
+		try {
+			xmlWithoutNotNullField.getAttributeNotNull();
 			fail();
 		} catch (ConfigurationException cause) {
 			Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
@@ -120,7 +157,14 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest {
 	@Test
 	public void loadFieldNotNullFromInexistentPropertyFile() {
 		try {
-			noFileConfig.getIntegerNotNull();
+			propertyNoFileConfig.getAttributeNotNull();
+			fail();
+		} catch (ConfigurationException cause) {
+			Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
+		}
+		
+		try {
+			xmlNoFileConfig.getAttributeNotNull();
 			fail();
 		} catch (ConfigurationException cause) {
 			Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
@@ -36,8 +36,9 @@
  */
 package br.gov.frameworkdemoiselle.configuration.field.notnull;
  
+import static br.gov.frameworkdemoiselle.configuration.ConfigType.PROPERTIES;
 import br.gov.frameworkdemoiselle.configuration.Configuration;
  
-@Configuration(resource = "nofile")
+@Configuration(resource = "nofile", type = PROPERTIES)
 public class PropertyWithoutFileConfig extends AbstractNotNullFieldConfig {
 }
@@ -0,0 +1,8 @@
+package br.gov.frameworkdemoiselle.configuration.field.notnull;
+
+import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(resource = "empty-field", type = XML)
+public class XMLWithEmptyFieldConfig extends AbstractNotNullFieldConfig {
+}
@@ -0,0 +1,8 @@
+package br.gov.frameworkdemoiselle.configuration.field.notnull;
+
+import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(resource = "demoiselle", type = XML)
+public class XMLWithFilledFieldConfig extends AbstractNotNullFieldConfig {
+}
@@ -0,0 +1,8 @@
+package br.gov.frameworkdemoiselle.configuration.field.notnull;
+
+import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(resource = "nofile", type = XML)
+public class XMLWithoutFileConfig extends AbstractNotNullFieldConfig {
+}
@@ -0,0 +1,8 @@
+package br.gov.frameworkdemoiselle.configuration.field.notnull;
+
+import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(resource = "without-field", type = XML)
+public class XMLWithoutNotNullField extends AbstractNotNullFieldConfig {
+}
@@ -56,37 +56,57 @@ import br.gov.frameworkdemoiselle.configuration.AbstractConfigurationTest;
 public class ConfigurationPrefixTest extends AbstractConfigurationTest {
  
 	@Inject
-	private ExistentPrefix existentPrefix;
+	private PropertyPrefixEndingWithoutDot propertyEndingWithoutDotPrefix;
  
 	@Inject
-	private MissingPrefix missingPrefix;
+	private PropertyMissingPrefix propertyMissingPrefix;
  
 	@Inject
-	private PrefixEndingWithDot endingWithDotPrefix;
+	private PropertyPrefixEndingWithDot propertyEndingWithDotPrefix;
+	
+	
+	@Inject
+	private XMLPrefixEndingWithoutDot xmlEndingWithoutDotPrefix;
+
+	@Inject
+	private XMLMissingPrefix xmlMissingPrefix;
+
+	@Inject
+	private XMLPrefixEndingWithDot xmlEndingWithDotPrefix;
  
 	@Deployment
 	public static JavaArchive createDeployment() {
 		JavaArchive deployment = createConfigurationDeployment();
  
 		deployment.addPackages(true, ConfigurationPrefixTest.class.getPackage());
-		deployment.addAsResource(new FileAsset(
-				new File("src/test/resources/configuration/prefix/demoiselle.properties")), "demoiselle.properties");
+		deployment.addAsResource(
+				new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.properties")),
+				"demoiselle.properties").addAsResource(
+				new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.xml")),
+				"demoiselle.xml");
  
 		return deployment;
 	}
  
 	@Test
 	public void loadFromPrefixedExistentProperty() {
-		assertEquals("with prefix", existentPrefix.getPrefixedAttribute());
+		String expected = "prefix ending without dot";
+		
+		assertEquals(expected, propertyEndingWithoutDotPrefix.getPrefixedAttribute());
+		assertEquals(expected, xmlEndingWithoutDotPrefix.getPrefixedAttribute());
 	}
  
 	@Test
 	public void loadFromPrefixedWithouPrefixOnProperty() {
-		assertNull(missingPrefix.getPrefixedAttribute());
+		assertNull(propertyMissingPrefix.getPrefixedAttribute());
+		assertNull(xmlMissingPrefix.getPrefixedAttribute());
 	}
  
 	@Test
 	public void loadPrefixEndingWithDot() {
-		assertEquals("prefix ending with dot", endingWithDotPrefix.getPrefixedAttribute());
+		String expected = "prefix ending with dot";
+		
+		assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute());
+		assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute());
 	}
 }
@@ -1,7 +0,0 @@
-package br.gov.frameworkdemoiselle.configuration.prefix;
-
-import br.gov.frameworkdemoiselle.configuration.Configuration;
-
-@Configuration(prefix = "prefix")
-public class ExistentPrefix extends AbstractPrefixConfig {
-}
@@ -1,7 +0,0 @@
-package br.gov.frameworkdemoiselle.configuration.prefix;
-
-import br.gov.frameworkdemoiselle.configuration.Configuration;
-
-@Configuration(prefix = "missing.prefix")
-public class MissingPrefix extends AbstractPrefixConfig {
-}
@@ -1,7 +0,0 @@
-package br.gov.frameworkdemoiselle.configuration.prefix;
-
-import br.gov.frameworkdemoiselle.configuration.Configuration;
-
-@Configuration(prefix = "endingWithDot.")
-public class PrefixEndingWithDot extends AbstractPrefixConfig {
-}
@@ -0,0 +1,7 @@
+package br.gov.frameworkdemoiselle.configuration.prefix;
+
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(prefix = "missing.prefix")
+public class PropertyMissingPrefix extends AbstractPrefixConfig {
+}
@@ -0,0 +1,7 @@
+package br.gov.frameworkdemoiselle.configuration.prefix;
+
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(prefix = "endingWithDot.")
+public class PropertyPrefixEndingWithDot extends AbstractPrefixConfig {
+}
@@ -0,0 +1,7 @@
+package br.gov.frameworkdemoiselle.configuration.prefix;
+
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(prefix = "prefix")
+public class PropertyPrefixEndingWithoutDot extends AbstractPrefixConfig {
+}
@@ -0,0 +1,8 @@
+package br.gov.frameworkdemoiselle.configuration.prefix;
+
+import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(type = XML, prefix = "missing.prefix")
+public class XMLMissingPrefix extends AbstractPrefixConfig {
+}
@@ -0,0 +1,8 @@
+package br.gov.frameworkdemoiselle.configuration.prefix;
+
+import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(type = XML, prefix = "endingWithDot.")
+public class XMLPrefixEndingWithDot extends AbstractPrefixConfig {
+}
@@ -0,0 +1,8 @@
+package br.gov.frameworkdemoiselle.configuration.prefix;
+
+import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML;
+import br.gov.frameworkdemoiselle.configuration.Configuration;
+
+@Configuration(type = XML, prefix = "prefix")
+public class XMLPrefixEndingWithoutDot extends AbstractPrefixConfig {
+}
@@ -33,12 +33,4 @@
 # ou escreva para a Fundação do Software Livre (FSF) Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  
-integerNotNull=1
-byteNotNull=2
-shortNotNull=3
-intNotNull=4
-longNotNull=5
-charNotNull=a
-floatNotNull=6.6
-doubleNotNull=7.7
-booleanNotNull=true
+attibuteNotNull=1
@@ -0,0 +1,40 @@
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses />
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses />
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+
+<configurations>
+	<attibuteNotNull>1</attibuteNotNull>
+</configurations>
@@ -0,0 +1,39 @@
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses />
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses />
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+<configurations>
+	<integerNotNull></integerNotNull>
+</configurations>
@@ -0,0 +1,39 @@
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses />
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses />
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+<configurations>
+	<propertyNotNull>1</propertyNotNull>
+</configurations>
@@ -33,6 +33,6 @@
 # ou escreva para a Fundação do Software Livre (FSF) Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  
-prefix.prefixedAttribute=with prefix
+prefix.prefixedAttribute=prefix ending without dot
 prefixedAttribute=without prefix
 endingWithDot.prefixedAttribute=prefix ending with dot
@@ -0,0 +1,46 @@
+<!--
+ Demoiselle Framework
+ Copyright (C) 2010 SERPRO
+ ============================================================================
+ This file is part of Demoiselle Framework.
+ 
+ Demoiselle Framework is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public License version 3
+ along with this program; if not,  see <http://www.gnu.org/licenses />
+ or write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA  02110-1301, USA.
+ ============================================================================
+ Este arquivo é parte do Framework Demoiselle.
+ 
+ O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
+ modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
+ do Software Livre (FSF).
+ 
+ Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
+ GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
+ APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
+ para maiores detalhes.
+ 
+ Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
+ "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses />
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+
+<configuration>
+	<prefix>
+		<prefixedAttribute>prefix ending without dot</prefixedAttribute>
+	</prefix>
+	<prefixedAttribute>without prefix</prefixedAttribute>
+	<endingWithDot>
+		<prefixedAttribute>prefix ending with dot</prefixedAttribute>
+	</endingWithDot>
+</configuration>
...	...	@@ -41,13 +41,9 @@ import br.gov.frameworkdemoiselle.annotation.Ignore;
41	41	public abstract class AbstractIgnoredFieldConfig {
42	42
43	43	@Ignore
44		- private int ignoredInt;
	44	+ private int ignoredAttribute;
45	45
46		- public int getIgnoredInt() {
47		- return ignoredInt;
48		- }
49		-
50		- public void setIgnoredInt(int ignoredInt) {
51		- this.ignoredInt = ignoredInt;
	46	+ public int getIgnoredAttribute() {
	47	+ return ignoredAttribute;
52	48	}
53	49	}
...	...
...	...	@@ -78,11 +78,11 @@ public class ConfigurationIgnoredFieldTest extends AbstractConfigurationTest {
78	78	}
79	79
80	80	@Test
81		- public void loadIgnoredInt() {
	81	+ public void loadIgnoredAttribute() {
82	82	int expected = 0;
83	83
84		- assertEquals(expected, filledFieldConfig.getIgnoredInt());
85		- assertEquals(expected, noFileConfig.getIgnoredInt());
86		- assertEquals(expected, emptyFieldsConfig.getIgnoredInt());
	84	+ assertEquals(expected, filledFieldConfig.getIgnoredAttribute());
	85	+ assertEquals(expected, noFileConfig.getIgnoredAttribute());
	86	+ assertEquals(expected, emptyFieldsConfig.getIgnoredAttribute());
87	87	}
88	88	}
...	...
...	...	@@ -41,35 +41,23 @@ import br.gov.frameworkdemoiselle.annotation.Name;
41	41	public abstract class AbstractNamedFieldConfig {
42	42
43	43	@Name("main.int")
44		- private int intUniqueName;
	44	+ private int uniqueNameAttribute;
45	45
46	46	@Name("nonexistent.property")
47		- private int intNotPresent;
	47	+ private int notPresentAttribute;
48	48
49	49	@Name("attribute.without.file")
50		- private int intNamedWithoutFile;
	50	+ private int namedWithoutFileAttribute;
51	51
52		- public int getIntUniqueName() {
53		- return intUniqueName;
	52	+ public int intUniqueNameAttribute() {
	53	+ return uniqueNameAttribute;
54	54	}
55	55
56		- public void setIntUniqueName(int intUniqueName) {
57		- this.intUniqueName = intUniqueName;
	56	+ public int intNotPresentAttribute() {
	57	+ return notPresentAttribute;
58	58	}
59	59
60		- public int getIntNotPresent() {
61		- return intNotPresent;
62		- }
63		-
64		- public void setIntNotPresent(int intNotPresent) {
65		- this.intNotPresent = intNotPresent;
66		- }
67		-
68		- public int getIntNamedWithoutFile() {
69		- return intNamedWithoutFile;
70		- }
71		-
72		- public void setIntNamedWithoutFile(int intNamedWithoutFile) {
73		- this.intNamedWithoutFile = intNamedWithoutFile;
	60	+ public int intNamedWithoutFileAttribute() {
	61	+ return namedWithoutFileAttribute;
74	62	}
75	63	}
...	...
...	...	@@ -76,19 +76,19 @@ public class ConfigurationNamedFieldTest extends AbstractConfigurationTest {
76	76
77	77	@Test
78	78	public void loadNamedConfigFromPropertyWithName() {
79		- assertEquals(1, propertyNamed.getIntUniqueName());
80		- assertEquals(1, xmlNamed.getIntUniqueName());
	79	+ assertEquals(1, propertyNamed.intUniqueNameAttribute());
	80	+ assertEquals(1, xmlNamed.intUniqueNameAttribute());
81	81	}
82	82
83	83	@Test
84	84	public void loadNamedConfigFromNonexistentProperty() {
85		- assertEquals(0, propertyNamed.getIntNotPresent());
86		- assertEquals(0, xmlNamed.getIntNotPresent());
	85	+ assertEquals(0, propertyNamed.intNotPresentAttribute());
	86	+ assertEquals(0, xmlNamed.intNotPresentAttribute());
87	87	}
88	88
89	89	@Test
90	90	public void loadNamedConfigFromPropertyWithoutField() {
91		- assertEquals(0, propertyNamed.getIntNamedWithoutFile());
92		- assertEquals(0, xmlNamed.getIntNamedWithoutFile());
	91	+ assertEquals(0, propertyNamed.intNamedWithoutFileAttribute());
	92	+ assertEquals(0, xmlNamed.intNamedWithoutFileAttribute());
93	93	}
94	94	}
...	...
...	...	@@ -41,9 +41,9 @@ import javax.validation.constraints.NotNull;
41	41	public abstract class AbstractNotNullFieldConfig {
42	42
43	43	@NotNull
44		- private Integer integerNotNull;
	44	+ private Integer attibuteNotNull;
45	45
46		- public Integer getIntegerNotNull() {
47		- return integerNotNull;
	46	+ public Integer getAttributeNotNull() {
	47	+ return attibuteNotNull;
48	48	}
49	49	}
...	...
...	...	@@ -59,16 +59,28 @@ import br.gov.frameworkdemoiselle.configuration.ConfigurationException;
59	59	public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest {
60	60
61	61	@Inject
62		- private PropertyWithFilledFieldConfig filledFieldConfig;
	62	+ private PropertyWithFilledFieldConfig propertyFilledFieldConfig;
63	63
64	64	@Inject
65		- private PropertyWithEmptyFieldConfig emptyFieldsConfig;
	65	+ private PropertyWithEmptyFieldConfig propertyEmptyFieldsConfig;
66	66
67	67	@Inject
68		- private PropertyWithoutNotNullField withoutNotNullField;
	68	+ private PropertyWithoutNotNullField propertyWithoutNotNullField;
69	69
70	70	@Inject
71		- private PropertyWithoutFileConfig noFileConfig;
	71	+ private PropertyWithoutFileConfig propertyNoFileConfig;
	72	+
	73	+ @Inject
	74	+ private XMLWithFilledFieldConfig xmlFilledFieldConfig;
	75	+
	76	+ @Inject
	77	+ private XMLWithEmptyFieldConfig xmlEmptyFieldsConfig;
	78	+
	79	+ @Inject
	80	+ private XMLWithoutNotNullField xmlWithoutNotNullField;
	81	+
	82	+ @Inject
	83	+ private XMLWithoutFileConfig xmlNoFileConfig;
72	84
73	85	@Deployment
74	86	public static JavaArchive createDeployment() {
...	...	@@ -85,22 +97,40 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest {
85	97	.addAsResource(
86	98	new FileAsset(new File(
87	99	"src/test/resources/configuration/field/notnull/without-field.properties")),
88		- "without-field.properties");
	100	+ "without-field.properties")
	101	+ .addAsResource(
	102	+ new FileAsset(new File("src/test/resources/configuration/field/notnull/demoiselle.xml")),
	103	+ "demoiselle.xml")
	104	+ .addAsResource(
	105	+ new FileAsset(new File("src/test/resources/configuration/field/notnull/empty-field.xml")),
	106	+ "empty-field.xml")
	107	+ .addAsResource(
	108	+ new FileAsset(new File(
	109	+ "src/test/resources/configuration/field/notnull/without-field.xml")),
	110	+ "without-field.xml");
89	111
90	112	return deployment;
91	113	}
92	114
93	115	@Test
94		- public void loadFieldNotNullFromFilledProperty() {
	116	+ public void loadFieldNotNullFromFilledFile() {
95	117	Integer expected = 1;
96	118
97		- assertEquals(expected, filledFieldConfig.getIntegerNotNull());
	119	+ assertEquals(expected, propertyFilledFieldConfig.getAttributeNotNull());
	120	+ assertEquals(expected, xmlFilledFieldConfig.getAttributeNotNull());
98	121	}
99	122
100	123	@Test
101	124	public void loadFieldNotNullFromEmptyProperty() {
102	125	try {
103		- emptyFieldsConfig.getIntegerNotNull();
	126	+ propertyEmptyFieldsConfig.getAttributeNotNull();
	127	+ fail();
	128	+ } catch (ConfigurationException cause) {
	129	+ Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
	130	+ }
	131	+
	132	+ try {
	133	+ xmlEmptyFieldsConfig.getAttributeNotNull();
104	134	fail();
105	135	} catch (ConfigurationException cause) {
106	136	Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
...	...	@@ -110,7 +140,14 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest {
110	140	@Test
111	141	public void loadFieldFromPropertyFileWithoutNotNullField() {
112	142	try {
113		- withoutNotNullField.getIntegerNotNull();
	143	+ propertyWithoutNotNullField.getAttributeNotNull();
	144	+ fail();
	145	+ } catch (ConfigurationException cause) {
	146	+ Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
	147	+ }
	148	+
	149	+ try {
	150	+ xmlWithoutNotNullField.getAttributeNotNull();
114	151	fail();
115	152	} catch (ConfigurationException cause) {
116	153	Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
...	...	@@ -120,7 +157,14 @@ public class ConfigurationNotNullFieldTest extends AbstractConfigurationTest {
120	157	@Test
121	158	public void loadFieldNotNullFromInexistentPropertyFile() {
122	159	try {
123		- noFileConfig.getIntegerNotNull();
	160	+ propertyNoFileConfig.getAttributeNotNull();
	161	+ fail();
	162	+ } catch (ConfigurationException cause) {
	163	+ Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
	164	+ }
	165	+
	166	+ try {
	167	+ xmlNoFileConfig.getAttributeNotNull();
124	168	fail();
125	169	} catch (ConfigurationException cause) {
126	170	Assert.assertEquals(NullPointerException.class, cause.getCause().getClass());
...	...
...	...	@@ -36,8 +36,9 @@
36	36	*/
37	37	package br.gov.frameworkdemoiselle.configuration.field.notnull;
38	38
	39	+import static br.gov.frameworkdemoiselle.configuration.ConfigType.PROPERTIES;
39	40	import br.gov.frameworkdemoiselle.configuration.Configuration;
40	41
41		-@Configuration(resource = "nofile")
	42	+@Configuration(resource = "nofile", type = PROPERTIES)
42	43	public class PropertyWithoutFileConfig extends AbstractNotNullFieldConfig {
43	44	}
...	...
...	...	@@ -0,0 +1,8 @@
	1	+package br.gov.frameworkdemoiselle.configuration.field.notnull;
	2	+
	3	+import static br.gov.frameworkdemoiselle.configuration.ConfigType.XML;
	4	+import br.gov.frameworkdemoiselle.configuration.Configuration;
	5	+
	6	+@Configuration(resource = "empty-field", type = XML)
	7	+public class XMLWithEmptyFieldConfig extends AbstractNotNullFieldConfig {
	8	+}
...	...
...	...	@@ -56,37 +56,57 @@ import br.gov.frameworkdemoiselle.configuration.AbstractConfigurationTest;
56	56	public class ConfigurationPrefixTest extends AbstractConfigurationTest {
57	57
58	58	@Inject
59		- private ExistentPrefix existentPrefix;
	59	+ private PropertyPrefixEndingWithoutDot propertyEndingWithoutDotPrefix;
60	60
61	61	@Inject
62		- private MissingPrefix missingPrefix;
	62	+ private PropertyMissingPrefix propertyMissingPrefix;
63	63
64	64	@Inject
65		- private PrefixEndingWithDot endingWithDotPrefix;
	65	+ private PropertyPrefixEndingWithDot propertyEndingWithDotPrefix;
	66	+
	67	+
	68	+ @Inject
	69	+ private XMLPrefixEndingWithoutDot xmlEndingWithoutDotPrefix;
	70	+
	71	+ @Inject
	72	+ private XMLMissingPrefix xmlMissingPrefix;
	73	+
	74	+ @Inject
	75	+ private XMLPrefixEndingWithDot xmlEndingWithDotPrefix;
66	76
67	77	@Deployment
68	78	public static JavaArchive createDeployment() {
69	79	JavaArchive deployment = createConfigurationDeployment();
70	80
71	81	deployment.addPackages(true, ConfigurationPrefixTest.class.getPackage());
72		- deployment.addAsResource(new FileAsset(
73		- new File("src/test/resources/configuration/prefix/demoiselle.properties")), "demoiselle.properties");
	82	+ deployment.addAsResource(
	83	+ new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.properties")),
	84	+ "demoiselle.properties").addAsResource(
	85	+ new FileAsset(new File("src/test/resources/configuration/prefix/demoiselle.xml")),
	86	+ "demoiselle.xml");
74	87
75	88	return deployment;
76	89	}
77	90
78	91	@Test
79	92	public void loadFromPrefixedExistentProperty() {
80		- assertEquals("with prefix", existentPrefix.getPrefixedAttribute());
	93	+ String expected = "prefix ending without dot";
	94	+
	95	+ assertEquals(expected, propertyEndingWithoutDotPrefix.getPrefixedAttribute());
	96	+ assertEquals(expected, xmlEndingWithoutDotPrefix.getPrefixedAttribute());
81	97	}
82	98
83	99	@Test
84	100	public void loadFromPrefixedWithouPrefixOnProperty() {
85		- assertNull(missingPrefix.getPrefixedAttribute());
	101	+ assertNull(propertyMissingPrefix.getPrefixedAttribute());
	102	+ assertNull(xmlMissingPrefix.getPrefixedAttribute());
86	103	}
87	104
88	105	@Test
89	106	public void loadPrefixEndingWithDot() {
90		- assertEquals("prefix ending with dot", endingWithDotPrefix.getPrefixedAttribute());
	107	+ String expected = "prefix ending with dot";
	108	+
	109	+ assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute());
	110	+ assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute());
91	111	}
92	112	}
...	...
...	...	@@ -1,7 +0,0 @@
1		-package br.gov.frameworkdemoiselle.configuration.prefix;
2		-
3		-import br.gov.frameworkdemoiselle.configuration.Configuration;
4		-
5		-@Configuration(prefix = "prefix")
6		-public class ExistentPrefix extends AbstractPrefixConfig {
7		-}