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

r1980 - trunk/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org Dec. 23, 2010

Dec. 23, 2010

Author: sletellier Date: 2010-12-23 10:25:30 +0100 (Thu, 23 Dec 2010) New Revision: 1980 Url: http://nuiton.org/repositories/revision/nuiton-utils/1980 Log: Add svn keywords Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java Property changes on: trunk/src/main/java/org/nuiton/util/TimeTrace.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1979 - trunk
by sletellier＠users.nuiton.org Dec. 23, 2010

Dec. 23, 2010

Author: sletellier Date: 2010-12-23 10:24:11 +0100 (Thu, 23 Dec 2010) New Revision: 1979 Url: http://nuiton.org/repositories/revision/nuiton-utils/1979 Log: Up i18n version to 2.0.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-22 18:26:23 UTC (rev 1978) +++ trunk/pom.xml 2010-12-23 09:24:11 UTC (rev 1979) @@ -164,7 +164,7 @@ <properties> - <nuitonI18nVersion>2.0.1-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>2.0.1</nuitonI18nVersion>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>

1 0

r1978 - trunk
by bleny＠users.nuiton.org Dec. 22, 2010

Dec. 22, 2010

Author: bleny Date: 2010-12-22 19:26:23 +0100 (Wed, 22 Dec 2010) New Revision: 1978 Url: http://nuiton.org/repositories/revision/nuiton-utils/1978 Log: add missing developers at http://maven-site.nuiton.org/nuiton-utils/dev-activity.html ; should tchemit and jcouteau be added ? they are both inherited from mavenpom and it seems OK on nuiton-utils maven site Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-22 17:56:43 UTC (rev 1977) +++ trunk/pom.xml 2010-12-22 18:26:23 UTC (rev 1978) @@ -107,6 +107,55 @@ <inceptionYear>2004</inceptionYear> <url>http://maven-site.nuiton.org/nuiton-utils</url> + <developers> + + <developer> + <name>Brendan Le Ny</name> + <id>bleny</id> + <email>bleny(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Benjamin Poussin</name> + <id>bpoussin</id> + <email>poussin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + <role>Debian packager</role> + </roles> + </developer> + + <developer> + <name>Éric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + + <developer> + <name>Sylvain Letellier</name> + <id>sletellier</id> + <email>letellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + + </developers> +

1 0

r1977 - in trunk/src: main/java/org/nuiton/util main/resources/i18n test/java/org/nuiton/util
by bleny＠users.nuiton.org Dec. 22, 2010

Dec. 22, 2010

Author: bleny Date: 2010-12-22 18:56:43 +0100 (Wed, 22 Dec 2010) New Revision: 1977 Url: http://nuiton.org/repositories/revision/nuiton-utils/1977 Log: fix #1157 + test Modified: trunk/src/main/java/org/nuiton/util/DateUtil.java trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties trunk/src/test/java/org/nuiton/util/DateUtilTest.java Modified: trunk/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtil.java 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/main/java/org/nuiton/util/DateUtil.java 2010-12-22 17:56:43 UTC (rev 1977) @@ -96,6 +96,7 @@ */ public static Date createDate(int s, int m, int h, int dd, int mm, int yy) { Calendar calendar = Calendar.getInstance(); + calendar.setTimeInMillis(0L); calendar.set(Calendar.YEAR, yy); calendar.set(Calendar.MONTH, mm-1); calendar.set(Calendar.DAY_OF_MONTH, dd); Modified: trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties 2010-12-22 17:56:43 UTC (rev 1977) @@ -1,3 +1,6 @@ +Can't\ find\ assignable\ argument\ for\ %s\ in\ %s= +Class\ %s\ can't\ be\ instanciated\ with\ %s= +Your\ class\ %s\ has\ more\ than\ one\ constructor= nuitonutil.config.moving.conf=Moving old configuration file from %s to %s nuitonutil.debug.objectutil.create=Try to create %s with %s nuitonutil.debug.objectutil.instantiate=Can't instantiate %s with params %s Modified: trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties 2010-12-22 17:56:43 UTC (rev 1977) @@ -1,3 +1,6 @@ +Can't\ find\ assignable\ argument\ for\ %s\ in\ %s= +Class\ %s\ can't\ be\ instanciated\ with\ %s= +Your\ class\ %s\ has\ more\ than\ one\ constructor= nuitonutil.config.moving.conf=D\u00E9placement du fichier de configuration depuis %s vers %s nuitonutil.debug.objectutil.create=Essaye de cr\u00E9er %s avec %s nuitonutil.debug.objectutil.instantiate=Ne peut pas instancier %s avec les param\u00EAtres %s Modified: trunk/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilTest.java 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/test/java/org/nuiton/util/DateUtilTest.java 2010-12-22 17:56:43 UTC (rev 1977) @@ -35,6 +35,7 @@ import org.junit.Test; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -85,11 +86,11 @@ * Test of createDate method, of class DateUtils. */ @Test - public void testCreateDate() { + public void testCreateDate() throws ParseException { log.info("createDate"); - Date newdate = DateUtil.createDate(3, 3, 2009); - Calendar calendar = DateUtil.getDefaultCalendar(newdate); + Date newDate = DateUtil.createDate(3, 3, 2009); + Calendar calendar = DateUtil.getDefaultCalendar(newDate); Assert.assertEquals(3, calendar.get(Calendar.DAY_OF_MONTH)); Assert.assertEquals(2, calendar.get(Calendar.MONTH)); @@ -102,6 +103,18 @@ } /** + * Non regression test for bug #1157 + * @since 1.5.2 + */ + @Test + public void testCreateDateIsDeterministic() throws ParseException { + Date createdDate = DateUtil.createDate(0, 33, 18, 22, 12, 2010); + Date parsedDate = DateUtil.parseDate("22/12/2010 18:33", "dd/MM/yyyy HH:mm"); + log.info(createdDate.getTime() + " ?= " + parsedDate.getTime()); + Assert.assertEquals(createdDate, parsedDate); + } + + /** * Test of createDateAfterToday method, of class DateUtil. */ //@Test

