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

r1945 - trunk
by echatellier＠users.nuiton.org 05 Nov '10

05 Nov '10

Author: echatellier Date: 2010-11-05 10:53:45 +0100 (Fri, 05 Nov 2010) New Revision: 1945 Url: http://nuiton.org/repositories/revision/nuiton-utils/1945 Log: Update winstone to 0.9.10-hudson-24 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-05 09:52:03 UTC (rev 1944) +++ trunk/pom.xml 2010-11-05 09:53:45 UTC (rev 1945) @@ -84,7 +84,7 @@ <dependency> <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> - <version>0.9.10-hudson-20</version> + <version>0.9.10-hudson-24</version> <scope>provided</scope> </dependency>

1 0

r1944 - trunk
by echatellier＠users.nuiton.org 05 Nov '10

05 Nov '10

Author: echatellier Date: 2010-11-05 10:52:03 +0100 (Fri, 05 Nov 2010) New Revision: 1944 Url: http://nuiton.org/repositories/revision/nuiton-utils/1944 Log: Next version is 1.5.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 08:29:25 UTC (rev 1943) +++ trunk/pom.xml 2010-11-05 09:52:03 UTC (rev 1944) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <dependencies>

1 0

r1943 - trunk
by tchemit＠users.nuiton.org 29 Oct '10

29 Oct '10

Author: tchemit Date: 2010-10-29 10:29:25 +0200 (Fri, 29 Oct 2010) New Revision: 1943 Url: http://nuiton.org/repositories/revision/nuiton-utils/1943 Log: Update mavenpom4redmineAndCentral to 2.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-28 13:39:25 UTC (rev 1942) +++ trunk/pom.xml 2010-10-29 08:29:25 UTC (rev 1943) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1942 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 28 Oct '10

28 Oct '10

Author: bpoussin Date: 2010-10-28 15:39:25 +0200 (Thu, 28 Oct 2010) New Revision: 1942 Url: http://nuiton.org/repositories/revision/nuiton-utils/1942 Log: add EMPTY_STRING_ARRAY in ArrayUtil and use it in parse method of ApplicationConfig Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/src/main/java/org/nuiton/util/ArrayUtil.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-10-28 09:54:34 UTC (rev 1941) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-10-28 13:39:25 UTC (rev 1942) @@ -1432,7 +1432,7 @@ */ public void parse(String[] args) throws ArgumentsParserException { if (args == null) { - args = new String[0]; + args = ArrayUtil.EMPTY_STRING_ARRAY; } try { Map<String, Method> methods = getMethods(); Modified: trunk/src/main/java/org/nuiton/util/ArrayUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ArrayUtil.java 2010-10-28 09:54:34 UTC (rev 1941) +++ trunk/src/main/java/org/nuiton/util/ArrayUtil.java 2010-10-28 13:39:25 UTC (rev 1942) @@ -45,6 +45,9 @@ public class ArrayUtil { // ArrayUtil + /** empty string array useful when we want passe null, but api want String[] */ + static final String[] EMPTY_STRING_ARRAY = new String[0]; + /** * Permet de convertir un tableau en une liste, le type primitif * est encapsulé dans un objet.

1 0

r1941 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 28 Oct '10

28 Oct '10

Author: bpoussin Date: 2010-10-28 11:54:34 +0200 (Thu, 28 Oct 2010) New Revision: 1941 Url: http://nuiton.org/repositories/revision/nuiton-utils/1941 Log: accept null argument for parse 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-10-27 10:59:17 UTC (rev 1940) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-10-28 09:54:34 UTC (rev 1941) @@ -546,7 +546,7 @@ // iterate with Properties method and not with Hashtable method to // prevent missed value with chained Properties object for (String key : defaults.stringPropertyNames()) { - this.defaults.put(key, defaults.getProperty(key)); + setDefaultOption(key, defaults.getProperty(key)); } } @@ -1431,6 +1431,9 @@ * @throws ArgumentsParserException if parsing failed */ public void parse(String[] args) throws ArgumentsParserException { + if (args == null) { + args = new String[0]; + } try { Map<String, Method> methods = getMethods();

2 1

r1940 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 27 Oct '10

27 Oct '10

Author: bpoussin Date: 2010-10-27 12:59:17 +0200 (Wed, 27 Oct 2010) New Revision: 1940 Url: http://nuiton.org/repositories/revision/nuiton-utils/1940 Log: use good way for iteration on properties (prevent chained properties problem) 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-10-27 09:05:59 UTC (rev 1939) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-10-27 10:59:17 UTC (rev 1940) @@ -543,8 +543,11 @@ */ public ApplicationConfig(Properties defaults) { this(); - // TODO poussin 20101112 perhaps iterate with Properties method and not with Hashtable method to prevent missed value with chained Properties object - this.defaults.putAll(defaults); + // iterate with Properties method and not with Hashtable method to + // prevent missed value with chained Properties object + for (String key : defaults.stringPropertyNames()) { + this.defaults.put(key, defaults.getProperty(key)); + } } /**

1 0

r1939 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 27 Oct '10

27 Oct '10

Author: bpoussin Date: 2010-10-27 11:05:59 +0200 (Wed, 27 Oct 2010) New Revision: 1939 Url: http://nuiton.org/repositories/revision/nuiton-utils/1939 Log: remove unused import 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-10-26 12:57:58 UTC (rev 1938) +++ trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-10-27 09:05:59 UTC (rev 1939) @@ -36,17 +36,13 @@ package org.nuiton.util; -import com.sun.corba.se.impl.orbutil.ObjectWriter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.beanutils.MethodUtils; import static org.nuiton.i18n.I18n._;

1 0

r1938 - trunk
by tchemit＠users.nuiton.org 26 Oct '10

