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 b811fd5e26e5444c2ae626794b723e407763d2ea Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Aug 21 11:49:14 2017 +0200 fixes #318: Replace deprecated --- src/main/java/org/nuiton/util/AliasMap.java | 18 ++++++++++-------- src/main/java/org/nuiton/util/MatrixMap.java | 17 +++-------------- src/main/java/org/nuiton/util/beans/BeanMonitor.java | 11 ++--------- 3 files changed, 15 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/nuiton/util/AliasMap.java b/src/main/java/org/nuiton/util/AliasMap.java index 7e6c9b1..281ef62 100644 --- a/src/main/java/org/nuiton/util/AliasMap.java +++ b/src/main/java/org/nuiton/util/AliasMap.java @@ -24,7 +24,9 @@ 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; @@ -62,13 +64,13 @@ public class AliasMap<K, V, A> extends HashMap<K, V> { private static final long serialVersionUID = 1L; /** key: alias, value: key */ - protected MultiValueMap aliases; + protected MultiValuedMap aliases; /** key: key, value: alias */ - protected MultiValueMap keys; + protected MultiValuedMap keys; public AliasMap() { - aliases = MultiValueMap.multiValueMap(new HashMap(), HashSet.class); - keys = MultiValueMap.multiValueMap(new HashMap(), HashSet.class); + aliases = new HashSetValuedHashMap(); + keys = new HashSetValuedHashMap(); } /** @@ -124,7 +126,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.getCollection(a); + Collection tmp = aliases.get(a); if (tmp != null) { if (result == null) { result = new HashSet(tmp); @@ -184,7 +186,7 @@ public class AliasMap<K, V, A> extends HashMap<K, V> { * @return FIXME */ public Collection<A> getAlias(K key) { - Collection result = keys.getCollection(key); + Collection result = keys.get(key); if (result == null) { result = Collections.emptySet(); } @@ -213,7 +215,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.getCollection(a))) { + if (CollectionUtils.isEmpty(aliases.get(a))) { aliases.remove(a); } } @@ -261,7 +263,7 @@ public class AliasMap<K, V, A> extends HashMap<K, V> { */ public void removeAlias(A ... alias) { for (Object a : alias) { - Collection ks = aliases.getCollection(a); + Collection ks = aliases.get(a); aliases.remove(a); if (ks != null) { for (Object k : ks) { diff --git a/src/main/java/org/nuiton/util/MatrixMap.java b/src/main/java/org/nuiton/util/MatrixMap.java index 33ccce1..c16b250 100644 --- a/src/main/java/org/nuiton/util/MatrixMap.java +++ b/src/main/java/org/nuiton/util/MatrixMap.java @@ -27,18 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.io.Serializable; -import java.util.AbstractList; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.RandomAccess; +import java.util.*; /** * Permet de stocker des informations dans une matrix a N dimension @@ -1081,7 +1070,7 @@ public interface MatrixMap<E> extends Iterable<E> { for (int i = 0; result && i < getDimCount(); i++) { String dimName1 = getDimensionName(i); String dimName2 = mat.getDimensionName(i); - result = ObjectUtils.equals(dimName1, dimName2); + result = Objects.equals(dimName1, dimName2); if (log.isTraceEnabled()) { log.trace("dimName1(" + dimName1 + ")==dimName2(" + dimName2 + ")=" + result); @@ -1091,7 +1080,7 @@ public interface MatrixMap<E> extends Iterable<E> { List sem1 = getSemantic(i); List sem2 = mat.getSemantic(i); - result = result && ObjectUtils.equals(sem1, sem2); + result = result && Objects.equals(sem1, sem2); if (log.isTraceEnabled()) { log.trace("sem1(" + sem1 + ")==sem2(" + sem2 + ")=" + result); } diff --git a/src/main/java/org/nuiton/util/beans/BeanMonitor.java b/src/main/java/org/nuiton/util/beans/BeanMonitor.java index 9a895e2..f2a6415 100644 --- a/src/main/java/org/nuiton/util/beans/BeanMonitor.java +++ b/src/main/java/org/nuiton/util/beans/BeanMonitor.java @@ -27,14 +27,7 @@ import org.apache.commons.logging.LogFactory; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; +import java.util.*; /** * A monitor of beans. @@ -121,7 +114,7 @@ public class BeanMonitor { // check if value did not come back to original Object originalValue = propertyDiff.getSourceValue(); - if (ObjectUtils.equals(originalValue, newValue)) { + if (Objects.equals(originalValue, newValue)) { // coming back to original value // the property is no more modified -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.