1 0

r1976 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 22, 2010

Dec. 22, 2010

Author: bpoussin Date: 2010-12-22 18:37:01 +0100 (Wed, 22 Dec 2010) New Revision: 1976 Url: http://nuiton.org/repositories/revision/nuiton-utils/1976 Log: must use 1000000l to multiple long Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java =================================================================== --- trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-22 16:58:14 UTC (rev 1975) +++ trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-22 17:37:01 UTC (rev 1976) @@ -52,9 +52,9 @@ } /** time to trigger log time in info level (ns) (default: 1s) */ - protected long timeToLogInfo = 1000 * 1000000; + protected long timeToLogInfo = 1000l * 1000000l; /** time to trigger log time in warn level (ns) (default: 3s) */ - protected long timeToLogWarn = 3000 * 1000000; + protected long timeToLogWarn = 3000l * 1000000l; /** for each method of all proxies, keep number of call */ protected Map<String, CallStat> callCount = new HashMap<String, CallStat>(); @@ -77,7 +77,7 @@ * @param timeToLogInfoMs time in milliseconde after that we log info */ public void setTimeToLogInfo(long timeToLogInfoMs) { - this.timeToLogInfo = timeToLogInfoMs * 1000000; // convert ms -> ns + this.timeToLogInfo = timeToLogInfoMs * 1000000l; // convert ms -> ns } /** @@ -85,7 +85,7 @@ * @param timeToWarnInfoMs time in milliseconde after that we log warn */ public void setTimeToLogWarn(long timeToLogWarnMs) { - this.timeToLogWarn = timeToLogWarnMs * 1000000; // convert ms -> ns + this.timeToLogWarn = timeToLogWarnMs * 1000000l; // convert ms -> ns } public Map<String, CallStat> getCallCount() {

1 0

r1975 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 22, 2010

Dec. 22, 2010

Author: bpoussin Date: 2010-12-22 17:58:14 +0100 (Wed, 22 Dec 2010) New Revision: 1975 Url: http://nuiton.org/repositories/revision/nuiton-utils/1975 Log: change bad default log time value (miss x1000000) Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java =================================================================== --- trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-20 16:50:43 UTC (rev 1974) +++ trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-22 16:58:14 UTC (rev 1975) @@ -51,10 +51,10 @@ } - /** time to trigger log time in info level (ns) */ - protected long timeToLogInfo = 1000; - /** time to trigger log time in warn level (ns) */ - protected long timeToLogWarn = 3000; + /** time to trigger log time in info level (ns) (default: 1s) */ + protected long timeToLogInfo = 1000 * 1000000; + /** time to trigger log time in warn level (ns) (default: 3s) */ + protected long timeToLogWarn = 3000 * 1000000; /** for each method of all proxies, keep number of call */ protected Map<String, CallStat> callCount = new HashMap<String, CallStat>();

1 0

r1974 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org Dec. 20, 2010

Dec. 20, 2010

