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

r1875 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 09 Jun '10

09 Jun '10

Author: tchemit Date: 2010-06-09 12:18:55 +0200 (Wed, 09 Jun 2010) New Revision: 1875 Url: http://nuiton.org/repositories/revision/nuiton-utils/1875 Log: add usefull methods in ReflectUtil Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-09 10:14:18 UTC (rev 1874) +++ trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-09 10:18:55 UTC (rev 1875) @@ -156,7 +156,16 @@ String methodName, boolean strict, Object... arguments) throws IllegalArgumentException { - Method method = getDeclaredMethod(klass, methodName, new HashSet<Class<?>>(), arguments); + HashSet<Class<?>> classes = new HashSet<Class<?>>(); + Method method; + try { + method = getDeclaredMethod(klass, methodName, classes, arguments); + } finally { + if (log.isDebugEnabled()) { + log.debug("Inspected classes : " + classes); + } + classes.clear(); + } if (method == null && strict) { throw new IllegalArgumentException( "could not find method " + methodName + " on type " +

1 0

r1874 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 09 Jun '10

09 Jun '10

Author: tchemit Date: 2010-06-09 12:14:18 +0200 (Wed, 09 Jun 2010) New Revision: 1874 Url: http://nuiton.org/repositories/revision/nuiton-utils/1874 Log: add usefull methods in ReflectionUtil Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-08 09:01:57 UTC (rev 1873) +++ trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-09 10:14:18 UTC (rev 1874) @@ -25,13 +25,20 @@ package org.nuiton.util; -import static org.nuiton.i18n.I18n._; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * Des méthodes utiles d'introspection * @@ -39,6 +46,10 @@ */ public class ReflectUtil { + + /** Logger */ + static private Log log = LogFactory.getLog(ReflectUtil.class); + /** * Pour déterminer si un champ d'une classe est une constante * (modifiers sont static, final et public) @@ -57,7 +68,7 @@ * <p/> * L'algorithme parcourt aussi les superclasses. * - * @param <T> enumeration's type + * @param <T> enumeration's type * @param klass la classe contenant les constantes * @param searchingClass le type des champs constants à récupérer * @return la liste des champs du type requis dans @@ -86,7 +97,7 @@ } /** - * @param <T> enumeration's type + * @param <T> enumeration's type * @param klass the required class * @param fieldName the required constant name * @return the constant value @@ -111,7 +122,7 @@ /** * Convertit une classe non typée, en une classe d'enum * - * @param <T> enumeration's type + * @param <T> enumeration's type * @param type la classe a typer * @return la classe typee * @throws IllegalArgumentException si le type est null ou non une extension @@ -127,4 +138,218 @@ } return (Class<T>) type; } + + /** + * Cherche une methode selon son nom et ses paramètres d'invocation. + * + * @param klass la classe dans laquelle rechercher la méthode + * @param methodName le nom de la méthode recherchée + * @param strict un drapeau pour déclancher une exception si la méthode + * n'est pas trouvée + * @param arguments les arguments d'invocation de la méthode + * @return la méthode trouvée + * @throws IllegalArgumentException si la méthode n'est pas trouvée et que + * le drapeau {@code strict} est à {@code true} + * @since 1.3.1 + */ + public static Method getDeclaredMethod(Class<?> klass, + String methodName, + boolean strict, + Object... arguments) throws IllegalArgumentException { + Method method = getDeclaredMethod(klass, methodName, new HashSet<Class<?>>(), arguments); + if (method == null && strict) { + throw new IllegalArgumentException( + "could not find method " + methodName + " on type " + + klass.getName()); + } + + return method; + } + + /** + * Obtain the boxed type of any incoming type. + * <p/> + * If incoming type is not a primitive type, then just returns himself. + * + * @param type the type to box + * @return the boxed type + * @see Class#isPrimitive() + * @since 1.3.1 + */ + public static Class<?> boxType(Class<?> type) { + if (!type.isPrimitive()) { + return type; + } + if (boolean.class.equals(type)) { + return Boolean.class; + } + if (char.class.equals(type)) { + return Character.class; + } + if (byte.class.equals(type)) { + return Byte.class; + } + if (short.class.equals(type)) { + return Short.class; + } + if (int.class.equals(type)) { + return Integer.class; + } + if (long.class.equals(type)) { + return Long.class; + } + if (float.class.equals(type)) { + return Float.class; + } + if (double.class.equals(type)) { + return Double.class; + } + if (void.class.equals(type)) { + return Void.class; + } + // should never come here... + return type; + + } + + /** + * Obtain the unboxed type of any incoming type. + * <p/> + * If incoming type is a primitive type, then just returns himself. + * + * @param type the type to unbox + * @return the unboxed type + * @see Class#isPrimitive() + * @since 1.3.1 + */ + public static Class<?> unboxType(Class<?> type) { + if (type.isPrimitive()) { + return type; + } + if (Boolean.class.equals(type)) { + return boolean.class; + } + if (Character.class.equals(type)) { + return char.class; + } + if (Byte.class.equals(type)) { + return byte.class; + } + if (Short.class.equals(type)) { + return short.class; + } + if (Integer.class.equals(type)) { + return int.class; + } + if (Long.class.equals(type)) { + return long.class; + } + if (Float.class.equals(type)) { + return float.class; + } + if (Double.class.equals(type)) { + return double.class; + } + if (Void.class.equals(type)) { + return void.class; + } + + // not a primitive type + return type; + + } + + protected static Method getDeclaredMethod(Class<?> klass, + String methodName, + Set<Class<?>> visitedClasses, + Object... arguments) { + if (visitedClasses.contains(klass)) { + + // this means class was already unsucessfull visited + return null; + } + visitedClasses.add(klass); + Method method = null; + for (Method m : klass.getDeclaredMethods()) { + if (!methodName.equals(m.getName())) { + continue; + } + + // same method name + + Class<?>[] types = m.getParameterTypes(); + if (arguments.length != types.length) { + continue; + } + + // same number arguments + + Class<?>[] prototype = m.getParameterTypes(); + if (log.isDebugEnabled()) { + log.debug("Found a method with same parameters size : " + + m.getName() + " : " + Arrays.toString(prototype)); + } + int index = 0; + boolean parametersMatches = true; + for (Object argument : arguments) { + Class<?> type = prototype[index++]; + if (argument == null) { + + // can not say anything, let says it is ok... + continue; + } + Class<?> runtimeType = argument.getClass(); + if (log.isDebugEnabled()) { + log.debug("Test parameter [" + (index - 1) + "] : " + + type + " vs " + runtimeType); + } + + type = boxType(type); + runtimeType = boxType(runtimeType); + + if (!type.equals(runtimeType) || + !type.isAssignableFrom(runtimeType)) { + + // not same type + parametersMatches = false; + break; + } + } + if (parametersMatches) { + + // same parameters types, this is a match + method = m; + } + break; + } + if (method == null) { + + // try on super class + if (klass.getSuperclass() != null) { + method = getDeclaredMethod(klass.getSuperclass(), + methodName, + visitedClasses, + arguments + ); + } + } + + if (method == null) { + + // try on interfaces + Class<?>[] interfaces = klass.getInterfaces(); + for (Class<?> anInterface : interfaces) { + method = getDeclaredMethod(anInterface, + methodName, + visitedClasses, + arguments + ); + if (method != null) { + break; + } + } + } + return method; + + } }

