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

r2509 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by tchemit＠users.nuiton.org 24 Feb '13

24 Feb '13

Author: tchemit Date: 2013-02-24 11:38:46 +0100 (Sun, 24 Feb 2013) New Revision: 2509 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2509 Log: fixes #2542: Deprecates ApplicationUpdater Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater.java trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationUpdaterTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater.java 2013-02-24 01:40:27 UTC (rev 2508) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater.java 2013-02-24 10:38:46 UTC (rev 2509) @@ -127,7 +127,10 @@ * by : $Author$ * * @since 2.6.6 + * @deprecated since 2.7 (replaced by org.nuiton.util.updater.ApplicationUpdater + * in nuiton-updater module), will be removed in version 2.7.1. */ +@Deprecated public class ApplicationUpdater { /** to use log facility, just put in your code: log.info(\"...\"); */ @@ -206,7 +209,7 @@ * * Si {@link ApplicationInfo#needAuthentication} est vrai, il faut que * les valeurs {@link ApplicationInfo#login} et {@link ApplicationInfo#password} - * soient renseignees. Si elle ne le sont pas la recuperation de la + * soient renseignees. Si elle ne le sont pas la recuperation de la * ressource echouera. Pour des raisons de securite vous pouvez souhaiter * mettre le mot de passe sous une forme encrypte. Dans ce cas il doit * etre encadrer par '{' et '}'. Pour encrypter le mot de passe @@ -281,7 +284,7 @@ name, oldVersion, newVersion, url, destDir); return result; } - + } /** @@ -427,7 +430,7 @@ * si targetPath existait deja, il est supprime au prealable. * * Si l'archive a plus d'un repertoire root, une exception est levee - * + * * @param srcPath source path de la forme vfs2 ex:"zip:http://www.nuiton.org/attachments/download/830/nuiton-utils-2.6.5-deps.…" * @param targetPath le path destination * @throws FileSystemException @@ -537,7 +540,7 @@ if (StringUtils.isNumeric(port)) { int portNumber = Integer.parseInt(port); - + HttpFileSystemConfigBuilder.getInstance().setProxyHost(result, hostname); HttpFileSystemConfigBuilder.getInstance().setProxyPort(result, portNumber); } else { Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationUpdaterTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationUpdaterTest.java 2013-02-24 01:40:27 UTC (rev 2508) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationUpdaterTest.java 2013-02-24 10:38:46 UTC (rev 2509) @@ -39,8 +39,8 @@ * @version $Revision$ * @since 2.6.6 * - * Last update: $Date$ - * by : $Author$ + * @deprecated since 2.7 (replaced by org.nuiton.util.updater.ApplicationUpdater + * in nuiton-updater module), will be removed in version 2.7.1. */ public class ApplicationUpdaterTest {

1 0

r2508 - in trunk: . nuiton-csv nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org 24 Feb '13

24 Feb '13

Author: maven-release Date: 2013-02-24 02:40:27 +0100 (Sun, 24 Feb 2013) New Revision: 2508 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2508 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2013-02-24 01:40:25 UTC (rev 2507) +++ trunk/nuiton-csv/pom.xml 2013-02-24 01:40:27 UTC (rev 2508) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.9</version> + <version>2.6.10-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2013-02-24 01:40:25 UTC (rev 2507) +++ trunk/nuiton-utils/pom.xml 2013-02-24 01:40:27 UTC (rev 2508) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.9</version> + <version>2.6.10-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-02-24 01:40:25 UTC (rev 2507) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-02-24 01:40:27 UTC (rev 2508) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.9</version> + <version>2.6.10-SNAPSHOT</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2013-02-24 01:40:25 UTC (rev 2507) +++ trunk/nuiton-validator/pom.xml 2013-02-24 01:40:27 UTC (rev 2508) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.9</version> + <version>2.6.10-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-24 01:40:25 UTC (rev 2507) +++ trunk/pom.xml 2013-02-24 01:40:27 UTC (rev 2508) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.9</version> + <version>2.6.10-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -331,12 +331,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.9 + 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.6.9 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-utils-2…</url> + <url>http://nuiton.org/projects/nuiton-utils/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2507 - in tags: . nuiton-utils-2.6.9
by maven-release＠users.nuiton.org 24 Feb '13

24 Feb '13

Author: maven-release Date: 2013-02-24 02:40:25 +0100 (Sun, 24 Feb 2013) New Revision: 2507 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2507 Log: [maven-release-plugin] copy for tag nuiton-utils-2.6.9 Added: tags/nuiton-utils-2.6.9/ Property changes on: tags/nuiton-utils-2.6.9 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2506 - in trunk: . nuiton-csv nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org 24 Feb '13