Author: echatellier Date: 2010-12-20 17:50:43 +0100 (Mon, 20 Dec 2010) New Revision: 1974 Url: http://nuiton.org/repositories/revision/nuiton-utils/1974 Log: Fix javadoc Modified: trunk/src/main/java/org/nuiton/util/ZipUtil.java Modified: trunk/src/main/java/org/nuiton/util/ZipUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ZipUtil.java 2010-12-13 13:41:35 UTC (rev 1973) +++ trunk/src/main/java/org/nuiton/util/ZipUtil.java 2010-12-20 16:50:43 UTC (rev 1974) @@ -233,7 +233,7 @@ * Entry result name in zip start at fileOrDirectory. * example: if we compress /etc/apache, entry will be apache/http.conf, ... * - * @param zipFile the source zip file + * @param zipFile the target zip file * @param fileOrDirectory the file or directory to compress * @throws IOException if any problem while compressing */ @@ -249,7 +249,7 @@ * Entry result name in zip start at fileOrDirectory. * example: if we compress /etc/apache, entry will be apache/http.conf, ... * - * @param zipFile the source zip file + * @param zipFile the target zip file * @param fileOrDirectory the file or directory to compress * @param filter used to accept file, if null, all file is accepted * @throws IOException if any problem while compressing @@ -267,7 +267,7 @@ * Entry result name in zip start at fileOrDirectory. * example: if we compress /etc/apache, entry will be apache/http.conf, ... * - * @param zipFile the source zip file + * @param zipFile the target zip file * @param fileOrDirectory the file or directory to compress * @param filter used to accept file, if null, all file is accepted * @param createMD5 also create a MD5 file (zip name + .md5). MD5 file is created after zip.

1 0

r1973 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 13, 2010

Dec. 13, 2010

Author: bpoussin Date: 2010-12-13 14:41:35 +0100 (Mon, 13 Dec 2010) New Revision: 1973 Url: http://nuiton.org/repositories/revision/nuiton-utils/1973 Log: add cast for Class<?> add getPrintableConfig method 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-12-10 03:14:16 UTC (rev 1972) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-12-13 13:41:35 UTC (rev 1973) @@ -633,8 +633,8 @@ * @param key the option's key * @return value as Class */ - public List<Class<?>> getOptionAsClass() { - List<Class<?>> result = (List<Class<?>>)config.convertOption( + public List<Class> getOptionAsClass() { + List<Class> result = (List<Class>)config.convertOption( Class.class, key, value, true); return result; } @@ -1929,6 +1929,18 @@ output.println("options " + options); } + public String getPrintableConfig(String includePattern, int padding) { + String msg = "Configuration:\n"; + for (String key : getFlatOptions().stringPropertyNames()) { + if (includePattern == null || "".equals(includePattern) + || key.matches(includePattern)) { + String value = getOption(key); + msg += String.format("\t%" + padding + "s = %s\n", key, value); + } + } + return msg; + } + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { pcs.firePropertyChange(propertyName, oldValue, newValue);

1 0

r1972 - trunk/src/test/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 10, 2010

Dec. 10, 2010

Author: bpoussin Date: 2010-12-10 04:14:16 +0100 (Fri, 10 Dec 2010) New Revision: 1972 Url: http://nuiton.org/repositories/revision/nuiton-utils/1972 Log: Evolution #1144: [ApplicationConfig] add getOptionAsList() method (change behavior, if no option for the key return empty list and not null) Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-12-10 03:11:19 UTC (rev 1971) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-12-10 03:14:16 UTC (rev 1972) @@ -34,6 +34,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.ListIterator; import java.util.Map; @@ -246,7 +247,8 @@ asClass.add(ApplicationConfigTest.class); ApplicationConfig instance = new ApplicationConfig(); - Assert.assertEquals(null, instance.getOptionAsList("truc")); + Assert.assertEquals(null, instance.getOption("truc")); + Assert.assertEquals(Collections.EMPTY_LIST, instance.getOptionAsList("truc").getOption()); instance.setOption("truc", ApplicationConfig.class.getName() + "," + ApplicationConfigTest.class.getName());

1 0

r1971 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 10, 2010

Dec. 10, 2010

Author: bpoussin Date: 2010-12-10 04:11:19 +0100 (Fri, 10 Dec 2010) New Revision: 1971 Url: http://nuiton.org/repositories/revision/nuiton-utils/1971 Log: Evolution #1144: [ApplicationConfig] add getOptionAsList() method (change behavior, if no option for the key return empty list and not null) 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-12-10 02:17:23 UTC (rev 1970) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-12-10 03:11:19 UTC (rev 1971) @@ -1295,7 +1295,9 @@ * * example: * <li> convertOption(Boolean.class, "toto", "true,true", false) => false + * <li> convertOption(Boolean.class, "toto", null, false) => ? ConverterUtil dependant * <li> convertOption(Boolean.class, "toto", "true,true", true) => [true, true] + * <li> convertOption(Boolean.class, "toto", null, true) => [] * * @param clazz result type expected * @param key option key @@ -1316,9 +1318,8 @@ // if it's modified since last computation if (cacheItem == null || cacheItem.hash != hash) { if (asList) { - List<T> list = null; + List<T> list = new ArrayList<T>(); if (value != null) { - list = new ArrayList<T>(); String[] values = StringUtil.split(value, LIST_SEPARATOR); for (String valueString : values) { // prefer use our convertert method (auto-register more converters) @@ -1343,16 +1344,15 @@ } /** - * Help to convert value to list of object + * Help to convert value to list of object. If no option for this key + * empty List is returned finaly + * * @param key * @return */ public OptionList getOptionAsList(String key) { String value = getOption(key); - OptionList result = null; - if (value != null){ - result = new OptionList(this, key, value); - } + OptionList result = new OptionList(this, key, value); return result; }