26 Oct '10

Author: tchemit Date: 2010-10-26 14:57:58 +0200 (Tue, 26 Oct 2010) New Revision: 1938 Url: http://nuiton.org/repositories/revision/nuiton-utils/1938 Log: fix build (use inheritance from mavenpom for commons libs) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 12:13:48 UTC (rev 1937) +++ trunk/pom.xml 2010-10-26 12:57:58 UTC (rev 1938) @@ -44,7 +44,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.16</version> +  <scope>provided</scope> </dependency>

1 0

r1937 - trunk
by tchemit＠users.nuiton.org 26 Oct '10

26 Oct '10

Author: tchemit Date: 2010-10-26 14:13:48 +0200 (Tue, 26 Oct 2010) New Revision: 1937 Url: http://nuiton.org/repositories/revision/nuiton-utils/1937 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-22 13:13:20 UTC (rev 1936) +++ trunk/pom.xml 2010-10-26 12:13:48 UTC (rev 1937) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> @@ -51,41 +51,33 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> </dependency> <dependency> <groupId>commons-primitives</groupId> <artifactId>commons-primitives</artifactId> - <version>1.0</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.8.2</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> - <version>${i18n.version}</version> + <version>${nuitonI18nVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> <scope>test</scope> </dependency> @@ -123,7 +115,7 @@ <properties> - <i18n.version>1.2.2</i18n.version> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> @@ -138,7 +130,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> + <version>${nuitonI18nVersion}</version> <configuration> <silent>true</silent> </configuration>

1 0

r1936 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by bpoussin＠users.nuiton.org 22 Oct '10

22 Oct '10

Author: bpoussin Date: 2010-10-22 15:13:20 +0200 (Fri, 22 Oct 2010) New Revision: 1936 Url: http://nuiton.org/repositories/revision/nuiton-utils/1936 Log: add method clone and deepClone on ObjectUtil http://www.nuiton.org/issues/show/971 Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java trunk/src/test/java/org/nuiton/util/ObjectUtilTest.java Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-10-21 09:29:28 UTC (rev 1935) +++ trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-10-22 13:13:20 UTC (rev 1936) @@ -36,9 +36,17 @@ package org.nuiton.util; +import com.sun.corba.se.impl.orbutil.ObjectWriter; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.commons.beanutils.MethodUtils; import static org.nuiton.i18n.I18n._; @@ -132,8 +140,61 @@ } return t; } - + /** + * Clone object by introspection because Cloneable interface don't permit + * to call clone :(. This methode replace next code that don't work :( + * + * <pre> + * if (o instanceof Cloneable) { + * Object n = ((Cloneable)o).clone(); + * } + * </pre> + * + * @param e object to clone + * @return new instance of E + * @throws CloneNotSupportedException if some error occur during clone + */ + static public <E extends Cloneable> E clone(E e) throws CloneNotSupportedException { + try { + E result = (E) MethodUtils.invokeExactMethod(e, "clone", null); + return result; + } catch (Exception eee) { + // on est oblige de faire un log, car CloneNotSupportedException + // ne prend pas d'exception en arguement :( + log.error("Can't clone object", eee); + throw new CloneNotSupportedException(); + } + } + + /** + * Use serialization/deserialization to do deep clone of object + * @param e object to clone + * @return new instance of E + * @throws CloneNotSupportedException if some error occur during clone + */ + static public <E> E deepClone(E e) throws CloneNotSupportedException { + try { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(bos); + oos.writeObject(e); + oos.close(); + + ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); + ObjectInputStream ois = new ObjectInputStream(bis); + E result = (E) ois.readObject(); + ois.close(); + + return result; + } catch (Exception eee) { + // on est oblige de faire un log, car CloneNotSupportedException + // ne prend pas d'exception en arguement :( + log.error("Can't clone object", eee); + throw new CloneNotSupportedException(); + } + } + + /** * Call method m with params as String. Each param is converted to required type for * method with beanutils converter * @param o object where method must be call Modified: trunk/src/test/java/org/nuiton/util/ObjectUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ObjectUtilTest.java 2010-10-21 09:29:28 UTC (rev 1935) +++ trunk/src/test/java/org/nuiton/util/ObjectUtilTest.java 2010-10-22 13:13:20 UTC (rev 1936) @@ -41,6 +41,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; import org.junit.Assert; import org.junit.Test; @@ -53,7 +54,7 @@ public class ObjectUtilTest extends Assert { @Test - public void testCall() throws Exception { + public void testCall() throws Exception { Dummy dummy = new Dummy(); List<Method> methods = ObjectUtil.getMethod(Dummy.class, "setfile", true); @@ -72,10 +73,32 @@ assertEquals("toto", dummy.getName()); assertEquals(new ArrayList<File>(), Arrays.asList(dummy.getAllFile())); -} - -@Test - public void testCreate() throws Exception { + } + + @Test + public void testClone() throws Exception { + ArrayList c = new ArrayList(); + ArrayList inner = new ArrayList(); + c.add(inner); + + ArrayList n = ObjectUtil.clone(c); + Assert.assertNotSame(c, n); + Assert.assertSame(c.get(0), n.get(0)); + } + + @Test + public void testDeepClone() throws Exception { + ArrayList c = new ArrayList(); + ArrayList inner = new ArrayList(); + c.add(inner); + + ArrayList n = ObjectUtil.deepClone(c); + Assert.assertNotSame(c, n); + Assert.assertNotSame(c.get(0), n.get(0)); + } + + @Test + public void testCreate() throws Exception { Object o = ObjectUtil.create("java.lang.StringBuffer"); assertTrue(o != null); assertTrue(o instanceof StringBuffer);

2 1