24 Feb '13

Author: maven-release Date: 2013-02-24 02:40:22 +0100 (Sun, 24 Feb 2013) New Revision: 2506 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2506 Log: [maven-release-plugin] prepare release nuiton-utils-2.6.9 Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2013-02-23 14:49:49 UTC (rev 2505) +++ trunk/nuiton-csv/pom.xml 2013-02-24 01:40:22 UTC (rev 2506) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.9-SNAPSHOT</version> + <version>2.6.9</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2013-02-23 14:49:49 UTC (rev 2505) +++ trunk/nuiton-utils/pom.xml 2013-02-24 01:40:22 UTC (rev 2506) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.9-SNAPSHOT</version> + <version>2.6.9</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-02-23 14:49:49 UTC (rev 2505) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-02-24 01:40:22 UTC (rev 2506) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.9-SNAPSHOT</version> + <version>2.6.9</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2013-02-23 14:49:49 UTC (rev 2505) +++ trunk/nuiton-validator/pom.xml 2013-02-24 01:40:22 UTC (rev 2506) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.9-SNAPSHOT</version> + <version>2.6.9</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-23 14:49:49 UTC (rev 2505) +++ trunk/pom.xml 2013-02-24 01:40:22 UTC (rev 2506) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.9-SNAPSHOT</version> + <version>2.6.9</version> <modules> <module>nuiton-utils</module> @@ -331,12 +331,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.6.9 </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.6.9 </developerConnection> - <url>http://nuiton.org/projects/nuiton-utils/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-utils-2…</url> </scm> <distributionManagement>

1 0

r2505 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by bpoussin＠users.nuiton.org 23 Feb '13

23 Feb '13