1 0

r1970 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 10, 2010

Dec. 10, 2010

Author: bpoussin Date: 2010-12-10 03:17:23 +0100 (Fri, 10 Dec 2010) New Revision: 1970 Url: http://nuiton.org/repositories/revision/nuiton-utils/1970 Log: Evolution #1144: [ApplicationConfig] add getOptionAsList() method (change bad class visibility) 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-12-10 02:14:05 UTC (rev 1969) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-12-10 02:17:23 UTC (rev 1970) @@ -575,7 +575,7 @@ } } - static protected class OptionList { + static public class OptionList { protected ApplicationConfig config; protected String key;

1 0

r1969 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 10, 2010

Dec. 10, 2010

Author: bpoussin Date: 2010-12-10 03:14:05 +0100 (Fri, 10 Dec 2010) New Revision: 1969 Url: http://nuiton.org/repositories/revision/nuiton-utils/1969 Log: Evolution #1144: [ApplicationConfig] add getOptionAsList() method Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java trunk/src/test/java/org/nuiton/util/StringUtilTest.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-12-09 17:29:05 UTC (rev 1968) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-12-10 02:14:05 UTC (rev 1969) @@ -273,6 +273,7 @@ /** Used to know what is separator between class and method on command line. */ static final private String CLASS_METHOD_SEPARATOR = "#"; + static final public String LIST_SEPARATOR = ","; /** Configuration file key option. */ static final public String CONFIG_FILE_NAME = "config.file"; @@ -574,6 +575,143 @@ } } + static protected class OptionList { + + protected ApplicationConfig config; + protected String key; + protected String value; + + public OptionList(ApplicationConfig config, String key, String value) { + this.config = config; + this.key = key; + this.value = value; + } + + /** + * Get option value as {@link String}. + * + * @param key the option's key + * @return value as String + */ + public List<String> getOption() { + List<String> result = (List<String>)config.convertOption( + String.class, key, value, true); + return result; + } + + /** + * Get option value as {@link File}. + * + * @param key the option's key + * @return value as file + */ + public List<File> getOptionAsFile() { + List<File> tmp = (List<File>)config.convertOption( + File.class, key, value, true); + List<File> result = new ArrayList<File>(tmp.size()); + for (File file : tmp) { + result.add(file.getAbsoluteFile()); + } + return result; + } + + /** + * Get option value as {@link URL}. + * + * @param key the option's key + * @return value as URL + */ + public List<URL> getOptionAsURL() { + List<URL> result = (List<URL>)config.convertOption( + URL.class, key, value, true); + return result; + } + + /** + * Get option value as {@link Class}. + * + * @param key the option's key + * @return value as Class + */ + public List<Class<?>> getOptionAsClass() { + List<Class<?>> result = (List<Class<?>>)config.convertOption( + Class.class, key, value, true); + return result; + } + + /** + * Get option value as {@link Date}. + * + * @param key the option's key + * @return value as Date + */ + public List<Date> getOptionAsDate() { + List<Date> result = (List<Date>)config.convertOption( + Date.class, key, value, true); + return result; + } + + /** + * Get option value as {@link Time}. + * + * @param key the option's key + * @return value as Time + */ + public List<Time> getOptionAsTime() { + List<Time> result = (List<Time>)config.convertOption( + Time.class, key, value, true); + return result; + } + + /** + * Get option value as {@link Timestamp}. + * + * @param key the option's key + * @return value as Timestamp + */ + public List<Timestamp> getOptionAsTimestamp() { + List<Timestamp> result = (List<Timestamp>)config.convertOption( + Timestamp.class, key, value, true); + return result; + } + + /** + * Get option value as {@code int}. + * + * @param key the option's key + * @return value as {@code int} + */ + public List<Integer> getOptionAsInt() { + List<Integer> result = (List<Integer>)config.convertOption( + Integer.class, key, value, true); + return result; + } + + /** + * Get option value as {@code double}. + * + * @param key the option's key + * @return value as {@code double} + */ + public List<Double> getOptionAsDouble() { + List<Double> result = (List<Double>)config.convertOption( + Double.class, key, value, true); + return result; + } + + /** + * Get option value as {@code boolean}. + * + * @param key the option's key + * @return value as {@code boolean}. + */ + public List<Boolean> getOptionAsBoolean() { + List<Boolean> result = (List<Boolean>)config.convertOption( + Boolean.class, key, value, true); + return result; + } + } + /** * Init ApplicationConfig with current simple class name as config file. * @@ -1146,31 +1284,79 @@ * @return typed value */ public <T> T getOption(Class<T> clazz, String key) { - String cacheKey = key + "-" + clazz.getName(); + String value = getOption(key); + T result = (T)convertOption(clazz, key, value, false); - String value = getOption(key); + return result; + } + + /** + * Convert value in instance of clazz or List if asList is true + * + * example: + * <li> convertOption(Boolean.class, "toto", "true,true", false) => false + * <li> convertOption(Boolean.class, "toto", "true,true", true) => [true, true] + * + * @param clazz result type expected + * @param key option key + * @param value value to convert + * @param asList value is string that represente a list + * @return + */ + protected <T> Object convertOption(Class<T> clazz, String key, String value, boolean asList) { + String cacheKey = key + "-" + asList + "-" + clazz.getName(); + int hash = 0; if (value != null) { hash = value.hashCode(); } - T result; - CacheItem<T> cacheItem = (CacheItem<T>) cacheOption.get(cacheKey); + + CacheItem cacheItem = cacheOption.get(cacheKey); // compute value if value don't exist in cacheOption or // if it's modified since last computation if (cacheItem == null || cacheItem.hash != hash) { - // prefer use our convertert method (auto-register more converters) - result = ConverterUtil.convert(clazz, value); - // result = (T) ConvertUtils.convert(value, clazz); - cacheItem = new CacheItem<T>(result, hash); + if (asList) { + List<T> list = null; + if (value != null) { + list = new ArrayList<T>(); + String[] values = StringUtil.split(value, LIST_SEPARATOR); + for (String valueString : values) { + // prefer use our convertert method (auto-register more converters) + T v = ConverterUtil.convert(clazz, valueString); + list.add(v); + } + } + cacheItem = new CacheItem(list, hash); + } else { + // prefer use our convertert method (auto-register more converters) + T v = ConverterUtil.convert(clazz, value); + cacheItem = new CacheItem(v, hash); + } + // add new item to the cache cacheOption.put(cacheKey, cacheItem); - } else { - result = cacheItem.item; } + // take result in item + Object result = cacheItem.item; + return result; } /** + * Help to convert value to list of object + * @param key + * @return + */ + public OptionList getOptionAsList(String key) { + String value = getOption(key); + OptionList result = null; + if (value != null){ + result = new OptionList(this, key, value); + } + return result; + } + + /** * Get option value as {@link File}. * * @param key the option's key Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-12-09 17:29:05 UTC (rev 1968) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-12-10 02:14:05 UTC (rev 1969) @@ -233,6 +233,29 @@ } /** + * Test convertion to list + */ + @Test + public void testGetAsList() { + List<String> asString = new ArrayList<String>(); + asString.add(ApplicationConfig.class.getName()); + asString.add(ApplicationConfigTest.class.getName()); + + List<Class> asClass = new ArrayList<Class>(); + asClass.add(ApplicationConfig.class); + asClass.add(ApplicationConfigTest.class); + + ApplicationConfig instance = new ApplicationConfig(); + Assert.assertEquals(null, instance.getOptionAsList("truc")); + + instance.setOption("truc", ApplicationConfig.class.getName() + + "," + ApplicationConfigTest.class.getName()); + + Assert.assertEquals(asString, instance.getOptionAsList("truc").getOption()); + Assert.assertEquals(asClass, instance.getOptionAsList("truc").getOptionAsClass()); + } + + /** * Test of getMethods method, of class ApplicationConfig. */ @Test Modified: trunk/src/test/java/org/nuiton/util/StringUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/StringUtilTest.java 2010-12-09 17:29:05 UTC (rev 1968) +++ trunk/src/test/java/org/nuiton/util/StringUtilTest.java 2010-12-10 02:14:05 UTC (rev 1969) @@ -101,7 +101,7 @@ @Test public void testSplit() { - assertTrue(Arrays.equals(StringUtil.split("toto,titi,tutu"), new String[]{"toto", "titi", "tutu"})); + assertTrue(Arrays.equals(StringUtil.split("'toto',titi,tutu"), new String[]{"'toto'", "titi", "tutu"})); assertTrue(Arrays.equals(StringUtil.split("toto"), new String[]{"toto"})); assertTrue(Arrays.equals(StringUtil.split(""), EMPTY_STRING_ARRAY)); assertTrue(Arrays.equals(StringUtil.split(null), EMPTY_STRING_ARRAY));

