- Nuiton-utils-commits - mailman.cloud.codelutin.com

r2065 - trunk/nuiton-validator/src/license
by hudson＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: hudson Date: 2011-01-26 13:14:45 +0100 (Wed, 26 Jan 2011) New Revision: 2065 Url: http://nuiton.org/repositories/revision/nuiton-utils/2065 Log: fix third-parties Modified: trunk/nuiton-validator/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-validator/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-validator/src/license/THIRD-PARTY.properties 2011-01-26 12:14:35 UTC (rev 2064) +++ trunk/nuiton-validator/src/license/THIRD-PARTY.properties 2011-01-26 12:14:45 UTC (rev 2065) @@ -5,12 +5,11 @@ # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 09:14:11 CET 2010 +#Wed Jan 26 12:51:06 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License 1.1 - +javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 \ No newline at end of file

1 0

r2064 - tags/nuiton-utils-2.0/nuiton-validator/src/license
by hudson＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: hudson Date: 2011-01-26 13:14:35 +0100 (Wed, 26 Jan 2011) New Revision: 2064 Url: http://nuiton.org/repositories/revision/nuiton-utils/2064 Log: fix third-parties Modified: tags/nuiton-utils-2.0/nuiton-validator/src/license/THIRD-PARTY.properties Modified: tags/nuiton-utils-2.0/nuiton-validator/src/license/THIRD-PARTY.properties =================================================================== --- tags/nuiton-utils-2.0/nuiton-validator/src/license/THIRD-PARTY.properties 2011-01-26 12:01:19 UTC (rev 2063) +++ tags/nuiton-utils-2.0/nuiton-validator/src/license/THIRD-PARTY.properties 2011-01-26 12:14:35 UTC (rev 2064) @@ -5,12 +5,11 @@ # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 09:14:11 CET 2010 +#Wed Jan 26 13:05:36 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License 1.1 - +javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1

1 0

r2063 - in trunk: . nuiton-profiling nuiton-utils nuiton-validator
by hudson＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: hudson Date: 2011-01-26 13:01:19 +0100 (Wed, 26 Jan 2011) New Revision: 2063 Url: http://nuiton.org/repositories/revision/nuiton-utils/2063 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2011-01-26 12:01:18 UTC (rev 2062) +++ trunk/nuiton-profiling/pom.xml 2011-01-26 12:01:19 UTC (rev 2063) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-01-26 12:01:18 UTC (rev 2062) +++ trunk/nuiton-utils/pom.xml 2011-01-26 12:01:19 UTC (rev 2063) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-01-26 12:01:18 UTC (rev 2062) +++ trunk/nuiton-validator/pom.xml 2011-01-26 12:01:19 UTC (rev 2063) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 12:01:18 UTC (rev 2062) +++ trunk/pom.xml 2011-01-26 12:01:19 UTC (rev 2063) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -230,12 +230,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.0 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.0 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.0</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> </project>

1 0

r2062 - in tags: . nuiton-utils-2.0
by hudson＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: hudson Date: 2011-01-26 13:01:18 +0100 (Wed, 26 Jan 2011) New Revision: 2062 Url: http://nuiton.org/repositories/revision/nuiton-utils/2062 Log: [maven-release-plugin] copy for tag nuiton-utils-2.0 Added: tags/nuiton-utils-2.0/ Property changes on: tags/nuiton-utils-2.0 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2061 - in trunk: . nuiton-profiling nuiton-utils nuiton-validator
by hudson＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: hudson Date: 2011-01-26 13:01:17 +0100 (Wed, 26 Jan 2011) New Revision: 2061 Url: http://nuiton.org/repositories/revision/nuiton-utils/2061 Log: [maven-release-plugin] prepare release nuiton-utils-2.0 Modified: trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2011-01-26 10:39:56 UTC (rev 2060) +++ trunk/nuiton-profiling/pom.xml 2011-01-26 12:01:17 UTC (rev 2061) @@ -22,9 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-01-26 10:39:56 UTC (rev 2060) +++ trunk/nuiton-utils/pom.xml 2011-01-26 12:01:17 UTC (rev 2061) @@ -22,9 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-01-26 10:39:56 UTC (rev 2060) +++ trunk/nuiton-validator/pom.xml 2011-01-26 12:01:17 UTC (rev 2061) @@ -22,9 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 10:39:56 UTC (rev 2060) +++ trunk/pom.xml 2011-01-26 12:01:17 UTC (rev 2061) @@ -22,9 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -39,7 +37,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> <modules> <module>nuiton-utils</module> @@ -232,12 +230,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.0 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.0 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.0</url> </scm> </project>