Author: bpoussin Date: 2013-02-23 15:49:49 +0100 (Sat, 23 Feb 2013) New Revision: 2505 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2505 Log: ajout header et svn:keyword Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java trunk/nuiton-utils/src/main/java/org/nuiton/util/SemVer.java trunk/nuiton-utils/src/test/java/org/nuiton/util/AliasMapTest.java trunk/nuiton-utils/src/test/java/org/nuiton/util/SemVerTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java 2013-02-23 14:02:19 UTC (rev 2504) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java 2013-02-23 14:49:49 UTC (rev 2505) @@ -1,6 +1,30 @@ package org.nuiton.util; +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; Property changes on: trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/SemVer.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/SemVer.java 2013-02-23 14:02:19 UTC (rev 2504) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/SemVer.java 2013-02-23 14:49:49 UTC (rev 2505) @@ -3,8 +3,8 @@ /* * #%L * Nuiton Utils :: Nuiton Utils - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2013 CodeLutin * %% Property changes on: trunk/nuiton-utils/src/main/java/org/nuiton/util/SemVer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/AliasMapTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/AliasMapTest.java 2013-02-23 14:02:19 UTC (rev 2504) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/AliasMapTest.java 2013-02-23 14:49:49 UTC (rev 2505) @@ -1,6 +1,30 @@ package org.nuiton.util; +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + import java.util.Arrays; import java.util.Collection; import org.apache.commons.logging.Log; Property changes on: trunk/nuiton-utils/src/test/java/org/nuiton/util/AliasMapTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/SemVerTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/SemVerTest.java 2013-02-23 14:02:19 UTC (rev 2504) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/SemVerTest.java 2013-02-23 14:49:49 UTC (rev 2505) @@ -3,8 +3,8 @@ /* * #%L * Nuiton Utils :: Nuiton Utils - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2013 CodeLutin * %% Property changes on: trunk/nuiton-utils/src/test/java/org/nuiton/util/SemVerTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r2504 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 23 Feb '13

23 Feb '13

Author: bpoussin Date: 2013-02-23 15:02:19 +0100 (Sat, 23 Feb 2013) New Revision: 2504 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2504 Log: ajout du petit @since Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java 2013-02-23 14:00:57 UTC (rev 2503) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java 2013-02-23 14:02:19 UTC (rev 2504) @@ -31,6 +31,7 @@ * * @author poussin * @version $Revision$ + * @since 3.6.9 * * Last update: $Date$ * by : $Author$

1 0

r2503 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by bpoussin＠users.nuiton.org 23 Feb '13

23 Feb '13

Author: bpoussin Date: 2013-02-23 15:00:57 +0100 (Sat, 23 Feb 2013) New Revision: 2503 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2503 Log: Ajout d'un nouvelle implantation de Map qui permet de mettre des alias et de retourne une cle ou une valeur en passant en parametre les alias Added: trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java trunk/nuiton-utils/src/test/java/org/nuiton/util/AliasMapTest.java Added: trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java (rev 0) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/AliasMap.java 2013-02-23 14:00:57 UTC (rev 2503) @@ -0,0 +1,252 @@ +package org.nuiton.util; + + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.UUID; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.map.MultiValueMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Une map base sur une HashMap qui permet pour une valeur d'ajouter d'autres + * cles. Cette nouvelle cle est un alias, un alias peut-etre utilise pour + * plusieurs valeurs. Si l'on demande la valeur associe a un Alias, cela + * retourne une liste contenant toutes les valeurs pour lequel cette Alias est + * utilise. + * + * Cela permet de stocker des objets avec une cle principale et unique, puis + * avec des alias. + * + * Et ainsi recherche les valeurs qui ont un ensemble d'alias via la methode + * {@link #getValueAlias(java.lang.Object[]) } ou supprimer les valeurs qui + * ont un ensemble d'Alias en commun via la methode {@link #removeValue} + * + * Si la cle ne vous importe que peu, vous pouvez par exemple utiliser + * {@link UUID#randomUUID()} pour generer une cle unique. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class AliasMap<K, V, A> extends HashMap<K, V> { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(AliasMap.class); + private static final long serialVersionUID = 1L; + + /** key: alias, value: key */ + protected MultiValueMap aliases; + /** key: key, value: alias */ + protected MultiValueMap keys; + + public AliasMap() { + aliases = MultiValueMap.decorate(new HashMap<A, K>(), HashSet.class); + keys = MultiValueMap.decorate(new HashMap<K, A>(), HashSet.class); + } + + /** + * Ajoute une valeur dans la map avec un ensemble d'alias associe + * + * @param key identifiant unique pour cette valeur + * @param value la valeur + * @param alias les alias de la valeur + * @return + */ + public V put(K key, V value, A alias1, A ... alias) { + V result = put(key, value); + putAlias(key, alias1, alias); + + return result; + } + + /** + * Ajoute des alias a une cle + * @param key + * @param alias1 + * @param alias + */ + protected void putAlias(K key, A alias1, A ... alias) { + aliases.put(alias1, key); + keys.put(key, alias1); + for (Object a : alias) { + aliases.put(a, key); + keys.put(key, a); + } + } + + /** + * Retoure les cles en commun de tous les alias. Les cles retournees sont + * celle qui ont tous les alias. + * <pre> + * K1: a, b, c + * K2: b, c, d + * K3: c, d, e + * + * getKeyAlias(a, b, c) retourne [K1] + * getKeyAlias(b, c) retourne [K1, K2] + * getKeyAlias(c) retourne [K1, K2, K3] + * getKeyAlias(d) retourne [K2, K3] + * getKeyAlias(z) retourne [] + * </pre> + * + * + * @param alias + * @return une liste vide si aucune valeur ne correspond au alias en argument + */ + public Collection<K> getKeyAlias(A ... alias) { + Collection result = null; + for (Object a : alias) { + Collection tmp = aliases.getCollection(a); + if (tmp != null) { + if (result == null) { + result = new HashSet(tmp); + } else { + result.retainAll(tmp); + } + } + } + if (result == null) { + result = Collections.emptySet(); + } + return result; + } + + /** + * Retoure les valeurs en commun de tous les alias. Les valeurs retournees sont + * celle qui ont tous les alias. + * <pre> + * V1: a, b, c + * V2: b, c, d + * V3: c, d, e + * + * getKeyAlias(a, b, c) retourne [V1] + * getKeyAlias(b, c) retourne [V1, V2] + * getKeyAlias(c) retourne [V1, V2, V3] + * getKeyAlias(d) retourne [V2, V3] + * getKeyAlias(z) retourne [] + * </pre> + * + * + * @param alias + * @return une liste vide si aucune valeur ne correspond au alias en argument + */ + public Collection<V> getValueAlias(A ... alias) { + Collection keys = getKeyAlias(alias); + Collection result = new HashSet(keys.size()); + for (Object k : keys) { + result.add(get(k)); + } + return result; + } + + /** + * Retourne la liste d'alias associee avec une cle + * + * <pre> + * K1: a, b, c + * K2: b, c, d + * K3: c, d, e + * + * getAlias(K1) retourne [a, b, c] + * getAlias(k3) retourne [c, d, e] + * getKeyAlias(k9) retourne [] + * </pre> + * + * @param key + * @return + */ + public Collection<A> getAlias(K key) { + Collection result = keys.getCollection(key); + if (result == null) { + result = Collections.emptySet(); + } + return result; + } + + /** + * Retire une cle ainsi que tous ses alias + * + * <pre> + * K1: a, b, c + * K2: b, c, d + * K3: c, d, e + * + * remove(K1) il reste K2: [b, c, d], K3: [c, d, e] + * </pre> + * + * @param key + * @return + */ + @Override + public V remove(Object key) { + V result = super.remove(key); + Collection alias = getAlias((K)key); + keys.remove(key); + if (alias != null) { + for (Object a : alias) { + aliases.remove(a, key); + if (CollectionUtils.isEmpty(aliases.getCollection(a))) { + aliases.remove(a); + } + } + } + return result; + } + + /** + * Supprime toutes les valeurs et leur cle associe aux alias + * + * <pre> + * K1: a, b, c + * K2: b, c, d + * K3: c, d, e + * + * removeValue(b, c) il reste K3: [c, d, e] + * </pre> + * + * @param alias + * @return la liste de valeur qui a ete supprime de la map + */ + public Collection<V> removeValue(A ... alias) { + Collection keys = getKeyAlias(alias); + Collection result = new ArrayList(keys.size()); + for (Object k : keys) { + result.add(remove(k)); + } + return result; + } + + /** + * Supprime des alias quelque soit leur cle + * + * <pre> + * K1: a, b, c + * K2: b, c, d + * K3: c, d, e + * + * removeAlias(a, b) alors K1: [c], k2: [c, d], k3: [c, d, e] + * removeAlias(c) alors K1: [a, b], k2: [b, d], k3: [d, e] + * getKeyAlias(z) alors rien ne change car cette alias n'existe pas + * </pre> + * + * @param alias + */ + public void removeAlias(A ... alias) { + for (Object a : alias) { + Collection ks = aliases.getCollection(a); + aliases.remove(a); + if (ks != null) { + for (Object k : ks) { + keys.remove(k, a); + } + } + } + } +} Added: trunk/nuiton-utils/src/test/java/org/nuiton/util/AliasMapTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/AliasMapTest.java (rev 0) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/AliasMapTest.java 2013-02-23 14:00:57 UTC (rev 2503) @@ -0,0 +1,57 @@ +package org.nuiton.util; + + +import java.util.Arrays; +import java.util.Collection; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class AliasMapTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(AliasMapTest.class); + + protected Object[] toArray(Collection c) { + Object[] result = c.toArray(); + Arrays.sort(result); + return result; + } + + @Test + public void testAlias() { + AliasMap<String, String, String> map = new AliasMap<String, String, String>(); + map.put("a", "A", "à", "â", "ä", "commun"); + map.put("b", "B"); + map.put("e", "E", "é", "è", "ê", "ë", "commun"); + map.put("ebis", "EBIS", "é", "è", "commun"); + + Assert.assertEquals("A", map.get("a")); + Assert.assertArrayEquals(new String[]{"commun", "à", "â", "ä"}, toArray(map.getAlias("a"))); + Assert.assertArrayEquals(new String[]{"a"}, toArray(map.getKeyAlias("à"))); + Assert.assertArrayEquals(new String[]{"e", "ebis"}, toArray(map.getKeyAlias("é"))); + Assert.assertArrayEquals(new String[]{"E", "EBIS"}, toArray(map.getValueAlias("é", "è"))); + Assert.assertArrayEquals(new String[]{}, toArray(map.getValueAlias("é", "è", "à"))); + + String v = map.remove("e"); + Assert.assertEquals("E", v); + Assert.assertArrayEquals(new String[]{}, toArray(map.getAlias("e"))); + Assert.assertArrayEquals(new String[]{"ebis"}, toArray(map.getKeyAlias("é"))); + + Collection<String> cr = map.removeValue("à", "é"); + Assert.assertArrayEquals(new String[]{}, toArray(cr)); + + cr = map.removeValue("commun"); + Assert.assertArrayEquals(new String[]{"A", "EBIS"}, toArray(cr)); + } + +}