1 0

r1968 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 9, 2010

Dec. 9, 2010

Author: bpoussin Date: 2010-12-09 18:29:05 +0100 (Thu, 09 Dec 2010) New Revision: 1968 Url: http://nuiton.org/repositories/revision/nuiton-utils/1968 Log: add @see between CallAnalyse et TimeTrace Modified: trunk/src/main/java/org/nuiton/util/CallAnalyse.java trunk/src/main/java/org/nuiton/util/TimeTrace.java Modified: trunk/src/main/java/org/nuiton/util/CallAnalyse.java =================================================================== --- trunk/src/main/java/org/nuiton/util/CallAnalyse.java 2010-12-08 16:49:03 UTC (rev 1967) +++ trunk/src/main/java/org/nuiton/util/CallAnalyse.java 2010-12-09 17:29:05 UTC (rev 1968) @@ -58,6 +58,8 @@ * <li> le temps d'execution * <li> la memore utilisé * <li> le nombre d'appels + * + * @see TimeTrace */ public class CallAnalyse { // CallAnalyse Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java =================================================================== --- trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-08 16:49:03 UTC (rev 1967) +++ trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-09 17:29:05 UTC (rev 1968) @@ -23,6 +23,7 @@ * System.out.println ("time: " + timeTrace.getCallCount()); * </pre> * + * @see CallAnalyse * @author poussin * @version $Revision$ *