1 0

r2060 - in trunk/nuiton-validator/src/test/java/org/nuiton/validator: . model
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 11:39:56 +0100 (Wed, 26 Jan 2011) New Revision: 2060 Url: http://nuiton.org/repositories/revision/nuiton-utils/2060 Log: improve AbstractValidatorDetectorTest Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/AbstractValidatorDetectorTest.java trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/ModelValidatorDetectorTestImpl.java Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/AbstractValidatorDetectorTest.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/AbstractValidatorDetectorTest.java 2011-01-26 10:39:27 UTC (rev 2059) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/AbstractValidatorDetectorTest.java 2011-01-26 10:39:56 UTC (rev 2060) @@ -25,9 +25,11 @@ package org.nuiton.validator; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import java.io.File; +import java.util.Iterator; import java.util.SortedSet; import java.util.regex.Pattern; @@ -76,5 +78,83 @@ return validators; } + public void assertValidatorModel(NuitonValidator<?> validator, + String expectedContext, + Class<?> expectedType, + NuitonValidatorScope... expectedScopes) { + ValidatorTestHelper.assertValidatorModel( + validator, + expectedContext, + expectedType, + expectedScopes + ); + } + public void assertValidatorEffectiveScopes(NuitonValidator<?> validator, + NuitonValidatorScope... expectedScopes) { + ValidatorTestHelper.assertValidatorEffectiveScopes(validator, + expectedScopes + ); + } + + public void assertValidatorEffectiveFields(NuitonValidator<?> validator, + String... expectedFields) { + + ValidatorTestHelper.assertValidatorEffectiveFields(validator, + expectedFields); + } + + public void assertValidatorEffectiveFields(NuitonValidator<?> validator, + NuitonValidatorScope scope, + String... expectedFields) { + ValidatorTestHelper.assertValidatorEffectiveFields(validator, + scope, + expectedFields); + } + + public void assertValidatorSetWithMultiContextName(SortedSet<NuitonValidator<?>> result, + Object... contextThenClass) { + + Assert.assertNotNull(result); + Assert.assertEquals(contextThenClass.length / 2, result.size()); + + Iterator<NuitonValidator<?>> itr = result.iterator(); + int index = 0; + + NuitonValidatorScope[] scopes = NuitonValidatorScope.values(); + + while (itr.hasNext()) { + NuitonValidator<?> next = itr.next(); + ValidatorTestHelper.assertValidatorModel(next, + (String) contextThenClass[2 * index], + (Class<?>) contextThenClass[2 * index + 1], + scopes); + index++; + } + + } + + public void assertValidatorSetWithSameContextName(SortedSet<NuitonValidator<?>> result, + String context, + Class<?>... contextThenClass) { + + Assert.assertNotNull(result); + Assert.assertEquals(contextThenClass.length, result.size()); + + Iterator<NuitonValidator<?>> itr = result.iterator(); + int index = 0; + + NuitonValidatorScope[] scopes = NuitonValidatorScope.values(); + + while (itr.hasNext()) { + NuitonValidator<?> next = itr.next(); + ValidatorTestHelper.assertValidatorModel(next, + context, + contextThenClass[index++], + scopes); + } + + } + + } Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/ModelValidatorDetectorTestImpl.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/ModelValidatorDetectorTestImpl.java 2011-01-26 10:39:27 UTC (rev 2059) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/ModelValidatorDetectorTestImpl.java 2011-01-26 10:39:56 UTC (rev 2060) @@ -29,7 +29,6 @@ import org.nuiton.validator.AbstractValidatorDetectorTest; import org.nuiton.validator.NuitonValidator; import org.nuiton.validator.NuitonValidatorScope; -import org.nuiton.validator.ValidatorTestHelper; import org.nuiton.validator.xwork2.XWork2NuitonValidatorProvider; import java.io.File; @@ -70,25 +69,23 @@ Assert.assertNotNull(result); Assert.assertEquals(3, result.size()); - iterator = result.iterator(); validator = iterator.next(); - ValidatorTestHelper.assertValidatorModel(validator, null, Person.class, NuitonValidatorScope.values()); - ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); - ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.ERROR, Person.PROPERTY_NAME, Person.PROPERTY_FIRSTNAME); - ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.WARNING, Person.PROPERTY_PET); + assertValidatorModel(validator, null, Person.class, NuitonValidatorScope.values()); + assertValidatorEffectiveScopes(validator, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + assertValidatorEffectiveFields(validator, NuitonValidatorScope.ERROR, Person.PROPERTY_NAME, Person.PROPERTY_FIRSTNAME); + assertValidatorEffectiveFields(validator, NuitonValidatorScope.WARNING, Person.PROPERTY_PET); validator = iterator.next(); - ValidatorTestHelper.assertValidatorModel(validator, null, Pet.class, NuitonValidatorScope.values()); - ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.ERROR); - ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.ERROR, Pet.PROPERTY_NAME); + assertValidatorModel(validator, null, Pet.class, NuitonValidatorScope.values()); + assertValidatorEffectiveScopes(validator, NuitonValidatorScope.ERROR); + assertValidatorEffectiveFields(validator, NuitonValidatorScope.ERROR, Pet.PROPERTY_NAME); validator = iterator.next(); - ValidatorTestHelper.assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.values()); - ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO); - ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME); - + assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.values()); + assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO); + assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME); } @Test @@ -108,9 +105,9 @@ iterator = result.iterator(); validator = iterator.next(); - ValidatorTestHelper.assertValidatorModel(validator, null, Person.class, NuitonValidatorScope.WARNING); - ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.WARNING); - ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.WARNING, Person.PROPERTY_PET); + assertValidatorModel(validator, null, Person.class, NuitonValidatorScope.WARNING); + assertValidatorEffectiveScopes(validator, NuitonValidatorScope.WARNING); + assertValidatorEffectiveFields(validator, NuitonValidatorScope.WARNING, Person.PROPERTY_PET); // test with no context and only fatal scope : no validator @@ -119,7 +116,6 @@ Assert.assertNotNull(result); Assert.assertTrue(result.isEmpty()); - } @Test @@ -140,9 +136,9 @@ iterator = result.iterator(); validator = iterator.next(); - ValidatorTestHelper.assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.values()); - ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO); - ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME); + assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.values()); + assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO); + assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME); // test with specific context fake and all scopes : no validator @@ -152,7 +148,6 @@ Assert.assertNotNull(result); Assert.assertTrue(result.isEmpty()); - } @Test @@ -162,7 +157,6 @@ NuitonValidator<?> validator; Iterator<NuitonValidator<?>> iterator; - // test with context 'context' and info-fatal scopes : one validator (Pet) result = detectValidators(Pattern.compile(CONTEXT), @@ -175,9 +169,9 @@ iterator = result.iterator(); validator = iterator.next(); - ValidatorTestHelper.assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.FATAL, NuitonValidatorScope.INFO); - ValidatorTestHelper.assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO); - ValidatorTestHelper.assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME); + assertValidatorModel(validator, CONTEXT, Pet.class, NuitonValidatorScope.FATAL, NuitonValidatorScope.INFO); + assertValidatorEffectiveScopes(validator, NuitonValidatorScope.INFO); + assertValidatorEffectiveFields(validator, NuitonValidatorScope.INFO, Pet.PROPERTY_NAME); // test with specific context fake and fatal scope : no validator @@ -187,7 +181,6 @@ Assert.assertNotNull(result); Assert.assertTrue(result.isEmpty()); - }