1 0

r2502 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 23 Feb '13

23 Feb '13

Author: bpoussin Date: 2013-02-23 14:06:57 +0100 (Sat, 23 Feb 2013) New Revision: 2502 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2502 Log: la constante CLASS_METHOD_SEPARATOR est maintenant public Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java 2013-02-20 11:24:30 UTC (rev 2501) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java 2013-02-23 13:06:57 UTC (rev 2502) @@ -74,7 +74,7 @@ static private Log log = LogFactory.getLog(ObjectUtil.class); /** Used to know what is separator between class and method*/ - private static final String CLASS_METHOD_SEPARATOR = "#"; + public static final String CLASS_METHOD_SEPARATOR = "#"; protected static final Integer ZERO = 0;

1 0

r2501 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 20 Feb '13

20 Feb '13

Author: bpoussin Date: 2013-02-20 12:24:30 +0100 (Wed, 20 Feb 2013) New Revision: 2501 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2501 Log: move reuseable code from ApplicationConfig to ObjectUtil Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2013-02-15 19:56:59 UTC (rev 2500) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2013-02-20 11:24:30 UTC (rev 2501) @@ -1876,30 +1876,10 @@ InvocationTargetException { Action result = null; - Class<?> clazz; - Method method = null; - String className; - String methodName; + List<Method> methods = ObjectUtil.getMethod(name, true); - // looking for method name - int sep = name.lastIndexOf(CLASS_METHOD_SEPARATOR); - if (sep == -1) { - throw new IllegalArgumentException(String.format( - "Can't find action method in %s", name)); - } else { - className = name.substring(0, sep); - methodName = name.substring(sep + 1); - } - - // looking for class name - try { - clazz = Class.forName(className); - } catch (ClassNotFoundException eee) { - throw new IllegalArgumentException(String.format( - "Can't find action class %s", className)); - } - - List<Method> methods = ObjectUtil.getMethod(clazz, methodName, true); + Class clazz = null; + Method method = null; if (methods.size() > 0) { if (methods.size() > 1) { log.warn(String.format( @@ -1907,6 +1887,7 @@ methods)); } method = methods.get(0); + clazz = method.getDeclaringClass(); } if (method != null) { Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java 2013-02-15 19:56:59 UTC (rev 2500) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java 2013-02-20 11:24:30 UTC (rev 2501) @@ -73,6 +73,9 @@ /** Logger. */ static private Log log = LogFactory.getLog(ObjectUtil.class); + /** Used to know what is separator between class and method*/ + private static final String CLASS_METHOD_SEPARATOR = "#"; + protected static final Integer ZERO = 0; protected static final Character ZEROC = (char) 0; @@ -396,6 +399,42 @@ return result; } + /** + * List method that match name, name must be [package.][class][#][method] + * if package, class or method missing, exception throw + * + * @param name name of the method + * @param ignoreCase check exact method name if false + * @return list of method that match name + * @since 2.6.9 + */ + static public List<Method> getMethod(String name, boolean ignoreCase) { + Class<?> clazz; + String className; + String methodName; + + // looking for method name + int sep = name.lastIndexOf(CLASS_METHOD_SEPARATOR); + if (sep == -1) { + throw new IllegalArgumentException(String.format( + "Can't find method in %s", name)); + } else { + className = name.substring(0, sep); + methodName = name.substring(sep + 1); + } + + // looking for class name + try { + clazz = Class.forName(className); + } catch (ClassNotFoundException eee) { + throw new IllegalArgumentException(String.format( + "Can't find class %s", className)); + } + + List<Method> result = ObjectUtil.getMethod(clazz, methodName, ignoreCase); + return result; + } + public static Object newInstance(String constructorWithParams) throws ClassNotFoundException { int p = constructorWithParams.indexOf('('); int l = constructorWithParams.lastIndexOf(')');

1 0

r2500 - in trunk: . nuiton-csv nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org 15 Feb '13

15 Feb '13

Author: maven-release Date: 2013-02-15 20:56:59 +0100 (Fri, 15 Feb 2013) New Revision: 2500 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2500 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2013-02-15 19:56:57 UTC (rev 2499) +++ trunk/nuiton-csv/pom.xml 2013-02-15 19:56:59 UTC (rev 2500) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.8</version> + <version>2.6.9-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2013-02-15 19:56:57 UTC (rev 2499) +++ trunk/nuiton-utils/pom.xml 2013-02-15 19:56:59 UTC (rev 2500) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.8</version> + <version>2.6.9-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-02-15 19:56:57 UTC (rev 2499) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-02-15 19:56:59 UTC (rev 2500) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.8</version> + <version>2.6.9-SNAPSHOT</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2013-02-15 19:56:57 UTC (rev 2499) +++ trunk/nuiton-validator/pom.xml 2013-02-15 19:56:59 UTC (rev 2500) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.8</version> + <version>2.6.9-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-15 19:56:57 UTC (rev 2499) +++ trunk/pom.xml 2013-02-15 19:56:59 UTC (rev 2500) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.8</version> + <version>2.6.9-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -331,12 +331,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.8 + 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.6.8 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-utils-2…</url> + <url>http://nuiton.org/projects/nuiton-utils/repository/show/trunk</url> </scm> <distributionManagement>

1 0