1 0

r1967 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 8, 2010

Dec. 8, 2010

Author: bpoussin Date: 2010-12-08 17:49:03 +0100 (Wed, 08 Dec 2010) New Revision: 1967 Url: http://nuiton.org/repositories/revision/nuiton-utils/1967 Log: add setter to set log time Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java =================================================================== --- trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-08 16:34:23 UTC (rev 1966) +++ trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-08 16:49:03 UTC (rev 1967) @@ -67,10 +67,26 @@ * @param timeToLogWarn time in milliseconde after that we log warn */ public TimeTrace(long timeToLogInfo, long timeToLogWarn) { - this.timeToLogInfo = timeToLogInfo * 1000000; // convert ms -> ns - this.timeToLogWarn = timeToLogWarn * 1000000; // convert ms -> ns + setTimeToLogInfo(timeToLogInfo); + setTimeToLogWarn(timeToLogWarn); } + /** + * + * @param timeToLogInfoMs time in milliseconde after that we log info + */ + public void setTimeToLogInfo(long timeToLogInfoMs) { + this.timeToLogInfo = timeToLogInfoMs * 1000000; // convert ms -> ns + } + + /** + * + * @param timeToWarnInfoMs time in milliseconde after that we log warn + */ + public void setTimeToLogWarn(long timeToLogWarnMs) { + this.timeToLogWarn = timeToLogWarnMs * 1000000; // convert ms -> ns + } + public Map<String, CallStat> getCallCount() { return callCount; }

1 0

r1966 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 8, 2010

Dec. 8, 2010

Author: bpoussin Date: 2010-12-08 17:34:23 +0100 (Wed, 08 Dec 2010) New Revision: 1966 Url: http://nuiton.org/repositories/revision/nuiton-utils/1966 Log: add TimeTrace class to trace time spent between to point Added: trunk/src/main/java/org/nuiton/util/TimeTrace.java Added: trunk/src/main/java/org/nuiton/util/TimeTrace.java =================================================================== --- trunk/src/main/java/org/nuiton/util/TimeTrace.java (rev 0) +++ trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-08 16:34:23 UTC (rev 1966) @@ -0,0 +1,131 @@ +package org.nuiton.util; + +import java.util.HashMap; +import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Cette classe permet de facilement trace le temps d'execution entre deux points + * + * usage + * <pre> + * TimeTrace timeTrace = new TimeTrace(5000, 1000); + * + * + * long start = timeTrace.getTime(); + * ... + * // do some work + * ... + * timeTrace.add(start, "do some work"); + * + * + * System.out.println ("time: " + timeTrace.getCallCount()); + * </pre> + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class TimeTrace { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private Log log = LogFactory.getLog(TimeTrace.class); + + static public class CallStat { + long callNumber = 0; + long callTime = 0; + + @Override + public String toString() { + String callTimeString = + StringUtil.convertTime(callTime); + String avgTimeString = + StringUtil.convertTime((callTime/ callNumber)); + return String.format("total call %s, total time %s, avg time %s", + callNumber, callTimeString, avgTimeString); + } + + } + + /** time to trigger log time in info level (ns) */ + protected long timeToLogInfo = 1000; + /** time to trigger log time in warn level (ns) */ + protected long timeToLogWarn = 3000; + + /** for each method of all proxies, keep number of call */ + protected Map<String, CallStat> callCount = new HashMap<String, CallStat>(); + + public TimeTrace() { + } + + /** + * + * @param timeToLogInfo time in milliseconde after that we log info + * @param timeToLogWarn time in milliseconde after that we log warn + */ + public TimeTrace(long timeToLogInfo, long timeToLogWarn) { + this.timeToLogInfo = timeToLogInfo * 1000000; // convert ms -> ns + this.timeToLogWarn = timeToLogWarn * 1000000; // convert ms -> ns + } + + public Map<String, CallStat> getCallCount() { + return callCount; + } + + /** + * return time in format acceptable for {@link #add(timeToLogInfo, timeToLogInfo, null)} + * @return + */ + static public long getTime() { + return System.nanoTime(); + } + + /** + * add new trace, stop time is automaticaly computed + * + * @param startNs time returned by {@link #getTime()} method + * @param methodName key name to store this time + */ + public void add(long startNs, String methodName) { + add(startNs, getTime(), methodName); + } + + /** + * add new trace + * + * @param startNs time returned by {@link #getTime()} method + * @param stopNs time returned by {@link #getTime()} method + * @param methodName key name to store this time + */ + public void add(long startNs, long stopNs, String methodName) { + long time = stopNs - startNs; + + // incremente le nombre d'appel pour cette methode + CallStat calls = callCount.get(methodName); + if (calls == null) { + // is not thread safe, but if we lose one or two call, is not importante + calls = new CallStat(); + callCount.put(methodName, calls); + } + calls.callNumber++; + calls.callTime += time; + + // affiche le temps de l'appel si necessaire + String timeString = StringUtil.convertTime(time); + String msg = String.format("[%s] for method %s (%s)", + timeString, methodName, calls); + + if (time > timeToLogWarn && log.isWarnEnabled()) { + log.warn(msg); + } else if (time > timeToLogInfo && log.isInfoEnabled()) { + log.info(msg); + } else if (log.isDebugEnabled()) { + log.debug(msg); + } + + } + +}

1 0

r1965 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 7, 2010

Dec. 7, 2010

Author: bpoussin Date: 2010-12-07 01:42:17 +0100 (Tue, 07 Dec 2010) New Revision: 1965 Url: http://nuiton.org/repositories/revision/nuiton-utils/1965 Log: add new constructor that take filename as argument and call parse 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-12-07 00:35:41 UTC (rev 1964) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-12-07 00:42:17 UTC (rev 1965) @@ -591,6 +591,18 @@ } /** + * Create WikittyConfig and load particular configuration filename, parse + * method is automaticaly called + * + * @param configFilename name of wikitty config file + */ + public ApplicationConfig(String configFilename) throws ArgumentsParserException { + this(); + parse(new String[]{ + "--option", ApplicationConfig.CONFIG_FILE_NAME, configFilename}); + } + + /** * Init ApplicationConfig with current simple class name as config file * and use Properties parameter as defaults *

1 0

r1964 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 7, 2010

Dec. 7, 2010

Author: bpoussin Date: 2010-12-07 01:35:41 +0100 (Tue, 07 Dec 2010) New Revision: 1964 Url: http://nuiton.org/repositories/revision/nuiton-utils/1964 Log: add substring javadoc Modified: trunk/src/main/java/org/nuiton/util/StringUtil.java Modified: trunk/src/main/java/org/nuiton/util/StringUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/StringUtil.java 2010-12-02 14:23:21 UTC (rev 1963) +++ trunk/src/main/java/org/nuiton/util/StringUtil.java 2010-12-07 00:35:41 UTC (rev 1964) @@ -198,11 +198,32 @@ return result; } + /** + * substring from begin to end of s + * + * example: + * <li> substring("tatetitotu", -4) => totu + * + * @param s + * @param begin if begin &lt 0 then begin start at end of string - begin + * @return + */ static public String substring(String s, int begin) { String result = substring(s, begin, s.length()); return result; } + /** + * substring from begin to end of s + * + * example: + * <li> substring("tatetitotu", -4, -2) => to + * + * @param s + * @param begin if begin < 0 then begin start at end of string - begin + * @param end if end < 0 then end start at end of string - end + * @return + */ static public String substring(String s, int begin, int end) { if (begin < 0) { begin = s.length() + begin;

1 0

r1963 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 2, 2010

Dec. 2, 2010

Author: bpoussin Date: 2010-12-02 15:23:21 +0100 (Thu, 02 Dec 2010) New Revision: 1963 Url: http://nuiton.org/repositories/revision/nuiton-utils/1963 Log: in choiceArguement method break when one object is found to return immediatly Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-12-02 09:42:21 UTC (rev 1962) +++ trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-12-02 14:23:21 UTC (rev 1963) @@ -136,9 +136,11 @@ // cas on l'on trouve une class dans arg qui une fois instancier convient result = newInstance((Class) o, args, nullIfMissing); addResult = true; + break; } else if (clazz.isInstance(o)) { // cas on l'on retrouve un objet assignable pour ce type result = o; + break; } } }

1 0

r1962 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 2, 2010

Dec. 2, 2010