1 0

r2059 - trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 11:39:27 +0100 (Wed, 26 Jan 2011) New Revision: 2059 Url: http://nuiton.org/repositories/revision/nuiton-utils/2059 Log: add effective scopes and fields in BeanValidator + test nullity of scopes Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-26 10:38:34 UTC (rev 2058) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-26 10:39:27 UTC (rev 2059) @@ -382,6 +382,18 @@ return delegate.getModel().getScopes(); } + public Set<NuitonValidatorScope> getEffectiveScopes() { + return delegate.getEffectiveScopes(); + } + + public Set<String> getEffectiveFields() { + return delegate.getEffectiveFields(); + } + + public Set<String> getEffectiveFields(NuitonValidatorScope scope) { + return delegate.getEffectiveFields(scope); + } + public void setScopes(NuitonValidatorScope... scopes) { Set<NuitonValidatorScope> oldScopes = getScopes(); @@ -418,7 +430,7 @@ setBean(null); } - if (scopes.length == 0) { + if (scopes==null || scopes.length == 0) { scopes = NuitonValidatorScope.values(); }

1 0

r2058 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 11:38:34 +0100 (Wed, 26 Jan 2011) New Revision: 2058 Url: http://nuiton.org/repositories/revision/nuiton-utils/2058 Log: Evolution #1235: Add new convinient methods in ReflectUtil Added: trunk/nuiton-utils/src/test/java/org/nuiton/util/ReflectUtilTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ReflectUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ReflectUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ReflectUtil.java 2011-01-25 16:56:18 UTC (rev 2057) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ReflectUtil.java 2011-01-26 10:38:34 UTC (rev 2058) @@ -275,7 +275,54 @@ } /** + * Obtain all the declared fields of the given {@code objectClass} with a + * deep scan inside super classes and interfaces. + * + * Note: The type {@link Object} will not be scanned. + * + * @param objectClass the object class to scan + * @return the set of all declared fields found + * @since 2.0 + */ + public static Set<Field> getAllDeclaredFields(Class<?> objectClass) { + Set<Field> result = new HashSet<Field>(); + Set<Class<?>> visitedClasses = new HashSet<Class<?>>(); + + try { + getAllDeclaredFields(objectClass, visitedClasses, result); + } finally { + visitedClasses.clear(); + } + return result; + } + + /** + * Obtain all the declared methods of the given {@code objectClass} with a + * deep scan inside super classes and interfaces. + * + * Note: The type {@link Object} will not be scanned. + * + * @param objectClass the object class to scan + * @return the set of all declared methods found + * @since 2.0 + */ + public static Set<Method> getAllDeclaredMethods(Class<?> objectClass) { + Set<Method> result = new HashSet<Method>(); + Set<Class<?>> visitedClasses = new HashSet<Class<?>>(); + + try { + getAllDeclaredMethods(objectClass, visitedClasses, result); + } finally { + visitedClasses.clear(); + } + return result; + } + + /** * Obtain all the fields with the given annotation type. + * + * Note: This method will not scan deeply the given type + * (no scan of super-classes nor interfaces). * * @param objectClass the type to scan * @param annotationClass the type of annotation to scan @@ -285,16 +332,108 @@ */ public static <A extends Annotation> Map<Field, A> getFieldAnnotation(Class<?> objectClass, Class<A> annotationClass) { + Map<Field, A> result = getFieldAnnotation(objectClass, + annotationClass, + false + ); + return result; + } + + /** + * Obtain all the fields with the given annotation type. + * + * Note: This method will scan deeply the given type + * if parameter {@code deepVisit} is setted to {@code true}. + * + * Note: The type {@link Object} will not be scanned. + * + * @param objectClass the type to scan + * @param annotationClass the type of annotation to scan + * @param deepVisit flag to visit deeply the class (if set to + * {@code true}, will also scan super classes + * and interfaces) + * @param <A> type of annotation to scan + * @return the dictionnary of fields with the given annotation + * @since 2.0 + */ + public static <A extends Annotation> Map<Field, A> getFieldAnnotation(Class<?> objectClass, + Class<A> annotationClass, + boolean deepVisit) { + Map<Field, A> result = new HashMap<Field, A>(); - for (Field field : objectClass.getDeclaredFields()) { - A annotation = field.getAnnotation(annotationClass); - if (annotation != null) { - result.put(field, annotation); - } + Set<Class<?>> visitedClasses = new HashSet<Class<?>>(); + + try { + getFieldAnnotation(objectClass, + annotationClass, + deepVisit, + visitedClasses, + result + ); + } finally { + visitedClasses.clear(); } + return result; } + /** + * Obtain all the methods with the given annotation type. + * + * Note: This method will not scan deeply the given type + * (no scan of super-classes nor interfaces). + * + * @param objectClass the type to scan + * @param annotationClass the type of annotation to scan + * @param <A> type of annotation to scan + * @return the dictionnary of methods with the given annotation + * @since 2.0 + */ + public static <A extends Annotation> Map<Method, A> getMethodAnnotation(Class<?> objectClass, + Class<A> annotationClass) { + Map<Method, A> result = getMethodAnnotation(objectClass, + annotationClass, + false + ); + return result; + } + + /** + * Obtain all the methods with the given annotation type. + * + * Note: This method will scan deeply the given type + * if parameter {@code deepVisit} is setted to {@code true}. + * + * Note: The type {@link Object} will not be scanned. + * + * @param objectClass the type to scan + * @param annotationClass the type of annotation to scan + * @param <A> type of annotation to scan + * @param deepVisit flag to visit deeply the class (if set to + * {@code true}, will also scan super classes + * and interfaces) + * @return the dictionnary of methods with the given annotation + * @since 2.0 + */ + public static <A extends Annotation> Map<Method, A> getMethodAnnotation(Class<?> objectClass, + Class<A> annotationClass, + boolean deepVisit) { + Map<Method, A> result = new HashMap<Method, A>(); + Set<Class<?>> visitedClasses = new HashSet<Class<?>>(); + + try { + getMethodAnnotation(objectClass, + annotationClass, + deepVisit, + visitedClasses, + result + ); + } finally { + visitedClasses.clear(); + } + return result; + } + protected static Method getDeclaredMethod(Class<?> klass, String methodName, Set<Class<?>> visitedClasses, @@ -391,4 +530,192 @@ return method; } + + protected static void getAllDeclaredFields(Class<?> objectClass, + Set<Class<?>> visitedClasses, + Set<Field> result) { + + if (visitedClasses.contains(objectClass) || + Object.class.equals(objectClass)) { + + // already scanned + // or arrives to Object.class + return; + } + + // mark as scanned + visitedClasses.add(objectClass); + + Field[] declaredFields = objectClass.getDeclaredFields(); + result.addAll(Arrays.asList(declaredFields)); + + Class<?> superclass = objectClass.getSuperclass(); + if (superclass != null) { + + // scan also the superclass + getAllDeclaredFields(superclass, + visitedClasses, + result + ); + } + + Class<?>[] interfaces = objectClass.getInterfaces(); + + for (Class<?> anInterface : interfaces) { + + // scan also the interface + getAllDeclaredFields(anInterface, + visitedClasses, + result + ); + } + + } + + protected static void getAllDeclaredMethods(Class<?> objectClass, + Set<Class<?>> visitedClasses, + Set<Method> result) { + + if (visitedClasses.contains(objectClass) || + Object.class.equals(objectClass)) { + + // already scanned + // or arrives to Object.class + return; + } + + // mark as scanned + visitedClasses.add(objectClass); + + Method[] declaredFields = objectClass.getDeclaredMethods(); + result.addAll(Arrays.asList(declaredFields)); + + Class<?> superclass = objectClass.getSuperclass(); + if (superclass != null) { + + // scan also the superclass + getAllDeclaredMethods(superclass, + visitedClasses, + result + ); + } + + Class<?>[] interfaces = objectClass.getInterfaces(); + + for (Class<?> anInterface : interfaces) { + + // scan also the interface + getAllDeclaredMethods(anInterface, + visitedClasses, + result + ); + } + + } + + protected static <A extends Annotation> void getFieldAnnotation(Class<?> objectClass, + Class<A> annotationClass, + boolean deepVisit, + Set<Class<?>> visitedClasses, + Map<Field, A> result) { + + if (visitedClasses.contains(objectClass) || + Object.class.equals(objectClass)) { + + // already scanned + // or arrives to Object.class + return; + } + + // mark as scanned + visitedClasses.add(objectClass); + + for (Field field : objectClass.getDeclaredFields()) { + A annotation = field.getAnnotation(annotationClass); + if (annotation != null) { + result.put(field, annotation); + } + } + + if (deepVisit) { + + Class<?> superclass = objectClass.getSuperclass(); + if (superclass != null) { + + // scan also the superclass + getFieldAnnotation(superclass, + annotationClass, + deepVisit, + visitedClasses, + result + ); + } + + Class<?>[] interfaces = objectClass.getInterfaces(); + + for (Class<?> anInterface : interfaces) { + + // scan also the interface + getFieldAnnotation(anInterface, + annotationClass, + deepVisit, + visitedClasses, + result + ); + } + } + } + + protected static <A extends Annotation> void getMethodAnnotation(Class<?> objectClass, + Class<A> annotationClass, + boolean deepVisit, + Set<Class<?>> visitedClasses, + Map<Method, A> result) { + + if (visitedClasses.contains(objectClass) || + Object.class.equals(objectClass)) { + + // already scanned + // or arrives to Object.class + return; + } + + // mark as scanned + visitedClasses.add(objectClass); + + for (Method method : objectClass.getDeclaredMethods()) { + A annotation = method.getAnnotation(annotationClass); + if (annotation != null) { + result.put(method, annotation); + } + } + + if (deepVisit) { + + Class<?> superclass = objectClass.getSuperclass(); + if (superclass != null) { + + // scan also the superclass + getMethodAnnotation(superclass, + annotationClass, + deepVisit, + visitedClasses, + result + ); + } + + Class<?>[] interfaces = objectClass.getInterfaces(); + + for (Class<?> anInterface : interfaces) { + + // scan also the interface + getMethodAnnotation(anInterface, + annotationClass, + deepVisit, + visitedClasses, + result + ); + } + } + } } Added: trunk/nuiton-utils/src/test/java/org/nuiton/util/ReflectUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/ReflectUtilTest.java (rev 0) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/ReflectUtilTest.java 2011-01-26 10:38:34 UTC (rev 2058) @@ -0,0 +1,394 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.util; + +import org.junit.Assert; +import org.junit.Test; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Map; +import java.util.Set; + +/** + * To test the class {@link ReflectUtil}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class ReflectUtilTest { + + public static class MyClass { + + @SuppressWarnings("") + @Deprecated + public String publicField; + + @SuppressWarnings("") + @Deprecated + protected String protectedField; + + @SuppressWarnings("") + @Deprecated + private String privateField; + + @SuppressWarnings("") + @Deprecated + String field; + + @SuppressWarnings("") + String fieldSkipped; + + @SuppressWarnings("") + @Deprecated + public void publicMethod() { + + } + + @SuppressWarnings("") + @Deprecated + protected void protectedMethod() { + + } + + @SuppressWarnings("") + @Deprecated + private void privateMethod() { + + } + + @SuppressWarnings("") + @Deprecated + void method() { + + } + + @SuppressWarnings("") + void methodSkipped() { + + } + } + + public static class MySubClass extends MyClass { + + @SuppressWarnings("") + @Deprecated + String field2; + + @SuppressWarnings("") + @Deprecated + void method2() { + + } + } + + @Test + public void getAllDeclaredFields() throws NoSuchFieldException { + + Set<Field> fields; + + fields = ReflectUtil.getAllDeclaredFields(MyClass.class); + + assertGetAllDeclaredFields(fields, + "publicField", + "protectedField", + "privateField", + "field", + "fieldSkipped" + ); + + fields = ReflectUtil.getAllDeclaredFields(MySubClass.class); + + assertGetAllDeclaredFields(fields, + "publicField", + "protectedField", + "privateField", + "field", + "fieldSkipped", + "field2" + ); + + } + + @Test + public void getAllDeclaredMethods() throws NoSuchFieldException { + + Set<Method> methods; + + methods = ReflectUtil.getAllDeclaredMethods(MyClass.class); + + assertGetAllDeclaredMethods(methods, + "publicMethod", + "protectedMethod", + "privateMethod", + "method", + "methodSkipped" + ); + + methods = ReflectUtil.getAllDeclaredMethods(MySubClass.class); + + assertGetAllDeclaredMethods(methods, + "publicMethod", + "protectedMethod", + "privateMethod", + "method", + "methodSkipped", + "method2" + ); + + } + + @Test + public void getFieldAnnotation() throws NoSuchFieldException { + + Map<Field, ? extends Annotation> fieldAnnotation; + + // SuppressWarning is source scope so will disappear at compilation :) + fieldAnnotation = ReflectUtil.getFieldAnnotation(MyClass.class, + SuppressWarnings.class); + + assertFieldAnnotation(MyClass.class, fieldAnnotation); + + // SuppressWarning is source scope so will disappear at compilation :) + fieldAnnotation = ReflectUtil.getFieldAnnotation(MyClass.class, + SuppressWarnings.class, + true); + + assertFieldAnnotation(MyClass.class, fieldAnnotation); + + // SuppressWarning is source scope so will disappear at compilation :) + fieldAnnotation = ReflectUtil.getFieldAnnotation(MySubClass.class, + SuppressWarnings.class); + + assertFieldAnnotation(MySubClass.class, fieldAnnotation); + + // SuppressWarning is source scope so will disappear at compilation :) + fieldAnnotation = ReflectUtil.getFieldAnnotation(MySubClass.class, + SuppressWarnings.class, + true); + + assertFieldAnnotation(MySubClass.class, fieldAnnotation); + + fieldAnnotation = ReflectUtil.getFieldAnnotation(MyClass.class, + Deprecated.class); + + assertFieldAnnotation(MyClass.class, + fieldAnnotation, + "publicField", + "protectedField", + "privateField", + "field" + ); + + + fieldAnnotation = ReflectUtil.getFieldAnnotation(MyClass.class, + Deprecated.class, + true); + + assertFieldAnnotation(MyClass.class, + fieldAnnotation, + "publicField", + "protectedField", + "privateField", + "field" + ); + + fieldAnnotation = ReflectUtil.getFieldAnnotation(MySubClass.class, + Deprecated.class); + + assertFieldAnnotation(MySubClass.class, + fieldAnnotation, + "field2" + ); + + fieldAnnotation = ReflectUtil.getFieldAnnotation(MySubClass.class, + Deprecated.class, + true); + + assertFieldAnnotation(MySubClass.class, + fieldAnnotation, + "publicField", + "protectedField", + "privateField", + "field", + "field2" + ); + + } + + @Test + public void getMethodAnnotation() throws NoSuchMethodException { + + Map<Method, ? extends Annotation> methodAnnotation; + + // SuppressWarning is source scope so will disappear at compilation :) + methodAnnotation = ReflectUtil.getMethodAnnotation(MyClass.class, + SuppressWarnings.class); + + assertMethodAnnotation(MyClass.class, methodAnnotation); + + // SuppressWarning is source scope so will disappear at compilation :) + methodAnnotation = ReflectUtil.getMethodAnnotation(MyClass.class, + SuppressWarnings.class, + true); + + assertMethodAnnotation(MyClass.class, methodAnnotation); + + // SuppressWarning is source scope so will disappear at compilation :) + methodAnnotation = ReflectUtil.getMethodAnnotation(MySubClass.class, + SuppressWarnings.class); + + assertMethodAnnotation(MySubClass.class, methodAnnotation); + + // SuppressWarning is source scope so will disappear at compilation :) + methodAnnotation = ReflectUtil.getMethodAnnotation(MySubClass.class, + SuppressWarnings.class, + true); + + assertMethodAnnotation(MySubClass.class, methodAnnotation); + + methodAnnotation = ReflectUtil.getMethodAnnotation(MyClass.class, + Deprecated.class); + + assertMethodAnnotation(MyClass.class, + methodAnnotation, + "publicMethod", + "protectedMethod", + "privateMethod", + "method" + ); + + methodAnnotation = ReflectUtil.getMethodAnnotation(MyClass.class, + Deprecated.class, + true); + + assertMethodAnnotation(MyClass.class, + methodAnnotation, + "publicMethod", + "protectedMethod", + "privateMethod", + "method" + ); + + methodAnnotation = ReflectUtil.getMethodAnnotation(MySubClass.class, + Deprecated.class); + + assertMethodAnnotation(MySubClass.class, + methodAnnotation, + "method2" + ); + + methodAnnotation = ReflectUtil.getMethodAnnotation(MySubClass.class, + Deprecated.class, + true); + + assertMethodAnnotation(MySubClass.class, + methodAnnotation, + "publicMethod", + "protectedMethod", + "privateMethod", + "method", + "method2" + ); + + } + + protected void assertGetAllDeclaredFields(Set<Field> fields, + String... fieldNames) throws NoSuchFieldException { + + Assert.assertNotNull(fields); + Assert.assertEquals(fieldNames.length, fields.size()); + for (String fieldName : fieldNames) { + + Field field = getField(fieldName, fields); + + Assert.assertNotNull("Could not found field named " + fieldName, field); + } + } + + protected void assertGetAllDeclaredMethods(Set<Method> methods, + String... methodNames) throws NoSuchFieldException { + + Assert.assertNotNull(methods); + Assert.assertEquals(methodNames.length, methods.size()); + for (String methodName : methodNames) { + + Method method = getMethod(methodName, methods); + Assert.assertNotNull("Could not found method named " + methodName, method); + } + + } + + protected void assertFieldAnnotation(Class<?> type, + Map<Field, ? extends Annotation> fieldAnnotation, + String... fieldNames) throws NoSuchFieldException { + + Set<Field> allDeclaredFields = ReflectUtil.getAllDeclaredFields(type); + + Assert.assertNotNull(fieldAnnotation); + Assert.assertEquals(fieldNames.length, fieldAnnotation.size()); + for (String fieldName : fieldNames) { + Field field = getField(fieldName, allDeclaredFields); + Assert.assertNotNull(field); + Annotation annotation = fieldAnnotation.get(field); + Assert.assertNotNull("Could not found annotation for field " + fieldName, annotation); + } + } + + protected void assertMethodAnnotation(Class<?> type, + Map<Method, ? extends Annotation> fieldAnnotation, + String... methodNames) throws NoSuchMethodException { + + Set<Method> allDeclaredMethods = ReflectUtil.getAllDeclaredMethods(type); + + Assert.assertNotNull(fieldAnnotation); + Assert.assertEquals(methodNames.length, fieldAnnotation.size()); + for (String methodName : methodNames) { + Method method = getMethod(methodName, allDeclaredMethods); + Assert.assertNotNull(method); + Annotation annotation = fieldAnnotation.get(method); + Assert.assertNotNull("Could not found annotation for method " + methodName, annotation); + } + } + + protected Field getField(String fieldName, Set<Field> fields) { + for (Field field : fields) { + if (fieldName.equals(field.getName())) { + return field; + } + } + return null; + } + + protected Method getMethod(String methodName, Set<Method> methods) { + for (Method method : methods) { + if (methodName.equals(method.getName())) { + return method; + } + } + return null; + } +} Property changes on: trunk/nuiton-utils/src/test/java/org/nuiton/util/ReflectUtilTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2057 - in trunk: . nuiton-validator
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 17:56:18 +0100 (Tue, 25 Jan 2011) New Revision: 2057 Url: http://nuiton.org/repositories/revision/nuiton-utils/2057 Log: Evolution #990: Update xwork-core to 2.2.1.1 Modified: trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-01-25 16:55:41 UTC (rev 2056) +++ trunk/nuiton-validator/pom.xml 2011-01-25 16:56:18 UTC (rev 2057) @@ -76,11 +76,17 @@  <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> </dependency> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-25 16:55:41 UTC (rev 2056) +++ trunk/pom.xml 2011-01-25 16:56:18 UTC (rev 2057) @@ -74,8 +74,8 @@  <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> <version>${xworkVersion}</version> <exclusions> <exclusion> @@ -85,6 +85,13 @@ </exclusions> </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.8.0.GA</version> + <scope>runtime</scope> + </dependency> +  <dependency> @@ -200,7 +207,7 @@ <nuitonI18nVersion>2.2</nuitonI18nVersion> <aspectwerkzVersion>2.0</aspectwerkzVersion> - <xworkVersion>2.1.3</xworkVersion> + <xworkVersion>2.2.1.1</xworkVersion> </properties>

1 0

r2056 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 17:55:41 +0100 (Tue, 25 Jan 2011) New Revision: 2056 Url: http://nuiton.org/repositories/revision/nuiton-utils/2056 Log: use new i18n api Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/FileCompletion.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/FileCompletion.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/FileCompletion.java 2011-01-25 14:52:19 UTC (rev 2055) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/FileCompletion.java 2011-01-25 16:55:41 UTC (rev 2056) @@ -95,14 +95,16 @@ public FileCompletion(boolean creation, boolean exit) { this.exit = exit; this.creation = creation; - + + I18n.setDefaultLocale(Locale.getDefault()); + // TODO does this util class init i18n ? - if (Locale.getDefault().getLanguage().equals("fr")) { - I18n.init("fr", "FR"); - } - else { - I18n.init("en", "US"); - } +// if (Locale.getDefault().getLanguage().equals("fr")) { +// I18n.init("fr", "FR"); +// } +// else { +// I18n.init("en", "US"); +// } console = System.console(); consoleAvailable = (console != null);

1 0