This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
The following commit(s) were added to refs/heads/master by this push:
new 4b1a3b0ce Import once instead of using FQCN over and over.
4b1a3b0ce is described below
commit 4b1a3b0ce818ec59e8e1316efcbf12ae645c8087
Author: Gary Gregory <[email protected]>
AuthorDate: Fri Jul 10 10:23:17 2026 -0400
Import once instead of using FQCN over and over.
---
.../apache/commons/collections4/ArrayStack.java | 8 ++-
.../java/org/apache/commons/collections4/Bag.java | 2 +-
.../org/apache/commons/collections4/Equator.java | 9 ++-
.../apache/commons/collections4/IterableGet.java | 3 +-
.../apache/commons/collections4/IterableUtils.java | 3 +-
.../org/apache/commons/collections4/MapUtils.java | 6 +-
.../apache/commons/collections4/MultiMapUtils.java | 4 +-
.../org/apache/commons/collections4/MultiSet.java | 2 +-
.../commons/collections4/OrderedIterator.java | 4 +-
.../org/apache/commons/collections4/Predicate.java | 2 +-
.../org/apache/commons/collections4/SortedBag.java | 4 +-
.../collections4/bag/AbstractBagDecorator.java | 3 +-
.../commons/collections4/bag/AbstractMapBag.java | 3 +-
.../bag/AbstractSortedBagDecorator.java | 3 +-
.../commons/collections4/bag/CollectionBag.java | 3 +-
.../collections4/bag/CollectionSortedBag.java | 3 +-
.../apache/commons/collections4/bag/HashBag.java | 4 +-
.../commons/collections4/bag/PredicatedBag.java | 3 +-
.../collections4/bag/PredicatedSortedBag.java | 3 +-
.../commons/collections4/bag/SynchronizedBag.java | 3 +-
.../collections4/bag/SynchronizedSortedBag.java | 3 +-
.../commons/collections4/bag/TransformedBag.java | 3 +-
.../collections4/bag/TransformedSortedBag.java | 3 +-
.../apache/commons/collections4/bag/TreeBag.java | 6 +-
.../commons/collections4/bag/UnmodifiableBag.java | 3 +-
.../collections4/bag/UnmodifiableSortedBag.java | 3 +-
.../commons/collections4/bidimap/TreeBidiMap.java | 3 +-
.../collections4/bloomfilter/CellExtractor.java | 3 +-
.../comparators/ComparableComparator.java | 6 +-
.../collections4/iterators/ArrayIterator.java | 5 +-
.../collections4/iterators/ArrayListIterator.java | 7 ++-
.../collections4/iterators/CollatingIterator.java | 3 +-
.../iterators/ListIteratorWrapper.java | 3 +-
.../iterators/ObjectArrayIterator.java | 3 +-
.../iterators/ObjectArrayListIterator.java | 7 ++-
.../collections4/iterators/PeekingIterator.java | 3 +-
.../collections4/iterators/SingletonIterator.java | 3 +-
.../iterators/SingletonListIterator.java | 3 +-
.../collections4/keyvalue/AbstractKeyValue.java | 5 +-
.../collections4/keyvalue/AbstractMapEntry.java | 3 +-
.../keyvalue/AbstractMapEntryDecorator.java | 3 +-
.../collections4/keyvalue/DefaultKeyValue.java | 3 +-
.../collections4/keyvalue/DefaultMapEntry.java | 5 +-
.../commons/collections4/keyvalue/MultiKey.java | 3 +-
.../collections4/keyvalue/TiedMapEntry.java | 3 +-
.../keyvalue/UnmodifiableMapEntry.java | 3 +-
.../collections4/list/AbstractLinkedList.java | 2 +-
.../list/AbstractLinkedListJava21.java | 2 +-
.../collections4/list/CursorableLinkedList.java | 3 +-
.../commons/collections4/list/SetUniqueList.java | 3 +-
.../apache/commons/collections4/list/TreeList.java | 5 +-
.../map/ConcurrentReferenceHashMap.java | 10 ++--
.../apache/commons/collections4/map/HashedMap.java | 4 +-
.../apache/commons/collections4/map/LRUMap.java | 3 +-
.../apache/commons/collections4/map/LinkedMap.java | 3 +-
.../commons/collections4/map/ListOrderedMap.java | 7 ++-
.../commons/collections4/map/MultiValueMap.java | 3 +-
.../collections4/map/PassiveExpiringMap.java | 2 +-
.../collections4/map/ReferenceIdentityMap.java | 5 +-
.../commons/collections4/map/ReferenceMap.java | 8 ++-
.../commons/collections4/map/StaticBucketMap.java | 10 ++--
.../commons/collections4/set/CompositeSet.java | 3 +-
.../splitmap/AbstractIterableGetMapDecorator.java | 3 +-
.../collections4/splitmap/TransformedSplitMap.java | 8 ++-
.../collections4/trie/AbstractPatriciaTrie.java | 64 +++++++++++-----------
.../commons/collections4/trie/KeyAnalyzer.java | 4 +-
.../commons/collections4/trie/PatriciaTrie.java | 13 +++--
.../collections4/AbstractLinkedListTest.java | 2 +-
.../collections4/bag/AbstractSortedBagTest.java | 2 +-
.../collection/AbstractCollectionTest.java | 24 ++++----
.../collections4/keyvalue/MultiKeyTest.java | 2 +-
.../collections4/list/AbstractListTest.java | 10 ++--
.../commons/collections4/map/AbstractMapTest.java | 2 +-
.../collections4/map/AbstractSortedMapTest.java | 2 +-
.../multiset/AbstractMultiSetTest.java | 2 +-
.../multiset/AbstractSortedMultiSetTest.java | 4 +-
.../collections4/queue/AbstractQueueTest.java | 2 +-
77 files changed, 231 insertions(+), 159 deletions(-)
diff --git a/src/main/java/org/apache/commons/collections4/ArrayStack.java
b/src/main/java/org/apache/commons/collections4/ArrayStack.java
index 2fa7e5e08..c89fa2675 100644
--- a/src/main/java/org/apache/commons/collections4/ArrayStack.java
+++ b/src/main/java/org/apache/commons/collections4/ArrayStack.java
@@ -16,11 +16,13 @@
*/
package org.apache.commons.collections4;
+import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.EmptyStackException;
+import java.util.Stack;
/**
- * An implementation of the {@link java.util.Stack} API that is based on an
+ * An implementation of the {@link Stack} API that is based on an
* {@code ArrayList} instead of a {@code Vector}, so it is not
* synchronized to protect against multithreaded access. The implementation
* is therefore operates faster in environments where you do not need to
@@ -41,7 +43,7 @@ import java.util.EmptyStackException;
* @param <E> The type of elements in this list
* @see java.util.Stack
* @since 1.0
- * @deprecated Use {@link java.util.ArrayDeque} instead (available from Java
1.6)
+ * @deprecated Use {@link ArrayDeque} instead (available from Java 1.6)
*/
@Deprecated
public class ArrayStack<E> extends ArrayList<E> {
@@ -70,7 +72,7 @@ public class ArrayStack<E> extends ArrayList<E> {
/**
* Return {@code true} if this stack is currently empty.
* <p>
- * This method exists for compatibility with {@link java.util.Stack}.
+ * This method exists for compatibility with {@link Stack}.
* New users of this class should use {@code isEmpty} instead.
* </p>
*
diff --git a/src/main/java/org/apache/commons/collections4/Bag.java
b/src/main/java/org/apache/commons/collections4/Bag.java
index de8dde949..6afac44e8 100644
--- a/src/main/java/org/apache/commons/collections4/Bag.java
+++ b/src/main/java/org/apache/commons/collections4/Bag.java
@@ -238,7 +238,7 @@ public interface Bag<E> extends Collection<E> {
/**
* Returns a {@link Set} of unique elements in the Bag.
* <p>
- * Uniqueness constraints are the same as those in {@link java.util.Set}.
+ * Uniqueness constraints are the same as those in {@link Set}.
* </p>
*
* @return the Set of unique Bag elements
diff --git a/src/main/java/org/apache/commons/collections4/Equator.java
b/src/main/java/org/apache/commons/collections4/Equator.java
index f0903ce07..c5e6e5e69 100644
--- a/src/main/java/org/apache/commons/collections4/Equator.java
+++ b/src/main/java/org/apache/commons/collections4/Equator.java
@@ -16,11 +16,14 @@
*/
package org.apache.commons.collections4;
+import java.util.Comparator;
+
+import org.apache.commons.collections4.map.HashedMap;
/**
* An equation function, which determines equality between objects of type T.
* <p>
- * It is the functional sibling of {@link java.util.Comparator}; {@link
Equator} is to
- * {@link Object} as {@link java.util.Comparator} is to {@link Comparable}.
+ * It is the functional sibling of {@link Comparator}; {@link Equator} is to
+ * {@link Object} as {@link Comparator} is to {@link Comparable}.
* </p>
*
* @param <T> The types of object this {@link Equator} can evaluate.
@@ -41,7 +44,7 @@ public interface Equator<T> {
* Calculates the hash for the object, based on the method of equality
used in the equate
* method. This is used for classes that delegate their {@link
Object#equals(Object) equals(Object)} method to an
* Equator (and so must also delegate their {@link Object#hashCode()
hashCode()} method), or for implementations
- * of {@link org.apache.commons.collections4.map.HashedMap} that use an
Equator for the key objects.
+ * of {@link HashedMap} that use an Equator for the key objects.
*
* @param o the object to calculate the hash for.
* @return the hash of the object.
diff --git a/src/main/java/org/apache/commons/collections4/IterableGet.java
b/src/main/java/org/apache/commons/collections4/IterableGet.java
index a46cc1acb..cccb5882f 100644
--- a/src/main/java/org/apache/commons/collections4/IterableGet.java
+++ b/src/main/java/org/apache/commons/collections4/IterableGet.java
@@ -16,8 +16,9 @@
*/
package org.apache.commons.collections4;
+import java.util.Map;
/**
- * The "read" subset of the {@link java.util.Map} interface.
+ * The "read" subset of the {@link Map} interface.
*
* @param <K> The type of the keys in this map
* @param <V> The type of the values in this map
diff --git a/src/main/java/org/apache/commons/collections4/IterableUtils.java
b/src/main/java/org/apache/commons/collections4/IterableUtils.java
index 5bd916ff4..133b8a93e 100644
--- a/src/main/java/org/apache/commons/collections4/IterableUtils.java
+++ b/src/main/java/org/apache/commons/collections4/IterableUtils.java
@@ -28,6 +28,7 @@ import java.util.Objects;
import java.util.Set;
import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.functors.NullPredicate;
import org.apache.commons.collections4.iterators.LazyIteratorChain;
import org.apache.commons.collections4.iterators.ReverseListIterator;
import org.apache.commons.collections4.iterators.UniqueFilterIterator;
@@ -292,7 +293,7 @@ public class IterableUtils {
* <p>
* A {@code null} or empty iterable returns false.
* A {@code null} object will not be passed to the equator, instead a
- * {@link org.apache.commons.collections4.functors.NullPredicate
NullPredicate}
+ * {@link NullPredicate NullPredicate}
* will be used.
* </p>
*
diff --git a/src/main/java/org/apache/commons/collections4/MapUtils.java
b/src/main/java/org/apache/commons/collections4/MapUtils.java
index 6dc8c74e7..540885a33 100644
--- a/src/main/java/org/apache/commons/collections4/MapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/MapUtils.java
@@ -1619,7 +1619,7 @@ public class MapUtils {
* allows you to build a map from an object array of various possible
styles.
* </p>
* <p>
- * If the first entry in the object array implements {@link Map.Entry} or
{@link KeyValue} then the key
+ * If the first entry in the object array implements {@link Entry} or
{@link KeyValue} then the key
* and value are added from that object. If the first entry in the object
array is an object array itself, then it
* is assumed that index 0 in the sub-array is the key and index 1 is the
value. Otherwise, the array is treated as
* keys and values in alternate indices.
@@ -1744,7 +1744,7 @@ public class MapUtils {
* }
* </pre>
* <p>
- * This method uses the implementation in {@link java.util.Collections
Collections}.
+ * This method uses the implementation in {@link Collections Collections}.
* </p>
*
* @param <K> The key type
@@ -1772,7 +1772,7 @@ public class MapUtils {
* }
* </pre>
* <p>
- * This method uses the implementation in {@link java.util.Collections
Collections}.
+ * This method uses the implementation in {@link Collections Collections}.
* </p>
*
* @param <K> The key type
diff --git a/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
b/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
index 3cc74cb8b..4beb4b482 100644
--- a/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
@@ -179,7 +179,7 @@ public class MultiMapUtils {
}
/**
- * Creates a {@link ListValuedMap} with an {@link java.util.ArrayList
ArrayList} as collection class to store the values mapped to a key.
+ * Creates a {@link ListValuedMap} with an {@link ArrayList ArrayList} as
collection class to store the values mapped to a key.
*
* @param <K> The key type.
* @param <V> The value type.
@@ -190,7 +190,7 @@ public class MultiMapUtils {
}
/**
- * Creates a {@link SetValuedMap} with an {@link java.util.HashSet
HashSet} as collection class to store the values mapped to a key.
+ * Creates a {@link SetValuedMap} with an {@link HashSet HashSet} as
collection class to store the values mapped to a key.
*
* @param <K> The key type.
* @param <V> The value type.
diff --git a/src/main/java/org/apache/commons/collections4/MultiSet.java
b/src/main/java/org/apache/commons/collections4/MultiSet.java
index ead3b5fd4..a593d81bc 100644
--- a/src/main/java/org/apache/commons/collections4/MultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/MultiSet.java
@@ -241,7 +241,7 @@ public interface MultiSet<E> extends Collection<E> {
/**
* Returns a {@link Set} of unique elements in the MultiSet.
* <p>
- * Uniqueness constraints are the same as those in {@link java.util.Set}.
+ * Uniqueness constraints are the same as those in {@link Set}.
* </p>
* <p>
* The returned set is backed by this multiset, so any change to either is
immediately reflected in the other. Only removal operations are supported, in
diff --git a/src/main/java/org/apache/commons/collections4/OrderedIterator.java
b/src/main/java/org/apache/commons/collections4/OrderedIterator.java
index a412ffcfb..15efb03a3 100644
--- a/src/main/java/org/apache/commons/collections4/OrderedIterator.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedIterator.java
@@ -17,9 +17,9 @@
package org.apache.commons.collections4;
import java.util.Iterator;
-
+import java.util.ListIterator;
/**
- * Defines an iterator that operates over an ordered container. Subset of
{@link java.util.ListIterator}.
+ * Defines an iterator that operates over an ordered container. Subset of
{@link ListIterator}.
* <p>
* This iterator allows both forward and reverse iteration through the
container.
* </p>
diff --git a/src/main/java/org/apache/commons/collections4/Predicate.java
b/src/main/java/org/apache/commons/collections4/Predicate.java
index cce3bbaef..173390e26 100644
--- a/src/main/java/org/apache/commons/collections4/Predicate.java
+++ b/src/main/java/org/apache/commons/collections4/Predicate.java
@@ -32,7 +32,7 @@ package org.apache.commons.collections4;
*
* @param <T> The type of the input to the predicate.
* @since 1.0
- * This will be deprecated in 5.0 in favor of {@link
java.util.function.Predicate}.
+ * This will be deprecated in 5.0 in favor of {@link Predicate}.
*/
//@Deprecated
public interface Predicate<T> extends java.util.function.Predicate<T> {
diff --git a/src/main/java/org/apache/commons/collections4/SortedBag.java
b/src/main/java/org/apache/commons/collections4/SortedBag.java
index 47151ff38..cf3bf4de6 100644
--- a/src/main/java/org/apache/commons/collections4/SortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/SortedBag.java
@@ -16,14 +16,14 @@
*/
package org.apache.commons.collections4;
+import java.util.Collection;
import java.util.Comparator;
-
/**
* Defines a type of {@code Bag} that maintains a sorted order among
* its unique representative members.
* <p>
* The {@link SortedMultiSet} interface provides the same functionality
- * while complying with the {@link java.util.Collection Collection}
+ * while complying with the {@link Collection Collection}
* contract, and should be preferred for new code; see the {@link Bag}
* documentation for migration notes.
* </p>
diff --git
a/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
b/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
index 8e3fe1213..3b5ddb12e 100644
---
a/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
+++
b/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
@@ -20,6 +20,7 @@ import java.util.Set;
import org.apache.commons.collections4.Bag;
import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
+import org.apache.commons.collections4.multiset.AbstractMultiSetDecorator;
/**
* Decorates another {@code Bag} to provide additional behavior.
@@ -29,7 +30,7 @@ import
org.apache.commons.collections4.collection.AbstractCollectionDecorator;
*
* @param <E> The type of elements in this bag
* @since 3.0
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.AbstractMultiSetDecorator} instead.
+ * @deprecated Since 4.6.0, use {@link AbstractMultiSetDecorator} instead.
*/
@Deprecated
public abstract class AbstractBagDecorator<E>
diff --git
a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
index aa9c5f65c..15c597421 100644
--- a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
@@ -31,6 +31,7 @@ import java.util.Set;
import org.apache.commons.collections4.Bag;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.multiset.AbstractMapMultiSet;
import org.apache.commons.collections4.set.UnmodifiableSet;
/**
@@ -44,7 +45,7 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
*
* @param <E> The type of elements in this bag
* @since 3.0 (previously DefaultMapBag v2.0)
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.AbstractMapMultiSet} instead.
+ * @deprecated Since 4.6.0, use {@link AbstractMapMultiSet} instead.
*/
@Deprecated
public abstract class AbstractMapBag<E> implements Bag<E> {
diff --git
a/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
b/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
index f76933cfe..644a84e2d 100644
---
a/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
+++
b/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
@@ -19,6 +19,7 @@ package org.apache.commons.collections4.bag;
import java.util.Comparator;
import org.apache.commons.collections4.SortedBag;
+import
org.apache.commons.collections4.multiset.AbstractSortedMultiSetDecorator;
/**
* Decorates another {@code SortedBag} to provide additional behavior.
@@ -28,7 +29,7 @@ import org.apache.commons.collections4.SortedBag;
*
* @param <E> The type of elements in this bag
* @since 3.0
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.AbstractSortedMultiSetDecorator}
instead.
+ * @deprecated Since 4.6.0, use {@link AbstractSortedMultiSetDecorator}
instead.
*/
@Deprecated
public abstract class AbstractSortedBagDecorator<E>
diff --git
a/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
b/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
index 6c7d757ce..75bf5c4ac 100644
--- a/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.MultiSet;
/**
* Decorates another {@link Bag} to comply with the Collection contract.
@@ -38,7 +39,7 @@ import org.apache.commons.collections4.Bag;
* @see Bag
* @param <E> The type of elements in this bag
* @since 4.0
- * @deprecated Since 4.6.0, no longer needed; a {@link
org.apache.commons.collections4.MultiSet} already complies with the {@link
Collection} contract.
+ * @deprecated Since 4.6.0, no longer needed; a {@link MultiSet} already
complies with the {@link Collection} contract.
*/
@Deprecated
public final class CollectionBag<E> extends AbstractBagDecorator<E> {
diff --git
a/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java
b/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java
index 4b23c4849..b4d757037 100644
--- a/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java
@@ -23,13 +23,14 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.SortedMultiSet;
/**
* Decorates another {@link SortedBag} to comply with the Collection contract.
*
* @param <E> The type of elements in this bag
* @since 4.0
- * @deprecated Since 4.6.0, no longer needed; a {@link
org.apache.commons.collections4.SortedMultiSet} already complies with the
{@link java.util.Collection} contract.
+ * @deprecated Since 4.6.0, no longer needed; a {@link SortedMultiSet} already
complies with the {@link Collection} contract.
*/
@Deprecated
public final class CollectionSortedBag<E> extends
AbstractSortedBagDecorator<E> {
diff --git a/src/main/java/org/apache/commons/collections4/bag/HashBag.java
b/src/main/java/org/apache/commons/collections4/bag/HashBag.java
index 6efc306a6..8e08cab3b 100644
--- a/src/main/java/org/apache/commons/collections4/bag/HashBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/HashBag.java
@@ -23,6 +23,8 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
+import org.apache.commons.collections4.multiset.HashMultiSet;
+
/**
* Implements {@code Bag}, using a {@link HashMap} to provide the
* data storage. This is the standard implementation of a bag.
@@ -46,7 +48,7 @@ import java.util.HashMap;
*
* @param <E> The type of elements in this bag
* @since 3.0 (previously in main package v2.0)
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.HashMultiSet} instead.
+ * @deprecated Since 4.6.0, use {@link HashMultiSet} instead.
*/
@Deprecated
public class HashBag<E> extends AbstractMapBag<E> implements Serializable {
diff --git
a/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
b/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
index 241303552..d31e38b6e 100644
--- a/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
@@ -21,6 +21,7 @@ import java.util.Set;
import org.apache.commons.collections4.Bag;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.collections4.collection.PredicatedCollection;
+import org.apache.commons.collections4.multiset.PredicatedMultiSet;
/**
* Decorates another {@link Bag} to validate that additions
@@ -42,7 +43,7 @@ import
org.apache.commons.collections4.collection.PredicatedCollection;
*
* @param <E> The type of elements in this bag
* @since 3.0
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.PredicatedMultiSet} instead.
+ * @deprecated Since 4.6.0, use {@link PredicatedMultiSet} instead.
*/
@Deprecated
public class PredicatedBag<E> extends PredicatedCollection<E> implements
Bag<E> {
diff --git
a/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
b/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
index f6b824c7b..17d639f24 100644
--- a/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
@@ -20,6 +20,7 @@ import java.util.Comparator;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.multiset.PredicatedSortedMultiSet;
/**
* Decorates another {@link SortedBag} to validate that additions
@@ -40,7 +41,7 @@ import org.apache.commons.collections4.SortedBag;
*
* @param <E> The type of elements in this bag
* @since 3.0
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.PredicatedSortedMultiSet} instead.
+ * @deprecated Since 4.6.0, use {@link PredicatedSortedMultiSet} instead.
*/
@Deprecated
public class PredicatedSortedBag<E> extends PredicatedBag<E> implements
SortedBag<E> {
diff --git
a/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
index 56c6505f6..c3bee3680 100644
--- a/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
@@ -20,6 +20,7 @@ import java.util.Set;
import org.apache.commons.collections4.Bag;
import org.apache.commons.collections4.collection.SynchronizedCollection;
+import org.apache.commons.collections4.multiset.SynchronizedMultiSet;
/**
* Decorates another {@link Bag} to synchronize its behavior
@@ -34,7 +35,7 @@ import
org.apache.commons.collections4.collection.SynchronizedCollection;
*
* @param <E> The type of elements in this bag
* @since 3.0
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.SynchronizedMultiSet} instead.
+ * @deprecated Since 4.6.0, use {@link SynchronizedMultiSet} instead.
*/
@Deprecated
public class SynchronizedBag<E> extends SynchronizedCollection<E> implements
Bag<E> {
diff --git
a/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
index f460159c9..499d1edb7 100644
---
a/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
+++
b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
@@ -20,6 +20,7 @@ import java.util.Comparator;
import org.apache.commons.collections4.Bag;
import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.multiset.SynchronizedSortedMultiSet;
/**
* Decorates another {@link SortedBag} to synchronize its behavior
@@ -34,7 +35,7 @@ import org.apache.commons.collections4.SortedBag;
*
* @param <E> The type of elements in this bag
* @since 3.0
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.SynchronizedSortedMultiSet} instead.
+ * @deprecated Since 4.6.0, use {@link SynchronizedSortedMultiSet} instead.
*/
@Deprecated
public class SynchronizedSortedBag<E> extends SynchronizedBag<E> implements
SortedBag<E> {
diff --git
a/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
b/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
index f7d1253ba..86da4ad21 100644
--- a/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
@@ -21,6 +21,7 @@ import java.util.Set;
import org.apache.commons.collections4.Bag;
import org.apache.commons.collections4.Transformer;
import org.apache.commons.collections4.collection.TransformedCollection;
+import org.apache.commons.collections4.multiset.TransformedMultiSet;
import org.apache.commons.collections4.set.TransformedSet;
/**
@@ -37,7 +38,7 @@ import org.apache.commons.collections4.set.TransformedSet;
*
* @param <E> The type of elements in this bag
* @since 3.0
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.TransformedMultiSet} instead.
+ * @deprecated Since 4.6.0, use {@link TransformedMultiSet} instead.
*/
@Deprecated
public class TransformedBag<E> extends TransformedCollection<E> implements
Bag<E> {
diff --git
a/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
b/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
index 563b64be3..a30c350ed 100644
---
a/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
+++
b/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
@@ -20,6 +20,7 @@ import java.util.Comparator;
import org.apache.commons.collections4.SortedBag;
import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.multiset.TransformedSortedMultiSet;
/**
* Decorates another {@link SortedBag} to transform objects that are added.
@@ -35,7 +36,7 @@ import org.apache.commons.collections4.Transformer;
*
* @param <E> The type of elements in this bag
* @since 3.0
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.TransformedSortedMultiSet} instead.
+ * @deprecated Since 4.6.0, use {@link TransformedSortedMultiSet} instead.
*/
@Deprecated
public class TransformedSortedBag<E> extends TransformedBag<E> implements
SortedBag<E> {
diff --git a/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
b/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
index f2ec44668..003436488 100644
--- a/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
@@ -26,7 +26,9 @@ import java.util.Objects;
import java.util.SortedMap;
import java.util.TreeMap;
+import org.apache.commons.collections4.Bag;
import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.multiset.TreeMultiSet;
/**
* Implements {@link SortedBag}, using a {@link TreeMap} to provide the data
storage.
@@ -35,7 +37,7 @@ import org.apache.commons.collections4.SortedBag;
* Order will be maintained among the bag members and can be viewed through
the iterator.
* </p>
* <p>
- * A {@link org.apache.commons.collections4.Bag Bag} stores each object in the
collection
+ * A {@link Bag Bag} stores each object in the collection
* together with a count of occurrences. Extra methods on the interface allow
multiple
* copies of an object to be added or removed at once. It is important to read
the interface
* Javadoc carefully as several methods violate the {@link Collection}
interface specification.
@@ -52,7 +54,7 @@ import org.apache.commons.collections4.SortedBag;
*
* @param <E> The type of elements in this bag
* @since 3.0 (previously in main package v2.0)
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.TreeMultiSet} instead.
+ * @deprecated Since 4.6.0, use {@link TreeMultiSet} instead.
*/
@Deprecated
public class TreeBag<E> extends AbstractMapBag<E> implements SortedBag<E>,
Serializable {
diff --git
a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
index 8d619bf2c..ea1499210 100644
--- a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
@@ -27,6 +27,7 @@ import java.util.function.Predicate;
import org.apache.commons.collections4.Bag;
import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections4.iterators.UnmodifiableIterator;
+import org.apache.commons.collections4.multiset.UnmodifiableMultiSet;
import org.apache.commons.collections4.set.UnmodifiableSet;
/**
@@ -40,7 +41,7 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
*
* @param <E> The type of elements in this bag
* @since 3.0
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.UnmodifiableMultiSet} instead.
+ * @deprecated Since 4.6.0, use {@link UnmodifiableMultiSet} instead.
*/
@Deprecated
public final class UnmodifiableBag<E>
diff --git
a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
index 59e5037ff..356568d81 100644
---
a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
+++
b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
@@ -27,6 +27,7 @@ import java.util.function.Predicate;
import org.apache.commons.collections4.SortedBag;
import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections4.iterators.UnmodifiableIterator;
+import org.apache.commons.collections4.multiset.UnmodifiableSortedMultiSet;
import org.apache.commons.collections4.set.UnmodifiableSet;
/**
@@ -40,7 +41,7 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
*
* @param <E> The type of elements in this bag
* @since 3.0
- * @deprecated Since 4.6.0, use {@link
org.apache.commons.collections4.multiset.UnmodifiableSortedMultiSet} instead.
+ * @deprecated Since 4.6.0, use {@link UnmodifiableSortedMultiSet} instead.
*/
@Deprecated
public final class UnmodifiableSortedBag<E>
diff --git
a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
index 53483a60f..37b27d81d 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.Set;
+import java.util.TreeMap;
import org.apache.commons.collections4.KeyValue;
import org.apache.commons.collections4.MapIterator;
@@ -64,7 +65,7 @@ import
org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry;
* </p>
* <p>
* This solution keeps minimizes the data storage by holding data only once.
- * The red-black algorithm is based on {@link java.util.TreeMap}, but has been
modified
+ * The red-black algorithm is based on {@link TreeMap}, but has been modified
* to simultaneously map a tree node by key and by value. This doubles the
* cost of put operations (but so does using two TreeMaps), and nearly doubles
* the cost of remove operations (there is a savings in that the lookup of the
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/CellExtractor.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/CellExtractor.java
index 2536d94b1..b0998c5c7 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/CellExtractor.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/CellExtractor.java
@@ -17,6 +17,7 @@
package org.apache.commons.collections4.bloomfilter;
import java.util.TreeMap;
+import java.util.function.BiPredicate;
import java.util.function.IntPredicate;
/**
@@ -47,7 +48,7 @@ public interface CellExtractor extends IndexExtractor {
* Returns {@code true} if processing should continue, {@code false}
otherwise.
*
* <p>Note: This is a functional interface as a specialization of
- * {@link java.util.function.BiPredicate} for {@code int}.</p>
+ * {@link BiPredicate} for {@code int}.</p>
*/
@FunctionalInterface
interface CellPredicate {
diff --git
a/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
index b789512ec..d69bb87e8 100644
---
a/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
+++
b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
@@ -18,14 +18,16 @@ package org.apache.commons.collections4.comparators;
import java.io.Serializable;
import java.util.Comparator;
+import java.util.SortedMap;
+import java.util.SortedSet;
/**
* A {@link Comparator Comparator} that compares {@link Comparable Comparable}
* objects.
* <p>
* This Comparator is useful, for example, for enforcing the natural order in
- * custom implementations of {@link java.util.SortedSet SortedSet} and
- * {@link java.util.SortedMap SortedMap}.
+ * custom implementations of {@link SortedSet SortedSet} and
+ * {@link SortedMap SortedMap}.
* </p>
* <p>
* Note: In the 2.0 and 2.1 releases of Commons Collections, this class would
diff --git
a/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java
b/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java
index b2b0e596c..44e33a7aa 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java
@@ -17,16 +17,17 @@
package org.apache.commons.collections4.iterators;
import java.lang.reflect.Array;
+import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.commons.collections4.ResettableIterator;
/**
- * Implements an {@link java.util.Iterator Iterator} over any array.
+ * Implements an {@link Iterator Iterator} over any array.
* <p>
* The array can be either an array of object or of primitives. If you know
* that you have an object array, the
- * {@link org.apache.commons.collections4.iterators.ObjectArrayIterator
ObjectArrayIterator}
+ * {@link ObjectArrayIterator ObjectArrayIterator}
* class is a better choice, as it will perform better.
* </p>
* <p>
diff --git
a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
index 51629bf4d..6b0ca5ba7 100644
---
a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
+++
b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
@@ -17,12 +17,13 @@
package org.apache.commons.collections4.iterators;
import java.lang.reflect.Array;
+import java.util.ListIterator;
import java.util.NoSuchElementException;
import org.apache.commons.collections4.ResettableListIterator;
/**
- * Implements a {@link java.util.ListIterator} over an array.
+ * Implements a {@link ListIterator} over an array.
* <p>
* The array can be either an array of object or of primitives. If you know
* that you have an object array, the {@link ObjectArrayListIterator}
@@ -183,9 +184,9 @@ public class ArrayListIterator<E> extends ArrayIterator<E>
* to {@link #next()} of {@link #previous()}.
* </p>
* <p>
- * <strong>Note:</strong> {@link java.util.ListIterator} implementations
that support
+ * <strong>Note:</strong> {@link ListIterator} implementations that support
* {@code add()} and {@code remove()} only allow {@code set()} to be called
- * once per call to {@code next()} or {@code previous} (see the {@link
java.util.ListIterator}
+ * once per call to {@code next()} or {@code previous} (see the {@link
ListIterator}
* Javadoc for more details). Since this implementation does
* not support {@code add()} or {@code remove()}, {@code set()} may be
* called as often as desired.
diff --git
a/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
index 4711d8608..58b2662e4 100644
---
a/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
+++
b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Objects;
+import org.apache.commons.collections4.comparators.ComparableComparator;
import org.apache.commons.collections4.list.UnmodifiableList;
/**
@@ -345,7 +346,7 @@ public class CollatingIterator<E> implements Iterator<E> {
* would like to use the natural sort order (or, in other words,
* if the elements in the iterators are implementing the
* {@link Comparable} interface), then use the
- * {@link
org.apache.commons.collections4.comparators.ComparableComparator}.
+ * {@link ComparableComparator}.
*
* @param comp the {@link Comparator} to set
* @throws IllegalStateException if iteration has started
diff --git
a/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
index 2d9100d23..6f2ce9be5 100644
---
a/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
+++
b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
@@ -24,13 +24,14 @@ import java.util.ListIterator;
import java.util.NoSuchElementException;
import java.util.Objects;
+import org.apache.commons.collections4.ResettableIterator;
import org.apache.commons.collections4.ResettableListIterator;
/**
* Converts an {@link Iterator} into a {@link ResettableListIterator}.
* For plain {@code Iterator}s this is accomplished by caching the returned
* elements. This class can also be used to simply add
- * {@link org.apache.commons.collections4.ResettableIterator
ResettableIterator}
+ * {@link ResettableIterator ResettableIterator}
* functionality to a given {@link ListIterator}.
* <p>
* The {@code ListIterator} interface has additional useful methods
diff --git
a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
index eccb12ebe..0bb86470e 100644
---
a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
+++
b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
@@ -16,12 +16,13 @@
*/
package org.apache.commons.collections4.iterators;
+import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.commons.collections4.ResettableIterator;
/**
- * An {@link java.util.Iterator Iterator} over an array of objects.
+ * An {@link Iterator Iterator} over an array of objects.
* <p>
* This iterator does not support {@link #remove}, as the object array cannot
be
* structurally modified.
diff --git
a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
index ce8241d62..009a9719c 100644
---
a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
+++
b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
@@ -16,12 +16,13 @@
*/
package org.apache.commons.collections4.iterators;
+import java.util.ListIterator;
import java.util.NoSuchElementException;
import org.apache.commons.collections4.ResettableListIterator;
/**
- * Implements a {@link java.util.ListIterator} over an array of objects.
+ * Implements a {@link ListIterator} over an array of objects.
* <p>
* This iterator does not support {@link #add} or {@link #remove}, as the
object array
* cannot be structurally modified. The {@link #set} method is supported
however.
@@ -174,9 +175,9 @@ public class ObjectArrayListIterator<E> extends
ObjectArrayIterator<E>
* to {@link #next()} of {@link #previous()}.
* </p>
* <p>
- * <strong>Note:</strong> {@link java.util.ListIterator} implementations
that support {@code add()}
+ * <strong>Note:</strong> {@link ListIterator} implementations that
support {@code add()}
* and {@code remove()} only allow {@code set()} to be called once per call
- * to {@code next()} or {@code previous} (see the {@link
java.util.ListIterator}
+ * to {@code next()} or {@code previous} (see the {@link ListIterator}
* Javadoc for more details). Since this implementation does not support
* {@code add()} or {@code remove()}, {@code set()} may be
* called as often as desired.
diff --git
a/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
b/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
index cf6249966..811964f3c 100644
---
a/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
+++
b/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
@@ -19,6 +19,7 @@ package org.apache.commons.collections4.iterators;
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Objects;
+import java.util.Queue;
/**
* Decorates an iterator to support one-element lookahead while iterating.
@@ -143,7 +144,7 @@ public class PeekingIterator<E> implements Iterator<E> {
* {@link #element()} instead.
* </p>
* <p>
- * The rationale behind this is to follow the {@link java.util.Queue}
interface which uses the same terminology.
+ * The rationale behind this is to follow the {@link Queue} interface
which uses the same terminology.
* </p>
* <p>
* Note that if the underlying iterator is a {@link FilterIterator} or a
{@link FilterListIterator}, the underlying predicate will <em>not</em> be
tested if
diff --git
a/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
index b83b18f72..1aa158508 100644
---
a/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
+++
b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
@@ -16,12 +16,13 @@
*/
package org.apache.commons.collections4.iterators;
+import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.commons.collections4.ResettableIterator;
/**
- * {@code SingletonIterator} is an {@link java.util.Iterator} over a single
+ * {@code SingletonIterator} is an {@link Iterator} over a single
* object instance.
*
* @param <E> The type of elements returned by this iterator.
diff --git
a/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
index 753638d0a..7d4c02142 100644
---
a/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
+++
b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
@@ -16,12 +16,13 @@
*/
package org.apache.commons.collections4.iterators;
+import java.util.ListIterator;
import java.util.NoSuchElementException;
import org.apache.commons.collections4.ResettableListIterator;
/**
- * {@code SingletonIterator} is an {@link java.util.ListIterator} over a single
+ * {@code SingletonIterator} is an {@link ListIterator} over a single
* object instance.
*
* @param <E> The type of elements returned by this iterator.
diff --git
a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
index ae901a699..41add92ab 100644
---
a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
+++
b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
@@ -16,11 +16,12 @@
*/
package org.apache.commons.collections4.keyvalue;
-import org.apache.commons.collections4.KeyValue;
+import java.util.Map.Entry;
+import org.apache.commons.collections4.KeyValue;
/**
* Abstract pair class to assist with creating {@code KeyValue}
- * and {@link java.util.Map.Entry Map.Entry} implementations.
+ * and {@link Entry Map.Entry} implementations.
*
* @param <K> The type of keys
* @param <V> The type of values
diff --git
a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
index 2428e1ac9..38eacbc18 100644
---
a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
+++
b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
@@ -17,11 +17,12 @@
package org.apache.commons.collections4.keyvalue;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Objects;
/**
* Abstract Pair class to assist with creating correct
- * {@link java.util.Map.Entry Map.Entry} implementations.
+ * {@link Entry Map.Entry} implementations.
*
* @param <K> The type of keys
* @param <V> The type of mapped values
diff --git
a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
index d87863364..0b119457e 100644
---
a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
+++
b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
@@ -17,13 +17,14 @@
package org.apache.commons.collections4.keyvalue;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Objects;
import org.apache.commons.collections4.KeyValue;
/**
* Provides a base decorator that allows additional functionality to be
- * added to a {@link java.util.Map.Entry Map.Entry}.
+ * added to a {@link Entry Map.Entry}.
*
* @param <K> The type of keys
* @param <V> The type of mapped values
diff --git
a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
index f0aced4ea..11fe6e392 100644
---
a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
+++
b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
@@ -17,13 +17,14 @@
package org.apache.commons.collections4.keyvalue;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Objects;
import org.apache.commons.collections4.KeyValue;
/**
* A mutable {@code KeyValue} pair that does not implement
- * {@link java.util.Map.Entry Map.Entry}.
+ * {@link Entry Map.Entry}.
* <p>
* Note that a {@code DefaultKeyValue} instance may not contain
* itself as a key or value.
diff --git
a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
index ac55fa2e7..d4aef4a24 100644
---
a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
+++
b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
@@ -17,12 +17,13 @@
package org.apache.commons.collections4.keyvalue;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.commons.collections4.KeyValue;
/**
- * A restricted implementation of {@link java.util.Map.Entry Map.Entry} that
prevents
- * the {@link java.util.Map.Entry Map.Entry} contract from being broken.
+ * A restricted implementation of {@link Entry Map.Entry} that prevents
+ * the {@link Entry Map.Entry} contract from being broken.
*
* @param <K> The type of keys
* @param <V> The type of mapped values
diff --git
a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
index b54c83d98..c3756e41b 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
@@ -19,6 +19,7 @@ package org.apache.commons.collections4.keyvalue;
import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.Arrays;
+import java.util.Map;
import java.util.Objects;
/**
@@ -303,7 +304,7 @@ public class MultiKey<K> implements Serializable {
* This value is computed once and then cached, so elements should not
* change their hash codes once created (note that this is the same
* constraint that would be used if the individual keys elements were
- * themselves {@link java.util.Map Map} keys).
+ * themselves {@link Map Map} keys).
* </p>
*
* @return the hash code
diff --git
a/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
index 7d18f528a..0cc134abb 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
@@ -18,12 +18,13 @@ package org.apache.commons.collections4.keyvalue;
import java.io.Serializable;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Objects;
import org.apache.commons.collections4.KeyValue;
/**
- * A {@link java.util.Map.Entry Map.Entry} tied to a map underneath.
+ * A {@link Entry Map.Entry} tied to a map underneath.
* <p>
* This can be used to enable a map entry to make changes on the underlying
* map, however this will probably mess up any iterators.
diff --git
a/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
b/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
index ffc510fae..024779d63 100644
---
a/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
+++
b/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
@@ -17,12 +17,13 @@
package org.apache.commons.collections4.keyvalue;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.commons.collections4.KeyValue;
import org.apache.commons.collections4.Unmodifiable;
/**
- * A {@link java.util.Map.Entry Map.Entry} that throws
+ * A {@link Entry Map.Entry} that throws
* UnsupportedOperationException when {@code setValue} is called.
*
* @param <K> The type of keys
diff --git
a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
index 88d0fb8d8..6ab0a7e0b 100644
--- a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
@@ -93,7 +93,7 @@ public abstract class AbstractLinkedList<E> implements
List<E> {
/**
* The modification count that the list is expected to have. If the
list
* doesn't have this count, then a
- * {@link java.util.ConcurrentModificationException} may be thrown by
+ * {@link ConcurrentModificationException} may be thrown by
* the operations.
*/
protected int expectedModCount;
diff --git
a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedListJava21.java
b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedListJava21.java
index 74dc9ba6f..c8b3303bd 100644
---
a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedListJava21.java
+++
b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedListJava21.java
@@ -96,7 +96,7 @@ public abstract class AbstractLinkedListJava21<E> implements
List<E> {
/**
* The modification count that the list is expected to have. If the
list
* doesn't have this count, then a
- * {@link java.util.ConcurrentModificationException} may be thrown by
+ * {@link ConcurrentModificationException} may be thrown by
* the operations.
*/
protected int expectedModCount;
diff --git
a/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
index 11317b77d..7a4d24a92 100644
---
a/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
+++
b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
@@ -34,7 +35,7 @@ import java.util.ListIterator;
* <p>
* This implementation supports all of the optional {@link List} operations.
* It extends {@code AbstractLinkedList} and thus provides the
- * stack/queue/dequeue operations available in {@link java.util.LinkedList}.
+ * stack/queue/dequeue operations available in {@link LinkedList}.
* </p>
* <p>
* The main feature of this class is the ability to modify the list and the
diff --git
a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
index 43b9081b2..fb2ce36ef 100644
--- a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
+++ b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
@@ -33,6 +33,7 @@ import java.util.function.Predicate;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator;
+import org.apache.commons.collections4.set.ListOrderedSet;
import org.apache.commons.collections4.set.UnmodifiableSet;
/**
@@ -46,7 +47,7 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
* function correctly.
* </p>
* <p>
- * The {@link org.apache.commons.collections4.set.ListOrderedSet
ListOrderedSet}
+ * The {@link ListOrderedSet ListOrderedSet}
* class provides an alternative approach, by wrapping an existing Set and
* retaining insertion order in the iterator.
* </p>
diff --git a/src/main/java/org/apache/commons/collections4/list/TreeList.java
b/src/main/java/org/apache/commons/collections4/list/TreeList.java
index 19ce15383..e22982d60 100644
--- a/src/main/java/org/apache/commons/collections4/list/TreeList.java
+++ b/src/main/java/org/apache/commons/collections4/list/TreeList.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.Deque;
import java.util.Iterator;
+import java.util.List;
import java.util.ListIterator;
import java.util.NoSuchElementException;
import java.util.Objects;
@@ -72,7 +73,7 @@ public class TreeList<E> extends AbstractList<E> {
* Implements an AVLNode which keeps the offset updated.
* <p>
* This node contains the real work.
- * TreeList is just there to implement {@link java.util.List}.
+ * TreeList is just there to implement {@link List}.
* The nodes don't know the index of the object they are holding. They
* do know however their position relative to their parent node.
* This allows to calculate the index of a node while traversing the tree.
@@ -792,7 +793,7 @@ public class TreeList<E> extends AbstractList<E> {
/**
* The modification count that the list is expected to have. If the
list
* doesn't have this count, then a
- * {@link java.util.ConcurrentModificationException} may be thrown by
+ * {@link ConcurrentModificationException} may be thrown by
* the operations.
*/
private int expectedModCount;
diff --git
a/src/main/java/org/apache/commons/collections4/map/ConcurrentReferenceHashMap.java
b/src/main/java/org/apache/commons/collections4/map/ConcurrentReferenceHashMap.java
index 9b02d61ed..6de2dd206 100644
---
a/src/main/java/org/apache/commons/collections4/map/ConcurrentReferenceHashMap.java
+++
b/src/main/java/org/apache/commons/collections4/map/ConcurrentReferenceHashMap.java
@@ -47,6 +47,8 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.BiFunction;
@@ -58,11 +60,11 @@ import java.util.function.Supplier;
* and adjustable expected concurrency for updates.
* <p>
* This map is designed around specific advanced use-cases. If there is any
doubt whether this map is for you, you most likely should be using
- * {@link java.util.concurrent.ConcurrentHashMap} instead.
+ * {@link ConcurrentHashMap} instead.
* </p>
* <p>
* This map supports strong, weak, and soft keys and values. By default, keys
are weak, and values are strong. Such a configuration offers similar behavior to
- * {@link java.util.WeakHashMap}, entries of this map are periodically removed
once their corresponding keys are no longer referenced outside of this map. In
+ * {@link WeakHashMap}, entries of this map are periodically removed once
their corresponding keys are no longer referenced outside of this map. In
* other words, this map will not prevent a key from being discarded by the
garbage collector. Once a key has been discarded by the collector, the
corresponding
* entry is no longer visible to this map; however, the entry may occupy space
until a future map operation decides to reclaim it. For this reason, summary
* functions such as {@code size} and {@code isEmpty} might return a value
greater than the observed number of entries. In order to support a high level of
@@ -80,11 +82,11 @@ import java.util.function.Supplier;
* non-strong values may disappear before their corresponding key.
* </p>
* <p>
- * While this map does allow the use of both strong keys and values, it is
recommended you use {@link java.util.concurrent.ConcurrentHashMap} for such a
+ * While this map does allow the use of both strong keys and values, it is
recommended you use {@link ConcurrentHashMap} for such a
* configuration, since it is optimized for that case.
* </p>
* <p>
- * Just like {@link java.util.concurrent.ConcurrentHashMap}, this class obeys
the same functional specification as {@link Hashtable}, and includes versions of
+ * Just like {@link ConcurrentHashMap}, this class obeys the same functional
specification as {@link Hashtable}, and includes versions of
* methods corresponding to each method of {@code Hashtable}. However, even
though all operations are thread-safe, retrieval operations do <em>not</em>
entail
* locking, and there is <em>not</em> any support for locking the entire map
in a way that prevents all access. This class is fully interoperable with
* {@code Hashtable} in programs that rely on its thread safety but not on its
synchronization details.
diff --git a/src/main/java/org/apache/commons/collections4/map/HashedMap.java
b/src/main/java/org/apache/commons/collections4/map/HashedMap.java
index 6f6259138..1e14a6b18 100644
--- a/src/main/java/org/apache/commons/collections4/map/HashedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/HashedMap.java
@@ -22,12 +22,14 @@ import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Map;
+import org.apache.commons.collections4.MapIterator;
+
/**
* A {@code Map} implementation that is a general purpose alternative
* to {@code HashMap}.
* <p>
* This implementation improves on the JDK1.4 HashMap by adding the
- * {@link org.apache.commons.collections4.MapIterator MapIterator}
+ * {@link MapIterator MapIterator}
* functionality and many methods for subclassing.
* </p>
* <p>
diff --git a/src/main/java/org/apache/commons/collections4/map/LRUMap.java
b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
index a68fb752c..e1bd4552f 100644
--- a/src/main/java/org/apache/commons/collections4/map/LRUMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
@@ -24,6 +24,7 @@ import java.io.Serializable;
import java.util.Map;
import org.apache.commons.collections4.BoundedMap;
+import org.apache.commons.collections4.MapIterator;
/**
* A {@code Map} implementation with a fixed maximum size which removes
@@ -40,7 +41,7 @@ import org.apache.commons.collections4.BoundedMap;
* of modifying the map's iteration order and thus invalidating any
* iterators currently in use. It is therefore suggested that iterations
* over an {@link LRUMap} instance access entry values only through a
- * {@link org.apache.commons.collections4.MapIterator MapIterator} or {@link
#entrySet()} iterator.
+ * {@link MapIterator MapIterator} or {@link #entrySet()} iterator.
* </p>
* <p>
* The map implements {@code OrderedMap} and entries may be queried using
diff --git a/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
index 5b247bbd3..71c568839 100644
--- a/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.function.Predicate;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapIterator;
import org.apache.commons.collections4.iterators.UnmodifiableIterator;
import org.apache.commons.collections4.iterators.UnmodifiableListIterator;
import org.apache.commons.collections4.list.UnmodifiableList;
@@ -38,7 +39,7 @@ import org.apache.commons.collections4.list.UnmodifiableList;
* In this implementation order is maintained by original insertion.
* <p>
* This implementation improves on the JDK1.4 LinkedHashMap by adding the
- * {@link org.apache.commons.collections4.MapIterator MapIterator}
+ * {@link MapIterator MapIterator}
* functionality, additional convenience methods and allowing
* bidirectional iteration. It also implements {@code OrderedMap}.
* In addition, non-interface methods are provided to access the map by index.
diff --git
a/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
index 0ae817e0f..9dc68f7e5 100644
--- a/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
@@ -64,13 +65,13 @@ import
org.apache.commons.collections4.list.UnmodifiableList;
* </p>
* <p>
* <strong>Note that ListOrderedMap doesn't work with
- * {@link java.util.IdentityHashMap IdentityHashMap}, {@link
CaseInsensitiveMap},
- * or similar maps that violate the general contract of {@link
java.util.Map}.</strong>
+ * {@link IdentityHashMap IdentityHashMap}, {@link CaseInsensitiveMap},
+ * or similar maps that violate the general contract of {@link Map}.</strong>
* The {@code ListOrderedMap} (or, more precisely, the underlying {@code List})
* is relying on {@link Object#equals(Object) equals()}. This is fine, as long
as the
* decorated {@code Map} is also based on {@link Object#equals(Object)
equals()},
* and {@link Object#hashCode() hashCode()}, which
- * {@link java.util.IdentityHashMap IdentityHashMap}, and
+ * {@link IdentityHashMap IdentityHashMap}, and
* {@link CaseInsensitiveMap} don't: The former uses {@code ==}, and
* the latter uses {@link Object#equals(Object) equals()} on a lower-cased
* key.
diff --git
a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
index f4a64559e..37da34382 100644
--- a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
@@ -32,6 +32,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Factory;
import org.apache.commons.collections4.FunctorException;
import org.apache.commons.collections4.MultiMap;
+import org.apache.commons.collections4.MultiValuedMap;
import org.apache.commons.collections4.Transformer;
import org.apache.commons.collections4.iterators.EmptyIterator;
import org.apache.commons.collections4.iterators.IteratorChain;
@@ -66,7 +67,7 @@ import
org.apache.commons.collections4.iterators.TransformIterator;
* @param <K> The type of the keys in this map
* @param <V> The type of the values in this map
* @since 3.2
- * @deprecated Since 4.1, use {@link
org.apache.commons.collections4.MultiValuedMap MultiValuedMap} instead
+ * @deprecated Since 4.1, use {@link MultiValuedMap MultiValuedMap} instead
*/
@Deprecated
public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object>
implements MultiMap<K, V>, Serializable {
diff --git
a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
index feacaf26c..a0f39262e 100644
--- a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
@@ -70,7 +70,7 @@ public class PassiveExpiringMap<K, V>
implements Serializable {
/**
- * A {@link
org.apache.commons.collections4.map.PassiveExpiringMap.ExpirationPolicy
ExpirationPolicy}
+ * A {@link ExpirationPolicy ExpirationPolicy}
* that returns an expiration time that is a
* constant about of time in the future from the current time.
*
diff --git
a/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
index 5a5d099ec..9407678ed 100644
---
a/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
+++
b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
@@ -21,6 +21,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.lang.ref.Reference;
+import java.util.Map;
/**
* A {@code Map} implementation that allows mappings to be
@@ -41,7 +42,7 @@ import java.lang.ref.Reference;
* </p>
* <p>
* This map is similar to
- * {@link org.apache.commons.collections4.map.ReferenceMap ReferenceMap}.
+ * {@link ReferenceMap ReferenceMap}.
* It differs in that keys and values in this class are compared using {@code
==}.
* </p>
* <p>
@@ -49,7 +50,7 @@ import java.lang.ref.Reference;
* As a general rule, don't compare this map to other maps.
* </p>
* <p>
- * This {@link java.util.Map Map} implementation does <em>not</em> allow null
elements.
+ * This {@link Map Map} implementation does <em>not</em> allow null elements.
* Attempting to add a null key or value to the map will raise a {@code
NullPointerException}.
* </p>
* <p>
diff --git
a/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
index 9a3eb46fc..ed65bd373 100644
--- a/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
@@ -20,6 +20,8 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
+import java.lang.ref.Reference;
+import java.util.Map;
/**
* A {@code Map} implementation that allows mappings to be
@@ -30,7 +32,7 @@ import java.io.Serializable;
* If non-hard references are used, then the garbage collector can remove
* mappings if a key or value becomes unreachable, or if the JVM's memory is
* running low. For information on how the different reference types behave,
- * see {@link java.lang.ref.Reference Reference}.
+ * see {@link Reference Reference}.
* </p>
* <p>
* Different types of references can be specified for keys and values.
@@ -43,11 +45,11 @@ import java.io.Serializable;
* </p>
* <p>
* This map is similar to
- * {@link org.apache.commons.collections4.map.ReferenceIdentityMap
ReferenceIdentityMap}.
+ * {@link ReferenceIdentityMap ReferenceIdentityMap}.
* It differs in that keys and values in this class are compared using {@code
equals()}.
* </p>
* <p>
- * This {@link java.util.Map Map} implementation does <em>not</em> allow null
elements.
+ * This {@link Map Map} implementation does <em>not</em> allow null elements.
* Attempting to add a null key or value to the map will raise a {@code
NullPointerException}.
* </p>
* <p>
diff --git
a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
index 52de89e95..d1d275484 100644
--- a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
@@ -20,6 +20,8 @@ import java.util.AbstractCollection;
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
@@ -30,7 +32,7 @@ import org.apache.commons.collections4.KeyValue;
/**
* A StaticBucketMap is an efficient, thread-safe implementation of
- * {@link java.util.Map} that performs well in a highly
+ * {@link Map} that performs well in a highly
* thread-contentious environment.
* <p>
* The map supports very efficient
@@ -79,13 +81,13 @@ import org.apache.commons.collections4.KeyValue;
* <p>
* The iterators returned by the collection views of this class are
<em>not</em>
* fail-fast. They will <em>never</em> raise a
- * {@link java.util.ConcurrentModificationException}. Keys and values
+ * {@link ConcurrentModificationException}. Keys and values
* added to the map after the iterator is created do not necessarily appear
* during iteration. Similarly, the iterator does not necessarily fail to
* return keys and values that were removed after the iterator was created.
* </p>
* <p>
- * Finally, unlike {@link java.util.HashMap}-style implementations, this
+ * Finally, unlike {@link HashMap}-style implementations, this
* class <em>never</em> rehashes the map. The number of buckets is fixed
* at construction time and never altered. Performance may degrade if
* you do not allocate enough buckets upfront.
@@ -94,7 +96,7 @@ import org.apache.commons.collections4.KeyValue;
* The {@link #atomic(Runnable)} method is provided to allow atomic iterations
* and bulk operations; however, overuse of {@link #atomic(Runnable) atomic}
* will basically result in a map that's slower than an ordinary synchronized
- * {@link java.util.HashMap}.
+ * {@link HashMap}.
* </p>
* <p>
* Use this class if you do not require reliable bulk operations and
diff --git
a/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
index 90d468a01..5a640f5c1 100644
--- a/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
@@ -28,6 +28,7 @@ import java.util.Set;
import java.util.function.Predicate;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.collection.CompositeCollection;
import org.apache.commons.collections4.iterators.EmptyIterator;
import org.apache.commons.collections4.iterators.IteratorChain;
import org.apache.commons.collections4.list.UnmodifiableList;
@@ -41,7 +42,7 @@ import org.apache.commons.collections4.list.UnmodifiableList;
* </p>
* <p>
* From version 4.0, this class does not extend
- * {@link org.apache.commons.collections4.collection.CompositeCollection
CompositeCollection}
+ * {@link CompositeCollection CompositeCollection}
* anymore due to its input restrictions (only accepts Sets).
* See <a
href="https://issues.apache.org/jira/browse/COLLECTIONS-424";>COLLECTIONS-424</a>
* for more details.
diff --git
a/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
index 08ccdbbf2..b422e76c0 100644
---
a/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
+++
b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
@@ -21,13 +21,14 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import org.apache.commons.collections4.Get;
import org.apache.commons.collections4.IterableGet;
import org.apache.commons.collections4.MapIterator;
import org.apache.commons.collections4.map.EntrySetToMapIteratorAdapter;
/**
* {@link IterableGet} that uses a {@link Map}<K, V> for the
- * {@link org.apache.commons.collections4.Get Get}<K, V> implementation.
+ * {@link Get Get}<K, V> implementation.
*
* @param <K> The type of the keys in this map
* @param <V> The type of the values in this map
diff --git
a/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
b/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
index 61719fdcf..b2f77aa0e 100644
---
a/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
+++
b/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
@@ -23,9 +23,11 @@ import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
+import org.apache.commons.collections4.Get;
import org.apache.commons.collections4.Put;
import org.apache.commons.collections4.Transformer;
import org.apache.commons.collections4.map.LinkedMap;
+import org.apache.commons.collections4.map.TransformedMap;
/**
* Decorates another {@link Map} to transform objects that are added.
@@ -45,16 +47,16 @@ import org.apache.commons.collections4.map.LinkedMap;
* </p>
* <p>
* The "put" and "get" type constraints of this class are mutually independent;
- * contrast with {@link org.apache.commons.collections4.map.TransformedMap}
which,
+ * contrast with {@link TransformedMap} which,
* by virtue of its implementing {@link Map}<K, V>, must be constructed
in such
* a way that its read and write parameters are generalized to a common
(super-)type.
* In practice this would often mean {@code >Object, Object>}, defeating
* much of the usefulness of having parameterized types.
* </p>
* <p>
- * On the downside, this class is not drop-in compatible with {@link
java.util.Map}
+ * On the downside, this class is not drop-in compatible with {@link Map}
* but is intended to be worked with either directly or by {@link Put} and
- * {@link org.apache.commons.collections4.Get Get} generalizations.
+ * {@link Get Get} generalizations.
* </p>
*
* @param <J> The type of the keys to put in this map
diff --git
a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
index 47ccce76e..0c74e45eb 100644
---
a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
+++
b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
@@ -47,7 +47,7 @@ import org.apache.commons.collections4.Trie;
public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K, V> {
/**
- * A range view of the {@link org.apache.commons.collections4.Trie}.
+ * A range view of the {@link Trie}.
*/
private abstract class AbstractRangeMap extends AbstractMap<K, V>
implements SortedMap<K, V> {
@@ -290,7 +290,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * This is an entry set view of the {@link
org.apache.commons.collections4.Trie} as returned by {@link Map#entrySet()}.
+ * This is an entry set view of the {@link Trie} as returned by {@link
Map#entrySet()}.
*/
private final class EntrySet extends AbstractSet<Map.Entry<K, V>> {
@@ -344,7 +344,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * This is a key set view of the {@link
org.apache.commons.collections4.Trie} as returned by {@link Map#keySet()}.
+ * This is a key set view of the {@link Trie} as returned by {@link
Map#keySet()}.
*/
private final class KeySet extends AbstractSet<K> {
@@ -387,7 +387,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * A prefix {@link RangeEntrySet} view of the {@link
org.apache.commons.collections4.Trie}.
+ * A prefix {@link RangeEntrySet} view of the {@link Trie}.
*/
private final class PrefixRangeEntrySet extends RangeEntrySet {
@@ -535,7 +535,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * A submap used for prefix views over the {@link
org.apache.commons.collections4.Trie}.
+ * A submap used for prefix views over the {@link Trie}.
*/
private final class PrefixRangeMap extends AbstractRangeMap {
@@ -607,7 +607,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
* This method does two things. It determines the FROM
* and TO range of the {@link PrefixRangeMap} and the number
* of elements in the range. This method must be called every
- * time the {@link org.apache.commons.collections4.Trie} has changed.
+ * time the {@link Trie} has changed.
*/
private int fixup() {
// The trie has changed since we last found our toKey / fromKey
@@ -978,7 +978,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * A {@link org.apache.commons.collections4.Trie} is a set of {@link
TrieEntry} nodes.
+ * A {@link Trie} is a set of {@link TrieEntry} nodes.
*
* @param <K> The key type.
* @param <V> The value type.
@@ -1107,7 +1107,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * An {@link OrderedMapIterator} for a {@link
org.apache.commons.collections4.Trie}.
+ * An {@link OrderedMapIterator} for a {@link Trie}.
*/
private final class TrieMapIterator extends AbstractTrieIterator<K>
implements OrderedMapIterator<K, V> {
@@ -1178,7 +1178,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * This is a value view of the {@link
org.apache.commons.collections4.Trie} as returned by {@link Map#values()}.
+ * This is a value view of the {@link Trie} as returned by {@link
Map#values()}.
*/
private final class Values extends AbstractCollection<V> {
@@ -1234,7 +1234,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
return next != null && next.bitIndex <= from.bitIndex &&
!next.isEmpty();
}
- /** The root node of the {@link org.apache.commons.collections4.Trie}. */
+ /** The root node of the {@link Trie}. */
private transient TrieEntry<K, V> root = new TrieEntry<>(null, null, -1);
/**
@@ -1248,11 +1248,11 @@ public abstract class AbstractPatriciaTrie<K, V>
extends AbstractBitwiseTrie<K,
private transient volatile Set<Map.Entry<K, V>> entrySet;
- /** The current size of the {@link org.apache.commons.collections4.Trie}.
*/
+ /** The current size of the {@link Trie}. */
private transient int size;
/**
- * The number of times this {@link org.apache.commons.collections4.Trie}
has been modified.
+ * The number of times this {@link Trie} has been modified.
* It's used to detect concurrent modifications and fail-fast the {@link
Iterator}s.
*/
protected transient int modCount;
@@ -1267,8 +1267,8 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * Constructs a new {@link org.apache.commons.collections4.Trie} using the
given {@link KeyAnalyzer} and initializes the
- * {@link org.apache.commons.collections4.Trie} with the values from the
provided {@link Map}.
+ * Constructs a new {@link Trie} using the given {@link KeyAnalyzer} and
initializes the
+ * {@link Trie} with the values from the provided {@link Map}.
*
* @param keyAnalyzer the {@link KeyAnalyzer}.
* @param map The source map.
@@ -1279,7 +1279,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * Adds the given {@link TrieEntry} to the {@link
org.apache.commons.collections4.Trie}.
+ * Adds the given {@link TrieEntry} to the {@link Trie}.
*/
TrieEntry<K, V> addEntry(final TrieEntry<K, V> entry, final int
lengthInBits) {
TrieEntry<K, V> current = root.left;
@@ -1414,7 +1414,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * A helper method to decrement the {@link
org.apache.commons.collections4.Trie} size and increment the modification
counter.
+ * A helper method to decrement the {@link Trie} size and increment the
modification counter.
*/
void decrementSize() {
size--;
@@ -1430,12 +1430,12 @@ public abstract class AbstractPatriciaTrie<K, V>
extends AbstractBitwiseTrie<K,
}
/**
- * Returns the first entry the {@link
org.apache.commons.collections4.Trie} is storing.
+ * Returns the first entry the {@link Trie} is storing.
* <p>
* This is implemented by going always to the left until we encounter a
valid uplink. That uplink is the first key.
* </p>
*
- * @return the first entry the {@link
org.apache.commons.collections4.Trie} is storing.
+ * @return the first entry the {@link Trie} is storing.
* @since 4.6.0
*/
public TrieEntry<K, V> firstEntry() {
@@ -1596,14 +1596,14 @@ public abstract class AbstractPatriciaTrie<K, V>
extends AbstractBitwiseTrie<K,
}
/**
- * Gets a view of this {@link org.apache.commons.collections4.Trie} of all
elements that are prefixed
+ * Gets a view of this {@link Trie} of all elements that are prefixed
* by the number of bits in the given Key.
* <p>
* The view that this returns is optimized to have a very efficient
* {@link Iterator}. The {@link SortedMap#firstKey()},
* {@link SortedMap#lastKey()} & {@link Map#size()} methods must
* iterate over all possible values in order to determine the results.
- * This information is cached until the PATRICIA {@link
org.apache.commons.collections4.Trie} changes.
+ * This information is cached until the PATRICIA {@link Trie} changes.
* All other methods (except {@link Iterator}) must compare the given
* key to the prefix to ensure that it is within the range of the view.
* The {@link Iterator}'s remove method must also relocate the subtree
@@ -1613,7 +1613,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
* @param key the key to use in the search
* @param offsetInBits the prefix offset
* @param lengthInBits the number of significant prefix bits
- * @return a {@link SortedMap} view of this {@link
org.apache.commons.collections4.Trie} with all elements whose
+ * @return a {@link SortedMap} view of this {@link Trie} with all elements
whose
* key is prefixed by the search key
*/
private SortedMap<K, V> getPrefixMapByBits(final K key, final int
offsetInBits, final int lengthInBits) {
@@ -1700,7 +1700,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * A helper method to increment the {@link
org.apache.commons.collections4.Trie} size and the modification counter.
+ * A helper method to increment the {@link Trie} size and the modification
counter.
*/
void incrementSize() {
size++;
@@ -1716,13 +1716,13 @@ public abstract class AbstractPatriciaTrie<K, V>
extends AbstractBitwiseTrie<K,
}
/**
- * Returns the last entry the {@link org.apache.commons.collections4.Trie}
is storing.
+ * Returns the last entry the {@link Trie} is storing.
*
* <p>
* This is implemented by going always to the right until we encounter a
valid uplink. That uplink is the last key.
* </p>
*
- * @return the last entry the {@link org.apache.commons.collections4.Trie}
is storing.
+ * @return the last entry the {@link Trie} is storing.
* @since 4.6.0
*/
public TrieEntry<K, V> lastEntry() {
@@ -2129,7 +2129,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * Removes a single entry from the {@link
org.apache.commons.collections4.Trie}.
+ * Removes a single entry from the {@link Trie}.
*
* If we found a Key (Entry h) then figure out if it's
* an internal (hard to remove) or external Entry (easy
@@ -2149,7 +2149,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * Removes an external entry from the {@link
org.apache.commons.collections4.Trie}.
+ * Removes an external entry from the {@link Trie}.
*
* If it's an external Entry then just remove it.
* This is very easy and straight forward.
@@ -2181,7 +2181,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * Removes an internal entry from the {@link
org.apache.commons.collections4.Trie}.
+ * Removes an internal entry from the {@link Trie}.
*
* If it's an internal Entry then "good luck" with understanding
* this code. The Idea is essentially that Entry p takes Entry h's
@@ -2264,7 +2264,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
}
/**
- * Returns the {@link java.util.Map.Entry} whose key is closest in a
bitwise XOR
+ * Returns the {@link Entry} whose key is closest in a bitwise XOR
* metric to the given key. This is NOT lexicographic closeness.
* For example, given the keys:
*
@@ -2274,12 +2274,12 @@ public abstract class AbstractPatriciaTrie<K, V>
extends AbstractBitwiseTrie<K,
* <li>L = 1001100</li>
* </ol>
*
- * If the {@link org.apache.commons.collections4.Trie} contained 'H' and
'L', a lookup of 'D' would
+ * If the {@link Trie} contained 'H' and 'L', a lookup of 'D' would
* return 'L', because the XOR distance between D & L is smaller
* than the XOR distance between D & H.
*
* @param key the key to use in the search
- * @return the {@link java.util.Map.Entry} whose key is closest in a
bitwise XOR metric
+ * @return the {@link Entry} whose key is closest in a bitwise XOR metric
* to the provided key
*/
public Map.Entry<K, V> select(final K key) {
@@ -2303,7 +2303,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
* <li>L = 1001100</li>
* </ol>
*
- * If the {@link org.apache.commons.collections4.Trie} contained 'H' and
'L', a lookup of 'D' would
+ * If the {@link Trie} contained 'H' and 'L', a lookup of 'D' would
* return 'L', because the XOR distance between D & L is smaller
* than the XOR distance between D & H.
*
@@ -2355,7 +2355,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
* <li>L = 1001100</li>
* </ol>
*
- * If the {@link org.apache.commons.collections4.Trie} contained 'H' and
'L', a lookup of 'D' would
+ * If the {@link Trie} contained 'H' and 'L', a lookup of 'D' would
* return 'L', because the XOR distance between D & L is smaller
* than the XOR distance between D & H.
*
diff --git
a/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java
b/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java
index 065081e94..64152ed38 100644
--- a/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java
@@ -19,8 +19,10 @@ package org.apache.commons.collections4.trie;
import java.io.Serializable;
import java.util.Comparator;
+import org.apache.commons.collections4.Trie;
+
/**
- * Defines the interface to analyze {@link
org.apache.commons.collections4.Trie Trie} keys on a bit level.
+ * Defines the interface to analyze {@link Trie Trie} keys on a bit level.
* {@link KeyAnalyzer}'s methods return the length of the key in bits, whether
or not a bit is set,
* and bits per element in the key.
* <p>
diff --git
a/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
index 287117f4b..b02e4eed5 100644
--- a/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
@@ -18,15 +18,16 @@ package org.apache.commons.collections4.trie;
import java.util.Map;
+import org.apache.commons.collections4.Trie;
import org.apache.commons.collections4.trie.analyzer.StringKeyAnalyzer;
/**
* Implements a PATRICIA Trie (Practical Algorithm to Retrieve Information
* Coded in Alphanumeric).
* <p>
- * A PATRICIA {@link org.apache.commons.collections4.Trie} is a compressed
- * {@link org.apache.commons.collections4.Trie}. Instead of storing
- * all data at the edges of the {@link org.apache.commons.collections4.Trie}
+ * A PATRICIA {@link Trie} is a compressed
+ * {@link Trie}. Instead of storing
+ * all data at the edges of the {@link Trie}
* (and having empty internal nodes), PATRICIA stores data in every node.
* This allows for very efficient traversal, insert, delete, predecessor,
* successor, prefix, range, and {@link #select(Object)}
@@ -42,15 +43,15 @@ import
org.apache.commons.collections4.trie.analyzer.StringKeyAnalyzer;
* the given key, instead of comparing the entire key to another key.
* </p>
* <p>
- * The {@link org.apache.commons.collections4.Trie} can return operations in
+ * The {@link Trie} can return operations in
* lexicographical order using the 'prefixMap', 'submap', or 'iterator'
methods.
- * The {@link org.apache.commons.collections4.Trie} can also
+ * The {@link Trie} can also
* scan for items that are 'bitwise' (using an XOR metric) by the 'select'
method.
* Bitwise closeness is determined by the {@link KeyAnalyzer} returning true or
* false for a bit being set or not in a given key.
* </p>
* <p>
- * This PATRICIA {@link org.apache.commons.collections4.Trie} supports both
variable
+ * This PATRICIA {@link Trie} supports both variable
* length & fixed length keys. Some methods, such as {@link
org.apache.commons.collections4.Trie#prefixMap(Object)}
* are suited only to variable length keys.
* </p>
diff --git
a/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
index 64d75cb71..af8c1e7aa 100644
--- a/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections4.list.AbstractListTest;
import org.junit.jupiter.api.Test;
/**
- * Tests base {@link java.util.LinkedList} methods and contracts.
+ * Tests base {@link LinkedList} methods and contracts.
* <p>
* To use, simply extend this class, and implement the {@link #makeObject()}
method.
* </p>
diff --git
a/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
index b9b36a323..568cf548f 100644
---
a/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
+++
b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections4.SortedBag;
/**
* Abstract test class for
- * {@link org.apache.commons.collections4.SortedBag SortedBag}
+ * {@link SortedBag SortedBag}
* methods and contracts.
*/
public abstract class AbstractSortedBagTest<T> extends AbstractBagTest<T> {
diff --git
a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
index 320f98270..581396c14 100644
---
a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
+++
b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
@@ -41,12 +41,16 @@ import java.util.Objects;
import java.util.function.Predicate;
import org.apache.commons.collections4.AbstractObjectTest;
+import org.apache.commons.collections4.bag.AbstractBagTest;
+import org.apache.commons.collections4.list.AbstractListTest;
+import org.apache.commons.collections4.map.AbstractMapTest;
+import org.apache.commons.collections4.set.AbstractSetTest;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.Test;
/**
- * Tests {@link java.util.Collection}.
+ * Tests {@link Collection}.
* <p>
* You should create a concrete subclass of this class to test any custom
* {@link Collection} implementation. At minimum, you'll have to
@@ -95,7 +99,7 @@ import org.junit.jupiter.api.Test;
* for the collection. Basically, the operation is performed against your
* collection implementation, and an identical operation is performed against a
* <em>confirmed</em> collection implementation. A confirmed collection
- * implementation is something like {@link java.util.ArrayList}, which is
+ * implementation is something like {@link ArrayList}, which is
* known to conform exactly to its collection interface's contract. After the
* operation takes place on both your collection implementation and the
* confirmed collection implementation, the two collections are compared to see
@@ -116,7 +120,7 @@ import org.junit.jupiter.api.Test;
* {@link #confirmed}, the {@link #verify()} method is invoked to compare
* the results. You may want to override {@link #verify()} to perform
* additional verifications. For instance, when testing the collection
- * views of a map, {@link org.apache.commons.collections4.map.AbstractMapTest
AbstractTestMap}
+ * views of a map, {@link AbstractMapTest AbstractTestMap}
* would override {@link #verify()} to make
* sure the map is changed after the collection view is changed.
* </p>
@@ -133,9 +137,9 @@ import org.junit.jupiter.api.Test;
* that's compatible with your collection implementation.
* </p>
* <p>
- * If you're extending {@link
org.apache.commons.collections4.list.AbstractListTest AbstractListTest},
- * {@link org.apache.commons.collections4.set.AbstractSetTest AbstractTestSet},
- * or {@link org.apache.commons.collections4.bag.AbstractBagTest
AbstractBagTest},
+ * If you're extending {@link AbstractListTest AbstractListTest},
+ * {@link AbstractSetTest AbstractTestSet},
+ * or {@link AbstractBagTest AbstractBagTest},
* you probably don't have to worry about the
* above methods, because those three classes already override the methods
* to provide standard JDK confirmed collections.
@@ -513,8 +517,8 @@ public abstract class AbstractCollectionTest<E> extends
AbstractObjectTest {
/**
* Returns a confirmed empty collection.
- * For instance, an {@link java.util.ArrayList} for lists or a
- * {@link java.util.HashSet} for sets.
+ * For instance, an {@link ArrayList} for lists or a
+ * {@link HashSet} for sets.
*
* @return a confirmed empty collection
*/
@@ -522,8 +526,8 @@ public abstract class AbstractCollectionTest<E> extends
AbstractObjectTest {
/**
* Returns a confirmed full collection.
- * For instance, an {@link java.util.ArrayList} for lists or a
- * {@link java.util.HashSet} for sets. The returned collection
+ * For instance, an {@link ArrayList} for lists or a
+ * {@link HashSet} for sets. The returned collection
* should contain the elements returned by {@link #getFullElements()}.
*
* @return a confirmed full collection
diff --git
a/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
b/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
index 0e32fa25b..4fba58098 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
@@ -44,7 +44,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
/**
- * Tests for {@link org.apache.commons.collections4.keyvalue.MultiKey}.
+ * Tests for {@link MultiKey}.
*/
class MultiKeyTest {
diff --git
a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
index 97d4e3fbe..af43423f6 100644
--- a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
@@ -42,7 +42,7 @@ import
org.apache.commons.collections4.iterators.AbstractListIteratorTest;
import org.junit.jupiter.api.Test;
/**
- * Tests {@link java.util.List}.
+ * Tests {@link List}.
* <p>
* To use, simply extend this class, and implement
* the {@link #makeObject} method.
@@ -222,7 +222,7 @@ public abstract class AbstractListTest<E> extends
AbstractCollectionTest<E> {
/**
* Invokes all the methods on the given sublist to make sure they raise
- * a {@link java.util.ConcurrentModificationException
ConcurrentModificationException}.
+ * a {@link ConcurrentModificationException
ConcurrentModificationException}.
*/
protected void failFastAll(final List<E> list) {
final Method[] methods = List.class.getMethods();
@@ -233,7 +233,7 @@ public abstract class AbstractListTest<E> extends
AbstractCollectionTest<E> {
/**
* Invokes the given method on the given sublist to make sure it raises
- * a {@link java.util.ConcurrentModificationException
ConcurrentModificationException}.
+ * a {@link ConcurrentModificationException
ConcurrentModificationException}.
*
* Unless the method happens to be the equals() method, in which case
* the test is skipped. There seems to be a bug in
@@ -1103,7 +1103,7 @@ public abstract class AbstractListTest<E> extends
AbstractCollectionTest<E> {
}
/**
- * Tests that a sublist raises a {@link
java.util.ConcurrentModificationException ConcurrentModificationException}
+ * Tests that a sublist raises a {@link ConcurrentModificationException
ConcurrentModificationException}
* if elements are added to the original list.
*/
@Test
@@ -1138,7 +1138,7 @@ public abstract class AbstractListTest<E> extends
AbstractCollectionTest<E> {
}
/**
- * Tests that a sublist raises a {@link
java.util.ConcurrentModificationException ConcurrentModificationException}
+ * Tests that a sublist raises a {@link ConcurrentModificationException
ConcurrentModificationException}
* if elements are removed from the original list.
*/
@Test
diff --git
a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
index 4e0f761d3..d8c131cbf 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
@@ -54,7 +54,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
/**
- * Tests {@link java.util.Map}.
+ * Tests {@link Map}.
* <p>
* The forces at work here are similar to those in {@link
AbstractCollectionTest}. If your class implements the full Map interface,
including optional
* operations, simply extend this class, and implement the {@link
#makeObject()} method.
diff --git
a/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java
b/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java
index 320babef9..973adb7a2 100644
---
a/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections4.BulkTest;
import org.junit.jupiter.api.Test;
/**
- * Tests {@link java.util.SortedMap}.
+ * Tests {@link SortedMap}.
*
* @param <K> The key type.
* @param <V> The value type.
diff --git
a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
index 8d35bdb12..90b5fa1b8 100644
---
a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
/**
- * Abstract test class for {@link org.apache.commons.collections4.MultiSet
MultiSet}
+ * Abstract test class for {@link MultiSet MultiSet}
* methods and contracts.
* <p>
* To use, simply extend this class, and implement
diff --git
a/src/test/java/org/apache/commons/collections4/multiset/AbstractSortedMultiSetTest.java
b/src/test/java/org/apache/commons/collections4/multiset/AbstractSortedMultiSetTest.java
index 234774938..044937739 100644
---
a/src/test/java/org/apache/commons/collections4/multiset/AbstractSortedMultiSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/multiset/AbstractSortedMultiSetTest.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections4.bag.TreeBag;
/**
* Abstract test class for
- * {@link org.apache.commons.collections4.SortedMultiSet SortedMultiSet}
+ * {@link SortedMultiSet SortedMultiSet}
* methods and contracts.
*/
public abstract class AbstractSortedMultiSetTest<T> extends
AbstractMultiSetTest<T> {
@@ -79,7 +79,7 @@ public abstract class AbstractSortedMultiSetTest<T> extends
AbstractMultiSetTest
}
/**
- * Returns an empty sorted, {@link java.util.Collection}-compliant
+ * Returns an empty sorted, {@link Collection}-compliant
* collection for use in modification testing.
*
* @return a confirmed empty collection
diff --git
a/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
b/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
index 21551cd79..f7a889213 100644
--- a/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
@@ -35,7 +35,7 @@ import
org.apache.commons.collections4.collection.AbstractCollectionTest;
import org.junit.jupiter.api.Test;
/**
- * Tests {@link java.util.Queue}.
+ * Tests {@link Queue}.
* <p>
* To use, simply extend this class, and implement
* the {@link #makeObject} method.