Author: bpoussin Date: 2010-12-02 10:42:21 +0100 (Thu, 02 Dec 2010) New Revision: 1962 Url: http://nuiton.org/repositories/revision/nuiton-utils/1962 Log: keep in available object, object created to prevent multiple instanciation Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-12-02 01:03:40 UTC (rev 1961) +++ trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-12-02 09:42:21 UTC (rev 1962) @@ -54,6 +54,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.LinkedList; import java.util.List; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtils; @@ -93,12 +94,16 @@ if (constructors.length != 1) { throw new IllegalArgumentException(_("Your class %s has more than one constructor", clazz)); } + + // copy collection into modifiable list to add new object + List container = new LinkedList(args); + Constructor<E> constructor = constructors[0]; Class[] paramTypes = constructor.getParameterTypes(); Object[] params = new Object[paramTypes.length]; for (int i=0; i<paramTypes.length; i++) { - Object o = choiceArgument(paramTypes[i], args, nullIfMissing); + Object o = choiceArgument(paramTypes[i], container, nullIfMissing); params[i] = o; } @@ -122,13 +127,15 @@ * @param nullIfMissing * @return */ - static protected Object choiceArgument(Class clazz, Collection args, boolean nullIfMissing) { + static protected Object choiceArgument(Class clazz, List args, boolean nullIfMissing) { Object result = null; + boolean addResult = false; for (Object o : args) { if (o != null) { if ((o instanceof Class) && clazz.isAssignableFrom((Class) o)) { // cas on l'on trouve une class dans arg qui une fois instancier convient result = newInstance((Class) o, args, nullIfMissing); + addResult = true; } else if (clazz.isInstance(o)) { // cas on l'on retrouve un objet assignable pour ce type result = o; @@ -136,6 +143,13 @@ } } + if (addResult) { + // on ajoute en tete pour qu'il soit retrouve dans les premiers + // et non pas reinstancier une nouvelle fois si on en a besoin + // a nouveau + args.add(0, result); + } + // si on ne retrouve rien, result est reste a null if (result == null && !nullIfMissing) { throw new IllegalArgumentException(_(

1 0

r1961 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org Dec. 2, 2010

Dec. 2, 2010

Author: bpoussin Date: 2010-12-02 02:03:40 +0100 (Thu, 02 Dec 2010) New Revision: 1961 Url: http://nuiton.org/repositories/revision/nuiton-utils/1961 Log: add new method newInstance that try to find argument for constructor in collection of object and class Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-11-29 20:12:17 UTC (rev 1960) +++ trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-12-02 01:03:40 UTC (rev 1961) @@ -53,6 +53,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtils; @@ -77,6 +78,73 @@ private ObjectUtil() {} /** + * Invoke constructor on clazz to create new instance. Try to find argument + * for constructor in args parameter. + * + * @param clazz class of object to instanciate + * @param args all possible parameter that constructor can used + * @param nullIfMissing if no suitable class or object found in args, + * use null value (no exception) + * @return new instance + * @throws IllegalArgumentException if something is wrong during instanciation + */ + static public <E> E newInstance(Class<E> clazz, Collection args, boolean nullIfMissing) { + Constructor<E>[] constructors = (Constructor<E>[])clazz.getConstructors(); + if (constructors.length != 1) { + throw new IllegalArgumentException(_("Your class %s has more than one constructor", clazz)); + } + Constructor<E> constructor = constructors[0]; + Class[] paramTypes = constructor.getParameterTypes(); + Object[] params = new Object[paramTypes.length]; + + for (int i=0; i<paramTypes.length; i++) { + Object o = choiceArgument(paramTypes[i], args, nullIfMissing); + params[i] = o; + } + + try { + E result = constructor.newInstance(params); + return result; + } catch (Exception eee) { + throw new IllegalArgumentException(_( + "Class %s can't be instanciated with %s", + clazz, Arrays.toString(params)), eee); + } + } + + /** + * Permet de matcher un type d'agument attendu clazz parmi un ensemble + * possible de candidat. Les candidats peuvent etre des classes qu'il faudra + * instancier pour satisfaire le type demande. + * + * @param clazz + * @param args + * @param nullIfMissing + * @return + */ + static protected Object choiceArgument(Class clazz, Collection args, boolean nullIfMissing) { + Object result = null; + for (Object o : args) { + if (o != null) { + if ((o instanceof Class) && clazz.isAssignableFrom((Class) o)) { + // cas on l'on trouve une class dans arg qui une fois instancier convient + result = newInstance((Class) o, args, nullIfMissing); + } else if (clazz.isInstance(o)) { + // cas on l'on retrouve un objet assignable pour ce type + result = o; + } + } + } + + // si on ne retrouve rien, result est reste a null + if (result == null && !nullIfMissing) { + throw new IllegalArgumentException(_( + "Can't find assignable argument for %s in %s", clazz, args)); + } + return result; + } + + /** * Create new object from string like org.nuiton.Toto(name=machine, int=10) * where machine and int is properties on org.nuiton.Toto object. * Conversion between 10 in string and 10 as integer as automaticaly done

1 0