1 0

r1873 - trunk
by echatellier＠users.nuiton.org 08 Jun '10

08 Jun '10

Author: echatellier Date: 2010-06-08 11:01:57 +0200 (Tue, 08 Jun 2010) New Revision: 1873 Url: http://nuiton.org/repositories/revision/nuiton-utils/1873 Log: Update to 0.9.10-hudson-20 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-02 10:29:15 UTC (rev 1872) +++ trunk/pom.xml 2010-06-08 09:01:57 UTC (rev 1873) @@ -92,7 +92,7 @@ <dependency> <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> - <version>0.9.10-hudson-16</version> + <version>0.9.10-hudson-20</version> <scope>provided</scope> </dependency>

1 0

r1872 - trunk
by tchemit＠users.nuiton.org 02 Jun '10

02 Jun '10

Author: tchemit Date: 2010-06-02 12:29:15 +0200 (Wed, 02 Jun 2010) New Revision: 1872 Url: http://nuiton.org/repositories/revision/nuiton-utils/1872 Log: Utilisation de mavenpom4redmine 2.1.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-01 13:31:51 UTC (rev 1871) +++ trunk/pom.xml 2010-06-02 10:29:15 UTC (rev 1872) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.4</version> + <version>2.1.5</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1871 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 01 Jun '10

01 Jun '10

Author: tchemit Date: 2010-06-01 15:31:51 +0200 (Tue, 01 Jun 2010) New Revision: 1871 Url: http://nuiton.org/repositories/revision/nuiton-utils/1871 Log: - use new converter api - let OptionDef be Serializable Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-05-28 10:13:06 UTC (rev 1870) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-01 13:31:51 UTC (rev 1871) @@ -26,6 +26,8 @@ package org.nuiton.util; +import org.nuiton.util.converter.ConverterUtil; + import org.apache.commons.beanutils.ConstructorUtils; import org.apache.commons.collections.EnumerationUtils; import org.apache.commons.logging.Log; @@ -63,7 +65,7 @@ /** * Application configuration. * - * <h3>TODO</h3> + * <h3>A finir...</h3> * <ul> * <li>Ajout d'annotations sur les methodes * pour preciser plus de chose pour les options (pattern, min/max, alias, @@ -408,7 +410,7 @@ * * @since 1.0.0-rc-9 */ - public interface OptionDef { + public interface OptionDef extends Serializable { /** * @return la clef identifiant l'option

1 0