branch develop updated (b811fd5 -> fe07c20)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git from b811fd5 fixes #318: Replace deprecated new fe07c20 fixes #318: Revert due to test behaviour change The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit fe07c201ea3f21f52e5e2e1bab6c292acc6d8e7a Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Aug 21 12:38:38 2017 +0200 fixes #318: Revert due to test behaviour change Summary of changes: src/main/java/org/nuiton/util/AliasMap.java | 18 ++++++++---------- src/test/java/org/nuiton/util/AliasMapTest.java | 12 ++---------- 2 files changed, 10 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git commit fe07c201ea3f21f52e5e2e1bab6c292acc6d8e7a Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Aug 21 12:38:38 2017 +0200 fixes #318: Revert due to test behaviour change --- src/main/java/org/nuiton/util/AliasMap.java | 18 ++++++++---------- src/test/java/org/nuiton/util/AliasMapTest.java | 12 ++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/nuiton/util/AliasMap.java b/src/main/java/org/nuiton/util/AliasMap.java index 281ef62..7e6c9b1 100644 --- a/src/main/java/org/nuiton/util/AliasMap.java +++ b/src/main/java/org/nuiton/util/AliasMap.java @@ -24,9 +24,7 @@ package org.nuiton.util; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.MultiValuedMap; import org.apache.commons.collections4.map.MultiValueMap; -import org.apache.commons.collections4.multimap.HashSetValuedHashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -64,13 +62,13 @@ public class AliasMap<K, V, A> extends HashMap<K, V> { private static final long serialVersionUID = 1L; /** key: alias, value: key */ - protected MultiValuedMap aliases; + protected MultiValueMap aliases; /** key: key, value: alias */ - protected MultiValuedMap keys; + protected MultiValueMap keys; public AliasMap() { - aliases = new HashSetValuedHashMap(); - keys = new HashSetValuedHashMap(); + aliases = MultiValueMap.multiValueMap(new HashMap(), HashSet.class); + keys = MultiValueMap.multiValueMap(new HashMap(), HashSet.class); } /** @@ -126,7 +124,7 @@ public class AliasMap<K, V, A> extends HashMap<K, V> { public Collection<K> getKeyAlias(A ... alias) { Collection result = null; for (Object a : alias) { - Collection tmp = aliases.get(a); + Collection tmp = aliases.getCollection(a); if (tmp != null) { if (result == null) { result = new HashSet(tmp); @@ -186,7 +184,7 @@ public class AliasMap<K, V, A> extends HashMap<K, V> { * @return FIXME */ public Collection<A> getAlias(K key) { - Collection result = keys.get(key); + Collection result = keys.getCollection(key); if (result == null) { result = Collections.emptySet(); } @@ -215,7 +213,7 @@ public class AliasMap<K, V, A> extends HashMap<K, V> { if (alias != null) { for (Object a : alias) { aliases.removeMapping(a, key); - if (CollectionUtils.isEmpty(aliases.get(a))) { + if (CollectionUtils.isEmpty(aliases.getCollection(a))) { aliases.remove(a); } } @@ -263,7 +261,7 @@ public class AliasMap<K, V, A> extends HashMap<K, V> { */ public void removeAlias(A ... alias) { for (Object a : alias) { - Collection ks = aliases.get(a); + Collection ks = aliases.getCollection(a); aliases.remove(a); if (ks != null) { for (Object k : ks) { diff --git a/src/test/java/org/nuiton/util/AliasMapTest.java b/src/test/java/org/nuiton/util/AliasMapTest.java index ef7c4a4..8f80b15 100644 --- a/src/test/java/org/nuiton/util/AliasMapTest.java +++ b/src/test/java/org/nuiton/util/AliasMapTest.java @@ -4,7 +4,7 @@ package org.nuiton.util; * #%L * Nuiton Utils * %% - * Copyright (C) 2004 - 2013 CodeLutin + * Copyright (C) 2004 - 2017 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 @@ -22,9 +22,6 @@ package org.nuiton.util; * #L% */ - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; @@ -36,11 +33,6 @@ import java.util.Collection; */ public class AliasMapTest { - /** - * Logger. - */ - private static final Log log = LogFactory.getLog(AliasMapTest.class); - protected Object[] toArray(Collection c) { Object[] result = c.toArray(); Arrays.sort(result); @@ -49,7 +41,7 @@ public class AliasMapTest { @Test public void testAlias() { - AliasMap<String, String, String> map = new AliasMap<String, String, String>(); + AliasMap<String, String, String> map = new AliasMap<>(); map.put("a", "A", "à", "â", "ä", "commun"); map.put("b", "B"); map.put("e", "E", "é", "è", "ê", "ë", "commun"); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm