From a8d1066b5ec6b8ec6db6bdb47d947fccaa7d07bf Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Wed, 17 Apr 2013 17:37:03 +0000 Subject: [PATCH] [COLLECTIONS-452] Change package to o.a.c.collections4. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1469004 13f79535-47bb-0310-9956-ffa450edef68 --- findbugs-exclude-filter.xml | 10 +- .../ArrayStack.java | 2 +- .../{collections => collections4}/Bag.java | 2 +- .../BagUtils.java | 22 ++-- .../BidiMap.java | 2 +- .../BoundedCollection.java | 2 +- .../BoundedMap.java | 2 +- .../Closure.java | 2 +- .../ClosureUtils.java | 60 +++++----- .../CollectionUtils.java | 18 +-- .../ComparatorUtils.java | 14 +-- .../EnumerationUtils.java | 4 +- .../Factory.java | 2 +- .../FactoryUtils.java | 22 ++-- .../FunctorException.java | 2 +- .../{collections => collections4}/Get.java | 2 +- .../IterableGet.java | 2 +- .../IterableMap.java | 2 +- .../IterableSortedMap.java | 2 +- .../IteratorUtils.java | 56 ++++----- .../KeyValue.java | 2 +- .../ListUtils.java | 14 +-- .../MapIterator.java | 2 +- .../MapUtils.java | 30 ++--- .../MultiMap.java | 2 +- .../OrderedBidiMap.java | 2 +- .../OrderedIterator.java | 2 +- .../OrderedMap.java | 2 +- .../OrderedMapIterator.java | 2 +- .../Predicate.java | 2 +- .../PredicateUtils.java | 108 +++++++++--------- .../{collections => collections4}/Put.java | 2 +- .../QueueUtils.java | 8 +- .../ResettableIterator.java | 2 +- .../ResettableListIterator.java | 2 +- .../SetUtils.java | 16 +-- .../SortedBag.java | 2 +- .../SortedBidiMap.java | 2 +- .../SplitMapUtils.java | 12 +- .../Transformer.java | 2 +- .../TransformerUtils.java | 74 ++++++------ .../{collections => collections4}/Trie.java | 2 +- .../TrieUtils.java | 6 +- .../Unmodifiable.java | 2 +- .../bag/AbstractBagDecorator.java | 6 +- .../bag/AbstractMapBag.java | 6 +- .../bag/AbstractSortedBagDecorator.java | 4 +- .../bag/HashBag.java | 4 +- .../bag/PredicatedBag.java | 8 +- .../bag/PredicatedSortedBag.java | 6 +- .../bag/SynchronizedBag.java | 6 +- .../bag/SynchronizedSortedBag.java | 6 +- .../bag/TransformedBag.java | 10 +- .../bag/TransformedSortedBag.java | 6 +- .../bag/TreeBag.java | 6 +- .../bag/UnmodifiableBag.java | 10 +- .../bag/UnmodifiableSortedBag.java | 10 +- .../bag/package-info.java | 6 +- .../bidimap/AbstractBidiMapDecorator.java | 8 +- .../bidimap/AbstractDualBidiMap.java | 14 +-- .../AbstractOrderedBidiMapDecorator.java | 6 +- .../AbstractSortedBidiMapDecorator.java | 4 +- .../bidimap/DualHashBidiMap.java | 4 +- .../bidimap/DualLinkedHashBidiMap.java | 4 +- .../bidimap/DualTreeBidiMap.java | 16 +-- .../bidimap/TreeBidiMap.java | 22 ++-- .../bidimap/UnmodifiableBidiMap.java | 16 +-- .../bidimap/UnmodifiableOrderedBidiMap.java | 16 +-- .../bidimap/UnmodifiableSortedBidiMap.java | 18 +-- .../bidimap/package-info.java | 8 +- .../AbstractCollectionDecorator.java | 2 +- .../AbstractUntypedCollectionDecorator.java | 2 +- .../collection/CompositeCollection.java | 8 +- .../collection/IndexedCollection.java | 8 +- .../collection/PredicatedCollection.java | 4 +- .../collection/SynchronizedCollection.java | 2 +- .../collection/TransformedCollection.java | 4 +- .../UnmodifiableBoundedCollection.java | 6 +- .../collection/UnmodifiableCollection.java | 6 +- .../collection/package-info.java | 2 +- .../comparators/BooleanComparator.java | 2 +- .../comparators/ComparableComparator.java | 2 +- .../comparators/ComparatorChain.java | 2 +- .../comparators/FixedOrderComparator.java | 2 +- .../comparators/NullComparator.java | 4 +- .../comparators/ReverseComparator.java | 4 +- .../comparators/TransformingComparator.java | 10 +- .../comparators/package-info.java | 4 +- .../comparators/sequence/CommandVisitor.java | 2 +- .../comparators/sequence/DeleteCommand.java | 2 +- .../comparators/sequence/EditCommand.java | 2 +- .../comparators/sequence/EditScript.java | 2 +- .../comparators/sequence/InsertCommand.java | 2 +- .../comparators/sequence/KeepCommand.java | 2 +- .../sequence/ReplacementsFinder.java | 2 +- .../sequence/ReplacementsHandler.java | 2 +- .../sequence/SequencesComparator.java | 2 +- .../comparators/sequence/Snake.java | 2 +- .../comparators/sequence/package-info.java | 2 +- .../functors/AbstractQuantifierPredicate.java | 4 +- .../functors/AllPredicate.java | 10 +- .../functors/AndPredicate.java | 4 +- .../functors/AnyPredicate.java | 4 +- .../functors/CatchAndRethrowClosure.java | 6 +- .../functors/ChainedClosure.java | 4 +- .../functors/ChainedTransformer.java | 4 +- .../functors/CloneTransformer.java | 4 +- .../functors/ClosureTransformer.java | 6 +- .../functors/ComparatorPredicate.java | 6 +- .../functors/ConstantFactory.java | 4 +- .../functors/ConstantTransformer.java | 4 +- .../functors/DefaultEquator.java | 2 +- .../functors/EqualPredicate.java | 6 +- .../functors/Equator.java | 4 +- .../functors/ExceptionClosure.java | 6 +- .../functors/ExceptionFactory.java | 6 +- .../functors/ExceptionPredicate.java | 6 +- .../functors/ExceptionTransformer.java | 6 +- .../functors/FactoryTransformer.java | 6 +- .../functors/FalsePredicate.java | 4 +- .../functors/ForClosure.java | 4 +- .../functors/FunctorUtils.java | 8 +- .../functors/IdentityPredicate.java | 4 +- .../functors/IfClosure.java | 6 +- .../functors/InstanceofPredicate.java | 4 +- .../functors/InstantiateFactory.java | 6 +- .../functors/InstantiateTransformer.java | 6 +- .../functors/InvokerTransformer.java | 6 +- .../functors/MapTransformer.java | 4 +- .../functors/NOPClosure.java | 4 +- .../functors/NOPTransformer.java | 4 +- .../functors/NonePredicate.java | 4 +- .../functors/NotNullPredicate.java | 4 +- .../functors/NotPredicate.java | 4 +- .../functors/NullIsExceptionPredicate.java | 6 +- .../functors/NullIsFalsePredicate.java | 4 +- .../functors/NullIsTruePredicate.java | 4 +- .../functors/NullPredicate.java | 4 +- .../functors/OnePredicate.java | 4 +- .../functors/OrPredicate.java | 4 +- .../functors/PredicateDecorator.java | 4 +- .../functors/PredicateTransformer.java | 6 +- .../functors/PrototypeFactory.java | 6 +- .../functors/StringValueTransformer.java | 4 +- .../functors/SwitchClosure.java | 6 +- .../functors/SwitchTransformer.java | 6 +- .../functors/TransformedPredicate.java | 6 +- .../functors/TransformerClosure.java | 6 +- .../functors/TransformerPredicate.java | 8 +- .../functors/TruePredicate.java | 4 +- .../functors/UniquePredicate.java | 4 +- .../functors/WhileClosure.java | 6 +- .../functors/package-info.java | 10 +- .../iterators/AbstractEmptyIterator.java | 2 +- .../iterators/AbstractEmptyMapIterator.java | 2 +- .../iterators/AbstractIteratorDecorator.java | 2 +- .../AbstractListIteratorDecorator.java | 2 +- .../AbstractMapIteratorDecorator.java | 4 +- .../AbstractOrderedMapIteratorDecorator.java | 4 +- .../AbstractUntypedIteratorDecorator.java | 2 +- .../iterators/ArrayIterator.java | 6 +- .../iterators/ArrayListIterator.java | 6 +- .../iterators/CollatingIterator.java | 6 +- .../iterators/EmptyIterator.java | 4 +- .../iterators/EmptyListIterator.java | 4 +- .../iterators/EmptyMapIterator.java | 6 +- .../iterators/EmptyOrderedIterator.java | 6 +- .../iterators/EmptyOrderedMapIterator.java | 6 +- .../iterators/EntrySetMapIterator.java | 6 +- .../iterators/EnumerationIterator.java | 2 +- .../iterators/FilterIterator.java | 4 +- .../iterators/FilterListIterator.java | 4 +- .../iterators/IteratorChain.java | 4 +- .../iterators/IteratorEnumeration.java | 2 +- .../iterators/IteratorIterable.java | 4 +- .../iterators/LazyIteratorChain.java | 2 +- .../iterators/ListIteratorWrapper.java | 6 +- .../iterators/LoopingIterator.java | 4 +- .../iterators/LoopingListIterator.java | 4 +- .../iterators/NodeListIterator.java | 2 +- .../iterators/ObjectArrayIterator.java | 4 +- .../iterators/ObjectArrayListIterator.java | 6 +- .../iterators/ObjectGraphIterator.java | 6 +- .../iterators/ReverseListIterator.java | 4 +- .../iterators/SingletonIterator.java | 4 +- .../iterators/SingletonListIterator.java | 4 +- .../iterators/TransformIterator.java | 4 +- .../iterators/UniqueFilterIterator.java | 4 +- .../iterators/UnmodifiableIterator.java | 4 +- .../iterators/UnmodifiableListIterator.java | 4 +- .../iterators/UnmodifiableMapIterator.java | 6 +- .../UnmodifiableOrderedMapIterator.java | 6 +- .../iterators/package-info.java | 4 +- .../keyvalue/AbstractKeyValue.java | 4 +- .../keyvalue/AbstractMapEntry.java | 2 +- .../keyvalue/AbstractMapEntryDecorator.java | 4 +- .../keyvalue/DefaultKeyValue.java | 4 +- .../keyvalue/DefaultMapEntry.java | 4 +- .../keyvalue/MultiKey.java | 2 +- .../keyvalue/TiedMapEntry.java | 4 +- .../keyvalue/UnmodifiableMapEntry.java | 6 +- .../keyvalue/package-info.java | 2 +- .../list/AbstractLinkedList.java | 4 +- .../list/AbstractListDecorator.java | 4 +- .../AbstractSerializableListDecorator.java | 2 +- .../list/CursorableLinkedList.java | 2 +- .../list/FixedSizeList.java | 8 +- .../list/GrowthList.java | 2 +- .../list/LazyList.java | 4 +- .../list/NodeCachingLinkedList.java | 2 +- .../list/PredicatedList.java | 8 +- .../list/SetUniqueList.java | 8 +- .../list/TransformedList.java | 8 +- .../list/TreeList.java | 4 +- .../list/UnmodifiableList.java | 8 +- .../list/package-info.java | 2 +- .../map/AbstractHashedMap.java | 12 +- .../map/AbstractInputCheckedMapDecorator.java | 8 +- .../map/AbstractIterableMap.java | 6 +- .../map/AbstractLinkedMap.java | 14 +-- .../map/AbstractMapDecorator.java | 2 +- .../map/AbstractOrderedMapDecorator.java | 6 +- .../map/AbstractReferenceMap.java | 6 +- .../map/AbstractSortedMapDecorator.java | 8 +- .../map/CaseInsensitiveMap.java | 2 +- .../map/CompositeMap.java | 8 +- .../map/DefaultedMap.java | 10 +- .../map/EntrySetToMapIteratorAdapter.java | 6 +- .../map/FixedSizeMap.java | 8 +- .../map/FixedSizeSortedMap.java | 10 +- .../map/Flat3Map.java | 12 +- .../map/HashedMap.java | 4 +- .../map/LRUMap.java | 6 +- .../map/LazyMap.java | 8 +- .../map/LazySortedMap.java | 6 +- .../map/LinkedMap.java | 10 +- .../map/ListOrderedMap.java | 14 +-- .../map/MultiKeyMap.java | 8 +- .../map/MultiValueMap.java | 14 +-- .../map/PassiveExpiringMap.java | 4 +- .../map/PredicatedMap.java | 4 +- .../map/PredicatedSortedMap.java | 4 +- .../map/ReferenceIdentityMap.java | 4 +- .../map/ReferenceMap.java | 4 +- .../map/SingletonMap.java | 16 +-- .../map/StaticBucketMap.java | 4 +- .../map/TransformedMap.java | 4 +- .../map/TransformedSortedMap.java | 4 +- .../map/UnmodifiableEntrySet.java | 10 +- .../map/UnmodifiableMap.java | 16 +-- .../map/UnmodifiableOrderedMap.java | 14 +-- .../map/UnmodifiableSortedMap.java | 8 +- .../map/package-info.java | 6 +- .../overview.html | 0 .../package-info.java | 2 +- .../queue/AbstractQueueDecorator.java | 4 +- .../queue/CircularFifoQueue.java | 4 +- .../queue/PredicatedQueue.java | 6 +- .../queue/TransformedQueue.java | 6 +- .../queue/UnmodifiableQueue.java | 6 +- .../queue/package-info.java | 2 +- .../set/AbstractSerializableSetDecorator.java | 2 +- .../set/AbstractSetDecorator.java | 4 +- .../set/AbstractSortedSetDecorator.java | 2 +- .../set/CompositeSet.java | 12 +- .../set/ListOrderedSet.java | 8 +- .../set/MapBackedSet.java | 2 +- .../set/PredicatedSet.java | 6 +- .../set/PredicatedSortedSet.java | 4 +- .../set/TransformedSet.java | 6 +- .../set/TransformedSortedSet.java | 4 +- .../set/UnmodifiableSet.java | 6 +- .../set/UnmodifiableSortedSet.java | 6 +- .../set/package-info.java | 2 +- .../AbstractIterableGetMapDecorator.java | 10 +- .../splitmap/TransformedMap.java | 16 +-- .../splitmap/package-info.java | 10 +- .../trie/AbstractKeyAnalyzer.java | 2 +- .../trie/AbstractTrie.java | 4 +- .../trie/ByteArrayKeyAnalyzer.java | 2 +- .../trie/ByteKeyAnalyzer.java | 2 +- .../trie/CharArrayKeyAnalyzer.java | 2 +- .../trie/CharacterKeyAnalyzer.java | 2 +- .../trie/IntegerKeyAnalyzer.java | 2 +- .../trie/KeyAnalyzer.java | 4 +- .../trie/LongKeyAnalyzer.java | 2 +- .../trie/PatriciaTrie.java | 4 +- .../trie/PatriciaTrieBase.java | 8 +- .../trie/ShortKeyAnalyzer.java | 2 +- .../trie/StringKeyAnalyzer.java | 2 +- .../trie/SynchronizedTrie.java | 6 +- .../trie/UnmodifiableTrie.java | 6 +- .../trie/package-info.java | 4 +- .../AbstractArrayListTest.java | 4 +- .../AbstractLinkedListTest.java | 4 +- .../AbstractObjectTest.java | 11 +- .../AbstractTreeMapTest.java | 4 +- .../ArrayStackTest.java | 16 ++- .../BagUtilsTest.java | 29 +++-- .../BulkTest.java | 2 +- .../ClosureUtilsTest.java | 18 ++- .../CollectionUtilsTest.java | 29 +++-- .../EnumerationUtilsTest.java | 4 +- .../FactoryUtilsTest.java | 9 +- .../IteratorUtilsTest.java | 18 ++- .../ListUtilsTest.java | 10 +- .../MapPerformance.java | 4 +- .../MapUtilsTest.java | 22 ++-- .../MockTestCase.java | 2 +- .../PredicateUtilsTest.java | 27 +++-- .../SetUtilsTest.java | 6 +- .../SplitMapUtilsTest.java | 14 ++- .../TestUtils.java | 2 +- .../TransformerUtilsTest.java | 26 +++-- .../bag/AbstractBagTest.java | 9 +- .../bag/AbstractSortedBagTest.java | 6 +- .../bag/HashBagTest.java | 15 +-- .../bag/PredicatedBagTest.java | 22 ++-- .../bag/PredicatedSortedBagTest.java | 20 ++-- .../bag/TransformedBagTest.java | 20 ++-- .../bag/TransformedSortedBagTest.java | 23 ++-- .../bag/TreeBagTest.java | 31 ++--- .../bidimap/AbstractBidiMapTest.java | 14 +-- .../AbstractOrderedBidiMapDecoratorTest.java | 6 +- .../bidimap/AbstractOrderedBidiMapTest.java | 10 +- .../bidimap/AbstractSortedBidiMapTest.java | 8 +- .../bidimap/DualHashBidiMapTest.java | 10 +- .../bidimap/DualLinkedHashBidiMapTest.java | 10 +- .../bidimap/DualTreeBidiMap2Test.java | 18 +-- .../bidimap/DualTreeBidiMapTest.java | 10 +- .../bidimap/TreeBidiMapTest.java | 13 ++- .../bidimap/UnmodifiableBidiMapTest.java | 8 +- .../UnmodifiableOrderedBidiMapTest.java | 10 +- .../UnmodifiableSortedBidiMapTest.java | 9 +- .../collection/AbstractCollectionTest.java | 12 +- .../collection/CompositeCollectionTest.java | 10 +- .../collection/IndexedCollectionTest.java | 6 +- .../collection/PredicatedCollectionTest.java | 13 ++- .../SynchronizedCollectionTest.java | 10 +- .../collection/TransformedCollectionTest.java | 13 ++- .../UnmodifiableBoundedCollectionTest.java | 9 +- .../UnmodifiableCollectionTest.java | 10 +- .../comparators/AbstractComparatorTest.java | 13 +-- .../AbstractNullComparatorTest.java | 24 +++- .../comparators/BooleanComparatorTest.java | 9 +- .../comparators/ComparableComparatorTest.java | 13 ++- .../comparators/ComparatorChainTest.java | 14 ++- .../comparators/FixedOrderComparatorTest.java | 7 +- .../comparators/ReverseComparatorTest.java | 15 ++- .../TransformingComparatorTest.java | 11 +- .../sequence/SequencesComparatorTest.java | 4 +- .../AbstractAnyAllOnePredicateTest.java | 5 +- .../functors/AbstractClosureTest.java | 4 +- .../AbstractCompositePredicateTest.java | 4 +- .../functors/AbstractMockPredicateTest.java | 4 +- .../functors/AbstractPredicateTest.java | 4 +- .../functors/AllPredicateTest.java | 7 +- .../functors/CatchAndRethrowClosureTest.java | 7 +- .../functors/ComparatorPredicateTest.java | 7 +- .../functors/EqualPredicateTest.java | 8 +- .../functors/NullPredicateTest.java | 7 +- .../iterators/AbstractIteratorTest.java | 4 +- .../iterators/AbstractListIteratorTest.java | 2 +- .../iterators/AbstractMapIteratorTest.java | 4 +- .../AbstractOrderedMapIteratorTest.java | 4 +- .../iterators/ArrayIterator2Test.java | 4 +- .../iterators/ArrayIteratorTest.java | 4 +- .../iterators/ArrayListIterator2Test.java | 4 +- .../iterators/ArrayListIteratorTest.java | 4 +- .../iterators/CollatingIteratorTest.java | 5 +- .../iterators/FilterIteratorTest.java | 10 +- .../iterators/FilterListIteratorTest.java | 9 +- .../iterators/IteratorChainTest.java | 7 +- .../iterators/IteratorIterableTest.java | 5 +- .../iterators/LazyIteratorChainTest.java | 7 +- .../iterators/ListIteratorWrapper2Test.java | 5 +- .../iterators/ListIteratorWrapperTest.java | 5 +- .../iterators/LoopingIteratorTest.java | 4 +- .../iterators/LoopingListIteratorTest.java | 4 +- .../iterators/NodeListIteratorTest.java | 4 +- .../iterators/ObjectArrayIteratorTest.java | 4 +- .../ObjectArrayListIterator2Test.java | 4 +- .../ObjectArrayListIteratorTest.java | 4 +- .../iterators/ObjectGraphIteratorTest.java | 7 +- .../iterators/ReverseListIteratorTest.java | 5 +- .../iterators/SingletonIterator2Test.java | 5 +- .../iterators/SingletonIteratorTest.java | 5 +- .../iterators/SingletonListIteratorTest.java | 5 +- .../iterators/UniqueFilterIteratorTest.java | 4 +- .../iterators/UnmodifiableIteratorTest.java | 5 +- .../UnmodifiableListIteratorTest.java | 5 +- .../UnmodifiableMapIteratorTest.java | 11 +- .../UnmodifiableOrderedMapIteratorTest.java | 11 +- .../keyvalue/AbstractMapEntryTest.java | 2 +- .../keyvalue/DefaultKeyValueTest.java | 4 +- .../keyvalue/DefaultMapEntryTest.java | 6 +- .../keyvalue/MultiKeyTest.java | 6 +- .../keyvalue/TiedMapEntryTest.java | 4 +- .../keyvalue/UnmodifiableMapEntryTest.java | 8 +- .../list/AbstractLinkedListTest.java | 9 +- .../list/AbstractListTest.java | 27 +---- .../list/CursorableLinkedListTest.java | 16 ++- .../list/FixedSizeListTest.java | 16 +-- .../list/GrowthListTest.java | 16 +-- .../list/NodeCachingLinkedListTest.java | 20 ++-- .../list/PredicatedListTest.java | 19 ++- .../list/SetUniqueListTest.java | 17 ++- .../list/TransformedListTest.java | 19 ++- .../list/TreeListTest.java | 11 +- .../list/UnmodifiableListTest.java | 16 +-- .../map/AbstractIterableMapTest.java | 10 +- .../map/AbstractMapTest.java | 14 +-- .../map/AbstractOrderedMapTest.java | 12 +- .../map/AbstractSortedMapTest.java | 4 +- .../map/CaseInsensitiveMapTest.java | 22 ++-- .../map/CompositeMapTest.java | 10 +- .../map/DefaultedMapTest.java | 19 +-- .../map/EmptyMapMutator.java | 4 +- .../map/FixedSizeMapTest.java | 12 +- .../map/FixedSizeSortedMapTest.java | 12 +- .../map/Flat3MapTest.java | 18 +-- .../map/HashedMapTest.java | 12 +- .../map/IdentityMap.java | 5 +- .../map/LRUMapTest.java | 18 +-- .../map/LazyMapTest.java | 18 +-- .../map/LazySortedMapTest.java | 19 +-- .../map/LinkedMapTest.java | 20 ++-- .../map/ListOrderedMap2Test.java | 11 +- .../map/ListOrderedMapTest.java | 15 +-- .../map/MultiKeyMapTest.java | 17 +-- .../map/MultiValueMapTest.java | 31 ++--- .../map/PassiveExpiringMapTest.java | 21 ++-- .../map/PredicatedMapTest.java | 16 +-- .../map/PredicatedSortedMapTest.java | 14 ++- .../map/ReferenceIdentityMapTest.java | 22 +++- .../map/ReferenceMapTest.java | 20 +++- .../map/SingletonMapTest.java | 20 ++-- .../map/StaticBucketMapTest.java | 5 +- .../map/TransformedMapTest.java | 18 +-- .../map/TransformedSortedMapTest.java | 17 +-- .../map/UnmodifiableMapTest.java | 14 ++- .../map/UnmodifiableOrderedMapTest.java | 15 ++- .../map/UnmodifiableSortedMapTest.java | 12 +- .../overview.html | 0 .../queue/CircularFifoQueueTest.java | 7 +- .../queue/PredicatedQueueTest.java | 6 +- .../queue/TransformedQueueTest.java | 8 +- .../queue/UnmodifiableQueueTest.java | 4 +- .../set/AbstractSetTest.java | 4 +- .../set/AbstractSortedSetTest.java | 4 +- .../set/CompositeSetTest.java | 18 +-- .../set/EmptySetMutator.java | 2 +- .../set/ListOrderedSet2Test.java | 4 +- .../set/ListOrderedSetTest.java | 16 +-- .../set/MapBackedSet2Test.java | 4 +- .../set/MapBackedSetTest.java | 18 +-- .../set/PredicatedSetTest.java | 20 ++-- .../set/PredicatedSortedSetTest.java | 22 ++-- .../set/TransformedSetTest.java | 20 ++-- .../set/TransformedSortedSetTest.java | 22 ++-- .../set/UnmodifiableSetTest.java | 18 +-- .../set/UnmodifiableSortedSetTest.java | 18 +-- .../splitmap/TransformedMapTest.java | 28 ++--- .../trie/ByteArrayKeyAnalyzerTest.java | 2 +- .../trie/PatriciaTrieTest.java | 4 +- .../ArrayStack.emptyCollection.version1.obj | Bin 114 -> 0 bytes .../ArrayStack.emptyCollection.version4.obj | Bin 0 -> 115 bytes .../ArrayStack.fullCollection.version1.obj | Bin 131 -> 0 bytes .../ArrayStack.fullCollection.version4.obj | Bin 0 -> 522 bytes .../data/test/BooleanComparator.version3.obj | Bin 94 -> 0 bytes .../data/test/BooleanComparator.version4.obj | Bin 0 -> 95 bytes ...nsensitiveMap.emptyCollection.version3.obj | Bin 89 -> 0 bytes ...nsensitiveMap.emptyCollection.version4.obj | Bin 0 -> 90 bytes ...InsensitiveMap.fullCollection.version3.obj | Bin 340 -> 0 bytes ...InsensitiveMap.fullCollection.version4.obj | Bin 0 -> 341 bytes ...ularFifoQueue.emptyCollection.version4.obj | Bin 100 -> 101 bytes ...cularFifoQueue.fullCollection.version4.obj | Bin 506 -> 507 bytes .../test/ComparableComparator.version2.obj | Bin 84 -> 0 bytes .../test/ComparableComparator.version4.obj | Bin 0 -> 85 bytes .../data/test/ComparatorChain.version2.obj | Bin 426 -> 0 bytes .../data/test/ComparatorChain.version4.obj | Bin 0 -> 428 bytes ...eCollection.emptyCollection.version3.3.obj | Bin 253 -> 0 bytes ...iteCollection.emptyCollection.version4.obj | Bin 0 -> 258 bytes ...teCollection.fullCollection.version3.3.obj | Bin 381 -> 0 bytes ...siteCollection.fullCollection.version4.obj | Bin 0 -> 386 bytes ...ompositeMap.emptyCollection.version3.3.obj | Bin 354 -> 0 bytes .../CompositeMap.emptyCollection.version4.obj | Bin 0 -> 357 bytes ...CompositeMap.fullCollection.version3.3.obj | Bin 605 -> 0 bytes .../CompositeMap.fullCollection.version4.obj | Bin 0 -> 608 bytes ...ompositeSet.emptyCollection.version3.3.obj | Bin 465 -> 0 bytes .../CompositeSet.emptyCollection.version4.obj | Bin 0 -> 374 bytes ...CompositeSet.fullCollection.version3.3.obj | Bin 866 -> 0 bytes .../CompositeSet.fullCollection.version4.obj | Bin 0 -> 775 bytes ...bleLinkedList.emptyCollection.version4.obj | Bin 0 -> 85 bytes ...ableLinkedList.fullCollection.version4.obj | Bin 0 -> 492 bytes ...efaultedMap.emptyCollection.version3.2.obj | Bin 395 -> 0 bytes .../DefaultedMap.emptyCollection.version4.obj | Bin 0 -> 442 bytes ...DefaultedMap.fullCollection.version3.2.obj | Bin 646 -> 0 bytes .../DefaultedMap.fullCollection.version4.obj | Bin 0 -> 693 bytes ...alHashBidiMap.emptyCollection.version3.obj | Bin 154 -> 0 bytes ...alHashBidiMap.emptyCollection.version4.obj | Bin 0 -> 155 bytes ...ualHashBidiMap.fullCollection.version3.obj | Bin 409 -> 0 bytes ...ualHashBidiMap.fullCollection.version4.obj | Bin 0 -> 410 bytes ...edHashBidiMap.emptyCollection.version4.obj | Bin 213 -> 214 bytes ...kedHashBidiMap.fullCollection.version4.obj | Bin 468 -> 469 bytes ...BidiMap.emptyCollection.version3.Test2.obj | Bin 353 -> 0 bytes ...alTreeBidiMap.emptyCollection.version3.obj | Bin 175 -> 0 bytes ...BidiMap.emptyCollection.version4.Test2.obj | Bin 0 -> 390 bytes ...alTreeBidiMap.emptyCollection.version4.obj | Bin 0 -> 200 bytes ...eBidiMap.fullCollection.version3.Test2.obj | Bin 634 -> 0 bytes ...eBidiMap.fullCollection.version4.Test2.obj | Bin 0 -> 671 bytes ...alTreeBidiMap.fullCollection.version4.obj} | Bin 456 -> 481 bytes .../test/FixedOrderComparator.version4.obj | Bin 749 -> 752 bytes ...xedSizeList.emptyCollection.version3.1.obj | Bin 209 -> 0 bytes ...FixedSizeList.emptyCollection.version4.obj | Bin 0 -> 412 bytes ...ixedSizeList.fullCollection.version3.1.obj | Bin 616 -> 0 bytes .../FixedSizeList.fullCollection.version4.obj | Bin 0 -> 819 bytes ...ixedSizeMap.emptyCollection.version3.1.obj | Bin 147 -> 0 bytes .../FixedSizeMap.emptyCollection.version4.obj | Bin 0 -> 148 bytes ...FixedSizeMap.fullCollection.version3.1.obj | Bin 398 -> 0 bytes .../FixedSizeMap.fullCollection.version4.obj | Bin 0 -> 399 bytes ...zeSortedMap.emptyCollection.version3.1.obj | Bin 155 -> 0 bytes ...SizeSortedMap.emptyCollection.version4.obj | Bin 0 -> 156 bytes ...SizeSortedMap.fullCollection.version4.obj} | Bin 418 -> 419 bytes .../Flat3Map.emptyCollection.version3.1.obj | Bin 71 -> 0 bytes .../Flat3Map.emptyCollection.version4.obj | Bin 0 -> 72 bytes .../Flat3Map.fullCollection.version3.1.obj | Bin 322 -> 0 bytes .../test/Flat3Map.fullCollection.version4.obj | Bin 0 -> 323 bytes .../GrowthList.emptyCollection.version3.2.obj | Bin 206 -> 0 bytes .../GrowthList.emptyCollection.version4.obj | Bin 0 -> 409 bytes .../GrowthList.fullCollection.version3.2.obj | Bin 613 -> 0 bytes .../GrowthList.fullCollection.version4.obj | Bin 0 -> 816 bytes .../test/HashBag.emptyCollection.version3.obj | Bin 70 -> 0 bytes .../test/HashBag.emptyCollection.version4.obj | Bin 0 -> 71 bytes .../test/HashBag.fullCollection.version3.obj | Bin 100 -> 0 bytes .../test/HashBag.fullCollection.version4.obj | Bin 0 -> 101 bytes .../HashedMap.emptyCollection.version3.obj | Bin 80 -> 0 bytes .../HashedMap.emptyCollection.version4.obj | Bin 0 -> 81 bytes ... => HashedMap.fullCollection.version4.obj} | Bin 331 -> 332 bytes .../test/LRUMap.emptyCollection.version3.obj | Bin 81 -> 0 bytes .../test/LRUMap.emptyCollection.version4.obj | Bin 0 -> 104 bytes .../test/LRUMap.fullCollection.version4.obj | Bin 0 -> 355 bytes .../LazyMap.emptyCollection.version3.1.obj | Bin 434 -> 0 bytes .../test/LazyMap.emptyCollection.version4.obj | Bin 0 -> 439 bytes .../LazyMap.fullCollection.version3.1.obj | Bin 685 -> 0 bytes .../test/LazyMap.fullCollection.version4.obj | Bin 0 -> 690 bytes ...zySortedMap.emptyCollection.version3.1.obj | Bin 499 -> 0 bytes ...LazySortedMap.emptyCollection.version4.obj | Bin 0 -> 505 bytes ...LazySortedMap.fullCollection.version4.obj} | Bin 762 -> 768 bytes .../LinkedMap.emptyCollection.version3.obj | Bin 80 -> 0 bytes .../LinkedMap.emptyCollection.version4.obj | Bin 0 -> 81 bytes .../LinkedMap.fullCollection.version3.obj | Bin 331 -> 0 bytes ... => LinkedMap.fullCollection.version4.obj} | Bin 332 -> 332 bytes ...tOrderedMap.emptyCollection.version3.1.obj | Bin 236 -> 0 bytes ...istOrderedMap.emptyCollection.version4.obj | Bin 0 -> 237 bytes ...stOrderedMap.fullCollection.version3.1.obj | Bin 573 -> 0 bytes ...ListOrderedMap.fullCollection.version4.obj | Bin 0 -> 574 bytes ...tOrderedSet.emptyCollection.version3.1.obj | Bin 286 -> 0 bytes ...istOrderedSet.emptyCollection.version4.obj | Bin 0 -> 487 bytes ...stOrderedSet.fullCollection.version3.1.obj | Bin 773 -> 0 bytes ...ListOrderedSet.fullCollection.version4.obj | Bin 0 -> 974 bytes ...apBackedSet.emptyCollection.version3.1.obj | Bin 203 -> 0 bytes .../MapBackedSet.emptyCollection.version4.obj | Bin 0 -> 205 bytes ...MapBackedSet.fullCollection.version3.1.obj | Bin 622 -> 0 bytes .../MapBackedSet.fullCollection.version4.obj | Bin 0 -> 624 bytes ...MultiKeyMap.emptyCollection.version4.0.obj | Bin 144 -> 0 bytes .../MultiKeyMap.emptyCollection.version4.obj | Bin 0 -> 146 bytes .../MultiKeyMap.fullCollection.version4.0.obj | Bin 831 -> 0 bytes .../MultiKeyMap.fullCollection.version4.obj | Bin 0 -> 834 bytes ...ltiValueMap.emptyCollection.version3.3.obj | Bin 365 -> 0 bytes ...MultiValueMap.emptyCollection.version4.obj | Bin 0 -> 368 bytes ...ultiValueMap.fullCollection.version3.3.obj | Bin 475 -> 0 bytes .../MultiValueMap.fullCollection.version4.obj | Bin 0 -> 478 bytes ...ingLinkedList.emptyCollection.version3.obj | Bin 108 -> 0 bytes ...ingLinkedList.emptyCollection.version4.obj | Bin 0 -> 109 bytes ...hingLinkedList.fullCollection.version3.obj | Bin 515 -> 0 bytes ...hingLinkedList.fullCollection.version4.obj | Bin 0 -> 516 bytes .../data/test/NullComparator.version2.obj1 | Bin 219 -> 0 bytes .../data/test/NullComparator.version2.obj2 | Bin 219 -> 0 bytes .../data/test/NullComparator.version4.obj1 | Bin 0 -> 221 bytes .../data/test/NullComparator.version4.obj2 | Bin 0 -> 221 bytes ...veExpiringMap.emptyCollection.version4.obj | Bin 436 -> 439 bytes ...iveExpiringMap.fullCollection.version4.obj | Bin 936 -> 939 bytes ...edicatedBag.emptyCollection.version3.1.obj | Bin 436 -> 0 bytes ...PredicatedBag.emptyCollection.version4.obj | Bin 0 -> 467 bytes ...redicatedBag.fullCollection.version3.1.obj | Bin 466 -> 0 bytes .../PredicatedBag.fullCollection.version4.obj | Bin 0 -> 497 bytes ...dCollection.emptyCollection.version3.1.obj | Bin 361 -> 0 bytes ...tedCollection.emptyCollection.version4.obj | Bin 0 -> 390 bytes ...edCollection.fullCollection.version3.1.obj | Bin 389 -> 0 bytes ...atedCollection.fullCollection.version4.obj | Bin 0 -> 418 bytes ...dicatedList.emptyCollection.version3.1.obj | Bin 426 -> 0 bytes ...redicatedList.emptyCollection.version4.obj | Bin 0 -> 456 bytes ...edicatedList.fullCollection.version3.1.obj | Bin 454 -> 0 bytes ...PredicatedList.fullCollection.version4.obj | Bin 0 -> 484 bytes ...edicatedMap.emptyCollection.version3.1.obj | Bin 305 -> 0 bytes ...PredicatedMap.emptyCollection.version4.obj | Bin 0 -> 308 bytes ...redicatedMap.fullCollection.version3.1.obj | Bin 556 -> 0 bytes .../PredicatedMap.fullCollection.version4.obj | Bin 0 -> 559 bytes ...edicatedQueue.emptyCollection.version4.obj | Bin 443 -> 448 bytes ...redicatedQueue.fullCollection.version4.obj | Bin 471 -> 476 bytes ...edicatedSet.emptyCollection.version3.1.obj | Bin 419 -> 0 bytes ...PredicatedSet.emptyCollection.version4.obj | Bin 0 -> 449 bytes ...redicatedSet.fullCollection.version3.1.obj | Bin 447 -> 0 bytes .../PredicatedSet.fullCollection.version4.obj | Bin 0 -> 477 bytes ...edSortedBag.emptyCollection.version3.1.obj | Bin 506 -> 0 bytes ...atedSortedBag.emptyCollection.version4.obj | Bin 0 -> 538 bytes ...tedSortedBag.fullCollection.version3.1.obj | Bin 536 -> 0 bytes ...catedSortedBag.fullCollection.version4.obj | Bin 0 -> 568 bytes ...edSortedMap.emptyCollection.version3.1.obj | Bin 376 -> 0 bytes ...atedSortedMap.emptyCollection.version4.obj | Bin 0 -> 380 bytes ...tedSortedMap.fullCollection.version3.1.obj | Bin 639 -> 0 bytes ...catedSortedMap.fullCollection.version4.obj | Bin 0 -> 643 bytes ...edSortedSet.emptyCollection.version3.1.obj | Bin 481 -> 0 bytes ...atedSortedSet.emptyCollection.version4.obj | Bin 0 -> 512 bytes ...tedSortedSet.fullCollection.version3.1.obj | Bin 848 -> 0 bytes ...catedSortedSet.fullCollection.version4.obj | Bin 0 -> 879 bytes ...IdentityMap.emptyCollection.version3.1.obj | Bin 97 -> 0 bytes ...ceIdentityMap.emptyCollection.version4.obj | Bin 0 -> 98 bytes ...eIdentityMap.fullCollection.version3.1.obj | Bin 374 -> 0 bytes ...nceIdentityMap.fullCollection.version4.obj | Bin 0 -> 375 bytes ...eferenceMap.emptyCollection.version3.1.obj | Bin 89 -> 0 bytes .../ReferenceMap.emptyCollection.version4.obj | Bin 0 -> 90 bytes ... ReferenceMap.fullCollection.version4.obj} | Bin 366 -> 367 bytes ...on2.obj => ReverseComparator.version4.obj} | Bin 175 -> 176 bytes ...uencedHashMap.emptyCollection.version2.obj | Bin 75 -> 0 bytes ...quencedHashMap.fullCollection.version2.obj | Bin 326 -> 0 bytes ...tUniqueList.emptyCollection.version3.1.obj | Bin 282 -> 0 bytes ...SetUniqueList.emptyCollection.version4.obj | Bin 0 -> 485 bytes ...etUniqueList.fullCollection.version3.1.obj | Bin 769 -> 0 bytes .../SetUniqueList.fullCollection.version4.obj | Bin 0 -> 972 bytes ...ingletonMap.emptyCollection.version3.1.obj | Bin 236 -> 0 bytes .../SingletonMap.emptyCollection.version4.obj | Bin 0 -> 313 bytes ...SingletonMap.fullCollection.version3.1.obj | Bin 195 -> 0 bytes .../SingletonMap.fullCollection.version4.obj | Bin 0 -> 196 bytes ...edCollection.emptyCollection.version4.obj} | Bin 210 -> 211 bytes ...zedCollection.fullCollection.version4.obj} | Bin 617 -> 618 bytes ...nsformedBag.emptyCollection.version3.1.obj | Bin 443 -> 0 bytes ...ransformedBag.emptyCollection.version4.obj | Bin 0 -> 474 bytes ...ansformedBag.fullCollection.version3.1.obj | Bin 473 -> 0 bytes ...TransformedBag.fullCollection.version4.obj | Bin 0 -> 504 bytes ...dCollection.emptyCollection.version3.1.obj | Bin 367 -> 0 bytes ...medCollection.emptyCollection.version4.obj | Bin 0 -> 396 bytes ...edCollection.fullCollection.version3.1.obj | Bin 395 -> 0 bytes ...rmedCollection.fullCollection.version4.obj | Bin 0 -> 424 bytes ...sformedList.emptyCollection.version3.1.obj | Bin 433 -> 0 bytes ...ansformedList.emptyCollection.version4.obj | Bin 0 -> 463 bytes ...nsformedList.fullCollection.version3.1.obj | Bin 840 -> 0 bytes ...ransformedList.fullCollection.version4.obj | Bin 0 -> 870 bytes ...nsformedMap.emptyCollection.version3.1.obj | Bin 313 -> 0 bytes ...nsformedMap.emptyCollection.version3.2.obj | Bin 318 -> 0 bytes ...ransformedMap.emptyCollection.version4.obj | Bin 0 -> 316 bytes ...ansformedMap.fullCollection.version3.1.obj | Bin 564 -> 0 bytes ...ansformedMap.fullCollection.version3.2.obj | Bin 350 -> 0 bytes ...TransformedMap.fullCollection.version4.obj | Bin 0 -> 567 bytes ...nsformedQueue.emptyCollection.version4.obj | Bin 450 -> 455 bytes ...ansformedQueue.fullCollection.version4.obj | Bin 857 -> 862 bytes ...nsformedSet.emptyCollection.version3.1.obj | Bin 426 -> 0 bytes ...ransformedSet.emptyCollection.version4.obj | Bin 0 -> 456 bytes ...ansformedSet.fullCollection.version3.1.obj | Bin 827 -> 0 bytes ...TransformedSet.fullCollection.version4.obj | Bin 0 -> 857 bytes ...edSortedBag.emptyCollection.version3.1.obj | Bin 514 -> 0 bytes ...rmedSortedBag.emptyCollection.version4.obj | Bin 0 -> 546 bytes ...medSortedBag.fullCollection.version3.1.obj | Bin 544 -> 0 bytes ...ormedSortedBag.fullCollection.version4.obj | Bin 0 -> 576 bytes ...edSortedMap.emptyCollection.version3.1.obj | Bin 385 -> 0 bytes ...rmedSortedMap.emptyCollection.version4.obj | Bin 0 -> 389 bytes ...medSortedMap.fullCollection.version3.1.obj | Bin 648 -> 0 bytes ...ormedSortedMap.fullCollection.version4.obj | Bin 0 -> 652 bytes ...edSortedSet.emptyCollection.version3.1.obj | Bin 489 -> 0 bytes ...rmedSortedSet.emptyCollection.version4.obj | Bin 0 -> 520 bytes ...medSortedSet.fullCollection.version3.1.obj | Bin 856 -> 0 bytes ...ormedSortedSet.fullCollection.version4.obj | Bin 0 -> 887 bytes ...ormedSplitMap.emptyCollection.version4.obj | Bin 0 -> 321 bytes ...formedSplitMap.fullCollection.version4.obj | Bin 0 -> 353 bytes .../test/TransformingComparator.version4.obj | Bin 335 -> 347 bytes .../test/TreeBag.emptyCollection.version3.obj | Bin 71 -> 0 bytes .../test/TreeBag.emptyCollection.version4.obj | Bin 0 -> 72 bytes .../test/TreeBag.fullCollection.version3.obj | Bin 101 -> 0 bytes .../test/TreeBag.fullCollection.version4.obj | Bin 0 -> 102 bytes ...TreeBidiMap.emptyCollection.version3.3.obj | Bin 260 -> 0 bytes .../TreeBidiMap.fullCollection.version3.3.obj | Bin 2225 -> 0 bytes ...eCollection.emptyCollection.version3.1.obj | Bin 236 -> 0 bytes ...bleCollection.emptyCollection.version4.obj | Bin 0 -> 263 bytes ...leCollection.fullCollection.version3.1.obj | Bin 643 -> 0 bytes ...ableCollection.fullCollection.version4.obj | Bin 0 -> 670 bytes ...ifiableList.emptyCollection.version3.1.obj | Bin 212 -> 0 bytes ...odifiableList.emptyCollection.version4.obj | Bin 0 -> 415 bytes ...difiableList.fullCollection.version3.1.obj | Bin 619 -> 0 bytes ...modifiableList.fullCollection.version4.obj | Bin 0 -> 822 bytes ...difiableMap.emptyCollection.version3.1.obj | Bin 150 -> 0 bytes ...modifiableMap.emptyCollection.version4.obj | Bin 0 -> 151 bytes ...odifiableMap.fullCollection.version3.1.obj | Bin 401 -> 0 bytes ...nmodifiableMap.fullCollection.version4.obj | Bin 0 -> 402 bytes ...eOrderedMap.emptyCollection.version3.1.obj | Bin 311 -> 0 bytes ...bleOrderedMap.emptyCollection.version4.obj | Bin 0 -> 313 bytes ...leOrderedMap.fullCollection.version3.1.obj | Bin 648 -> 0 bytes ...ableOrderedMap.fullCollection.version4.obj | Bin 0 -> 650 bytes ...difiableQueue.emptyCollection.version4.obj | Bin 321 -> 324 bytes ...odifiableQueue.fullCollection.version4.obj | Bin 727 -> 730 bytes ...difiableSet.emptyCollection.version3.1.obj | Bin 203 -> 0 bytes ...modifiableSet.emptyCollection.version4.obj | Bin 0 -> 404 bytes ...odifiableSet.fullCollection.version3.1.obj | Bin 604 -> 0 bytes ...nmodifiableSet.fullCollection.version4.obj | Bin 0 -> 805 bytes ...leSortedMap.emptyCollection.version3.1.obj | Bin 158 -> 0 bytes ...ableSortedMap.emptyCollection.version4.obj | Bin 0 -> 159 bytes ...ableSortedMap.fullCollection.version4.obj} | Bin 421 -> 422 bytes ...leSortedSet.emptyCollection.version3.1.obj | Bin 120 -> 0 bytes ...ableSortedSet.emptyCollection.version4.obj | Bin 0 -> 397 bytes ...bleSortedSet.fullCollection.version3.1.obj | Bin 487 -> 0 bytes ...iableSortedSet.fullCollection.version4.obj | Bin 0 -> 764 bytes .../trie/hamlet.txt | 0 712 files changed, 2035 insertions(+), 1750 deletions(-) rename src/main/java/org/apache/commons/{collections => collections4}/ArrayStack.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/Bag.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/BagUtils.java (93%) rename src/main/java/org/apache/commons/{collections => collections4}/BidiMap.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/BoundedCollection.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/BoundedMap.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/Closure.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/ClosureUtils.java (88%) rename src/main/java/org/apache/commons/{collections => collections4}/CollectionUtils.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/ComparatorUtils.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/EnumerationUtils.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/Factory.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/FactoryUtils.java (87%) rename src/main/java/org/apache/commons/{collections => collections4}/FunctorException.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/Get.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/IterableGet.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/IterableMap.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/IterableSortedMap.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/IteratorUtils.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/KeyValue.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/ListUtils.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/MapIterator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/MapUtils.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/MultiMap.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/OrderedBidiMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/OrderedIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/OrderedMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/OrderedMapIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/Predicate.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/PredicateUtils.java (85%) rename src/main/java/org/apache/commons/{collections => collections4}/Put.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/QueueUtils.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/ResettableIterator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/ResettableListIterator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/SetUtils.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/SortedBag.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/SortedBidiMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/SplitMapUtils.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/Transformer.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/TransformerUtils.java (87%) rename src/main/java/org/apache/commons/{collections => collections4}/Trie.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/TrieUtils.java (90%) rename src/main/java/org/apache/commons/{collections => collections4}/Unmodifiable.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/AbstractBagDecorator.java (93%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/AbstractMapBag.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/AbstractSortedBagDecorator.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/HashBag.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/PredicatedBag.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/PredicatedSortedBag.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/SynchronizedBag.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/SynchronizedSortedBag.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/TransformedBag.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/TransformedSortedBag.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/TreeBag.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/UnmodifiableBag.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/UnmodifiableSortedBag.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/bag/package-info.java (91%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/AbstractBidiMapDecorator.java (92%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/AbstractDualBidiMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/AbstractOrderedBidiMapDecorator.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/AbstractSortedBidiMapDecorator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/DualHashBidiMap.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/DualLinkedHashBidiMap.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/DualTreeBidiMap.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/TreeBidiMap.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/UnmodifiableBidiMap.java (89%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/UnmodifiableOrderedBidiMap.java (89%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/UnmodifiableSortedBidiMap.java (89%) rename src/main/java/org/apache/commons/{collections => collections4}/bidimap/package-info.java (85%) rename src/main/java/org/apache/commons/{collections => collections4}/collection/AbstractCollectionDecorator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/collection/AbstractUntypedCollectionDecorator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/collection/CompositeCollection.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/collection/IndexedCollection.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/collection/PredicatedCollection.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/collection/SynchronizedCollection.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/collection/TransformedCollection.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/collection/UnmodifiableBoundedCollection.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/collection/UnmodifiableCollection.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/collection/package-info.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/BooleanComparator.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/ComparableComparator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/ComparatorChain.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/FixedOrderComparator.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/NullComparator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/ReverseComparator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/TransformingComparator.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/package-info.java (89%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/sequence/CommandVisitor.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/sequence/DeleteCommand.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/sequence/EditCommand.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/sequence/EditScript.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/sequence/InsertCommand.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/sequence/KeepCommand.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/sequence/ReplacementsFinder.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/sequence/ReplacementsHandler.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/sequence/SequencesComparator.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/sequence/Snake.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/comparators/sequence/package-info.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/AbstractQuantifierPredicate.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/AllPredicate.java (92%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/AndPredicate.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/AnyPredicate.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/CatchAndRethrowClosure.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/ChainedClosure.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/ChainedTransformer.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/CloneTransformer.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/ClosureTransformer.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/ComparatorPredicate.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/ConstantFactory.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/ConstantTransformer.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/DefaultEquator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/EqualPredicate.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/Equator.java (92%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/ExceptionClosure.java (92%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/ExceptionFactory.java (92%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/ExceptionPredicate.java (92%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/ExceptionTransformer.java (93%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/FactoryTransformer.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/FalsePredicate.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/ForClosure.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/FunctorUtils.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/IdentityPredicate.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/IfClosure.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/InstanceofPredicate.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/InstantiateFactory.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/InstantiateTransformer.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/InvokerTransformer.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/MapTransformer.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/NOPClosure.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/NOPTransformer.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/NonePredicate.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/NotNullPredicate.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/NotPredicate.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/NullIsExceptionPredicate.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/NullIsFalsePredicate.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/NullIsTruePredicate.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/NullPredicate.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/OnePredicate.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/OrPredicate.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/PredicateDecorator.java (93%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/PredicateTransformer.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/PrototypeFactory.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/StringValueTransformer.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/SwitchClosure.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/SwitchTransformer.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/TransformedPredicate.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/TransformerClosure.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/TransformerPredicate.java (93%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/TruePredicate.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/UniquePredicate.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/WhileClosure.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/functors/package-info.java (74%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/AbstractEmptyIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/AbstractEmptyMapIterator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/AbstractIteratorDecorator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/AbstractListIteratorDecorator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/AbstractMapIteratorDecorator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/AbstractOrderedMapIteratorDecorator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/AbstractUntypedIteratorDecorator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/ArrayIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/ArrayListIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/CollatingIterator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/EmptyIterator.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/EmptyListIterator.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/EmptyMapIterator.java (90%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/EmptyOrderedIterator.java (90%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/EmptyOrderedMapIterator.java (90%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/EntrySetMapIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/EnumerationIterator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/FilterIterator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/FilterListIterator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/IteratorChain.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/IteratorEnumeration.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/IteratorIterable.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/LazyIteratorChain.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/ListIteratorWrapper.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/LoopingIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/LoopingListIterator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/NodeListIterator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/ObjectArrayIterator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/ObjectArrayListIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/ObjectGraphIterator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/ReverseListIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/SingletonIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/SingletonListIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/TransformIterator.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/UniqueFilterIterator.java (92%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/UnmodifiableIterator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/UnmodifiableListIterator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/UnmodifiableMapIterator.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/UnmodifiableOrderedMapIterator.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/iterators/package-info.java (89%) rename src/main/java/org/apache/commons/{collections => collections4}/keyvalue/AbstractKeyValue.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/keyvalue/AbstractMapEntry.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/keyvalue/AbstractMapEntryDecorator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/keyvalue/DefaultKeyValue.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/keyvalue/DefaultMapEntry.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/keyvalue/MultiKey.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/keyvalue/TiedMapEntry.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/keyvalue/UnmodifiableMapEntry.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/keyvalue/package-info.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/list/AbstractLinkedList.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/list/AbstractListDecorator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/list/AbstractSerializableListDecorator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/list/CursorableLinkedList.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/list/FixedSizeList.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/list/GrowthList.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/list/LazyList.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/list/NodeCachingLinkedList.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/list/PredicatedList.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/list/SetUniqueList.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/list/TransformedList.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/list/TreeList.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/list/UnmodifiableList.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/list/package-info.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/map/AbstractHashedMap.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/map/AbstractInputCheckedMapDecorator.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/map/AbstractIterableMap.java (88%) rename src/main/java/org/apache/commons/{collections => collections4}/map/AbstractLinkedMap.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/map/AbstractMapDecorator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/map/AbstractOrderedMapDecorator.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/map/AbstractReferenceMap.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/map/AbstractSortedMapDecorator.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/map/CaseInsensitiveMap.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/map/CompositeMap.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/map/DefaultedMap.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/map/EntrySetToMapIteratorAdapter.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/map/FixedSizeMap.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/map/FixedSizeSortedMap.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/map/Flat3Map.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/map/HashedMap.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/map/LRUMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/map/LazyMap.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/map/LazySortedMap.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/map/LinkedMap.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/map/ListOrderedMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/map/MultiKeyMap.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/map/MultiValueMap.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/map/PassiveExpiringMap.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/map/PredicatedMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/map/PredicatedSortedMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/map/ReferenceIdentityMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/map/ReferenceMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/map/SingletonMap.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/map/StaticBucketMap.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/map/TransformedMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/map/TransformedSortedMap.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/map/UnmodifiableEntrySet.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/map/UnmodifiableMap.java (90%) rename src/main/java/org/apache/commons/{collections => collections4}/map/UnmodifiableOrderedMap.java (91%) rename src/main/java/org/apache/commons/{collections => collections4}/map/UnmodifiableSortedMap.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/map/package-info.java (93%) rename src/main/java/org/apache/commons/{collections => collections4}/overview.html (100%) rename src/main/java/org/apache/commons/{collections => collections4}/package-info.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/queue/AbstractQueueDecorator.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/queue/CircularFifoQueue.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/queue/PredicatedQueue.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/queue/TransformedQueue.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/queue/UnmodifiableQueue.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/queue/package-info.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/set/AbstractSerializableSetDecorator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/set/AbstractSetDecorator.java (93%) rename src/main/java/org/apache/commons/{collections => collections4}/set/AbstractSortedSetDecorator.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/set/CompositeSet.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/set/ListOrderedSet.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/set/MapBackedSet.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/set/PredicatedSet.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/set/PredicatedSortedSet.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/set/TransformedSet.java (95%) rename src/main/java/org/apache/commons/{collections => collections4}/set/TransformedSortedSet.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/set/UnmodifiableSet.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/set/UnmodifiableSortedSet.java (96%) rename src/main/java/org/apache/commons/{collections => collections4}/set/package-info.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/splitmap/AbstractIterableGetMapDecorator.java (90%) rename src/main/java/org/apache/commons/{collections => collections4}/splitmap/TransformedMap.java (94%) rename src/main/java/org/apache/commons/{collections => collections4}/splitmap/package-info.java (83%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/AbstractKeyAnalyzer.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/AbstractTrie.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/ByteArrayKeyAnalyzer.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/ByteKeyAnalyzer.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/CharArrayKeyAnalyzer.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/CharacterKeyAnalyzer.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/IntegerKeyAnalyzer.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/KeyAnalyzer.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/LongKeyAnalyzer.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/PatriciaTrie.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/PatriciaTrieBase.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/ShortKeyAnalyzer.java (98%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/StringKeyAnalyzer.java (99%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/SynchronizedTrie.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/UnmodifiableTrie.java (97%) rename src/main/java/org/apache/commons/{collections => collections4}/trie/package-info.java (92%) rename src/test/java/org/apache/commons/{collections => collections4}/AbstractArrayListTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/AbstractLinkedListTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/AbstractObjectTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/AbstractTreeMapTest.java (94%) rename src/test/java/org/apache/commons/{collections => collections4}/ArrayStackTest.java (86%) rename src/test/java/org/apache/commons/{collections => collections4}/BagUtilsTest.java (86%) rename src/test/java/org/apache/commons/{collections => collections4}/BulkTest.java (99%) rename src/test/java/org/apache/commons/{collections => collections4}/ClosureUtilsTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/CollectionUtilsTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/EnumerationUtilsTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/FactoryUtilsTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/IteratorUtilsTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/ListUtilsTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/MapPerformance.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/MapUtilsTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/MockTestCase.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/PredicateUtilsTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/SetUtilsTest.java (94%) rename src/test/java/org/apache/commons/{collections => collections4}/SplitMapUtilsTest.java (92%) rename src/test/java/org/apache/commons/{collections => collections4}/TestUtils.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/TransformerUtilsTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/bag/AbstractBagTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/bag/AbstractSortedBagTest.java (88%) rename src/test/java/org/apache/commons/{collections => collections4}/bag/HashBagTest.java (74%) rename src/test/java/org/apache/commons/{collections => collections4}/bag/PredicatedBagTest.java (84%) rename src/test/java/org/apache/commons/{collections => collections4}/bag/PredicatedSortedBagTest.java (82%) rename src/test/java/org/apache/commons/{collections => collections4}/bag/TransformedBagTest.java (82%) rename src/test/java/org/apache/commons/{collections => collections4}/bag/TransformedSortedBagTest.java (78%) rename src/test/java/org/apache/commons/{collections => collections4}/bag/TreeBagTest.java (76%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/AbstractBidiMapTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/AbstractOrderedBidiMapDecoratorTest.java (90%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/AbstractOrderedBidiMapTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/AbstractSortedBidiMapTest.java (99%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/DualHashBidiMapTest.java (78%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/DualLinkedHashBidiMapTest.java (79%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/DualTreeBidiMap2Test.java (89%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/DualTreeBidiMapTest.java (79%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/TreeBidiMapTest.java (80%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/UnmodifiableBidiMapTest.java (88%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/UnmodifiableOrderedBidiMapTest.java (87%) rename src/test/java/org/apache/commons/{collections => collections4}/bidimap/UnmodifiableSortedBidiMapTest.java (90%) rename src/test/java/org/apache/commons/{collections => collections4}/collection/AbstractCollectionTest.java (99%) rename src/test/java/org/apache/commons/{collections => collections4}/collection/CompositeCollectionTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/collection/IndexedCollectionTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/collection/PredicatedCollectionTest.java (88%) rename src/test/java/org/apache/commons/{collections => collections4}/collection/SynchronizedCollectionTest.java (80%) rename src/test/java/org/apache/commons/{collections => collections4}/collection/TransformedCollectionTest.java (88%) rename src/test/java/org/apache/commons/{collections => collections4}/collection/UnmodifiableBoundedCollectionTest.java (90%) rename src/test/java/org/apache/commons/{collections => collections4}/collection/UnmodifiableCollectionTest.java (83%) rename src/test/java/org/apache/commons/{collections => collections4}/comparators/AbstractComparatorTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/comparators/AbstractNullComparatorTest.java (81%) rename src/test/java/org/apache/commons/{collections => collections4}/comparators/BooleanComparatorTest.java (94%) rename src/test/java/org/apache/commons/{collections => collections4}/comparators/ComparableComparatorTest.java (78%) rename src/test/java/org/apache/commons/{collections => collections4}/comparators/ComparatorChainTest.java (93%) rename src/test/java/org/apache/commons/{collections => collections4}/comparators/FixedOrderComparatorTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/comparators/ReverseComparatorTest.java (84%) rename src/test/java/org/apache/commons/{collections => collections4}/comparators/TransformingComparatorTest.java (81%) rename src/test/java/org/apache/commons/{collections => collections4}/comparators/sequence/SequencesComparatorTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/functors/AbstractAnyAllOnePredicateTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/functors/AbstractClosureTest.java (92%) rename src/test/java/org/apache/commons/{collections => collections4}/functors/AbstractCompositePredicateTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/functors/AbstractMockPredicateTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/functors/AbstractPredicateTest.java (94%) rename src/test/java/org/apache/commons/{collections => collections4}/functors/AllPredicateTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/functors/CatchAndRethrowClosureTest.java (92%) rename src/test/java/org/apache/commons/{collections => collections4}/functors/ComparatorPredicateTest.java (94%) rename src/test/java/org/apache/commons/{collections => collections4}/functors/EqualPredicateTest.java (88%) rename src/test/java/org/apache/commons/{collections => collections4}/functors/NullPredicateTest.java (85%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/AbstractIteratorTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/AbstractListIteratorTest.java (99%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/AbstractMapIteratorTest.java (99%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/AbstractOrderedMapIteratorTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/ArrayIterator2Test.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/ArrayIteratorTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/ArrayListIterator2Test.java (93%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/ArrayListIteratorTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/CollatingIteratorTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/FilterIteratorTest.java (94%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/FilterListIteratorTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/IteratorChainTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/IteratorIterableTest.java (93%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/LazyIteratorChainTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/ListIteratorWrapper2Test.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/ListIteratorWrapperTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/LoopingIteratorTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/LoopingListIteratorTest.java (99%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/NodeListIteratorTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/ObjectArrayIteratorTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/ObjectArrayListIterator2Test.java (93%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/ObjectArrayListIteratorTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/ObjectGraphIteratorTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/ReverseListIteratorTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/SingletonIterator2Test.java (94%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/SingletonIteratorTest.java (94%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/SingletonListIteratorTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/UniqueFilterIteratorTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/UnmodifiableIteratorTest.java (93%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/UnmodifiableListIteratorTest.java (93%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/UnmodifiableMapIteratorTest.java (89%) rename src/test/java/org/apache/commons/{collections => collections4}/iterators/UnmodifiableOrderedMapIteratorTest.java (89%) rename src/test/java/org/apache/commons/{collections => collections4}/keyvalue/AbstractMapEntryTest.java (99%) rename src/test/java/org/apache/commons/{collections => collections4}/keyvalue/DefaultKeyValueTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/keyvalue/DefaultMapEntryTest.java (93%) rename src/test/java/org/apache/commons/{collections => collections4}/keyvalue/MultiKeyTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/keyvalue/TiedMapEntryTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/keyvalue/UnmodifiableMapEntryTest.java (92%) rename src/test/java/org/apache/commons/{collections => collections4}/list/AbstractLinkedListTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/list/AbstractListTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/list/CursorableLinkedListTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/list/FixedSizeListTest.java (79%) rename src/test/java/org/apache/commons/{collections => collections4}/list/GrowthListTest.java (91%) rename src/test/java/org/apache/commons/{collections => collections4}/list/NodeCachingLinkedListTest.java (90%) rename src/test/java/org/apache/commons/{collections => collections4}/list/PredicatedListTest.java (89%) rename src/test/java/org/apache/commons/{collections => collections4}/list/SetUniqueListTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/list/TransformedListTest.java (88%) rename src/test/java/org/apache/commons/{collections => collections4}/list/TreeListTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/list/UnmodifiableListTest.java (91%) rename src/test/java/org/apache/commons/{collections => collections4}/map/AbstractIterableMapTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/map/AbstractMapTest.java (99%) rename src/test/java/org/apache/commons/{collections => collections4}/map/AbstractOrderedMapTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/map/AbstractSortedMapTest.java (99%) rename src/test/java/org/apache/commons/{collections => collections4}/map/CaseInsensitiveMapTest.java (90%) rename src/test/java/org/apache/commons/{collections => collections4}/map/CompositeMapTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/map/DefaultedMapTest.java (89%) rename src/test/java/org/apache/commons/{collections => collections4}/map/EmptyMapMutator.java (94%) rename src/test/java/org/apache/commons/{collections => collections4}/map/FixedSizeMapTest.java (84%) rename src/test/java/org/apache/commons/{collections => collections4}/map/FixedSizeSortedMapTest.java (87%) rename src/test/java/org/apache/commons/{collections => collections4}/map/Flat3MapTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/map/HashedMapTest.java (84%) rename src/test/java/org/apache/commons/{collections => collections4}/map/IdentityMap.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/map/LRUMapTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/map/LazyMapTest.java (86%) rename src/test/java/org/apache/commons/{collections => collections4}/map/LazySortedMapTest.java (88%) rename src/test/java/org/apache/commons/{collections => collections4}/map/LinkedMapTest.java (93%) rename src/test/java/org/apache/commons/{collections => collections4}/map/ListOrderedMap2Test.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/map/ListOrderedMapTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/map/MultiKeyMapTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/map/MultiValueMapTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/map/PassiveExpiringMapTest.java (92%) rename src/test/java/org/apache/commons/{collections => collections4}/map/PredicatedMapTest.java (90%) rename src/test/java/org/apache/commons/{collections => collections4}/map/PredicatedSortedMapTest.java (93%) rename src/test/java/org/apache/commons/{collections => collections4}/map/ReferenceIdentityMapTest.java (93%) rename src/test/java/org/apache/commons/{collections => collections4}/map/ReferenceMapTest.java (92%) rename src/test/java/org/apache/commons/{collections => collections4}/map/SingletonMapTest.java (89%) rename src/test/java/org/apache/commons/{collections => collections4}/map/StaticBucketMapTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/map/TransformedMapTest.java (91%) rename src/test/java/org/apache/commons/{collections => collections4}/map/TransformedSortedMapTest.java (92%) rename src/test/java/org/apache/commons/{collections => collections4}/map/UnmodifiableMapTest.java (86%) rename src/test/java/org/apache/commons/{collections => collections4}/map/UnmodifiableOrderedMapTest.java (85%) rename src/test/java/org/apache/commons/{collections => collections4}/map/UnmodifiableSortedMapTest.java (87%) rename src/test/java/org/apache/commons/{collections => collections4}/overview.html (100%) rename src/test/java/org/apache/commons/{collections => collections4}/queue/CircularFifoQueueTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/queue/PredicatedQueueTest.java (95%) rename src/test/java/org/apache/commons/{collections => collections4}/queue/TransformedQueueTest.java (94%) rename src/test/java/org/apache/commons/{collections => collections4}/queue/UnmodifiableQueueTest.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/set/AbstractSetTest.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/set/AbstractSortedSetTest.java (99%) rename src/test/java/org/apache/commons/{collections => collections4}/set/CompositeSetTest.java (90%) rename src/test/java/org/apache/commons/{collections => collections4}/set/EmptySetMutator.java (97%) rename src/test/java/org/apache/commons/{collections => collections4}/set/ListOrderedSet2Test.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/set/ListOrderedSetTest.java (94%) rename src/test/java/org/apache/commons/{collections => collections4}/set/MapBackedSet2Test.java (96%) rename src/test/java/org/apache/commons/{collections => collections4}/set/MapBackedSetTest.java (70%) rename src/test/java/org/apache/commons/{collections => collections4}/set/PredicatedSetTest.java (86%) rename src/test/java/org/apache/commons/{collections => collections4}/set/PredicatedSortedSetTest.java (86%) rename src/test/java/org/apache/commons/{collections => collections4}/set/TransformedSetTest.java (85%) rename src/test/java/org/apache/commons/{collections => collections4}/set/TransformedSortedSetTest.java (84%) rename src/test/java/org/apache/commons/{collections => collections4}/set/UnmodifiableSetTest.java (79%) rename src/test/java/org/apache/commons/{collections => collections4}/set/UnmodifiableSortedSetTest.java (89%) rename src/test/java/org/apache/commons/{collections => collections4}/splitmap/TransformedMapTest.java (87%) rename src/test/java/org/apache/commons/{collections => collections4}/trie/ByteArrayKeyAnalyzerTest.java (98%) rename src/test/java/org/apache/commons/{collections => collections4}/trie/PatriciaTrieTest.java (99%) delete mode 100644 src/test/resources/data/test/ArrayStack.emptyCollection.version1.obj create mode 100644 src/test/resources/data/test/ArrayStack.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/ArrayStack.fullCollection.version1.obj create mode 100644 src/test/resources/data/test/ArrayStack.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/BooleanComparator.version3.obj create mode 100644 src/test/resources/data/test/BooleanComparator.version4.obj delete mode 100644 src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version3.obj create mode 100644 src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version3.obj create mode 100644 src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/ComparableComparator.version2.obj create mode 100644 src/test/resources/data/test/ComparableComparator.version4.obj delete mode 100644 src/test/resources/data/test/ComparatorChain.version2.obj create mode 100644 src/test/resources/data/test/ComparatorChain.version4.obj delete mode 100644 src/test/resources/data/test/CompositeCollection.emptyCollection.version3.3.obj create mode 100644 src/test/resources/data/test/CompositeCollection.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/CompositeCollection.fullCollection.version3.3.obj create mode 100644 src/test/resources/data/test/CompositeCollection.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/CompositeMap.emptyCollection.version3.3.obj create mode 100644 src/test/resources/data/test/CompositeMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/CompositeMap.fullCollection.version3.3.obj create mode 100644 src/test/resources/data/test/CompositeMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/CompositeSet.emptyCollection.version3.3.obj create mode 100644 src/test/resources/data/test/CompositeSet.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/CompositeSet.fullCollection.version3.3.obj create mode 100644 src/test/resources/data/test/CompositeSet.fullCollection.version4.obj create mode 100644 src/test/resources/data/test/CursorableLinkedList.emptyCollection.version4.obj create mode 100644 src/test/resources/data/test/CursorableLinkedList.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/DefaultedMap.emptyCollection.version3.2.obj create mode 100644 src/test/resources/data/test/DefaultedMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/DefaultedMap.fullCollection.version3.2.obj create mode 100644 src/test/resources/data/test/DefaultedMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/DualHashBidiMap.emptyCollection.version3.obj create mode 100644 src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/DualHashBidiMap.fullCollection.version3.obj create mode 100644 src/test/resources/data/test/DualHashBidiMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version3.Test2.obj delete mode 100644 src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version3.obj create mode 100644 src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj create mode 100644 src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/DualTreeBidiMap.fullCollection.version3.Test2.obj create mode 100644 src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj rename src/test/resources/data/test/{DualTreeBidiMap.fullCollection.version3.obj => DualTreeBidiMap.fullCollection.version4.obj} (63%) delete mode 100644 src/test/resources/data/test/FixedSizeList.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/FixedSizeList.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/FixedSizeList.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/FixedSizeList.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/FixedSizeMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/FixedSizeMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/FixedSizeMap.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/FixedSizeMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version4.obj rename src/test/resources/data/test/{FixedSizeSortedMap.fullCollection.version3.1.obj => FixedSizeSortedMap.fullCollection.version4.obj} (73%) delete mode 100644 src/test/resources/data/test/Flat3Map.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/Flat3Map.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/Flat3Map.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/Flat3Map.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/GrowthList.emptyCollection.version3.2.obj create mode 100644 src/test/resources/data/test/GrowthList.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/GrowthList.fullCollection.version3.2.obj create mode 100644 src/test/resources/data/test/GrowthList.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/HashBag.emptyCollection.version3.obj create mode 100644 src/test/resources/data/test/HashBag.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/HashBag.fullCollection.version3.obj create mode 100644 src/test/resources/data/test/HashBag.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/HashedMap.emptyCollection.version3.obj create mode 100644 src/test/resources/data/test/HashedMap.emptyCollection.version4.obj rename src/test/resources/data/test/{HashedMap.fullCollection.version3.obj => HashedMap.fullCollection.version4.obj} (83%) delete mode 100644 src/test/resources/data/test/LRUMap.emptyCollection.version3.obj create mode 100644 src/test/resources/data/test/LRUMap.emptyCollection.version4.obj create mode 100644 src/test/resources/data/test/LRUMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/LazyMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/LazyMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/LazyMap.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/LazyMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/LazySortedMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/LazySortedMap.emptyCollection.version4.obj rename src/test/resources/data/test/{LazySortedMap.fullCollection.version3.1.obj => LazySortedMap.fullCollection.version4.obj} (50%) delete mode 100644 src/test/resources/data/test/LinkedMap.emptyCollection.version3.obj create mode 100644 src/test/resources/data/test/LinkedMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/LinkedMap.fullCollection.version3.obj rename src/test/resources/data/test/{LRUMap.fullCollection.version3.obj => LinkedMap.fullCollection.version4.obj} (61%) delete mode 100644 src/test/resources/data/test/ListOrderedMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/ListOrderedMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/ListOrderedMap.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/ListOrderedMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/ListOrderedSet.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/ListOrderedSet.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/ListOrderedSet.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/ListOrderedSet.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/MapBackedSet.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/MapBackedSet.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/MapBackedSet.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/MapBackedSet.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.0.obj create mode 100644 src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/MultiKeyMap.fullCollection.version4.0.obj create mode 100644 src/test/resources/data/test/MultiKeyMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/MultiValueMap.emptyCollection.version3.3.obj create mode 100644 src/test/resources/data/test/MultiValueMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/MultiValueMap.fullCollection.version3.3.obj create mode 100644 src/test/resources/data/test/MultiValueMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version3.obj create mode 100644 src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version3.obj create mode 100644 src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/NullComparator.version2.obj1 delete mode 100644 src/test/resources/data/test/NullComparator.version2.obj2 create mode 100644 src/test/resources/data/test/NullComparator.version4.obj1 create mode 100644 src/test/resources/data/test/NullComparator.version4.obj2 delete mode 100644 src/test/resources/data/test/PredicatedBag.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedBag.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedBag.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedBag.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedCollection.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedCollection.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedCollection.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedCollection.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedList.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedList.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedList.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedList.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedMap.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedSet.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedSet.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedSet.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedSet.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedSortedBag.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedSortedBag.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedSortedMap.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedSortedMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/PredicatedSortedSet.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/PredicatedSortedSet.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/ReferenceMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/ReferenceMap.emptyCollection.version4.obj rename src/test/resources/data/test/{ReferenceMap.fullCollection.version3.1.obj => ReferenceMap.fullCollection.version4.obj} (67%) rename src/test/resources/data/test/{ReverseComparator.version2.obj => ReverseComparator.version4.obj} (52%) delete mode 100644 src/test/resources/data/test/SequencedHashMap.emptyCollection.version2.obj delete mode 100644 src/test/resources/data/test/SequencedHashMap.fullCollection.version2.obj delete mode 100644 src/test/resources/data/test/SetUniqueList.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/SetUniqueList.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/SetUniqueList.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/SetUniqueList.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/SingletonMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/SingletonMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/SingletonMap.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/SingletonMap.fullCollection.version4.obj rename src/test/resources/data/test/{SynchronizedCollection.emptyCollection.version3.1.obj => SynchronizedCollection.emptyCollection.version4.obj} (58%) rename src/test/resources/data/test/{SynchronizedCollection.fullCollection.version3.1.obj => SynchronizedCollection.fullCollection.version4.obj} (85%) delete mode 100644 src/test/resources/data/test/TransformedBag.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedBag.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedBag.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedBag.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedCollection.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedCollection.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedCollection.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedCollection.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedList.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedList.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedList.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedList.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedMap.emptyCollection.version3.1.obj delete mode 100644 src/test/resources/data/test/TransformedMap.emptyCollection.version3.2.obj create mode 100644 src/test/resources/data/test/TransformedMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedMap.fullCollection.version3.1.obj delete mode 100644 src/test/resources/data/test/TransformedMap.fullCollection.version3.2.obj create mode 100644 src/test/resources/data/test/TransformedMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedSet.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedSet.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedSet.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedSet.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedSortedBag.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedSortedBag.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedSortedBag.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedSortedBag.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedSortedMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedSortedMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedSortedMap.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedSortedMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedSortedSet.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedSortedSet.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/TransformedSortedSet.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/TransformedSortedSet.fullCollection.version4.obj create mode 100644 src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj create mode 100644 src/test/resources/data/test/TransformedSplitMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/TreeBag.emptyCollection.version3.obj create mode 100644 src/test/resources/data/test/TreeBag.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/TreeBag.fullCollection.version3.obj create mode 100644 src/test/resources/data/test/TreeBag.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/TreeBidiMap.emptyCollection.version3.3.obj delete mode 100644 src/test/resources/data/test/TreeBidiMap.fullCollection.version3.3.obj delete mode 100644 src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/UnmodifiableCollection.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableCollection.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/UnmodifiableList.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableList.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/UnmodifiableList.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableList.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/UnmodifiableMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/UnmodifiableMap.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/UnmodifiableSet.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableSet.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/UnmodifiableSet.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableSet.fullCollection.version4.obj delete mode 100644 src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj rename src/test/resources/data/test/{UnmodifiableSortedMap.fullCollection.version3.1.obj => UnmodifiableSortedMap.fullCollection.version4.obj} (73%) delete mode 100644 src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj delete mode 100644 src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version3.1.obj create mode 100644 src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version4.obj rename src/test/resources/org/apache/commons/{collections => collections4}/trie/hamlet.txt (100%) diff --git a/findbugs-exclude-filter.xml b/findbugs-exclude-filter.xml index 934ec0f02..cf2bb2c62 100644 --- a/findbugs-exclude-filter.xml +++ b/findbugs-exclude-filter.xml @@ -25,7 +25,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -53,15 +53,15 @@ - - + + - + diff --git a/src/main/java/org/apache/commons/collections/ArrayStack.java b/src/main/java/org/apache/commons/collections4/ArrayStack.java similarity index 99% rename from src/main/java/org/apache/commons/collections/ArrayStack.java rename to src/main/java/org/apache/commons/collections4/ArrayStack.java index 43ecbeb73..d46fb7917 100644 --- a/src/main/java/org/apache/commons/collections/ArrayStack.java +++ b/src/main/java/org/apache/commons/collections4/ArrayStack.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.ArrayList; import java.util.EmptyStackException; diff --git a/src/main/java/org/apache/commons/collections/Bag.java b/src/main/java/org/apache/commons/collections4/Bag.java similarity index 99% rename from src/main/java/org/apache/commons/collections/Bag.java rename to src/main/java/org/apache/commons/collections4/Bag.java index 8b528a6a8..5b8c14842 100644 --- a/src/main/java/org/apache/commons/collections/Bag.java +++ b/src/main/java/org/apache/commons/collections4/Bag.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/org/apache/commons/collections/BagUtils.java b/src/main/java/org/apache/commons/collections4/BagUtils.java similarity index 93% rename from src/main/java/org/apache/commons/collections/BagUtils.java rename to src/main/java/org/apache/commons/collections4/BagUtils.java index 3c4f3c54d..8657e4e04 100644 --- a/src/main/java/org/apache/commons/collections/BagUtils.java +++ b/src/main/java/org/apache/commons/collections4/BagUtils.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; -import org.apache.commons.collections.bag.HashBag; -import org.apache.commons.collections.bag.PredicatedBag; -import org.apache.commons.collections.bag.PredicatedSortedBag; -import org.apache.commons.collections.bag.SynchronizedBag; -import org.apache.commons.collections.bag.SynchronizedSortedBag; -import org.apache.commons.collections.bag.TransformedBag; -import org.apache.commons.collections.bag.TransformedSortedBag; -import org.apache.commons.collections.bag.TreeBag; -import org.apache.commons.collections.bag.UnmodifiableBag; -import org.apache.commons.collections.bag.UnmodifiableSortedBag; +import org.apache.commons.collections4.bag.HashBag; +import org.apache.commons.collections4.bag.PredicatedBag; +import org.apache.commons.collections4.bag.PredicatedSortedBag; +import org.apache.commons.collections4.bag.SynchronizedBag; +import org.apache.commons.collections4.bag.SynchronizedSortedBag; +import org.apache.commons.collections4.bag.TransformedBag; +import org.apache.commons.collections4.bag.TransformedSortedBag; +import org.apache.commons.collections4.bag.TreeBag; +import org.apache.commons.collections4.bag.UnmodifiableBag; +import org.apache.commons.collections4.bag.UnmodifiableSortedBag; /** * Provides utility methods and decorators for {@link Bag} and {@link SortedBag} instances. diff --git a/src/main/java/org/apache/commons/collections/BidiMap.java b/src/main/java/org/apache/commons/collections4/BidiMap.java similarity index 99% rename from src/main/java/org/apache/commons/collections/BidiMap.java rename to src/main/java/org/apache/commons/collections4/BidiMap.java index 6bfe4df45..5c5f0dc58 100644 --- a/src/main/java/org/apache/commons/collections/BidiMap.java +++ b/src/main/java/org/apache/commons/collections4/BidiMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Defines a map that allows bidirectional lookup between key and values. diff --git a/src/main/java/org/apache/commons/collections/BoundedCollection.java b/src/main/java/org/apache/commons/collections4/BoundedCollection.java similarity index 97% rename from src/main/java/org/apache/commons/collections/BoundedCollection.java rename to src/main/java/org/apache/commons/collections4/BoundedCollection.java index 381f1ab38..0853c7377 100644 --- a/src/main/java/org/apache/commons/collections/BoundedCollection.java +++ b/src/main/java/org/apache/commons/collections4/BoundedCollection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/collections/BoundedMap.java b/src/main/java/org/apache/commons/collections4/BoundedMap.java similarity index 97% rename from src/main/java/org/apache/commons/collections/BoundedMap.java rename to src/main/java/org/apache/commons/collections4/BoundedMap.java index 8c4edf36f..597e93c2c 100644 --- a/src/main/java/org/apache/commons/collections/BoundedMap.java +++ b/src/main/java/org/apache/commons/collections4/BoundedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Defines a map that is bounded in size. diff --git a/src/main/java/org/apache/commons/collections/Closure.java b/src/main/java/org/apache/commons/collections4/Closure.java similarity index 97% rename from src/main/java/org/apache/commons/collections/Closure.java rename to src/main/java/org/apache/commons/collections4/Closure.java index ec5dde43c..046326a26 100644 --- a/src/main/java/org/apache/commons/collections/Closure.java +++ b/src/main/java/org/apache/commons/collections4/Closure.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Defines a functor interface implemented by classes that do something. diff --git a/src/main/java/org/apache/commons/collections/ClosureUtils.java b/src/main/java/org/apache/commons/collections4/ClosureUtils.java similarity index 88% rename from src/main/java/org/apache/commons/collections/ClosureUtils.java rename to src/main/java/org/apache/commons/collections4/ClosureUtils.java index b7ca4e8a4..0528b7bf2 100644 --- a/src/main/java/org/apache/commons/collections/ClosureUtils.java +++ b/src/main/java/org/apache/commons/collections4/ClosureUtils.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Collection; import java.util.Map; -import org.apache.commons.collections.functors.ChainedClosure; -import org.apache.commons.collections.functors.EqualPredicate; -import org.apache.commons.collections.functors.ExceptionClosure; -import org.apache.commons.collections.functors.ForClosure; -import org.apache.commons.collections.functors.IfClosure; -import org.apache.commons.collections.functors.InvokerTransformer; -import org.apache.commons.collections.functors.NOPClosure; -import org.apache.commons.collections.functors.SwitchClosure; -import org.apache.commons.collections.functors.TransformerClosure; -import org.apache.commons.collections.functors.WhileClosure; +import org.apache.commons.collections4.functors.ChainedClosure; +import org.apache.commons.collections4.functors.EqualPredicate; +import org.apache.commons.collections4.functors.ExceptionClosure; +import org.apache.commons.collections4.functors.ForClosure; +import org.apache.commons.collections4.functors.IfClosure; +import org.apache.commons.collections4.functors.InvokerTransformer; +import org.apache.commons.collections4.functors.NOPClosure; +import org.apache.commons.collections4.functors.SwitchClosure; +import org.apache.commons.collections4.functors.TransformerClosure; +import org.apache.commons.collections4.functors.WhileClosure; /** * ClosureUtils provides reference implementations and utilities @@ -61,7 +61,7 @@ public class ClosureUtils { * Gets a Closure that always throws an exception. * This could be useful during testing as a placeholder. * - * @see org.apache.commons.collections.functors.ExceptionClosure + * @see org.apache.commons.collections4.functors.ExceptionClosure * * @param the type that the closure acts on * @return the closure @@ -74,7 +74,7 @@ public class ClosureUtils { * Gets a Closure that will do nothing. * This could be useful during testing as a placeholder. * - * @see org.apache.commons.collections.functors.NOPClosure + * @see org.apache.commons.collections4.functors.NOPClosure * * @param the type that the closure acts on * @return the closure @@ -88,7 +88,7 @@ public class ClosureUtils { * The transformer will be called using the closure's input object. * The transformer's result will be ignored. * - * @see org.apache.commons.collections.functors.TransformerClosure + * @see org.apache.commons.collections4.functors.TransformerClosure * * @param the type that the closure acts on * @param transformer the transformer to run each time in the closure, null means nop @@ -103,7 +103,7 @@ public class ClosureUtils { *

* A null closure or zero count returns the NOPClosure. * - * @see org.apache.commons.collections.functors.ForClosure + * @see org.apache.commons.collections4.functors.ForClosure * * @param the type that the closure acts on * @param count the number of times to loop @@ -118,7 +118,7 @@ public class ClosureUtils { * Creates a Closure that will call the closure repeatedly until the * predicate returns false. * - * @see org.apache.commons.collections.functors.WhileClosure + * @see org.apache.commons.collections4.functors.WhileClosure * * @param the type that the closure acts on * @param predicate the predicate to use as an end of loop test, not null @@ -134,7 +134,7 @@ public class ClosureUtils { * Creates a Closure that will call the closure once and then repeatedly * until the predicate returns false. * - * @see org.apache.commons.collections.functors.WhileClosure + * @see org.apache.commons.collections4.functors.WhileClosure * * @param the type that the closure acts on * @param closure the closure to call repeatedly, not null @@ -151,8 +151,8 @@ public class ClosureUtils { * Creates a Closure that will invoke a specific method on the closure's * input object by reflection. * - * @see org.apache.commons.collections.functors.InvokerTransformer - * @see org.apache.commons.collections.functors.TransformerClosure + * @see org.apache.commons.collections4.functors.InvokerTransformer + * @see org.apache.commons.collections4.functors.TransformerClosure * * @param the type that the closure acts on * @param methodName the name of the method @@ -168,8 +168,8 @@ public class ClosureUtils { * Creates a Closure that will invoke a specific method on the closure's * input object by reflection. * - * @see org.apache.commons.collections.functors.InvokerTransformer - * @see org.apache.commons.collections.functors.TransformerClosure + * @see org.apache.commons.collections4.functors.InvokerTransformer + * @see org.apache.commons.collections4.functors.TransformerClosure * * @param the type that the closure acts on * @param methodName the name of the method @@ -189,7 +189,7 @@ public class ClosureUtils { * Create a new Closure that calls two Closures, passing the result of * the first into the second. * - * @see org.apache.commons.collections.functors.ChainedClosure + * @see org.apache.commons.collections4.functors.ChainedClosure * * @param the type that the closure acts on * @param closure1 the first closure @@ -205,7 +205,7 @@ public class ClosureUtils { * Create a new Closure that calls each closure in turn, passing the * result into the next closure. * - * @see org.apache.commons.collections.functors.ChainedClosure + * @see org.apache.commons.collections4.functors.ChainedClosure * * @param the type that the closure acts on * @param closures an array of closures to chain @@ -222,7 +222,7 @@ public class ClosureUtils { * result into the next closure. The ordering is that of the iterator() * method on the collection. * - * @see org.apache.commons.collections.functors.ChainedClosure + * @see org.apache.commons.collections4.functors.ChainedClosure * * @param the type that the closure acts on * @param closures a collection of closures to chain @@ -239,7 +239,7 @@ public class ClosureUtils { * Create a new Closure that calls another closure based on the * result of the specified predicate. * - * @see org.apache.commons.collections.functors.IfClosure + * @see org.apache.commons.collections4.functors.IfClosure * * @param the type that the closure acts on * @param predicate the validating predicate @@ -258,7 +258,7 @@ public class ClosureUtils { * Create a new Closure that calls one of two closures depending * on the specified predicate. * - * @see org.apache.commons.collections.functors.IfClosure + * @see org.apache.commons.collections4.functors.IfClosure * * @param the type that the closure acts on * @param predicate the predicate to switch on @@ -282,7 +282,7 @@ public class ClosureUtils { * location 0 returned true. Each predicate is evaluated * until one returns true. * - * @see org.apache.commons.collections.functors.SwitchClosure + * @see org.apache.commons.collections4.functors.SwitchClosure * * @param the type that the closure acts on * @param predicates an array of predicates to check, not null @@ -306,7 +306,7 @@ public class ClosureUtils { * until one returns true. If no predicates evaluate to true, the default * closure is called. * - * @see org.apache.commons.collections.functors.SwitchClosure + * @see org.apache.commons.collections4.functors.SwitchClosure * * @param the type that the closure acts on * @param predicates an array of predicates to check, not null @@ -334,7 +334,7 @@ public class ClosureUtils { * null key. The ordering is that of the iterator() method on the entryset * collection of the map. * - * @see org.apache.commons.collections.functors.SwitchClosure + * @see org.apache.commons.collections4.functors.SwitchClosure * * @param the type that the closure acts on * @param predicatesAndClosures a map of predicates to closures @@ -357,7 +357,7 @@ public class ClosureUtils { * default closure is called. The default closure is set in the map * using a null key. * - * @see org.apache.commons.collections.functors.SwitchClosure + * @see org.apache.commons.collections4.functors.SwitchClosure * * @param the type that the closure acts on * @param objectsAndClosures a map of objects to closures diff --git a/src/main/java/org/apache/commons/collections/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java similarity index 99% rename from src/main/java/org/apache/commons/collections/CollectionUtils.java rename to src/main/java/org/apache/commons/collections4/CollectionUtils.java index 6053af435..b3a5a12cc 100644 --- a/src/main/java/org/apache/commons/collections/CollectionUtils.java +++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.lang.reflect.Array; import java.util.ArrayList; @@ -28,14 +28,14 @@ import java.util.ListIterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.bag.HashBag; -import org.apache.commons.collections.collection.PredicatedCollection; -import org.apache.commons.collections.collection.SynchronizedCollection; -import org.apache.commons.collections.collection.TransformedCollection; -import org.apache.commons.collections.collection.UnmodifiableBoundedCollection; -import org.apache.commons.collections.collection.UnmodifiableCollection; -import org.apache.commons.collections.functors.Equator; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.bag.HashBag; +import org.apache.commons.collections4.collection.PredicatedCollection; +import org.apache.commons.collections4.collection.SynchronizedCollection; +import org.apache.commons.collections4.collection.TransformedCollection; +import org.apache.commons.collections4.collection.UnmodifiableBoundedCollection; +import org.apache.commons.collections4.collection.UnmodifiableCollection; +import org.apache.commons.collections4.functors.Equator; +import org.apache.commons.collections4.functors.TruePredicate; /** * Provides utility methods and decorators for {@link Collection} instances. diff --git a/src/main/java/org/apache/commons/collections/ComparatorUtils.java b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java similarity index 95% rename from src/main/java/org/apache/commons/collections/ComparatorUtils.java rename to src/main/java/org/apache/commons/collections4/ComparatorUtils.java index ab4b30a81..db4ff7b8a 100644 --- a/src/main/java/org/apache/commons/collections/ComparatorUtils.java +++ b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Collection; import java.util.Comparator; -import org.apache.commons.collections.comparators.BooleanComparator; -import org.apache.commons.collections.comparators.ComparableComparator; -import org.apache.commons.collections.comparators.ComparatorChain; -import org.apache.commons.collections.comparators.NullComparator; -import org.apache.commons.collections.comparators.ReverseComparator; -import org.apache.commons.collections.comparators.TransformingComparator; +import org.apache.commons.collections4.comparators.BooleanComparator; +import org.apache.commons.collections4.comparators.ComparableComparator; +import org.apache.commons.collections4.comparators.ComparatorChain; +import org.apache.commons.collections4.comparators.NullComparator; +import org.apache.commons.collections4.comparators.ReverseComparator; +import org.apache.commons.collections4.comparators.TransformingComparator; /** * Provides convenient static utility methods for Comparator diff --git a/src/main/java/org/apache/commons/collections/EnumerationUtils.java b/src/main/java/org/apache/commons/collections4/EnumerationUtils.java similarity index 95% rename from src/main/java/org/apache/commons/collections/EnumerationUtils.java rename to src/main/java/org/apache/commons/collections4/EnumerationUtils.java index c2d5f42c7..98d86ec99 100644 --- a/src/main/java/org/apache/commons/collections/EnumerationUtils.java +++ b/src/main/java/org/apache/commons/collections4/EnumerationUtils.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.StringTokenizer; -import org.apache.commons.collections.iterators.EnumerationIterator; +import org.apache.commons.collections4.iterators.EnumerationIterator; /** * Provides utility methods for {@link Enumeration} instances. diff --git a/src/main/java/org/apache/commons/collections/Factory.java b/src/main/java/org/apache/commons/collections4/Factory.java similarity index 97% rename from src/main/java/org/apache/commons/collections/Factory.java rename to src/main/java/org/apache/commons/collections4/Factory.java index be6ee00fe..b11202440 100644 --- a/src/main/java/org/apache/commons/collections/Factory.java +++ b/src/main/java/org/apache/commons/collections4/Factory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Defines a functor interface implemented by classes that create objects. diff --git a/src/main/java/org/apache/commons/collections/FactoryUtils.java b/src/main/java/org/apache/commons/collections4/FactoryUtils.java similarity index 87% rename from src/main/java/org/apache/commons/collections/FactoryUtils.java rename to src/main/java/org/apache/commons/collections4/FactoryUtils.java index a0fddaade..1c8acc0b8 100644 --- a/src/main/java/org/apache/commons/collections/FactoryUtils.java +++ b/src/main/java/org/apache/commons/collections4/FactoryUtils.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; -import org.apache.commons.collections.functors.ConstantFactory; -import org.apache.commons.collections.functors.InstantiateFactory; -import org.apache.commons.collections.functors.ExceptionFactory; -import org.apache.commons.collections.functors.PrototypeFactory; +import org.apache.commons.collections4.functors.ConstantFactory; +import org.apache.commons.collections4.functors.ExceptionFactory; +import org.apache.commons.collections4.functors.InstantiateFactory; +import org.apache.commons.collections4.functors.PrototypeFactory; /** * FactoryUtils provides reference implementations and utilities @@ -47,7 +47,7 @@ public class FactoryUtils { * Gets a Factory that always throws an exception. * This could be useful during testing as a placeholder. * - * @see org.apache.commons.collections.functors.ExceptionFactory + * @see org.apache.commons.collections4.functors.ExceptionFactory * * @param the type that the factory creates * @return the factory @@ -60,7 +60,7 @@ public class FactoryUtils { * Gets a Factory that will return null each time the factory is used. * This could be useful during testing as a placeholder. * - * @see org.apache.commons.collections.functors.ConstantFactory + * @see org.apache.commons.collections4.functors.ConstantFactory * @param the "type" of null object the factory should return. * @return the factory */ @@ -74,7 +74,7 @@ public class FactoryUtils { * immutable objects should use the constant factory. Mutable objects should * use the prototype factory. * - * @see org.apache.commons.collections.functors.ConstantFactory + * @see org.apache.commons.collections4.functors.ConstantFactory * * @param the type that the factory creates * @param constantToReturn the constant object to return each time in the factory @@ -94,7 +94,7 @@ public class FactoryUtils { *

  • serialization clone *
      * - * @see org.apache.commons.collections.functors.PrototypeFactory + * @see org.apache.commons.collections4.functors.PrototypeFactory * * @param the type that the factory creates * @param prototype the object to clone each time in the factory @@ -110,7 +110,7 @@ public class FactoryUtils { * Creates a Factory that can create objects of a specific type using * a no-args constructor. * - * @see org.apache.commons.collections.functors.InstantiateFactory + * @see org.apache.commons.collections4.functors.InstantiateFactory * * @param the type that the factory creates * @param classToInstantiate the Class to instantiate each time in the factory @@ -125,7 +125,7 @@ public class FactoryUtils { * Creates a Factory that can create objects of a specific type using * the arguments specified to this method. * - * @see org.apache.commons.collections.functors.InstantiateFactory + * @see org.apache.commons.collections4.functors.InstantiateFactory * * @param the type that the factory creates * @param classToInstantiate the Class to instantiate each time in the factory diff --git a/src/main/java/org/apache/commons/collections/FunctorException.java b/src/main/java/org/apache/commons/collections4/FunctorException.java similarity index 98% rename from src/main/java/org/apache/commons/collections/FunctorException.java rename to src/main/java/org/apache/commons/collections4/FunctorException.java index 8f01657d5..d3c32fcd0 100644 --- a/src/main/java/org/apache/commons/collections/FunctorException.java +++ b/src/main/java/org/apache/commons/collections4/FunctorException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Runtime exception thrown from functors. diff --git a/src/main/java/org/apache/commons/collections/Get.java b/src/main/java/org/apache/commons/collections4/Get.java similarity index 97% rename from src/main/java/org/apache/commons/collections/Get.java rename to src/main/java/org/apache/commons/collections4/Get.java index cad8fe9c9..8af5a74e7 100644 --- a/src/main/java/org/apache/commons/collections/Get.java +++ b/src/main/java/org/apache/commons/collections4/Get.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Collection; import java.util.Set; diff --git a/src/main/java/org/apache/commons/collections/IterableGet.java b/src/main/java/org/apache/commons/collections4/IterableGet.java similarity index 97% rename from src/main/java/org/apache/commons/collections/IterableGet.java rename to src/main/java/org/apache/commons/collections4/IterableGet.java index 6ca4e58fc..9f018e57c 100644 --- a/src/main/java/org/apache/commons/collections/IterableGet.java +++ b/src/main/java/org/apache/commons/collections4/IterableGet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * The "read" subset of the {@link java.util.Map} interface. diff --git a/src/main/java/org/apache/commons/collections/IterableMap.java b/src/main/java/org/apache/commons/collections4/IterableMap.java similarity index 97% rename from src/main/java/org/apache/commons/collections/IterableMap.java rename to src/main/java/org/apache/commons/collections4/IterableMap.java index c0818c259..9169561b0 100644 --- a/src/main/java/org/apache/commons/collections/IterableMap.java +++ b/src/main/java/org/apache/commons/collections4/IterableMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Map; diff --git a/src/main/java/org/apache/commons/collections/IterableSortedMap.java b/src/main/java/org/apache/commons/collections4/IterableSortedMap.java similarity index 96% rename from src/main/java/org/apache/commons/collections/IterableSortedMap.java rename to src/main/java/org/apache/commons/collections4/IterableSortedMap.java index 4fc162b01..460bfd235 100644 --- a/src/main/java/org/apache/commons/collections/IterableSortedMap.java +++ b/src/main/java/org/apache/commons/collections4/IterableSortedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.SortedMap; diff --git a/src/main/java/org/apache/commons/collections/IteratorUtils.java b/src/main/java/org/apache/commons/collections4/IteratorUtils.java similarity index 95% rename from src/main/java/org/apache/commons/collections/IteratorUtils.java rename to src/main/java/org/apache/commons/collections4/IteratorUtils.java index d6d908450..676d406c7 100644 --- a/src/main/java/org/apache/commons/collections/IteratorUtils.java +++ b/src/main/java/org/apache/commons/collections4/IteratorUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; @@ -29,33 +29,33 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -import org.apache.commons.collections.iterators.ArrayIterator; -import org.apache.commons.collections.iterators.ArrayListIterator; -import org.apache.commons.collections.iterators.CollatingIterator; -import org.apache.commons.collections.iterators.EmptyIterator; -import org.apache.commons.collections.iterators.EmptyListIterator; -import org.apache.commons.collections.iterators.EmptyMapIterator; -import org.apache.commons.collections.iterators.EmptyOrderedIterator; -import org.apache.commons.collections.iterators.EmptyOrderedMapIterator; -import org.apache.commons.collections.iterators.EnumerationIterator; -import org.apache.commons.collections.iterators.FilterIterator; -import org.apache.commons.collections.iterators.FilterListIterator; -import org.apache.commons.collections.iterators.IteratorChain; -import org.apache.commons.collections.iterators.IteratorEnumeration; -import org.apache.commons.collections.iterators.IteratorIterable; -import org.apache.commons.collections.iterators.ListIteratorWrapper; -import org.apache.commons.collections.iterators.LoopingIterator; -import org.apache.commons.collections.iterators.LoopingListIterator; -import org.apache.commons.collections.iterators.NodeListIterator; -import org.apache.commons.collections.iterators.ObjectArrayIterator; -import org.apache.commons.collections.iterators.ObjectArrayListIterator; -import org.apache.commons.collections.iterators.ObjectGraphIterator; -import org.apache.commons.collections.iterators.SingletonIterator; -import org.apache.commons.collections.iterators.SingletonListIterator; -import org.apache.commons.collections.iterators.TransformIterator; -import org.apache.commons.collections.iterators.UnmodifiableIterator; -import org.apache.commons.collections.iterators.UnmodifiableListIterator; -import org.apache.commons.collections.iterators.UnmodifiableMapIterator; +import org.apache.commons.collections4.iterators.ArrayIterator; +import org.apache.commons.collections4.iterators.ArrayListIterator; +import org.apache.commons.collections4.iterators.CollatingIterator; +import org.apache.commons.collections4.iterators.EmptyIterator; +import org.apache.commons.collections4.iterators.EmptyListIterator; +import org.apache.commons.collections4.iterators.EmptyMapIterator; +import org.apache.commons.collections4.iterators.EmptyOrderedIterator; +import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator; +import org.apache.commons.collections4.iterators.EnumerationIterator; +import org.apache.commons.collections4.iterators.FilterIterator; +import org.apache.commons.collections4.iterators.FilterListIterator; +import org.apache.commons.collections4.iterators.IteratorChain; +import org.apache.commons.collections4.iterators.IteratorEnumeration; +import org.apache.commons.collections4.iterators.IteratorIterable; +import org.apache.commons.collections4.iterators.ListIteratorWrapper; +import org.apache.commons.collections4.iterators.LoopingIterator; +import org.apache.commons.collections4.iterators.LoopingListIterator; +import org.apache.commons.collections4.iterators.NodeListIterator; +import org.apache.commons.collections4.iterators.ObjectArrayIterator; +import org.apache.commons.collections4.iterators.ObjectArrayListIterator; +import org.apache.commons.collections4.iterators.ObjectGraphIterator; +import org.apache.commons.collections4.iterators.SingletonIterator; +import org.apache.commons.collections4.iterators.SingletonListIterator; +import org.apache.commons.collections4.iterators.TransformIterator; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; +import org.apache.commons.collections4.iterators.UnmodifiableListIterator; +import org.apache.commons.collections4.iterators.UnmodifiableMapIterator; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/main/java/org/apache/commons/collections/KeyValue.java b/src/main/java/org/apache/commons/collections4/KeyValue.java similarity index 97% rename from src/main/java/org/apache/commons/collections/KeyValue.java rename to src/main/java/org/apache/commons/collections4/KeyValue.java index 7b6ad0965..d2728f290 100644 --- a/src/main/java/org/apache/commons/collections/KeyValue.java +++ b/src/main/java/org/apache/commons/collections4/KeyValue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Defines a simple key value pair. diff --git a/src/main/java/org/apache/commons/collections/ListUtils.java b/src/main/java/org/apache/commons/collections4/ListUtils.java similarity index 98% rename from src/main/java/org/apache/commons/collections/ListUtils.java rename to src/main/java/org/apache/commons/collections4/ListUtils.java index c82b69160..96de85e8e 100644 --- a/src/main/java/org/apache/commons/collections/ListUtils.java +++ b/src/main/java/org/apache/commons/collections4/ListUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.AbstractList; import java.util.ArrayList; @@ -24,12 +24,12 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import org.apache.commons.collections.bag.HashBag; -import org.apache.commons.collections.list.FixedSizeList; -import org.apache.commons.collections.list.LazyList; -import org.apache.commons.collections.list.PredicatedList; -import org.apache.commons.collections.list.TransformedList; -import org.apache.commons.collections.list.UnmodifiableList; +import org.apache.commons.collections4.bag.HashBag; +import org.apache.commons.collections4.list.FixedSizeList; +import org.apache.commons.collections4.list.LazyList; +import org.apache.commons.collections4.list.PredicatedList; +import org.apache.commons.collections4.list.TransformedList; +import org.apache.commons.collections4.list.UnmodifiableList; /** * Provides utility methods and decorators for {@link List} instances. diff --git a/src/main/java/org/apache/commons/collections/MapIterator.java b/src/main/java/org/apache/commons/collections4/MapIterator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/MapIterator.java rename to src/main/java/org/apache/commons/collections4/MapIterator.java index 4a2fa2a74..6c6d36f6b 100644 --- a/src/main/java/org/apache/commons/collections/MapIterator.java +++ b/src/main/java/org/apache/commons/collections4/MapIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Iterator; diff --git a/src/main/java/org/apache/commons/collections/MapUtils.java b/src/main/java/org/apache/commons/collections4/MapUtils.java similarity index 98% rename from src/main/java/org/apache/commons/collections/MapUtils.java rename to src/main/java/org/apache/commons/collections4/MapUtils.java index e88b2fe88..3eb507890 100644 --- a/src/main/java/org/apache/commons/collections/MapUtils.java +++ b/src/main/java/org/apache/commons/collections4/MapUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.io.PrintStream; import java.text.NumberFormat; @@ -31,20 +31,20 @@ import java.util.ResourceBundle; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.collections.map.AbstractMapDecorator; -import org.apache.commons.collections.map.AbstractSortedMapDecorator; -import org.apache.commons.collections.map.FixedSizeMap; -import org.apache.commons.collections.map.FixedSizeSortedMap; -import org.apache.commons.collections.map.LazyMap; -import org.apache.commons.collections.map.LazySortedMap; -import org.apache.commons.collections.map.ListOrderedMap; -import org.apache.commons.collections.map.MultiValueMap; -import org.apache.commons.collections.map.PredicatedMap; -import org.apache.commons.collections.map.PredicatedSortedMap; -import org.apache.commons.collections.map.TransformedMap; -import org.apache.commons.collections.map.TransformedSortedMap; -import org.apache.commons.collections.map.UnmodifiableMap; -import org.apache.commons.collections.map.UnmodifiableSortedMap; +import org.apache.commons.collections4.map.AbstractMapDecorator; +import org.apache.commons.collections4.map.AbstractSortedMapDecorator; +import org.apache.commons.collections4.map.FixedSizeMap; +import org.apache.commons.collections4.map.FixedSizeSortedMap; +import org.apache.commons.collections4.map.LazyMap; +import org.apache.commons.collections4.map.LazySortedMap; +import org.apache.commons.collections4.map.ListOrderedMap; +import org.apache.commons.collections4.map.MultiValueMap; +import org.apache.commons.collections4.map.PredicatedMap; +import org.apache.commons.collections4.map.PredicatedSortedMap; +import org.apache.commons.collections4.map.TransformedMap; +import org.apache.commons.collections4.map.TransformedSortedMap; +import org.apache.commons.collections4.map.UnmodifiableMap; +import org.apache.commons.collections4.map.UnmodifiableSortedMap; /** * Provides utility methods and decorators for diff --git a/src/main/java/org/apache/commons/collections/MultiMap.java b/src/main/java/org/apache/commons/collections4/MultiMap.java similarity index 99% rename from src/main/java/org/apache/commons/collections/MultiMap.java rename to src/main/java/org/apache/commons/collections4/MultiMap.java index 3cfd2a967..fb7e2da61 100644 --- a/src/main/java/org/apache/commons/collections/MultiMap.java +++ b/src/main/java/org/apache/commons/collections4/MultiMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/collections/OrderedBidiMap.java b/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/OrderedBidiMap.java rename to src/main/java/org/apache/commons/collections4/OrderedBidiMap.java index 8b90fb801..c9266342c 100644 --- a/src/main/java/org/apache/commons/collections/OrderedBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Defines a map that allows bidirectional lookup between key and values diff --git a/src/main/java/org/apache/commons/collections/OrderedIterator.java b/src/main/java/org/apache/commons/collections4/OrderedIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/OrderedIterator.java rename to src/main/java/org/apache/commons/collections4/OrderedIterator.java index d6339aa1c..64890236e 100644 --- a/src/main/java/org/apache/commons/collections/OrderedIterator.java +++ b/src/main/java/org/apache/commons/collections4/OrderedIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Iterator; diff --git a/src/main/java/org/apache/commons/collections/OrderedMap.java b/src/main/java/org/apache/commons/collections4/OrderedMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/OrderedMap.java rename to src/main/java/org/apache/commons/collections4/OrderedMap.java index 71b6c6ea9..f73a35eec 100644 --- a/src/main/java/org/apache/commons/collections/OrderedMap.java +++ b/src/main/java/org/apache/commons/collections4/OrderedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Defines a map that maintains order and allows both forward and backward diff --git a/src/main/java/org/apache/commons/collections/OrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/OrderedMapIterator.java rename to src/main/java/org/apache/commons/collections4/OrderedMapIterator.java index 24de17137..5f22f5d41 100644 --- a/src/main/java/org/apache/commons/collections/OrderedMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Defines an iterator that operates over an ordered Map. diff --git a/src/main/java/org/apache/commons/collections/Predicate.java b/src/main/java/org/apache/commons/collections4/Predicate.java similarity index 97% rename from src/main/java/org/apache/commons/collections/Predicate.java rename to src/main/java/org/apache/commons/collections4/Predicate.java index c0baf7250..983d78bd3 100644 --- a/src/main/java/org/apache/commons/collections/Predicate.java +++ b/src/main/java/org/apache/commons/collections4/Predicate.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Defines a functor interface implemented by classes that perform a predicate diff --git a/src/main/java/org/apache/commons/collections/PredicateUtils.java b/src/main/java/org/apache/commons/collections4/PredicateUtils.java similarity index 85% rename from src/main/java/org/apache/commons/collections/PredicateUtils.java rename to src/main/java/org/apache/commons/collections4/PredicateUtils.java index 19beaa554..bab7e4e42 100644 --- a/src/main/java/org/apache/commons/collections/PredicateUtils.java +++ b/src/main/java/org/apache/commons/collections4/PredicateUtils.java @@ -14,32 +14,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Collection; -import org.apache.commons.collections.functors.AllPredicate; -import org.apache.commons.collections.functors.AndPredicate; -import org.apache.commons.collections.functors.AnyPredicate; -import org.apache.commons.collections.functors.EqualPredicate; -import org.apache.commons.collections.functors.ExceptionPredicate; -import org.apache.commons.collections.functors.FalsePredicate; -import org.apache.commons.collections.functors.IdentityPredicate; -import org.apache.commons.collections.functors.InstanceofPredicate; -import org.apache.commons.collections.functors.InvokerTransformer; -import org.apache.commons.collections.functors.NonePredicate; -import org.apache.commons.collections.functors.NotNullPredicate; -import org.apache.commons.collections.functors.NotPredicate; -import org.apache.commons.collections.functors.NullIsExceptionPredicate; -import org.apache.commons.collections.functors.NullIsFalsePredicate; -import org.apache.commons.collections.functors.NullIsTruePredicate; -import org.apache.commons.collections.functors.NullPredicate; -import org.apache.commons.collections.functors.OnePredicate; -import org.apache.commons.collections.functors.OrPredicate; -import org.apache.commons.collections.functors.TransformedPredicate; -import org.apache.commons.collections.functors.TransformerPredicate; -import org.apache.commons.collections.functors.TruePredicate; -import org.apache.commons.collections.functors.UniquePredicate; +import org.apache.commons.collections4.functors.AllPredicate; +import org.apache.commons.collections4.functors.AndPredicate; +import org.apache.commons.collections4.functors.AnyPredicate; +import org.apache.commons.collections4.functors.EqualPredicate; +import org.apache.commons.collections4.functors.ExceptionPredicate; +import org.apache.commons.collections4.functors.FalsePredicate; +import org.apache.commons.collections4.functors.IdentityPredicate; +import org.apache.commons.collections4.functors.InstanceofPredicate; +import org.apache.commons.collections4.functors.InvokerTransformer; +import org.apache.commons.collections4.functors.NonePredicate; +import org.apache.commons.collections4.functors.NotNullPredicate; +import org.apache.commons.collections4.functors.NotPredicate; +import org.apache.commons.collections4.functors.NullIsExceptionPredicate; +import org.apache.commons.collections4.functors.NullIsFalsePredicate; +import org.apache.commons.collections4.functors.NullIsTruePredicate; +import org.apache.commons.collections4.functors.NullPredicate; +import org.apache.commons.collections4.functors.OnePredicate; +import org.apache.commons.collections4.functors.OrPredicate; +import org.apache.commons.collections4.functors.TransformedPredicate; +import org.apache.commons.collections4.functors.TransformerPredicate; +import org.apache.commons.collections4.functors.TruePredicate; +import org.apache.commons.collections4.functors.UniquePredicate; /** * PredicateUtils provides reference implementations and utilities @@ -85,7 +85,7 @@ public class PredicateUtils { * * @param the type that the predicate queries * @return the predicate - * @see org.apache.commons.collections.functors.ExceptionPredicate + * @see org.apache.commons.collections4.functors.ExceptionPredicate */ public static Predicate exceptionPredicate() { return ExceptionPredicate.exceptionPredicate(); @@ -96,7 +96,7 @@ public class PredicateUtils { * * @param the type that the predicate queries * @return the predicate - * @see org.apache.commons.collections.functors.TruePredicate + * @see org.apache.commons.collections4.functors.TruePredicate */ public static Predicate truePredicate() { return TruePredicate.truePredicate(); @@ -107,7 +107,7 @@ public class PredicateUtils { * * @param the type that the predicate queries * @return the predicate - * @see org.apache.commons.collections.functors.FalsePredicate + * @see org.apache.commons.collections4.functors.FalsePredicate */ public static Predicate falsePredicate() { return FalsePredicate. falsePredicate(); @@ -118,7 +118,7 @@ public class PredicateUtils { * * @param the type that the predicate queries * @return the predicate - * @see org.apache.commons.collections.functors.NullPredicate + * @see org.apache.commons.collections4.functors.NullPredicate */ public static Predicate nullPredicate() { return NullPredicate.nullPredicate(); @@ -129,7 +129,7 @@ public class PredicateUtils { * * @param the type that the predicate queries * @return the predicate - * @see org.apache.commons.collections.functors.NotNullPredicate + * @see org.apache.commons.collections4.functors.NotNullPredicate */ public static Predicate notNullPredicate() { return NotNullPredicate.notNullPredicate(); @@ -142,7 +142,7 @@ public class PredicateUtils { * @param the type that the predicate queries * @param value the value to compare against * @return the predicate - * @see org.apache.commons.collections.functors.EqualPredicate + * @see org.apache.commons.collections4.functors.EqualPredicate */ public static Predicate equalPredicate(final T value) { return EqualPredicate.equalPredicate(value); @@ -155,7 +155,7 @@ public class PredicateUtils { * @param the type that the predicate queries * @param value the value to compare against * @return the predicate - * @see org.apache.commons.collections.functors.IdentityPredicate + * @see org.apache.commons.collections4.functors.IdentityPredicate */ public static Predicate identityPredicate(final T value) { return IdentityPredicate.identityPredicate(value); @@ -169,7 +169,7 @@ public class PredicateUtils { * @param type the type to check for, may not be null * @return the predicate * @throws IllegalArgumentException if the class is null - * @see org.apache.commons.collections.functors.InstanceofPredicate + * @see org.apache.commons.collections4.functors.InstanceofPredicate */ public static Predicate instanceofPredicate(final Class type) { return InstanceofPredicate.instanceOfPredicate(type); @@ -184,7 +184,7 @@ public class PredicateUtils { * * @param the type that the predicate queries * @return the predicate - * @see org.apache.commons.collections.functors.UniquePredicate + * @see org.apache.commons.collections4.functors.UniquePredicate */ public static Predicate uniquePredicate() { // must return new instance each time @@ -205,8 +205,8 @@ public class PredicateUtils { * @param methodName the method name to call on the input object, may not be null * @return the predicate * @throws IllegalArgumentException if the methodName is null. - * @see org.apache.commons.collections.functors.InvokerTransformer - * @see org.apache.commons.collections.functors.TransformerPredicate + * @see org.apache.commons.collections4.functors.InvokerTransformer + * @see org.apache.commons.collections4.functors.TransformerPredicate */ public static Predicate invokerPredicate(final String methodName) { // reuse transformer as it has caching - this is lazy really, should have inner class here @@ -230,8 +230,8 @@ public class PredicateUtils { * @return the predicate * @throws IllegalArgumentException if the method name is null * @throws IllegalArgumentException if the paramTypes and args don't match - * @see org.apache.commons.collections.functors.InvokerTransformer - * @see org.apache.commons.collections.functors.TransformerPredicate + * @see org.apache.commons.collections4.functors.InvokerTransformer + * @see org.apache.commons.collections4.functors.TransformerPredicate */ public static Predicate invokerPredicate(final String methodName, final Class[] paramTypes, final Object[] args) { @@ -251,7 +251,7 @@ public class PredicateUtils { * @param predicate2 the second predicate, may not be null * @return the and predicate * @throws IllegalArgumentException if either predicate is null - * @see org.apache.commons.collections.functors.AndPredicate + * @see org.apache.commons.collections4.functors.AndPredicate */ public static Predicate andPredicate(final Predicate predicate1, final Predicate predicate2) { @@ -268,7 +268,7 @@ public class PredicateUtils { * @return the all predicate * @throws IllegalArgumentException if the predicates array is null * @throws IllegalArgumentException if any predicate in the array is null - * @see org.apache.commons.collections.functors.AllPredicate + * @see org.apache.commons.collections4.functors.AllPredicate */ public static Predicate allPredicate(final Predicate... predicates) { return AllPredicate.allPredicate(predicates); @@ -284,7 +284,7 @@ public class PredicateUtils { * @return the all predicate * @throws IllegalArgumentException if the predicates collection is null * @throws IllegalArgumentException if any predicate in the collection is null - * @see org.apache.commons.collections.functors.AllPredicate + * @see org.apache.commons.collections4.functors.AllPredicate */ public static Predicate allPredicate(final Collection> predicates) { return AllPredicate.allPredicate(predicates); @@ -299,7 +299,7 @@ public class PredicateUtils { * @param predicate2 the second predicate, may not be null * @return the or predicate * @throws IllegalArgumentException if either predicate is null - * @see org.apache.commons.collections.functors.OrPredicate + * @see org.apache.commons.collections4.functors.OrPredicate */ public static Predicate orPredicate(final Predicate predicate1, final Predicate predicate2) { @@ -316,7 +316,7 @@ public class PredicateUtils { * @return the any predicate * @throws IllegalArgumentException if the predicates array is null * @throws IllegalArgumentException if any predicate in the array is null - * @see org.apache.commons.collections.functors.AnyPredicate + * @see org.apache.commons.collections4.functors.AnyPredicate */ public static Predicate anyPredicate(final Predicate... predicates) { return AnyPredicate.anyPredicate(predicates); @@ -332,7 +332,7 @@ public class PredicateUtils { * @return the any predicate * @throws IllegalArgumentException if the predicates collection is null * @throws IllegalArgumentException if any predicate in the collection is null - * @see org.apache.commons.collections.functors.AnyPredicate + * @see org.apache.commons.collections4.functors.AnyPredicate */ public static Predicate anyPredicate(final Collection> predicates) { return AnyPredicate.anyPredicate(predicates); @@ -347,7 +347,7 @@ public class PredicateUtils { * @param predicate2 the second predicate, may not be null * @return the either predicate * @throws IllegalArgumentException if either predicate is null - * @see org.apache.commons.collections.functors.OnePredicate + * @see org.apache.commons.collections4.functors.OnePredicate */ public static Predicate eitherPredicate(final Predicate predicate1, final Predicate predicate2) { @@ -366,7 +366,7 @@ public class PredicateUtils { * @return the one predicate * @throws IllegalArgumentException if the predicates array is null * @throws IllegalArgumentException if any predicate in the array is null - * @see org.apache.commons.collections.functors.OnePredicate + * @see org.apache.commons.collections4.functors.OnePredicate */ public static Predicate onePredicate(final Predicate... predicates) { return OnePredicate.onePredicate(predicates); @@ -382,7 +382,7 @@ public class PredicateUtils { * @return the one predicate * @throws IllegalArgumentException if the predicates collection is null * @throws IllegalArgumentException if any predicate in the collection is null - * @see org.apache.commons.collections.functors.OnePredicate + * @see org.apache.commons.collections4.functors.OnePredicate */ public static Predicate onePredicate(final Collection> predicates) { return OnePredicate.onePredicate(predicates); @@ -397,7 +397,7 @@ public class PredicateUtils { * @param predicate2 the second predicate, may not be null * @return the neither predicate * @throws IllegalArgumentException if either predicate is null - * @see org.apache.commons.collections.functors.NonePredicate + * @see org.apache.commons.collections4.functors.NonePredicate */ public static Predicate neitherPredicate(final Predicate predicate1, final Predicate predicate2) { @@ -416,7 +416,7 @@ public class PredicateUtils { * @return the none predicate * @throws IllegalArgumentException if the predicates array is null * @throws IllegalArgumentException if any predicate in the array is null - * @see org.apache.commons.collections.functors.NonePredicate + * @see org.apache.commons.collections4.functors.NonePredicate */ public static Predicate nonePredicate(final Predicate... predicates) { return NonePredicate.nonePredicate(predicates); @@ -432,7 +432,7 @@ public class PredicateUtils { * @return the none predicate * @throws IllegalArgumentException if the predicates collection is null * @throws IllegalArgumentException if any predicate in the collection is null - * @see org.apache.commons.collections.functors.NonePredicate + * @see org.apache.commons.collections4.functors.NonePredicate */ public static Predicate nonePredicate(final Collection> predicates) { return NonePredicate.nonePredicate(predicates); @@ -446,7 +446,7 @@ public class PredicateUtils { * @param predicate the predicate to not * @return the not predicate * @throws IllegalArgumentException if the predicate is null - * @see org.apache.commons.collections.functors.NotPredicate + * @see org.apache.commons.collections4.functors.NotPredicate */ public static Predicate notPredicate(final Predicate predicate) { return NotPredicate.notPredicate(predicate); @@ -464,7 +464,7 @@ public class PredicateUtils { * @param transformer the transformer to wrap, may not be null * @return the transformer wrapping predicate * @throws IllegalArgumentException if the transformer is null - * @see org.apache.commons.collections.functors.TransformerPredicate + * @see org.apache.commons.collections4.functors.TransformerPredicate */ public static Predicate asPredicate(final Transformer transformer) { return TransformerPredicate.transformerPredicate(transformer); @@ -482,7 +482,7 @@ public class PredicateUtils { * @param predicate the predicate to wrap, may not be null * @return the predicate * @throws IllegalArgumentException if the predicate is null. - * @see org.apache.commons.collections.functors.NullIsExceptionPredicate + * @see org.apache.commons.collections4.functors.NullIsExceptionPredicate */ public static Predicate nullIsExceptionPredicate(final Predicate predicate){ return NullIsExceptionPredicate.nullIsExceptionPredicate(predicate); @@ -497,7 +497,7 @@ public class PredicateUtils { * @param predicate the predicate to wrap, may not be null * @return the predicate * @throws IllegalArgumentException if the predicate is null. - * @see org.apache.commons.collections.functors.NullIsFalsePredicate + * @see org.apache.commons.collections4.functors.NullIsFalsePredicate */ public static Predicate nullIsFalsePredicate(final Predicate predicate){ return NullIsFalsePredicate.nullIsFalsePredicate(predicate); @@ -512,7 +512,7 @@ public class PredicateUtils { * @param predicate the predicate to wrap, may not be null * @return the predicate * @throws IllegalArgumentException if the predicate is null. - * @see org.apache.commons.collections.functors.NullIsTruePredicate + * @see org.apache.commons.collections4.functors.NullIsTruePredicate */ public static Predicate nullIsTruePredicate(final Predicate predicate){ return NullIsTruePredicate.nullIsTruePredicate(predicate); @@ -529,7 +529,7 @@ public class PredicateUtils { * @param predicate the predicate to call with the result of the transform * @return the predicate * @throws IllegalArgumentException if the transformer or the predicate is null - * @see org.apache.commons.collections.functors.TransformedPredicate + * @see org.apache.commons.collections4.functors.TransformedPredicate * @since 3.1 */ public static Predicate transformedPredicate( diff --git a/src/main/java/org/apache/commons/collections/Put.java b/src/main/java/org/apache/commons/collections4/Put.java similarity index 96% rename from src/main/java/org/apache/commons/collections/Put.java rename to src/main/java/org/apache/commons/collections4/Put.java index cf9ff78b1..59cb1bbe5 100644 --- a/src/main/java/org/apache/commons/collections/Put.java +++ b/src/main/java/org/apache/commons/collections4/Put.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Map; diff --git a/src/main/java/org/apache/commons/collections/QueueUtils.java b/src/main/java/org/apache/commons/collections4/QueueUtils.java similarity index 94% rename from src/main/java/org/apache/commons/collections/QueueUtils.java rename to src/main/java/org/apache/commons/collections4/QueueUtils.java index e48db4246..99b9635c3 100644 --- a/src/main/java/org/apache/commons/collections/QueueUtils.java +++ b/src/main/java/org/apache/commons/collections4/QueueUtils.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.LinkedList; import java.util.Queue; -import org.apache.commons.collections.queue.PredicatedQueue; -import org.apache.commons.collections.queue.TransformedQueue; -import org.apache.commons.collections.queue.UnmodifiableQueue; +import org.apache.commons.collections4.queue.PredicatedQueue; +import org.apache.commons.collections4.queue.TransformedQueue; +import org.apache.commons.collections4.queue.UnmodifiableQueue; /** * Provides utility methods and decorators for {@link Queue} instances. diff --git a/src/main/java/org/apache/commons/collections/ResettableIterator.java b/src/main/java/org/apache/commons/collections4/ResettableIterator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/ResettableIterator.java rename to src/main/java/org/apache/commons/collections4/ResettableIterator.java index 0c68da89d..85a888768 100644 --- a/src/main/java/org/apache/commons/collections/ResettableIterator.java +++ b/src/main/java/org/apache/commons/collections4/ResettableIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Iterator; diff --git a/src/main/java/org/apache/commons/collections/ResettableListIterator.java b/src/main/java/org/apache/commons/collections4/ResettableListIterator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/ResettableListIterator.java rename to src/main/java/org/apache/commons/collections4/ResettableListIterator.java index 511b71810..1dd7939df 100644 --- a/src/main/java/org/apache/commons/collections/ResettableListIterator.java +++ b/src/main/java/org/apache/commons/collections4/ResettableListIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.ListIterator; diff --git a/src/main/java/org/apache/commons/collections/SetUtils.java b/src/main/java/org/apache/commons/collections4/SetUtils.java similarity index 96% rename from src/main/java/org/apache/commons/collections/SetUtils.java rename to src/main/java/org/apache/commons/collections4/SetUtils.java index eb59d721f..067582df5 100644 --- a/src/main/java/org/apache/commons/collections/SetUtils.java +++ b/src/main/java/org/apache/commons/collections4/SetUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Collection; import java.util.Collections; @@ -22,13 +22,13 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.collections.set.ListOrderedSet; -import org.apache.commons.collections.set.PredicatedSet; -import org.apache.commons.collections.set.PredicatedSortedSet; -import org.apache.commons.collections.set.TransformedSet; -import org.apache.commons.collections.set.TransformedSortedSet; -import org.apache.commons.collections.set.UnmodifiableSet; -import org.apache.commons.collections.set.UnmodifiableSortedSet; +import org.apache.commons.collections4.set.ListOrderedSet; +import org.apache.commons.collections4.set.PredicatedSet; +import org.apache.commons.collections4.set.PredicatedSortedSet; +import org.apache.commons.collections4.set.TransformedSet; +import org.apache.commons.collections4.set.TransformedSortedSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSortedSet; /** * Provides utility methods and decorators for diff --git a/src/main/java/org/apache/commons/collections/SortedBag.java b/src/main/java/org/apache/commons/collections4/SortedBag.java similarity index 97% rename from src/main/java/org/apache/commons/collections/SortedBag.java rename to src/main/java/org/apache/commons/collections4/SortedBag.java index 2c503de81..1051ed3db 100644 --- a/src/main/java/org/apache/commons/collections/SortedBag.java +++ b/src/main/java/org/apache/commons/collections4/SortedBag.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Comparator; diff --git a/src/main/java/org/apache/commons/collections/SortedBidiMap.java b/src/main/java/org/apache/commons/collections4/SortedBidiMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/SortedBidiMap.java rename to src/main/java/org/apache/commons/collections4/SortedBidiMap.java index 32c80cfe0..8e768b7db 100644 --- a/src/main/java/org/apache/commons/collections/SortedBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/SortedBidiMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Comparator; import java.util.SortedMap; diff --git a/src/main/java/org/apache/commons/collections/SplitMapUtils.java b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java similarity index 95% rename from src/main/java/org/apache/commons/collections/SplitMapUtils.java rename to src/main/java/org/apache/commons/collections4/SplitMapUtils.java index f079147c1..b8f5ec81d 100644 --- a/src/main/java/org/apache/commons/collections/SplitMapUtils.java +++ b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.collection.UnmodifiableCollection; -import org.apache.commons.collections.iterators.UnmodifiableMapIterator; -import org.apache.commons.collections.map.EntrySetToMapIteratorAdapter; -import org.apache.commons.collections.map.UnmodifiableEntrySet; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.collection.UnmodifiableCollection; +import org.apache.commons.collections4.iterators.UnmodifiableMapIterator; +import org.apache.commons.collections4.map.EntrySetToMapIteratorAdapter; +import org.apache.commons.collections4.map.UnmodifiableEntrySet; /** * Utilities for working with "split maps:" objects that implement {@link Put} diff --git a/src/main/java/org/apache/commons/collections/Transformer.java b/src/main/java/org/apache/commons/collections4/Transformer.java similarity index 97% rename from src/main/java/org/apache/commons/collections/Transformer.java rename to src/main/java/org/apache/commons/collections4/Transformer.java index c599422de..cf4637f14 100644 --- a/src/main/java/org/apache/commons/collections/Transformer.java +++ b/src/main/java/org/apache/commons/collections4/Transformer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Defines a functor interface implemented by classes that transform one diff --git a/src/main/java/org/apache/commons/collections/TransformerUtils.java b/src/main/java/org/apache/commons/collections4/TransformerUtils.java similarity index 87% rename from src/main/java/org/apache/commons/collections/TransformerUtils.java rename to src/main/java/org/apache/commons/collections4/TransformerUtils.java index bc61c8c75..623570c5c 100644 --- a/src/main/java/org/apache/commons/collections/TransformerUtils.java +++ b/src/main/java/org/apache/commons/collections4/TransformerUtils.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Collection; import java.util.Map; -import org.apache.commons.collections.functors.ChainedTransformer; -import org.apache.commons.collections.functors.CloneTransformer; -import org.apache.commons.collections.functors.ClosureTransformer; -import org.apache.commons.collections.functors.ConstantTransformer; -import org.apache.commons.collections.functors.EqualPredicate; -import org.apache.commons.collections.functors.ExceptionTransformer; -import org.apache.commons.collections.functors.FactoryTransformer; -import org.apache.commons.collections.functors.InstantiateTransformer; -import org.apache.commons.collections.functors.InvokerTransformer; -import org.apache.commons.collections.functors.MapTransformer; -import org.apache.commons.collections.functors.NOPTransformer; -import org.apache.commons.collections.functors.PredicateTransformer; -import org.apache.commons.collections.functors.StringValueTransformer; -import org.apache.commons.collections.functors.SwitchTransformer; +import org.apache.commons.collections4.functors.ChainedTransformer; +import org.apache.commons.collections4.functors.CloneTransformer; +import org.apache.commons.collections4.functors.ClosureTransformer; +import org.apache.commons.collections4.functors.ConstantTransformer; +import org.apache.commons.collections4.functors.EqualPredicate; +import org.apache.commons.collections4.functors.ExceptionTransformer; +import org.apache.commons.collections4.functors.FactoryTransformer; +import org.apache.commons.collections4.functors.InstantiateTransformer; +import org.apache.commons.collections4.functors.InvokerTransformer; +import org.apache.commons.collections4.functors.MapTransformer; +import org.apache.commons.collections4.functors.NOPTransformer; +import org.apache.commons.collections4.functors.PredicateTransformer; +import org.apache.commons.collections4.functors.StringValueTransformer; +import org.apache.commons.collections4.functors.SwitchTransformer; /** * TransformerUtils provides reference implementations and @@ -73,7 +73,7 @@ public class TransformerUtils { * @param the input type * @param the output type * @return the transformer - * @see org.apache.commons.collections.functors.ExceptionTransformer + * @see org.apache.commons.collections4.functors.ExceptionTransformer */ public static Transformer exceptionTransformer() { return ExceptionTransformer.exceptionTransformer(); @@ -85,7 +85,7 @@ public class TransformerUtils { * @param the input type * @param the output type * @return the transformer - * @see org.apache.commons.collections.functors.ConstantTransformer + * @see org.apache.commons.collections4.functors.ConstantTransformer */ public static Transformer nullTransformer() { return ConstantTransformer.nullTransformer(); @@ -98,7 +98,7 @@ public class TransformerUtils { * * @param the input/output type * @return the transformer - * @see org.apache.commons.collections.functors.NOPTransformer + * @see org.apache.commons.collections4.functors.NOPTransformer */ public static Transformer nopTransformer() { return NOPTransformer.nopTransformer(); @@ -116,7 +116,7 @@ public class TransformerUtils { * * @param the input/output type * @return the transformer - * @see org.apache.commons.collections.functors.CloneTransformer + * @see org.apache.commons.collections4.functors.CloneTransformer */ public static Transformer cloneTransformer() { return CloneTransformer.cloneTransformer(); @@ -130,7 +130,7 @@ public class TransformerUtils { * @param the output type * @param constantToReturn the constant object to return each time in the transformer * @return the transformer. - * @see org.apache.commons.collections.functors.ConstantTransformer + * @see org.apache.commons.collections4.functors.ConstantTransformer */ public static Transformer constantTransformer(final O constantToReturn) { return ConstantTransformer.constantTransformer(constantToReturn); @@ -144,7 +144,7 @@ public class TransformerUtils { * @param closure the closure to run each time in the transformer, not null * @return the transformer * @throws IllegalArgumentException if the closure is null - * @see org.apache.commons.collections.functors.ClosureTransformer + * @see org.apache.commons.collections4.functors.ClosureTransformer */ public static Transformer asTransformer(final Closure closure) { return ClosureTransformer.closureTransformer(closure); @@ -158,7 +158,7 @@ public class TransformerUtils { * @param predicate the predicate to run each time in the transformer, not null * @return the transformer * @throws IllegalArgumentException if the predicate is null - * @see org.apache.commons.collections.functors.PredicateTransformer + * @see org.apache.commons.collections4.functors.PredicateTransformer */ public static Transformer asTransformer(final Predicate predicate) { return PredicateTransformer.predicateTransformer(predicate); @@ -173,7 +173,7 @@ public class TransformerUtils { * @param factory the factory to run each time in the transformer, not null * @return the transformer * @throws IllegalArgumentException if the factory is null - * @see org.apache.commons.collections.functors.FactoryTransformer + * @see org.apache.commons.collections4.functors.FactoryTransformer */ public static Transformer asTransformer(final Factory factory) { return FactoryTransformer.factoryTransformer(factory); @@ -188,7 +188,7 @@ public class TransformerUtils { * @param transformer2 the second transformer * @return the transformer * @throws IllegalArgumentException if either transformer is null - * @see org.apache.commons.collections.functors.ChainedTransformer + * @see org.apache.commons.collections4.functors.ChainedTransformer */ @SuppressWarnings("unchecked") public static Transformer chainedTransformer( @@ -205,7 +205,7 @@ public class TransformerUtils { * @param transformers an array of transformers to chain * @return the transformer * @throws IllegalArgumentException if the transformers array or any of the transformers is null - * @see org.apache.commons.collections.functors.ChainedTransformer + * @see org.apache.commons.collections4.functors.ChainedTransformer */ public static Transformer chainedTransformer(final Transformer[] transformers) { return ChainedTransformer.chainedTransformer(transformers); @@ -220,7 +220,7 @@ public class TransformerUtils { * @param transformers a collection of transformers to chain * @return the transformer * @throws IllegalArgumentException if the transformers collection or any of the transformers is null - * @see org.apache.commons.collections.functors.ChainedTransformer + * @see org.apache.commons.collections4.functors.ChainedTransformer */ public static Transformer chainedTransformer( final Collection> transformers) { @@ -238,7 +238,7 @@ public class TransformerUtils { * @param falseTransformer the transformer called if the predicate is false * @return the transformer * @throws IllegalArgumentException if either the predicate or transformer is null - * @see org.apache.commons.collections.functors.SwitchTransformer + * @see org.apache.commons.collections4.functors.SwitchTransformer */ @SuppressWarnings("unchecked") public static Transformer switchTransformer(final Predicate predicate, @@ -262,7 +262,7 @@ public class TransformerUtils { * @throws IllegalArgumentException if the either array is null or empty * @throws IllegalArgumentException if any element in the arrays is null * @throws IllegalArgumentException if the arrays are different sizes - * @see org.apache.commons.collections.functors.SwitchTransformer + * @see org.apache.commons.collections4.functors.SwitchTransformer */ public static Transformer switchTransformer(final Predicate[] predicates, final Transformer[] transformers) { @@ -285,7 +285,7 @@ public class TransformerUtils { * @throws IllegalArgumentException if the either array is null or empty * @throws IllegalArgumentException if any element in the arrays is null * @throws IllegalArgumentException if the arrays are different sizes - * @see org.apache.commons.collections.functors.SwitchTransformer + * @see org.apache.commons.collections4.functors.SwitchTransformer */ public static Transformer switchTransformer(final Predicate[] predicates, final Transformer[] transformers, @@ -312,7 +312,7 @@ public class TransformerUtils { * @throws IllegalArgumentException if the map is null or empty * @throws IllegalArgumentException if any transformer in the map is null * @throws ClassCastException if the map elements are of the wrong type - * @see org.apache.commons.collections.functors.SwitchTransformer + * @see org.apache.commons.collections4.functors.SwitchTransformer */ public static Transformer switchTransformer( final Map, Transformer> predicatesAndTransformers) { @@ -334,7 +334,7 @@ public class TransformerUtils { * @return the transformer * @throws IllegalArgumentException if the map is null or empty * @throws IllegalArgumentException if any transformer in the map is null - * @see org.apache.commons.collections.functors.SwitchTransformer + * @see org.apache.commons.collections4.functors.SwitchTransformer */ @SuppressWarnings("unchecked") public static Transformer switchMapTransformer( @@ -360,7 +360,7 @@ public class TransformerUtils { * * @param the output type * @return the transformer - * @see org.apache.commons.collections.functors.InstantiateTransformer + * @see org.apache.commons.collections4.functors.InstantiateTransformer */ public static Transformer, T> instantiateTransformer() { return InstantiateTransformer.instantiateTransformer(); @@ -376,7 +376,7 @@ public class TransformerUtils { * @param args the arguments to pass to the constructor, can be null * @return the transformer * @throws IllegalArgumentException if the paramTypes and args don't match - * @see org.apache.commons.collections.functors.InstantiateTransformer + * @see org.apache.commons.collections4.functors.InstantiateTransformer */ public static Transformer, T> instantiateTransformer( final Class[] paramTypes, final Object[] args) { @@ -391,7 +391,7 @@ public class TransformerUtils { * @param the output type * @param map the map to use to transform the objects * @return the transformer, or a {@link ConstantTransformer#NULL_INSTANCE} if the {@code map} is {@code null} - * @see org.apache.commons.collections.functors.MapTransformer + * @see org.apache.commons.collections4.functors.MapTransformer */ public static Transformer mapTransformer(final Map map) { return MapTransformer.mapTransformer(map); @@ -411,7 +411,7 @@ public class TransformerUtils { * @param methodName the method name to call on the input object, may not be null * @return the transformer * @throws IllegalArgumentException if the methodName is null. - * @see org.apache.commons.collections.functors.InvokerTransformer + * @see org.apache.commons.collections4.functors.InvokerTransformer */ public static Transformer invokerTransformer(final String methodName) { return InvokerTransformer.invokerTransformer(methodName, null, null); @@ -429,7 +429,7 @@ public class TransformerUtils { * @param args the arguments * @return the transformer * @throws IllegalArgumentException if the method name is null or the paramTypes and args don't match - * @see org.apache.commons.collections.functors.InvokerTransformer + * @see org.apache.commons.collections4.functors.InvokerTransformer */ public static Transformer invokerTransformer(final String methodName, final Class[] paramTypes, final Object[] args) { @@ -443,7 +443,7 @@ public class TransformerUtils { * * @param the input type * @return the transformer - * @see org.apache.commons.collections.functors.StringValueTransformer + * @see org.apache.commons.collections4.functors.StringValueTransformer */ public static Transformer stringValueTransformer() { return StringValueTransformer.stringValueTransformer(); diff --git a/src/main/java/org/apache/commons/collections/Trie.java b/src/main/java/org/apache/commons/collections4/Trie.java similarity index 99% rename from src/main/java/org/apache/commons/collections/Trie.java rename to src/main/java/org/apache/commons/collections4/Trie.java index 58e4ea8c8..eb0cc8a7d 100644 --- a/src/main/java/org/apache/commons/collections/Trie.java +++ b/src/main/java/org/apache/commons/collections4/Trie.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Map; import java.util.SortedMap; diff --git a/src/main/java/org/apache/commons/collections/TrieUtils.java b/src/main/java/org/apache/commons/collections4/TrieUtils.java similarity index 90% rename from src/main/java/org/apache/commons/collections/TrieUtils.java rename to src/main/java/org/apache/commons/collections4/TrieUtils.java index 2132e4095..a8a99741a 100644 --- a/src/main/java/org/apache/commons/collections/TrieUtils.java +++ b/src/main/java/org/apache/commons/collections4/TrieUtils.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; -import org.apache.commons.collections.trie.SynchronizedTrie; -import org.apache.commons.collections.trie.UnmodifiableTrie; +import org.apache.commons.collections4.trie.SynchronizedTrie; +import org.apache.commons.collections4.trie.UnmodifiableTrie; /** * A collection of {@link Trie} utilities. diff --git a/src/main/java/org/apache/commons/collections/Unmodifiable.java b/src/main/java/org/apache/commons/collections4/Unmodifiable.java similarity index 97% rename from src/main/java/org/apache/commons/collections/Unmodifiable.java rename to src/main/java/org/apache/commons/collections4/Unmodifiable.java index ea18ede28..388c6f2d1 100644 --- a/src/main/java/org/apache/commons/collections/Unmodifiable.java +++ b/src/main/java/org/apache/commons/collections4/Unmodifiable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; /** * Marker interface for collections, maps and iterators that are unmodifiable. diff --git a/src/main/java/org/apache/commons/collections/bag/AbstractBagDecorator.java b/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java similarity index 93% rename from src/main/java/org/apache/commons/collections/bag/AbstractBagDecorator.java rename to src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java index 72b0e3021..a81a5b400 100644 --- a/src/main/java/org/apache/commons/collections/bag/AbstractBagDecorator.java +++ b/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.util.Set; -import org.apache.commons.collections.Bag; -import org.apache.commons.collections.collection.AbstractCollectionDecorator; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.collection.AbstractCollectionDecorator; /** * Decorates another Bag to provide additional behaviour. diff --git a/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java similarity index 99% rename from src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java rename to src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java index 0e20fbbea..ef10ed74b 100644 --- a/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.io.IOException; import java.io.ObjectInputStream; @@ -27,8 +27,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.collections.Bag; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.Bag; /** * Abstract implementation of the {@link Bag} interface to simplify the creation diff --git a/src/main/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java b/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java similarity index 95% rename from src/main/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java rename to src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java index 8727d7b31..5f83373cd 100644 --- a/src/main/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java +++ b/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.util.Comparator; -import org.apache.commons.collections.SortedBag; +import org.apache.commons.collections4.SortedBag; /** * Decorates another SortedBag to provide additional behaviour. diff --git a/src/main/java/org/apache/commons/collections/bag/HashBag.java b/src/main/java/org/apache/commons/collections4/bag/HashBag.java similarity index 96% rename from src/main/java/org/apache/commons/collections/bag/HashBag.java rename to src/main/java/org/apache/commons/collections4/bag/HashBag.java index d7ff7e5d9..f974d02be 100644 --- a/src/main/java/org/apache/commons/collections/bag/HashBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/HashBag.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.io.IOException; import java.io.ObjectInputStream; @@ -23,7 +23,7 @@ import java.io.Serializable; import java.util.Collection; import java.util.HashMap; -import org.apache.commons.collections.Bag; +import org.apache.commons.collections4.Bag; /** * Implements {@link Bag}, using a {@link HashMap} to provide the diff --git a/src/main/java/org/apache/commons/collections/bag/PredicatedBag.java b/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java similarity index 94% rename from src/main/java/org/apache/commons/collections/bag/PredicatedBag.java rename to src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java index 780970c07..d99778ef1 100644 --- a/src/main/java/org/apache/commons/collections/bag/PredicatedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.util.Set; -import org.apache.commons.collections.Bag; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.collection.PredicatedCollection; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.collection.PredicatedCollection; /** * Decorates another {@link Bag} to validate that additions diff --git a/src/main/java/org/apache/commons/collections/bag/PredicatedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java similarity index 96% rename from src/main/java/org/apache/commons/collections/bag/PredicatedSortedBag.java rename to src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java index d99dd5a5e..8fe8d6d87 100644 --- a/src/main/java/org/apache/commons/collections/bag/PredicatedSortedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.util.Comparator; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.SortedBag; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.SortedBag; /** * Decorates another {@link SortedBag} to validate that additions diff --git a/src/main/java/org/apache/commons/collections/bag/SynchronizedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java similarity index 96% rename from src/main/java/org/apache/commons/collections/bag/SynchronizedBag.java rename to src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java index ef89b9474..eec71e1f0 100644 --- a/src/main/java/org/apache/commons/collections/bag/SynchronizedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.util.Set; -import org.apache.commons.collections.Bag; -import org.apache.commons.collections.collection.SynchronizedCollection; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.collection.SynchronizedCollection; /** * Decorates another {@link Bag} to synchronize its behaviour diff --git a/src/main/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java similarity index 95% rename from src/main/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java rename to src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java index e9fb09e41..ec98cd8cf 100644 --- a/src/main/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.util.Comparator; -import org.apache.commons.collections.Bag; -import org.apache.commons.collections.SortedBag; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.SortedBag; /** * Decorates another {@link SortedBag} to synchronize its behaviour diff --git a/src/main/java/org/apache/commons/collections/bag/TransformedBag.java b/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java similarity index 94% rename from src/main/java/org/apache/commons/collections/bag/TransformedBag.java rename to src/main/java/org/apache/commons/collections4/bag/TransformedBag.java index 8dac05866..760b4dcca 100644 --- a/src/main/java/org/apache/commons/collections/bag/TransformedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.util.Set; -import org.apache.commons.collections.Bag; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.collection.TransformedCollection; -import org.apache.commons.collections.set.TransformedSet; +import org.apache.commons.collections4.set.TransformedSet; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.collection.TransformedCollection; /** * Decorates another {@link Bag} to transform objects that are added. diff --git a/src/main/java/org/apache/commons/collections/bag/TransformedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java similarity index 96% rename from src/main/java/org/apache/commons/collections/bag/TransformedSortedBag.java rename to src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java index 88f21b20d..7d1db12b7 100644 --- a/src/main/java/org/apache/commons/collections/bag/TransformedSortedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.util.Comparator; -import org.apache.commons.collections.SortedBag; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.SortedBag; +import org.apache.commons.collections4.Transformer; /** * Decorates another {@link SortedBag} to transform objects that are added. diff --git a/src/main/java/org/apache/commons/collections/bag/TreeBag.java b/src/main/java/org/apache/commons/collections4/bag/TreeBag.java similarity index 95% rename from src/main/java/org/apache/commons/collections/bag/TreeBag.java rename to src/main/java/org/apache/commons/collections4/bag/TreeBag.java index 743dcfe44..4d9c3276f 100644 --- a/src/main/java/org/apache/commons/collections/bag/TreeBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/TreeBag.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.io.IOException; import java.io.ObjectInputStream; @@ -25,7 +25,7 @@ import java.util.Comparator; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.collections.SortedBag; +import org.apache.commons.collections4.SortedBag; /** * Implements {@link SortedBag}, using a {@link TreeMap} to provide @@ -34,7 +34,7 @@ import org.apache.commons.collections.SortedBag; * Order will be maintained among the bag members and can be viewed through the * iterator. *

      - * A {@link org.apache.commons.collections.Bag Bag} stores each object in the collection together with a count + * A {@link org.apache.commons.collections4.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} diff --git a/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java similarity index 94% rename from src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java rename to src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java index fb12a6edb..a9d4e79ce 100644 --- a/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,10 +24,10 @@ import java.util.Collection; import java.util.Iterator; import java.util.Set; -import org.apache.commons.collections.Bag; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.iterators.UnmodifiableIterator; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; /** * Decorates another {@link Bag} to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java similarity index 94% rename from src/main/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java rename to src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java index 594d9e877..87ccec6fd 100644 --- a/src/main/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,10 +24,10 @@ import java.util.Collection; import java.util.Iterator; import java.util.Set; -import org.apache.commons.collections.SortedBag; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.iterators.UnmodifiableIterator; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.SortedBag; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; /** * Decorates another {@link SortedBag} to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/bag/package-info.java b/src/main/java/org/apache/commons/collections4/bag/package-info.java similarity index 91% rename from src/main/java/org/apache/commons/collections/bag/package-info.java rename to src/main/java/org/apache/commons/collections4/bag/package-info.java index 7fb455ad2..6f20378ce 100644 --- a/src/main/java/org/apache/commons/collections/bag/package-info.java +++ b/src/main/java/org/apache/commons/collections4/bag/package-info.java @@ -15,8 +15,8 @@ * limitations under the License. */ /** - * This package contains implementations of the {@link org.apache.commons.collections.Bag Bag} and - * {@link org.apache.commons.collections.SortedBag SortedBag} interfaces. + * This package contains implementations of the {@link org.apache.commons.collections4.Bag Bag} and + * {@link org.apache.commons.collections4.SortedBag SortedBag} interfaces. * A bag stores an object and a count of the number of occurrences of the object. *

      * The following implementations are provided in the package: @@ -35,4 +35,4 @@ * * @version $Id$ */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java similarity index 92% rename from src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java index 061c8a8c4..aefeb48c9 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; -import org.apache.commons.collections.BidiMap; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.map.AbstractMapDecorator; +import org.apache.commons.collections4.BidiMap; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.map.AbstractMapDecorator; /** * Provides a base decorator that enables additional functionality to be added diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java index 0d27ea29a..9915fb6a1 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.Collection; import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.BidiMap; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.ResettableIterator; -import org.apache.commons.collections.collection.AbstractCollectionDecorator; -import org.apache.commons.collections.iterators.AbstractIteratorDecorator; -import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator; +import org.apache.commons.collections4.BidiMap; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.ResettableIterator; +import org.apache.commons.collections4.collection.AbstractCollectionDecorator; +import org.apache.commons.collections4.iterators.AbstractIteratorDecorator; +import org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator; /** * Abstract {@link BidiMap} implemented using two maps. diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java similarity index 94% rename from src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java index 0624c5e3e..c7c9d6f39 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; -import org.apache.commons.collections.OrderedBidiMap; -import org.apache.commons.collections.OrderedMapIterator; +import org.apache.commons.collections4.OrderedBidiMap; +import org.apache.commons.collections4.OrderedMapIterator; /** * Provides a base decorator that enables additional functionality to be added diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java rename to src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java index 9f6348540..6d9993cc0 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.Comparator; import java.util.SortedMap; -import org.apache.commons.collections.SortedBidiMap; +import org.apache.commons.collections4.SortedBidiMap; /** * Provides a base decorator that enables additional functionality to be added diff --git a/src/main/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java similarity index 97% rename from src/main/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java index 28bc76178..adea1fc47 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.io.IOException; import java.io.ObjectInputStream; @@ -23,7 +23,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections.BidiMap; +import org.apache.commons.collections4.BidiMap; /** * Implementation of {@link BidiMap} that uses two {@link HashMap} instances. diff --git a/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java similarity index 97% rename from src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java index 48e437fff..bb08210f1 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; -import org.apache.commons.collections.BidiMap; +import org.apache.commons.collections4.BidiMap; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java similarity index 96% rename from src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java index aafd23875..b3c0edbed 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.io.IOException; import java.io.ObjectInputStream; @@ -28,13 +28,13 @@ import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.collections.BidiMap; -import org.apache.commons.collections.OrderedBidiMap; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.ResettableIterator; -import org.apache.commons.collections.SortedBidiMap; -import org.apache.commons.collections.map.AbstractSortedMapDecorator; +import org.apache.commons.collections4.BidiMap; +import org.apache.commons.collections4.OrderedBidiMap; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.ResettableIterator; +import org.apache.commons.collections4.SortedBidiMap; +import org.apache.commons.collections4.map.AbstractSortedMapDecorator; /** * Implementation of {@link BidiMap} that uses two {@link TreeMap} instances. diff --git a/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java similarity index 99% rename from src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java index c3a4fc30e..0c1486502 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.AbstractSet; import java.util.Collection; @@ -24,16 +24,16 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections.KeyValue; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.OrderedBidiMap; -import org.apache.commons.collections.OrderedIterator; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.iterators.EmptyOrderedMapIterator; -import org.apache.commons.collections.keyvalue.UnmodifiableMapEntry; +import org.apache.commons.collections4.KeyValue; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.OrderedBidiMap; +import org.apache.commons.collections4.OrderedIterator; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator; +import org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry; -import static org.apache.commons.collections.bidimap.TreeBidiMap.DataElement.KEY; -import static org.apache.commons.collections.bidimap.TreeBidiMap.DataElement.VALUE; +import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.KEY; +import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.VALUE; /** * Red-Black tree-based implementation of BidiMap where all objects added @@ -69,6 +69,8 @@ import static org.apache.commons.collections.bidimap.TreeBidiMap.DataElement.VAL * not allow setValue() and will throw an * UnsupportedOperationException on attempts to call that method. * + * TODO: serialization does not work anymore + * * @since 3.0 (previously DoubleOrderedMap v2.0) * @version $Id$ */ diff --git a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java similarity index 89% rename from src/main/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java index ef3e51a05..2366636b0 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.BidiMap; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.collection.UnmodifiableCollection; -import org.apache.commons.collections.iterators.UnmodifiableMapIterator; -import org.apache.commons.collections.map.UnmodifiableEntrySet; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.BidiMap; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.collection.UnmodifiableCollection; +import org.apache.commons.collections4.iterators.UnmodifiableMapIterator; +import org.apache.commons.collections4.map.UnmodifiableEntrySet; /** * Decorates another {@link BidiMap} to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java similarity index 89% rename from src/main/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java index 4fffa0489..a0fafd707 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.OrderedBidiMap; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.collection.UnmodifiableCollection; -import org.apache.commons.collections.iterators.UnmodifiableOrderedMapIterator; -import org.apache.commons.collections.map.UnmodifiableEntrySet; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.OrderedBidiMap; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.collection.UnmodifiableCollection; +import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator; +import org.apache.commons.collections4.map.UnmodifiableEntrySet; /** * Decorates another {@link OrderedBidiMap} to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java similarity index 89% rename from src/main/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java rename to src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java index 12b5d8d48..1938e5f31 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.Collection; import java.util.Map; import java.util.Set; import java.util.SortedMap; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.SortedBidiMap; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.collection.UnmodifiableCollection; -import org.apache.commons.collections.iterators.UnmodifiableOrderedMapIterator; -import org.apache.commons.collections.map.UnmodifiableEntrySet; -import org.apache.commons.collections.map.UnmodifiableSortedMap; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.SortedBidiMap; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.collection.UnmodifiableCollection; +import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator; +import org.apache.commons.collections4.map.UnmodifiableEntrySet; +import org.apache.commons.collections4.map.UnmodifiableSortedMap; /** * Decorates another {@link SortedBidiMap} to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/bidimap/package-info.java b/src/main/java/org/apache/commons/collections4/bidimap/package-info.java similarity index 85% rename from src/main/java/org/apache/commons/collections/bidimap/package-info.java rename to src/main/java/org/apache/commons/collections4/bidimap/package-info.java index 745e1f459..831b91a81 100644 --- a/src/main/java/org/apache/commons/collections/bidimap/package-info.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/package-info.java @@ -16,9 +16,9 @@ */ /** * This package contains implementations of the - * {@link org.apache.commons.collections.BidiMap BidiMap}, - * {@link org.apache.commons.collections.OrderedBidiMap OrderedBidiMap} and - * {@link org.apache.commons.collections.SortedBidiMap SortedBidiMap} interfaces. + * {@link org.apache.commons.collections4.BidiMap BidiMap}, + * {@link org.apache.commons.collections4.OrderedBidiMap OrderedBidiMap} and + * {@link org.apache.commons.collections4.SortedBidiMap SortedBidiMap} interfaces. * A BidiMap is an extension to Map that allows keys and values to be looked up with equal ease. * One example usage is a system communicating to a legacy datasource that must convert codes * from the new format to the old format and vice versa. @@ -38,4 +38,4 @@ * * @version $Id$ */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; diff --git a/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java b/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java rename to src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java index 188189f25..7c3558344 100644 --- a/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java +++ b/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.io.Serializable; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java b/src/main/java/org/apache/commons/collections4/collection/AbstractUntypedCollectionDecorator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java rename to src/main/java/org/apache/commons/collections4/collection/AbstractUntypedCollectionDecorator.java index 7c0adbdf8..38dcb53e4 100644 --- a/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java +++ b/src/main/java/org/apache/commons/collections4/collection/AbstractUntypedCollectionDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.io.Serializable; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java b/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java similarity index 98% rename from src/main/java/org/apache/commons/collections/collection/CompositeCollection.java rename to src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java index 100d9d2eb..8230b7c05 100644 --- a/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java +++ b/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.io.Serializable; import java.lang.reflect.Array; @@ -24,9 +24,9 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.apache.commons.collections.iterators.EmptyIterator; -import org.apache.commons.collections.iterators.IteratorChain; -import org.apache.commons.collections.list.UnmodifiableList; +import org.apache.commons.collections4.iterators.EmptyIterator; +import org.apache.commons.collections4.iterators.IteratorChain; +import org.apache.commons.collections4.list.UnmodifiableList; /** * Decorates a collection of other collections to provide a single unified view. diff --git a/src/main/java/org/apache/commons/collections/collection/IndexedCollection.java b/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java similarity index 97% rename from src/main/java/org/apache/commons/collections/collection/IndexedCollection.java rename to src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java index 9dca3ff48..60e31b8a4 100644 --- a/src/main/java/org/apache/commons/collections/collection/IndexedCollection.java +++ b/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.util.Collection; import java.util.HashMap; -import org.apache.commons.collections.MultiMap; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.map.MultiValueMap; +import org.apache.commons.collections4.MultiMap; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.map.MultiValueMap; /** * An IndexedCollection is a Map-like view onto a Collection. It accepts a diff --git a/src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java similarity index 98% rename from src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java rename to src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java index 7a917780c..e9d20ff83 100644 --- a/src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java +++ b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.util.Collection; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Decorates another {@link Collection} to validate that additions diff --git a/src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java b/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java similarity index 99% rename from src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java rename to src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java index b340cc2c1..b696a6a0a 100644 --- a/src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java +++ b/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.io.Serializable; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/collections/collection/TransformedCollection.java b/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java similarity index 98% rename from src/main/java/org/apache/commons/collections/collection/TransformedCollection.java rename to src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java index 8b263822a..1e751eb5e 100644 --- a/src/main/java/org/apache/commons/collections/collection/TransformedCollection.java +++ b/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Transformer; /** * Decorates another {@link Collection} to transform objects that are added. diff --git a/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java similarity index 96% rename from src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java rename to src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java index 667a25ae3..e3b426c3d 100644 --- a/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java +++ b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.util.Collection; import java.util.Iterator; -import org.apache.commons.collections.BoundedCollection; -import org.apache.commons.collections.iterators.UnmodifiableIterator; +import org.apache.commons.collections4.BoundedCollection; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; /** * {@link UnmodifiableBoundedCollection} decorates another diff --git a/src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java similarity index 95% rename from src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java rename to src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java index 3c35cff63..523ab1c6b 100644 --- a/src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java +++ b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.util.Collection; import java.util.Iterator; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.iterators.UnmodifiableIterator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; /** * Decorates another {@link Collection} to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/collection/package-info.java b/src/main/java/org/apache/commons/collections4/collection/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/collections/collection/package-info.java rename to src/main/java/org/apache/commons/collections4/collection/package-info.java index bbc908b76..42674bf04 100644 --- a/src/main/java/org/apache/commons/collections/collection/package-info.java +++ b/src/main/java/org/apache/commons/collections4/collection/package-info.java @@ -33,4 +33,4 @@ * * @version $Id$ */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; diff --git a/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java similarity index 99% rename from src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java index d020566ea..0040340bb 100644 --- a/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java +++ b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.io.Serializable; import java.util.Comparator; diff --git a/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java index 9a7a7a283..8d9605f15 100644 --- a/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java +++ b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.io.Serializable; import java.util.Comparator; diff --git a/src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java similarity index 99% rename from src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java rename to src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java index 3bf09f086..1fb7b66ec 100644 --- a/src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java +++ b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java similarity index 99% rename from src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java index 300d48b39..e42a00b46 100644 --- a/src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java +++ b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.io.Serializable; import java.util.Comparator; diff --git a/src/main/java/org/apache/commons/collections/comparators/NullComparator.java b/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/comparators/NullComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/NullComparator.java index c7a5ebe61..1be98fecf 100644 --- a/src/main/java/org/apache/commons/collections/comparators/NullComparator.java +++ b/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.io.Serializable; import java.util.Comparator; -import org.apache.commons.collections.ComparatorUtils; +import org.apache.commons.collections4.ComparatorUtils; /** * A Comparator that will compare nulls to be either lower or higher than diff --git a/src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java index f50311f30..86ac58838 100644 --- a/src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java +++ b/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.io.Serializable; import java.util.Comparator; -import org.apache.commons.collections.ComparatorUtils; +import org.apache.commons.collections4.ComparatorUtils; /** * Reverses the order of another comparator by reversing the arguments diff --git a/src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java similarity index 94% rename from src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java index 1d7e9007a..7a2f9b8b7 100644 --- a/src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java +++ b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.io.Serializable; import java.util.Comparator; -import org.apache.commons.collections.ComparatorUtils; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.ComparatorUtils; +import org.apache.commons.collections4.Transformer; /** * Decorates another Comparator with transformation behavior. That is, the @@ -32,8 +32,8 @@ import org.apache.commons.collections.Transformer; * @since 2.1 * @version $Id$ * - * @see org.apache.commons.collections.Transformer - * @see org.apache.commons.collections.comparators.ComparableComparator + * @see org.apache.commons.collections4.Transformer + * @see org.apache.commons.collections4.comparators.ComparableComparator */ public class TransformingComparator implements Comparator, Serializable { diff --git a/src/main/java/org/apache/commons/collections/comparators/package-info.java b/src/main/java/org/apache/commons/collections4/comparators/package-info.java similarity index 89% rename from src/main/java/org/apache/commons/collections/comparators/package-info.java rename to src/main/java/org/apache/commons/collections4/comparators/package-info.java index 55de9929d..1d237c42e 100644 --- a/src/main/java/org/apache/commons/collections/comparators/package-info.java +++ b/src/main/java/org/apache/commons/collections4/comparators/package-info.java @@ -19,10 +19,10 @@ * {@link java.util.Comparator Comparator} interface. *

      * You may also consider using - * {@link org.apache.commons.collections.ComparatorUtils ComparatorUtils}, + * {@link org.apache.commons.collections4.ComparatorUtils ComparatorUtils}, * which is a single class that uses static methods to construct instances * of the classes in this package. * * @version $Id$ */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/CommandVisitor.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/CommandVisitor.java similarity index 98% rename from src/main/java/org/apache/commons/collections/comparators/sequence/CommandVisitor.java rename to src/main/java/org/apache/commons/collections4/comparators/sequence/CommandVisitor.java index 02ec65d76..33079d3fa 100644 --- a/src/main/java/org/apache/commons/collections/comparators/sequence/CommandVisitor.java +++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/CommandVisitor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; /** * This interface should be implemented by user object to walk diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/DeleteCommand.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/DeleteCommand.java similarity index 97% rename from src/main/java/org/apache/commons/collections/comparators/sequence/DeleteCommand.java rename to src/main/java/org/apache/commons/collections4/comparators/sequence/DeleteCommand.java index cf1fa6da4..6bcf286dd 100644 --- a/src/main/java/org/apache/commons/collections/comparators/sequence/DeleteCommand.java +++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/DeleteCommand.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; /** * Command representing the deletion of one object of the first sequence. diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/EditCommand.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/EditCommand.java similarity index 97% rename from src/main/java/org/apache/commons/collections/comparators/sequence/EditCommand.java rename to src/main/java/org/apache/commons/collections4/comparators/sequence/EditCommand.java index eb4654f78..0582fc7ca 100644 --- a/src/main/java/org/apache/commons/collections/comparators/sequence/EditCommand.java +++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/EditCommand.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; /** * Abstract base class for all commands used to transform an objects sequence diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/EditScript.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/EditScript.java similarity index 98% rename from src/main/java/org/apache/commons/collections/comparators/sequence/EditScript.java rename to src/main/java/org/apache/commons/collections4/comparators/sequence/EditScript.java index ebb3faa48..6e93cb98d 100644 --- a/src/main/java/org/apache/commons/collections/comparators/sequence/EditScript.java +++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/EditScript.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/InsertCommand.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/InsertCommand.java similarity index 97% rename from src/main/java/org/apache/commons/collections/comparators/sequence/InsertCommand.java rename to src/main/java/org/apache/commons/collections4/comparators/sequence/InsertCommand.java index 906c59375..317f09deb 100644 --- a/src/main/java/org/apache/commons/collections/comparators/sequence/InsertCommand.java +++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/InsertCommand.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; /** * Command representing the insertion of one object of the second sequence. diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/KeepCommand.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/KeepCommand.java similarity index 97% rename from src/main/java/org/apache/commons/collections/comparators/sequence/KeepCommand.java rename to src/main/java/org/apache/commons/collections4/comparators/sequence/KeepCommand.java index 03db72e99..bc747c3e6 100644 --- a/src/main/java/org/apache/commons/collections/comparators/sequence/KeepCommand.java +++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/KeepCommand.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; /** * Command representing the keeping of one object present in both sequences. diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsFinder.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsFinder.java similarity index 98% rename from src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsFinder.java rename to src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsFinder.java index 7bb707137..073ad6de3 100644 --- a/src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsFinder.java +++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsFinder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsHandler.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsHandler.java similarity index 97% rename from src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsHandler.java rename to src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsHandler.java index 501f61fc2..a357f59c3 100644 --- a/src/main/java/org/apache/commons/collections/comparators/sequence/ReplacementsHandler.java +++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/ReplacementsHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; import java.util.List; diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/SequencesComparator.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/SequencesComparator.java similarity index 99% rename from src/main/java/org/apache/commons/collections/comparators/sequence/SequencesComparator.java rename to src/main/java/org/apache/commons/collections4/comparators/sequence/SequencesComparator.java index e03a5c088..2fd6e1937 100644 --- a/src/main/java/org/apache/commons/collections/comparators/sequence/SequencesComparator.java +++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/SequencesComparator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; import java.util.List; diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/Snake.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/Snake.java similarity index 97% rename from src/main/java/org/apache/commons/collections/comparators/sequence/Snake.java rename to src/main/java/org/apache/commons/collections4/comparators/sequence/Snake.java index be59bca9e..2589a580d 100644 --- a/src/main/java/org/apache/commons/collections/comparators/sequence/Snake.java +++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/Snake.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; /** * This class is a simple placeholder to hold the end part of a path diff --git a/src/main/java/org/apache/commons/collections/comparators/sequence/package-info.java b/src/main/java/org/apache/commons/collections4/comparators/sequence/package-info.java similarity index 98% rename from src/main/java/org/apache/commons/collections/comparators/sequence/package-info.java rename to src/main/java/org/apache/commons/collections4/comparators/sequence/package-info.java index 48d88441c..1afcb54c7 100644 --- a/src/main/java/org/apache/commons/collections/comparators/sequence/package-info.java +++ b/src/main/java/org/apache/commons/collections4/comparators/sequence/package-info.java @@ -78,4 +78,4 @@ * * @version $Id$ */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; diff --git a/src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java similarity index 94% rename from src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java index ec63decf2..3d840a43b 100644 --- a/src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Abstract base class for quantification predicates, e.g. All, Any, None. diff --git a/src/main/java/org/apache/commons/collections/functors/AllPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java similarity index 92% rename from src/main/java/org/apache/commons/collections/functors/AllPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/AllPredicate.java index 8d5c8f18f..6620bee61 100644 --- a/src/main/java/org/apache/commons/collections/functors/AllPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; -import static org.apache.commons.collections.functors.FunctorUtils.coerce; -import static org.apache.commons.collections.functors.FunctorUtils.validate; -import static org.apache.commons.collections.functors.TruePredicate.truePredicate; +import static org.apache.commons.collections4.functors.FunctorUtils.coerce; +import static org.apache.commons.collections4.functors.FunctorUtils.validate; +import static org.apache.commons.collections4.functors.TruePredicate.truePredicate; import java.io.Serializable; import java.util.Collection; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if all the diff --git a/src/main/java/org/apache/commons/collections/functors/AndPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/AndPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/AndPredicate.java index 2f7539cd7..702a7eaae 100644 --- a/src/main/java/org/apache/commons/collections/functors/AndPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if both the predicates return true. diff --git a/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/AnyPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java index bd17ca2a2..8520d4733 100644 --- a/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.util.Collection; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if any of the diff --git a/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java b/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java similarity index 94% rename from src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java rename to src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java index 2363efe83..8b10b3a02 100644 --- a/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; -import org.apache.commons.collections.Closure; -import org.apache.commons.collections.FunctorException; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.FunctorException; /** * {@link Closure} that catches any checked exception and re-throws it as a diff --git a/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/ChainedClosure.java rename to src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java index 8d2e7871c..a349e7f4e 100644 --- a/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.util.Collection; -import org.apache.commons.collections.Closure; +import org.apache.commons.collections4.Closure; /** * Closure implementation that chains the specified closures together. diff --git a/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java index 7a14a7fe3..53b1b6807 100644 --- a/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.util.Collection; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that chains the specified transformers together. diff --git a/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java b/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java similarity index 95% rename from src/main/java/org/apache/commons/collections/functors/CloneTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java index 175c018ad..66a071841 100644 --- a/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that returns a clone of the input object. diff --git a/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java similarity index 94% rename from src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java index f2bf920b0..c435107ee 100644 --- a/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Closure; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that calls a Closure using the input object diff --git a/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java index 231a41ebc..49ddb7301 100644 --- a/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.util.Comparator; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate that compares the input object with the one stored in the predicate using a comparator. @@ -155,7 +155,7 @@ public class ComparatorPredicate implements Predicate, Serializable { *

    • comparator.compare(object, input) <= 0 && criterion == LESS_OR_EQUAL
      • * * - * @see org.apache.commons.collections.Predicate#evaluate(java.lang.Object) + * @see org.apache.commons.collections4.Predicate#evaluate(java.lang.Object) * @see java.util.Comparator#compare(java.lang.Object first, java.lang.Object second) * * @param target the target object to compare to diff --git a/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/ConstantFactory.java rename to src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java index b992167af..02851b712 100644 --- a/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java +++ b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Factory; +import org.apache.commons.collections4.Factory; /** * Factory implementation that returns the same constant each time. diff --git a/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java index db6f7f99c..d35e650e4 100644 --- a/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that returns the same constant each time. diff --git a/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/DefaultEquator.java rename to src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java index c03b3df15..4cbc9bb41 100644 --- a/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java +++ b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; /** * Default {@link Equator} implementation. diff --git a/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java similarity index 95% rename from src/main/java/org/apache/commons/collections/functors/EqualPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java index 70a703c67..a34297cd1 100644 --- a/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; -import static org.apache.commons.collections.functors.NullPredicate.nullPredicate; +import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if the input is the same object diff --git a/src/main/java/org/apache/commons/collections/functors/Equator.java b/src/main/java/org/apache/commons/collections4/functors/Equator.java similarity index 92% rename from src/main/java/org/apache/commons/collections/functors/Equator.java rename to src/main/java/org/apache/commons/collections4/functors/Equator.java index 5efb0a07d..4a721b7ed 100644 --- a/src/main/java/org/apache/commons/collections/functors/Equator.java +++ b/src/main/java/org/apache/commons/collections4/functors/Equator.java @@ -8,7 +8,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License * for the specific language governing permissions and limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; /** *

      @@ -37,7 +37,7 @@ public interface Equator { * 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.collections.map.HashedMap} that use an Equator for the key objects. + * of {@link org.apache.commons.collections4.map.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/collections/functors/ExceptionClosure.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java similarity index 92% rename from src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java rename to src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java index abd1c260d..5703dcc33 100644 --- a/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Closure; -import org.apache.commons.collections.FunctorException; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.FunctorException; /** * Closure implementation that always throws an exception. diff --git a/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java similarity index 92% rename from src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java rename to src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java index 02509961b..6071158de 100644 --- a/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Factory; -import org.apache.commons.collections.FunctorException; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.FunctorException; /** * Factory implementation that always throws an exception. diff --git a/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java similarity index 92% rename from src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java index 1bb16bdec..f1b47b909 100644 --- a/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.FunctorException; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that always throws an exception. diff --git a/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java similarity index 93% rename from src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java index 2047610c7..88c185a26 100644 --- a/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.FunctorException; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that always throws an exception. diff --git a/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java b/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java similarity index 94% rename from src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java index 9a75ed7aa..2f133b3db 100644 --- a/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Factory; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that calls a Factory and returns the result. diff --git a/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java similarity index 95% rename from src/main/java/org/apache/commons/collections/functors/FalsePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java index ada10fc58..cd2f8c9c8 100644 --- a/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that always returns false. diff --git a/src/main/java/org/apache/commons/collections/functors/ForClosure.java b/src/main/java/org/apache/commons/collections4/functors/ForClosure.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/ForClosure.java rename to src/main/java/org/apache/commons/collections4/functors/ForClosure.java index 2a53d4b7f..dadaa2974 100644 --- a/src/main/java/org/apache/commons/collections/functors/ForClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/ForClosure.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Closure; +import org.apache.commons.collections4.Closure; /** * Closure implementation that calls another closure n times, like a for loop. diff --git a/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java b/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/FunctorUtils.java rename to src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java index 674411210..cc1fac4e8 100644 --- a/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java +++ b/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.util.Collection; -import org.apache.commons.collections.Closure; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.Transformer; /** * Internal utilities for functors. diff --git a/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java b/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java index f2b593409..5d7e71ca4 100644 --- a/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if the input is the same object diff --git a/src/main/java/org/apache/commons/collections/functors/IfClosure.java b/src/main/java/org/apache/commons/collections4/functors/IfClosure.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/IfClosure.java rename to src/main/java/org/apache/commons/collections4/functors/IfClosure.java index f26702b92..7ae30a20e 100644 --- a/src/main/java/org/apache/commons/collections/functors/IfClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/IfClosure.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Closure; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.Predicate; /** * Closure implementation acts as an if statement calling one or other closure diff --git a/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java b/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java index fae1a4b4e..e1a33ab1b 100644 --- a/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if the input is an instanceof diff --git a/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java b/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java rename to src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java index dfc4e3650..7490ead9f 100644 --- a/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java +++ b/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import org.apache.commons.collections.Factory; -import org.apache.commons.collections.FunctorException; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.FunctorException; /** * Factory implementation that creates a new object instance by reflection. diff --git a/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java index b7140e42d..25a8234b4 100644 --- a/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import org.apache.commons.collections.FunctorException; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that creates a new object instance by reflection. diff --git a/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java index 62a1da52c..1bb459672 100644 --- a/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.commons.collections.FunctorException; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that creates a new object instance by reflection. diff --git a/src/main/java/org/apache/commons/collections/functors/MapTransformer.java b/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/MapTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/MapTransformer.java index eabce4d5e..770017f54 100644 --- a/src/main/java/org/apache/commons/collections/functors/MapTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that returns the value held in a specified map diff --git a/src/main/java/org/apache/commons/collections/functors/NOPClosure.java b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java similarity index 94% rename from src/main/java/org/apache/commons/collections/functors/NOPClosure.java rename to src/main/java/org/apache/commons/collections4/functors/NOPClosure.java index 3ad398ceb..4a7055842 100644 --- a/src/main/java/org/apache/commons/collections/functors/NOPClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Closure; +import org.apache.commons.collections4.Closure; /** * Closure implementation that does nothing. diff --git a/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java similarity index 95% rename from src/main/java/org/apache/commons/collections/functors/NOPTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java index 81151d3cd..63ad6cad2 100644 --- a/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that does nothing. diff --git a/src/main/java/org/apache/commons/collections/functors/NonePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/NonePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NonePredicate.java index 7f3a615ba..3e820db28 100644 --- a/src/main/java/org/apache/commons/collections/functors/NonePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.util.Collection; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if none of the diff --git a/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java similarity index 95% rename from src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java index c766417ab..f7a1d5214 100644 --- a/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if the input is not null. diff --git a/src/main/java/org/apache/commons/collections/functors/NotPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/NotPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NotPredicate.java index fd634326f..a61c084f5 100644 --- a/src/main/java/org/apache/commons/collections/functors/NotPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns the opposite of the decorated predicate. diff --git a/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java similarity index 94% rename from src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java index 78028f29b..6618b64d6 100644 --- a/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.FunctorException; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that throws an exception if the input is null. diff --git a/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java index 3bd5ff604..39b07a75b 100644 --- a/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns false if the input is null. diff --git a/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java index b1d7c1137..e8de95659 100644 --- a/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if the input is null. diff --git a/src/main/java/org/apache/commons/collections/functors/NullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java similarity index 95% rename from src/main/java/org/apache/commons/collections/functors/NullPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/NullPredicate.java index a25fc2c4d..3609a0faf 100644 --- a/src/main/java/org/apache/commons/collections/functors/NullPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if the input is null. diff --git a/src/main/java/org/apache/commons/collections/functors/OnePredicate.java b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/OnePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/OnePredicate.java index c03a8ab28..3306db09d 100644 --- a/src/main/java/org/apache/commons/collections/functors/OnePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.util.Collection; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if only one of the diff --git a/src/main/java/org/apache/commons/collections/functors/OrPredicate.java b/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/OrPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/OrPredicate.java index 4018270db..7a880b96c 100644 --- a/src/main/java/org/apache/commons/collections/functors/OrPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true if either of the predicates return true. diff --git a/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java b/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java similarity index 93% rename from src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java rename to src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java index 446aa2cf5..8f6d06772 100644 --- a/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java +++ b/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Defines a predicate that decorates one or more other predicates. diff --git a/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java similarity index 94% rename from src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java index 61ce3589c..0257c468c 100644 --- a/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that calls a Predicate using the input object diff --git a/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java b/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java rename to src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java index 079d00086..6e66944dd 100644 --- a/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java +++ b/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -25,8 +25,8 @@ import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.commons.collections.Factory; -import org.apache.commons.collections.FunctorException; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.FunctorException; /** * Factory implementation that creates a new instance each time based on a prototype. diff --git a/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java b/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java similarity index 95% rename from src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java index 53b91b4bc..f9462efec 100644 --- a/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation that returns the result of calling diff --git a/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java similarity index 97% rename from src/main/java/org/apache/commons/collections/functors/SwitchClosure.java rename to src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java index 36abf8d95..c6a52646e 100644 --- a/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections.Closure; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.Predicate; /** * Closure implementation calls the closure whose predicate returns true, diff --git a/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java similarity index 98% rename from src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java rename to src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java index 64502d50c..dfff0bcd4 100644 --- a/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.Transformer; /** * Transformer implementation calls the transformer whose predicate returns true, diff --git a/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java index a7f3a3c48..652c084fe 100644 --- a/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.Transformer; /** * Predicate implementation that transforms the given object before invoking diff --git a/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java b/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java similarity index 94% rename from src/main/java/org/apache/commons/collections/functors/TransformerClosure.java rename to src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java index 811ecf3ce..b47b45416 100644 --- a/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Closure; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.Transformer; /** * Closure implementation that calls a Transformer using the input object diff --git a/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java similarity index 93% rename from src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java rename to src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java index 9cd09def9..ce6418806 100644 --- a/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.FunctorException; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.Transformer; /** * Predicate implementation that returns the result of a transformer. diff --git a/src/main/java/org/apache/commons/collections/functors/TruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java similarity index 95% rename from src/main/java/org/apache/commons/collections/functors/TruePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/TruePredicate.java index b91fdc82b..466dcd03b 100644 --- a/src/main/java/org/apache/commons/collections/functors/TruePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that always returns true. diff --git a/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java b/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java similarity index 95% rename from src/main/java/org/apache/commons/collections/functors/UniquePredicate.java rename to src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java index 591223025..d75141346 100644 --- a/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Predicate implementation that returns true the first time an object is diff --git a/src/main/java/org/apache/commons/collections/functors/WhileClosure.java b/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java similarity index 96% rename from src/main/java/org/apache/commons/collections/functors/WhileClosure.java rename to src/main/java/org/apache/commons/collections4/functors/WhileClosure.java index ada484034..939b025f1 100644 --- a/src/main/java/org/apache/commons/collections/functors/WhileClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.Serializable; -import org.apache.commons.collections.Closure; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.Predicate; /** * Closure implementation that executes a closure repeatedly until a condition is met, diff --git a/src/main/java/org/apache/commons/collections/functors/package-info.java b/src/main/java/org/apache/commons/collections4/functors/package-info.java similarity index 74% rename from src/main/java/org/apache/commons/collections/functors/package-info.java rename to src/main/java/org/apache/commons/collections4/functors/package-info.java index fd2dd64a6..321edd43f 100644 --- a/src/main/java/org/apache/commons/collections/functors/package-info.java +++ b/src/main/java/org/apache/commons/collections4/functors/package-info.java @@ -16,12 +16,12 @@ */ /** * This package contains implementations of the - * {@link org.apache.commons.collections.Closure Closure}, - * {@link org.apache.commons.collections.Predicate Predicate}, - * {@link org.apache.commons.collections.Transformer Transformer} and - * {@link org.apache.commons.collections.Factory Factory} interfaces. + * {@link org.apache.commons.collections4.Closure Closure}, + * {@link org.apache.commons.collections4.Predicate Predicate}, + * {@link org.apache.commons.collections4.Transformer Transformer} and + * {@link org.apache.commons.collections4.Factory Factory} interfaces. * These provide simple callbacks for processing with collections. * * @version $Id$ */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java index 99992b697..017464d12 100644 --- a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.NoSuchElementException; diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java index af333fd54..5672cff12 100644 --- a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; /** * Provides an implementation of an empty map iterator. diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java index 3ee502790..ddfc4fbfa 100644 --- a/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java index fc10f15ad..bdb120e44 100644 --- a/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ListIterator; diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java index e9d604edd..d65c7772f 100644 --- a/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; -import org.apache.commons.collections.MapIterator; +import org.apache.commons.collections4.MapIterator; /** * Provides basic behaviour for decorating a map iterator with extra functionality. diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java index 69bc46741..f215036f6 100644 --- a/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; -import org.apache.commons.collections.OrderedMapIterator; +import org.apache.commons.collections4.OrderedMapIterator; /** * Provides basic behaviour for decorating an ordered map iterator with extra functionality. diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java rename to src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java index 182a2f46d..29762e17b 100644 --- a/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; diff --git a/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java index 9e6f699ac..dbf882536 100644 --- a/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.lang.reflect.Array; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.ResettableIterator; /** * Implements an {@link java.util.Iterator Iterator} over any array. *

      * 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.collections.iterators.ObjectArrayIterator ObjectArrayIterator} + * {@link org.apache.commons.collections4.iterators.ObjectArrayIterator ObjectArrayIterator} * class is a better choice, as it will perform better. *

      * The iterator implements a {@link #reset} method, allowing the reset of diff --git a/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java index 2c37bf152..35201ba6c 100644 --- a/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.lang.reflect.Array; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableListIterator; +import org.apache.commons.collections4.ResettableListIterator; /** * Implements a {@link ListIterator} over an array. @@ -33,7 +33,7 @@ import org.apache.commons.collections.ResettableListIterator; * This iterator does not support {@link #add(Object)} or {@link #remove()}, as the array * cannot be changed in size. The {@link #set(Object)} method is supported however. * - * @see org.apache.commons.collections.iterators.ArrayIterator + * @see org.apache.commons.collections4.iterators.ArrayIterator * @see java.util.Iterator * @see java.util.ListIterator * diff --git a/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java index a495617f8..bf372ad97 100644 --- a/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.BitSet; @@ -24,7 +24,7 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.collections.list.UnmodifiableList; +import org.apache.commons.collections4.list.UnmodifiableList; /** @@ -216,7 +216,7 @@ public class CollatingIterator implements Iterator { * would like to use the natural sort order (or, in other words, * if the elements in the iterators are implementing the * {@link java.lang.Comparable} interface), then use the - * {@link org.apache.commons.collections.comparators.ComparableComparator}. + * {@link org.apache.commons.collections4.comparators.ComparableComparator}. * * @param comp the {@link Comparator} to set * @throws IllegalStateException if iteration has started diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java similarity index 95% rename from src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java index e163219eb..e4ce7e290 100644 --- a/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.ResettableIterator; /** * Provides an implementation of an empty iterator. diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java similarity index 95% rename from src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java index a1841aa3c..18d71040a 100644 --- a/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ListIterator; -import org.apache.commons.collections.ResettableListIterator; +import org.apache.commons.collections4.ResettableListIterator; /** * Provides an implementation of an empty list iterator. diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java similarity index 90% rename from src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java index de32971ff..68f93bc32 100644 --- a/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.ResettableIterator; /** * Provides an implementation of an empty map iterator. diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java similarity index 90% rename from src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java index ffeff4306..efd52dd66 100644 --- a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; -import org.apache.commons.collections.OrderedIterator; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.OrderedIterator; +import org.apache.commons.collections4.ResettableIterator; /** * Provides an implementation of an empty ordered iterator. diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java similarity index 90% rename from src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java index 758c4c5fb..8e4532d9c 100644 --- a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.ResettableIterator; /** * Provides an implementation of an empty ordered map iterator. diff --git a/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java index 8cdd57d2c..b7f8c4999 100644 --- a/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.Map; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.ResettableIterator; /** * Implements a MapIterator using a Map entrySet. diff --git a/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java index 3d9274bf9..800f42583 100644 --- a/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Collection; import java.util.Enumeration; diff --git a/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/iterators/FilterIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java index 5b96dc53c..146b08a0e 100644 --- a/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Decorates another {@link Iterator} using a predicate to filter elements. diff --git a/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java index de7552b66..685cb08f6 100644 --- a/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Decorates another {@link ListIterator} using a predicate to filter elements. diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java similarity index 98% rename from src/main/java/org/apache/commons/collections/iterators/IteratorChain.java rename to src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java index 648f04160..d65a79b65 100644 --- a/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java +++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.apache.commons.collections.list.UnmodifiableList; +import org.apache.commons.collections4.list.UnmodifiableList; /** * An IteratorChain is an Iterator that wraps a number of Iterators. diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java similarity index 98% rename from src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java rename to src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java index 52a55108c..ed0c7822e 100644 --- a/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java +++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Enumeration; import java.util.Iterator; diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java rename to src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java index b0844348d..3fafa8f1c 100644 --- a/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java +++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java @@ -11,11 +11,11 @@ * KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.ResettableIterator; /** * Adapter to make an {@link Iterator Iterator} instance appear to be an diff --git a/src/main/java/org/apache/commons/collections/iterators/LazyIteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java similarity index 99% rename from src/main/java/org/apache/commons/collections/iterators/LazyIteratorChain.java rename to src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java index 2c8b92111..0b5449660 100644 --- a/src/main/java/org/apache/commons/collections/iterators/LazyIteratorChain.java +++ b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; diff --git a/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java rename to src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java index 0c1a869f8..ba5295d58 100644 --- a/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.text.MessageFormat; import java.util.ArrayList; @@ -23,13 +23,13 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableListIterator; +import org.apache.commons.collections4.ResettableListIterator; /** * Converts an {@link Iterator} into a {@link ResettableListIterator}. * For plain Iterators this is accomplished by caching the returned * elements. This class can also be used to simply add - * {@link org.apache.commons.collections.ResettableIterator ResettableIterator} + * {@link org.apache.commons.collections4.ResettableIterator ResettableIterator} * functionality to a given {@link ListIterator}. *

      * The ListIterator interface has additional useful methods diff --git a/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java index 870a74be7..eb722a34d 100644 --- a/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Collection; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.ResettableIterator; /** * An Iterator that restarts when it reaches the end. diff --git a/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java index 4b33405d0..b67201ce3 100644 --- a/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableListIterator; +import org.apache.commons.collections4.ResettableListIterator; /** * A ListIterator that restarts when it reaches the end or when it diff --git a/src/main/java/org/apache/commons/collections/iterators/NodeListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/iterators/NodeListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java index 5200951f0..b33377c7a 100644 --- a/src/main/java/org/apache/commons/collections/iterators/NodeListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java index a5237f30f..02ecb3c89 100644 --- a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.ResettableIterator; /** * An {@link Iterator} over an array of objects. diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java index a973c61fc..873631712 100644 --- a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableListIterator; +import org.apache.commons.collections4.ResettableListIterator; /** * Implements a {@link ListIterator} over an array of objects. @@ -30,7 +30,7 @@ import org.apache.commons.collections.ResettableListIterator; * The iterator implements a {@link #reset} method, allowing the reset of the iterator * back to the start if required. * - * @see org.apache.commons.collections.iterators.ObjectArrayIterator + * @see org.apache.commons.collections4.iterators.ObjectArrayIterator * @see java.util.Iterator * @see java.util.ListIterator * diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java index 95b737eb6..6da45fa96 100644 --- a/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.ArrayStack; +import org.apache.commons.collections4.ArrayStack; +import org.apache.commons.collections4.Transformer; /** * An Iterator that can traverse multiple iterators down an object graph. diff --git a/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java index 754b3e873..cf7b0d4d5 100644 --- a/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections.ResettableListIterator; +import org.apache.commons.collections4.ResettableListIterator; /** * Iterates backwards through a List, starting with the last element diff --git a/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java index f4b4835e9..c6fc1518d 100644 --- a/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.ResettableIterator; /** * SingletonIterator is an {@link Iterator} over a single diff --git a/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java index 979ef0631..9ba29878d 100644 --- a/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableListIterator; +import org.apache.commons.collections4.ResettableListIterator; /** * SingletonIterator is an {@link ListIterator} over a single diff --git a/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java b/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java similarity index 97% rename from src/main/java/org/apache/commons/collections/iterators/TransformIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java index d09cf9f8f..688b9681c 100644 --- a/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Transformer; /** * Decorates an iterator such that each element returned is transformed. diff --git a/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java similarity index 92% rename from src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java index 9e73625a4..e357da2a4 100644 --- a/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; -import org.apache.commons.collections.functors.UniquePredicate; +import org.apache.commons.collections4.functors.UniquePredicate; /** * A FilterIterator which only returns "unique" Objects. Internally, diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java index 7cb28ed63..2261eaf4f 100644 --- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; -import org.apache.commons.collections.Unmodifiable; +import org.apache.commons.collections4.Unmodifiable; /** * Decorates an iterator such that it cannot be modified. diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java index f57e94aa3..19ad6db1f 100644 --- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ListIterator; -import org.apache.commons.collections.Unmodifiable; +import org.apache.commons.collections4.Unmodifiable; /** * Decorates a list iterator such that it cannot be modified. diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java similarity index 94% rename from src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java index bcd321b0d..9ddde36cd 100644 --- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.Unmodifiable; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.Unmodifiable; /** * Decorates a map iterator such that it cannot be modified. diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java similarity index 94% rename from src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java rename to src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java index 745da0f05..7e6679e82 100644 --- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.Unmodifiable; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.Unmodifiable; /** * Decorates an ordered map iterator such that it cannot be modified. diff --git a/src/main/java/org/apache/commons/collections/iterators/package-info.java b/src/main/java/org/apache/commons/collections4/iterators/package-info.java similarity index 89% rename from src/main/java/org/apache/commons/collections/iterators/package-info.java rename to src/main/java/org/apache/commons/collections4/iterators/package-info.java index 1f3561005..01584fc45 100644 --- a/src/main/java/org/apache/commons/collections/iterators/package-info.java +++ b/src/main/java/org/apache/commons/collections4/iterators/package-info.java @@ -19,10 +19,10 @@ * {@link java.util.Iterator Iterator} interface. *

      * You may also consider using - * {@link org.apache.commons.collections.IteratorUtils IteratorUtils}, + * {@link org.apache.commons.collections4.IteratorUtils IteratorUtils}, * which is a single class that uses static methods to construct instances * of the classes in this package. * * @version $Id$ */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; diff --git a/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java similarity index 95% rename from src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java rename to src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java index d6aeb8312..a852eb707 100644 --- a/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; -import org.apache.commons.collections.KeyValue; +import org.apache.commons.collections4.KeyValue; /** * Abstract pair class to assist with creating KeyValue diff --git a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java similarity index 98% rename from src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java rename to src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java index 80725a5a3..518f76aa8 100644 --- a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.util.Map; diff --git a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java rename to src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java index 7aa21efd4..57013e1bf 100644 --- a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.util.Map; -import org.apache.commons.collections.KeyValue; +import org.apache.commons.collections4.KeyValue; /** * Provides a base decorator that allows additional functionality to be diff --git a/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java similarity index 98% rename from src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java rename to src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java index b4197043c..545720fb2 100644 --- a/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.util.Map; -import org.apache.commons.collections.KeyValue; +import org.apache.commons.collections4.KeyValue; /** * A mutable KeyValue pair that does not implement diff --git a/src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java similarity index 95% rename from src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java rename to src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java index aa9807521..d120405b6 100644 --- a/src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.util.Map; -import org.apache.commons.collections.KeyValue; +import org.apache.commons.collections4.KeyValue; /** * A restricted implementation of {@link java.util.Map.Entry Map.Entry} that prevents diff --git a/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java similarity index 99% rename from src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java rename to src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java index 5fff95ed9..37bd86c5a 100644 --- a/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.io.Serializable; import java.util.Arrays; diff --git a/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java similarity index 97% rename from src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java rename to src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java index 80e371dfb..a1290ab31 100644 --- a/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections.KeyValue; +import org.apache.commons.collections4.KeyValue; /** * A {@link java.util.Map.Entry Map.Entry} tied to a map underneath. diff --git a/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java similarity index 94% rename from src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java rename to src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java index 385693d76..bb7901c54 100644 --- a/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.util.Map; -import org.apache.commons.collections.KeyValue; -import org.apache.commons.collections.Unmodifiable; +import org.apache.commons.collections4.KeyValue; +import org.apache.commons.collections4.Unmodifiable; /** * A {@link java.util.Map.Entry Map.Entry} that throws diff --git a/src/main/java/org/apache/commons/collections/keyvalue/package-info.java b/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/collections/keyvalue/package-info.java rename to src/main/java/org/apache/commons/collections4/keyvalue/package-info.java index 7b877b6cc..2e20d639b 100644 --- a/src/main/java/org/apache/commons/collections/keyvalue/package-info.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java @@ -27,4 +27,4 @@ * * @version $Id$ */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; diff --git a/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java similarity index 99% rename from src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java rename to src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java index 34dc3e5b8..b99f7e6ea 100644 --- a/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java +++ b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.io.IOException; import java.io.ObjectInputStream; @@ -28,7 +28,7 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.OrderedIterator; +import org.apache.commons.collections4.OrderedIterator; /** * An abstract implementation of a linked list which provides numerous points for diff --git a/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java rename to src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java index 27cbfabac..5a3b70faa 100644 --- a/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java +++ b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.Collection; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections.collection.AbstractCollectionDecorator; +import org.apache.commons.collections4.collection.AbstractCollectionDecorator; /** * Decorates another {@link List} to provide additional behaviour. diff --git a/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java rename to src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java index 54f40c737..2b4cd8d3b 100644 --- a/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java +++ b/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/apache/commons/collections/list/CursorableLinkedList.java b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java similarity index 99% rename from src/main/java/org/apache/commons/collections/list/CursorableLinkedList.java rename to src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java index fa7c89c83..c5c06f8f7 100644 --- a/src/main/java/org/apache/commons/collections/list/CursorableLinkedList.java +++ b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/apache/commons/collections/list/FixedSizeList.java b/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java similarity index 95% rename from src/main/java/org/apache/commons/collections/list/FixedSizeList.java rename to src/main/java/org/apache/commons/collections4/list/FixedSizeList.java index b2e9cef87..144f324e8 100644 --- a/src/main/java/org/apache/commons/collections/list/FixedSizeList.java +++ b/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections.BoundedCollection; -import org.apache.commons.collections.iterators.AbstractListIteratorDecorator; -import org.apache.commons.collections.iterators.UnmodifiableIterator; +import org.apache.commons.collections4.BoundedCollection; +import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; /** * Decorates another List to fix the size preventing add/remove. diff --git a/src/main/java/org/apache/commons/collections/list/GrowthList.java b/src/main/java/org/apache/commons/collections4/list/GrowthList.java similarity index 99% rename from src/main/java/org/apache/commons/collections/list/GrowthList.java rename to src/main/java/org/apache/commons/collections4/list/GrowthList.java index ab8567bc2..a1b438c4d 100644 --- a/src/main/java/org/apache/commons/collections/list/GrowthList.java +++ b/src/main/java/org/apache/commons/collections4/list/GrowthList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/collections/list/LazyList.java b/src/main/java/org/apache/commons/collections4/list/LazyList.java similarity index 98% rename from src/main/java/org/apache/commons/collections/list/LazyList.java rename to src/main/java/org/apache/commons/collections4/list/LazyList.java index d9ad4bd80..0ce31e548 100644 --- a/src/main/java/org/apache/commons/collections/list/LazyList.java +++ b/src/main/java/org/apache/commons/collections4/list/LazyList.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.List; -import org.apache.commons.collections.Factory; +import org.apache.commons.collections4.Factory; /** * Decorates another List to create objects in the list on demand. diff --git a/src/main/java/org/apache/commons/collections/list/NodeCachingLinkedList.java b/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java similarity index 99% rename from src/main/java/org/apache/commons/collections/list/NodeCachingLinkedList.java rename to src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java index fd8f8729e..83d40e777 100644 --- a/src/main/java/org/apache/commons/collections/list/NodeCachingLinkedList.java +++ b/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/apache/commons/collections/list/PredicatedList.java b/src/main/java/org/apache/commons/collections4/list/PredicatedList.java similarity index 95% rename from src/main/java/org/apache/commons/collections/list/PredicatedList.java rename to src/main/java/org/apache/commons/collections4/list/PredicatedList.java index 16ce35180..31062b040 100644 --- a/src/main/java/org/apache/commons/collections/list/PredicatedList.java +++ b/src/main/java/org/apache/commons/collections4/list/PredicatedList.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.collection.PredicatedCollection; -import org.apache.commons.collections.iterators.AbstractListIteratorDecorator; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.collection.PredicatedCollection; +import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator; import java.util.Collection; import java.util.List; diff --git a/src/main/java/org/apache/commons/collections/list/SetUniqueList.java b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java similarity index 98% rename from src/main/java/org/apache/commons/collections/list/SetUniqueList.java rename to src/main/java/org/apache/commons/collections4/list/SetUniqueList.java index 4443a3f8c..f151a341f 100644 --- a/src/main/java/org/apache/commons/collections/list/SetUniqueList.java +++ b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.ArrayList; import java.util.Collection; @@ -24,9 +24,9 @@ import java.util.List; import java.util.ListIterator; import java.util.Set; -import org.apache.commons.collections.iterators.AbstractIteratorDecorator; -import org.apache.commons.collections.iterators.AbstractListIteratorDecorator; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.iterators.AbstractIteratorDecorator; +import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator; /** * Decorates a List to ensure that no duplicates are present much diff --git a/src/main/java/org/apache/commons/collections/list/TransformedList.java b/src/main/java/org/apache/commons/collections4/list/TransformedList.java similarity index 96% rename from src/main/java/org/apache/commons/collections/list/TransformedList.java rename to src/main/java/org/apache/commons/collections4/list/TransformedList.java index 2b3c752f1..927c4c915 100644 --- a/src/main/java/org/apache/commons/collections/list/TransformedList.java +++ b/src/main/java/org/apache/commons/collections4/list/TransformedList.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.Collection; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.collection.TransformedCollection; -import org.apache.commons.collections.iterators.AbstractListIteratorDecorator; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.collection.TransformedCollection; +import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator; /** * Decorates another List to transform objects that are added. diff --git a/src/main/java/org/apache/commons/collections/list/TreeList.java b/src/main/java/org/apache/commons/collections4/list/TreeList.java similarity index 99% rename from src/main/java/org/apache/commons/collections/list/TreeList.java rename to src/main/java/org/apache/commons/collections4/list/TreeList.java index 9e0f89143..e47fd6294 100644 --- a/src/main/java/org/apache/commons/collections/list/TreeList.java +++ b/src/main/java/org/apache/commons/collections4/list/TreeList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.AbstractList; import java.util.Collection; @@ -23,7 +23,7 @@ import java.util.Iterator; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.OrderedIterator; +import org.apache.commons.collections4.OrderedIterator; /** * A List implementation that is optimised for fast insertions and diff --git a/src/main/java/org/apache/commons/collections/list/UnmodifiableList.java b/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java similarity index 94% rename from src/main/java/org/apache/commons/collections/list/UnmodifiableList.java rename to src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java index 92f1f225b..b7e0de17b 100644 --- a/src/main/java/org/apache/commons/collections/list/UnmodifiableList.java +++ b/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.iterators.UnmodifiableIterator; -import org.apache.commons.collections.iterators.UnmodifiableListIterator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; +import org.apache.commons.collections4.iterators.UnmodifiableListIterator; /** * Decorates another List to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/list/package-info.java b/src/main/java/org/apache/commons/collections4/list/package-info.java similarity index 97% rename from src/main/java/org/apache/commons/collections/list/package-info.java rename to src/main/java/org/apache/commons/collections4/list/package-info.java index 092822316..7ac1cae0d 100644 --- a/src/main/java/org/apache/commons/collections/list/package-info.java +++ b/src/main/java/org/apache/commons/collections4/list/package-info.java @@ -37,4 +37,4 @@ * * @version $Id$ */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; diff --git a/src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java similarity index 99% rename from src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java rename to src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java index 2f8e7cd40..3824c223c 100644 --- a/src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -29,11 +29,11 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.KeyValue; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.iterators.EmptyIterator; -import org.apache.commons.collections.iterators.EmptyMapIterator; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.KeyValue; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.iterators.EmptyIterator; +import org.apache.commons.collections4.iterators.EmptyMapIterator; /** * An abstract implementation of a hash-based map which provides numerous points for diff --git a/src/main/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java similarity index 96% rename from src/main/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java rename to src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java index 448aed4d4..8e7dbbf81 100644 --- a/src/main/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.lang.reflect.Array; import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.iterators.AbstractIteratorDecorator; -import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator; -import org.apache.commons.collections.set.AbstractSetDecorator; +import org.apache.commons.collections4.set.AbstractSetDecorator; +import org.apache.commons.collections4.iterators.AbstractIteratorDecorator; +import org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator; /** * An abstract base class that simplifies the task of creating map decorators. diff --git a/src/main/java/org/apache/commons/collections/map/AbstractIterableMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java similarity index 88% rename from src/main/java/org/apache/commons/collections/map/AbstractIterableMap.java rename to src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java index 679bfdaf9..104b4ba0d 100644 --- a/src/main/java/org/apache/commons/collections/map/AbstractIterableMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.MapIterator; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.MapIterator; /** * Provide a basic {@link IterableMap} implementation. diff --git a/src/main/java/org/apache/commons/collections/map/AbstractLinkedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java similarity index 97% rename from src/main/java/org/apache/commons/collections/map/AbstractLinkedMap.java rename to src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java index 35fdecb76..775bd7dd4 100644 --- a/src/main/java/org/apache/commons/collections/map/AbstractLinkedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.commons.collections.OrderedIterator; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.ResettableIterator; -import org.apache.commons.collections.iterators.EmptyOrderedIterator; -import org.apache.commons.collections.iterators.EmptyOrderedMapIterator; +import org.apache.commons.collections4.OrderedIterator; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.ResettableIterator; +import org.apache.commons.collections4.iterators.EmptyOrderedIterator; +import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator; /** * An abstract implementation of a hash-based map that links entries to create an diff --git a/src/main/java/org/apache/commons/collections/map/AbstractMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/map/AbstractMapDecorator.java rename to src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java index 509ff4d8f..f58b4ea00 100644 --- a/src/main/java/org/apache/commons/collections/map/AbstractMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java similarity index 94% rename from src/main/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java rename to src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java index 9bf78daca..0667680d7 100644 --- a/src/main/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.OrderedMapIterator; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.OrderedMapIterator; /** * Provides a base decorator that enables additional functionality to be added diff --git a/src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java similarity index 99% rename from src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java rename to src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java index 0cd69faa0..bbd67c03e 100644 --- a/src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -32,8 +32,8 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.keyvalue.DefaultMapEntry; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.keyvalue.DefaultMapEntry; /** * An abstract implementation of a hash-based map that allows the entries to diff --git a/src/main/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java similarity index 95% rename from src/main/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java rename to src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java index 24ec5bff9..cd6b82989 100644 --- a/src/main/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.Comparator; import java.util.Iterator; @@ -23,9 +23,9 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; -import org.apache.commons.collections.IterableSortedMap; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.iterators.ListIteratorWrapper; +import org.apache.commons.collections4.IterableSortedMap; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.iterators.ListIteratorWrapper; /** * Provides a base decorator that enables additional functionality to be added diff --git a/src/main/java/org/apache/commons/collections/map/CaseInsensitiveMap.java b/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java similarity index 99% rename from src/main/java/org/apache/commons/collections/map/CaseInsensitiveMap.java rename to src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java index 67a6e82f3..c107ddb81 100644 --- a/src/main/java/org/apache/commons/collections/map/CaseInsensitiveMap.java +++ b/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/apache/commons/collections/map/CompositeMap.java b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java similarity index 99% rename from src/main/java/org/apache/commons/collections/map/CompositeMap.java rename to src/main/java/org/apache/commons/collections4/map/CompositeMap.java index feadf9bbb..cbb39ed48 100644 --- a/src/main/java/org/apache/commons/collections/map/CompositeMap.java +++ b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.Serializable; @@ -22,9 +22,9 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.collection.CompositeCollection; -import org.apache.commons.collections.set.CompositeSet; +import org.apache.commons.collections4.set.CompositeSet; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.collection.CompositeCollection; /** * Decorates a map of other maps to provide a single unified view. diff --git a/src/main/java/org/apache/commons/collections/map/DefaultedMap.java b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java similarity index 96% rename from src/main/java/org/apache/commons/collections/map/DefaultedMap.java rename to src/main/java/org/apache/commons/collections4/map/DefaultedMap.java index 3e0f40a9e..7951d74e2 100644 --- a/src/main/java/org/apache/commons/collections/map/DefaultedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -23,10 +23,10 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections.Factory; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.functors.ConstantTransformer; -import org.apache.commons.collections.functors.FactoryTransformer; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.functors.ConstantTransformer; +import org.apache.commons.collections4.functors.FactoryTransformer; /** * Decorates another Map returning a default value if the map diff --git a/src/main/java/org/apache/commons/collections/map/EntrySetToMapIteratorAdapter.java b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java similarity index 94% rename from src/main/java/org/apache/commons/collections/map/EntrySetToMapIteratorAdapter.java rename to src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java index ba7203c1d..e0b917dee 100644 --- a/src/main/java/org/apache/commons/collections/map/EntrySetToMapIteratorAdapter.java +++ b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.ResettableIterator; /** * Adapts a Map entrySet to the MapIterator interface. diff --git a/src/main/java/org/apache/commons/collections/map/FixedSizeMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java similarity index 96% rename from src/main/java/org/apache/commons/collections/map/FixedSizeMap.java rename to src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java index c8b3c9c2a..8289e8f63 100644 --- a/src/main/java/org/apache/commons/collections/map/FixedSizeMap.java +++ b/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,9 +24,9 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.BoundedMap; -import org.apache.commons.collections.collection.UnmodifiableCollection; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.BoundedMap; +import org.apache.commons.collections4.collection.UnmodifiableCollection; /** * Decorates another Map to fix the size, preventing add/remove. diff --git a/src/main/java/org/apache/commons/collections/map/FixedSizeSortedMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java similarity index 95% rename from src/main/java/org/apache/commons/collections/map/FixedSizeSortedMap.java rename to src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java index f3de1eaee..31b329823 100644 --- a/src/main/java/org/apache/commons/collections/map/FixedSizeSortedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -25,10 +25,10 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; -import org.apache.commons.collections.BoundedMap; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.collection.UnmodifiableCollection; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.BoundedMap; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.collection.UnmodifiableCollection; /** * Decorates another SortedMap to fix the size blocking add/remove. diff --git a/src/main/java/org/apache/commons/collections/map/Flat3Map.java b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java similarity index 99% rename from src/main/java/org/apache/commons/collections/map/Flat3Map.java rename to src/main/java/org/apache/commons/collections4/map/Flat3Map.java index b137ccf79..3578d36ae 100644 --- a/src/main/java/org/apache/commons/collections/map/Flat3Map.java +++ b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -28,11 +28,11 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.ResettableIterator; -import org.apache.commons.collections.iterators.EmptyIterator; -import org.apache.commons.collections.iterators.EmptyMapIterator; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.ResettableIterator; +import org.apache.commons.collections4.iterators.EmptyIterator; +import org.apache.commons.collections4.iterators.EmptyMapIterator; /** * A Map implementation that stores data in simple fields until diff --git a/src/main/java/org/apache/commons/collections/map/HashedMap.java b/src/main/java/org/apache/commons/collections4/map/HashedMap.java similarity index 97% rename from src/main/java/org/apache/commons/collections/map/HashedMap.java rename to src/main/java/org/apache/commons/collections4/map/HashedMap.java index 485f4f85e..5eab2893c 100644 --- a/src/main/java/org/apache/commons/collections/map/HashedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/HashedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -27,7 +27,7 @@ import java.util.Map; * to HashMap. *

      * This implementation improves on the JDK1.4 HashMap by adding the - * {@link org.apache.commons.collections.MapIterator MapIterator} + * {@link org.apache.commons.collections4.MapIterator MapIterator} * functionality and many methods for subclassing. *

      * Note that HashedMap is not synchronized and is not thread-safe. diff --git a/src/main/java/org/apache/commons/collections/map/LRUMap.java b/src/main/java/org/apache/commons/collections4/map/LRUMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/map/LRUMap.java rename to src/main/java/org/apache/commons/collections4/map/LRUMap.java index 109b25c15..4c2c6e68d 100644 --- a/src/main/java/org/apache/commons/collections/map/LRUMap.java +++ b/src/main/java/org/apache/commons/collections4/map/LRUMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,7 +22,7 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections.BoundedMap; +import org.apache.commons.collections4.BoundedMap; /** * A Map implementation with a fixed maximum size which removes @@ -38,7 +38,7 @@ import org.apache.commons.collections.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.collections.MapIterator MapIterator} or {@link #entrySet()} iterator. + * {@link org.apache.commons.collections4.MapIterator MapIterator} or {@link #entrySet()} iterator. *

      * The map implements OrderedMap and entries may be queried using * the bidirectional OrderedMapIterator. The order returned is diff --git a/src/main/java/org/apache/commons/collections/map/LazyMap.java b/src/main/java/org/apache/commons/collections4/map/LazyMap.java similarity index 96% rename from src/main/java/org/apache/commons/collections/map/LazyMap.java rename to src/main/java/org/apache/commons/collections4/map/LazyMap.java index 5ef621bf6..ea9070431 100644 --- a/src/main/java/org/apache/commons/collections/map/LazyMap.java +++ b/src/main/java/org/apache/commons/collections4/map/LazyMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,9 +22,9 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections.Factory; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.functors.FactoryTransformer; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.functors.FactoryTransformer; /** * Decorates another Map to create objects in the map on demand. diff --git a/src/main/java/org/apache/commons/collections/map/LazySortedMap.java b/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java similarity index 97% rename from src/main/java/org/apache/commons/collections/map/LazySortedMap.java rename to src/main/java/org/apache/commons/collections4/map/LazySortedMap.java index 05ed96fe9..7b874bdfd 100644 --- a/src/main/java/org/apache/commons/collections/map/LazySortedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.Comparator; import java.util.SortedMap; -import org.apache.commons.collections.Factory; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.Transformer; /** * Decorates another SortedMap to create objects in the map on demand. diff --git a/src/main/java/org/apache/commons/collections/map/LinkedMap.java b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java similarity index 96% rename from src/main/java/org/apache/commons/collections/map/LinkedMap.java rename to src/main/java/org/apache/commons/collections4/map/LinkedMap.java index e69359182..eb5b44f3a 100644 --- a/src/main/java/org/apache/commons/collections/map/LinkedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -27,16 +27,16 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -import org.apache.commons.collections.iterators.UnmodifiableIterator; -import org.apache.commons.collections.iterators.UnmodifiableListIterator; -import org.apache.commons.collections.list.UnmodifiableList; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; +import org.apache.commons.collections4.iterators.UnmodifiableListIterator; +import org.apache.commons.collections4.list.UnmodifiableList; /** * A Map implementation that maintains the order of the entries. * In this implementation order is maintained by original insertion. *

      * This implementation improves on the JDK1.4 LinkedHashMap by adding the - * {@link org.apache.commons.collections.MapIterator MapIterator} + * {@link org.apache.commons.collections4.MapIterator MapIterator} * functionality, additional convenience methods and allowing * bidirectional iteration. It also implements OrderedMap. * In addition, non-interface methods are provided to access the map by index. diff --git a/src/main/java/org/apache/commons/collections/map/ListOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/map/ListOrderedMap.java rename to src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java index 337175c85..e3e48731b 100644 --- a/src/main/java/org/apache/commons/collections/map/ListOrderedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -32,12 +32,12 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.ResettableIterator; -import org.apache.commons.collections.iterators.AbstractUntypedIteratorDecorator; -import org.apache.commons.collections.keyvalue.AbstractMapEntry; -import org.apache.commons.collections.list.UnmodifiableList; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.ResettableIterator; +import org.apache.commons.collections4.iterators.AbstractUntypedIteratorDecorator; +import org.apache.commons.collections4.keyvalue.AbstractMapEntry; +import org.apache.commons.collections4.list.UnmodifiableList; /** * Decorates a Map to ensure that the order of addition is retained diff --git a/src/main/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java similarity index 99% rename from src/main/java/org/apache/commons/collections/map/MultiKeyMap.java rename to src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java index 8f558233d..48f7f9e77 100644 --- a/src/main/java/org/apache/commons/collections/map/MultiKeyMap.java +++ b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,9 +22,9 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.keyvalue.MultiKey; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.keyvalue.MultiKey; /** * A Map implementation that uses multiple keys to map the value. diff --git a/src/main/java/org/apache/commons/collections/map/MultiValueMap.java b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java similarity index 97% rename from src/main/java/org/apache/commons/collections/map/MultiValueMap.java rename to src/main/java/org/apache/commons/collections4/map/MultiValueMap.java index 132fa3c37..ac0bdfe92 100644 --- a/src/main/java/org/apache/commons/collections/map/MultiValueMap.java +++ b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -29,12 +29,12 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Factory; -import org.apache.commons.collections.FunctorException; -import org.apache.commons.collections.MultiMap; -import org.apache.commons.collections.iterators.EmptyIterator; -import org.apache.commons.collections.iterators.IteratorChain; +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.iterators.EmptyIterator; +import org.apache.commons.collections4.iterators.IteratorChain; /** * A MultiValueMap decorates another map, allowing it to have diff --git a/src/main/java/org/apache/commons/collections/map/PassiveExpiringMap.java b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java similarity index 99% rename from src/main/java/org/apache/commons/collections/map/PassiveExpiringMap.java rename to src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java index 56d5f4fb0..706c083bf 100644 --- a/src/main/java/org/apache/commons/collections/map/PassiveExpiringMap.java +++ b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -65,7 +65,7 @@ public class PassiveExpiringMap implements Serializable { /** - * A {@link org.apache.commons.collections.map.PassiveExpiringMap.ExpirationPolicy ExpirationPolicy} + * A {@link org.apache.commons.collections4.map.PassiveExpiringMap.ExpirationPolicy ExpirationPolicy} * that returns a 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/collections/map/PredicatedMap.java b/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/map/PredicatedMap.java rename to src/main/java/org/apache/commons/collections4/map/PredicatedMap.java index 5129f317f..d717ace4e 100644 --- a/src/main/java/org/apache/commons/collections/map/PredicatedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -23,7 +23,7 @@ import java.io.Serializable; import java.util.Iterator; import java.util.Map; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Decorates another Map to validate that additions diff --git a/src/main/java/org/apache/commons/collections/map/PredicatedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/map/PredicatedSortedMap.java rename to src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java index 0fd44e7e6..e847bde4c 100644 --- a/src/main/java/org/apache/commons/collections/map/PredicatedSortedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.Comparator; import java.util.SortedMap; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Decorates another SortedMap to validate that additions diff --git a/src/main/java/org/apache/commons/collections/map/ReferenceIdentityMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/map/ReferenceIdentityMap.java rename to src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java index d1582f652..d8978f597 100644 --- a/src/main/java/org/apache/commons/collections/map/ReferenceIdentityMap.java +++ b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -40,7 +40,7 @@ import java.lang.ref.Reference; * memory-sensitive cache. *

      * This map is similar to - * {@link org.apache.commons.collections.map.ReferenceMap ReferenceMap}. + * {@link org.apache.commons.collections4.map.ReferenceMap ReferenceMap}. * It differs in that keys and values in this class are compared using ==. *

      * This map will violate the detail of various Map and map view contracts. diff --git a/src/main/java/org/apache/commons/collections/map/ReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/map/ReferenceMap.java rename to src/main/java/org/apache/commons/collections4/map/ReferenceMap.java index c23007ff8..f229c570b 100644 --- a/src/main/java/org/apache/commons/collections/map/ReferenceMap.java +++ b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -41,7 +41,7 @@ import java.io.Serializable; * hard keys and soft values, providing a memory-sensitive cache. *

      * This map is similar to - * {@link org.apache.commons.collections.map.ReferenceIdentityMap ReferenceIdentityMap}. + * {@link org.apache.commons.collections4.map.ReferenceIdentityMap ReferenceIdentityMap}. * It differs in that keys and values in this class are compared using equals(). *

      * This {@link java.util.Map Map} implementation does not allow null elements. diff --git a/src/main/java/org/apache/commons/collections/map/SingletonMap.java b/src/main/java/org/apache/commons/collections4/map/SingletonMap.java similarity index 97% rename from src/main/java/org/apache/commons/collections/map/SingletonMap.java rename to src/main/java/org/apache/commons/collections4/map/SingletonMap.java index a1ee216aa..554aee4d7 100644 --- a/src/main/java/org/apache/commons/collections/map/SingletonMap.java +++ b/src/main/java/org/apache/commons/collections4/map/SingletonMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.Serializable; import java.util.AbstractSet; @@ -25,13 +25,13 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections.BoundedMap; -import org.apache.commons.collections.KeyValue; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.ResettableIterator; -import org.apache.commons.collections.iterators.SingletonIterator; -import org.apache.commons.collections.keyvalue.TiedMapEntry; +import org.apache.commons.collections4.BoundedMap; +import org.apache.commons.collections4.KeyValue; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.ResettableIterator; +import org.apache.commons.collections4.iterators.SingletonIterator; +import org.apache.commons.collections4.keyvalue.TiedMapEntry; /** * A Map implementation that holds a single item and is fixed size. diff --git a/src/main/java/org/apache/commons/collections/map/StaticBucketMap.java b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java similarity index 99% rename from src/main/java/org/apache/commons/collections/map/StaticBucketMap.java rename to src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java index f47d986b0..f2d989935 100644 --- a/src/main/java/org/apache/commons/collections/map/StaticBucketMap.java +++ b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.AbstractCollection; import java.util.AbstractSet; @@ -25,7 +25,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections.KeyValue; +import org.apache.commons.collections4.KeyValue; /** * A StaticBucketMap is an efficient, thread-safe implementation of diff --git a/src/main/java/org/apache/commons/collections/map/TransformedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/map/TransformedMap.java rename to src/main/java/org/apache/commons/collections4/map/TransformedMap.java index 23df66175..8d3725e22 100644 --- a/src/main/java/org/apache/commons/collections/map/TransformedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/TransformedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,7 +22,7 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Transformer; /** * Decorates another Map to transform objects that are added. diff --git a/src/main/java/org/apache/commons/collections/map/TransformedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java similarity index 98% rename from src/main/java/org/apache/commons/collections/map/TransformedSortedMap.java rename to src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java index 07ec45bb7..d42eecd29 100644 --- a/src/main/java/org/apache/commons/collections/map/TransformedSortedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.Comparator; import java.util.Map; import java.util.SortedMap; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Transformer; /** * Decorates another SortedMap to transform objects that are added. diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java similarity index 94% rename from src/main/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java index fb242c8a2..9355f4077 100644 --- a/src/main/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java +++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.lang.reflect.Array; import java.util.Collection; @@ -22,10 +22,10 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.iterators.AbstractIteratorDecorator; -import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator; -import org.apache.commons.collections.set.AbstractSetDecorator; +import org.apache.commons.collections4.set.AbstractSetDecorator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.iterators.AbstractIteratorDecorator; +import org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator; /** * Decorates a map entry Set to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java similarity index 90% rename from src/main/java/org/apache/commons/collections/map/UnmodifiableMap.java rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java index 07f432fc6..e29d2bb4e 100644 --- a/src/main/java/org/apache/commons/collections/map/UnmodifiableMap.java +++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,13 +24,13 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.collection.UnmodifiableCollection; -import org.apache.commons.collections.iterators.EntrySetMapIterator; -import org.apache.commons.collections.iterators.UnmodifiableMapIterator; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.collection.UnmodifiableCollection; +import org.apache.commons.collections4.iterators.EntrySetMapIterator; +import org.apache.commons.collections4.iterators.UnmodifiableMapIterator; /** * Decorates another Map to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java similarity index 91% rename from src/main/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java index 43fa0ac37..ea7a6c889 100644 --- a/src/main/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,12 +24,12 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.collection.UnmodifiableCollection; -import org.apache.commons.collections.iterators.UnmodifiableOrderedMapIterator; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.collection.UnmodifiableCollection; +import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator; /** * Decorates another OrderedMap to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java similarity index 95% rename from src/main/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java rename to src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java index 6889e3274..af6b14668 100644 --- a/src/main/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -26,9 +26,9 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.collection.UnmodifiableCollection; -import org.apache.commons.collections.set.UnmodifiableSet; +import org.apache.commons.collections4.set.UnmodifiableSet; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.collection.UnmodifiableCollection; /** * Decorates another SortedMap to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/map/package-info.java b/src/main/java/org/apache/commons/collections4/map/package-info.java similarity index 93% rename from src/main/java/org/apache/commons/collections/map/package-info.java rename to src/main/java/org/apache/commons/collections4/map/package-info.java index 30f4cc8dc..7407697ab 100644 --- a/src/main/java/org/apache/commons/collections/map/package-info.java +++ b/src/main/java/org/apache/commons/collections4/map/package-info.java @@ -16,8 +16,8 @@ */ /** * This package contains implementations of the {@link java.util.Map Map}, - * {@link org.apache.commons.collections.IterableMap IterableMap}, - * {@link org.apache.commons.collections.OrderedMap OrderedMap} and + * {@link org.apache.commons.collections4.IterableMap IterableMap}, + * {@link org.apache.commons.collections4.OrderedMap OrderedMap} and * {@link java.util.SortedMap SortedMap} interfaces. * A Map provides a lookup from a key to a value. * A number of implementations also support the new MapIterator interface that enables @@ -51,5 +51,5 @@ * * @version $Id$ */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; diff --git a/src/main/java/org/apache/commons/collections/overview.html b/src/main/java/org/apache/commons/collections4/overview.html similarity index 100% rename from src/main/java/org/apache/commons/collections/overview.html rename to src/main/java/org/apache/commons/collections4/overview.html diff --git a/src/main/java/org/apache/commons/collections/package-info.java b/src/main/java/org/apache/commons/collections4/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/collections/package-info.java rename to src/main/java/org/apache/commons/collections4/package-info.java index 0718841fe..d7229f522 100644 --- a/src/main/java/org/apache/commons/collections/package-info.java +++ b/src/main/java/org/apache/commons/collections4/package-info.java @@ -24,4 +24,4 @@ * * @version $Id$ */ -package org.apache.commons.collections; +package org.apache.commons.collections4; diff --git a/src/main/java/org/apache/commons/collections/queue/AbstractQueueDecorator.java b/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java similarity index 94% rename from src/main/java/org/apache/commons/collections/queue/AbstractQueueDecorator.java rename to src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java index 244406a46..065595e49 100644 --- a/src/main/java/org/apache/commons/collections/queue/AbstractQueueDecorator.java +++ b/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.queue; +package org.apache.commons.collections4.queue; import java.util.Queue; -import org.apache.commons.collections.collection.AbstractCollectionDecorator; +import org.apache.commons.collections4.collection.AbstractCollectionDecorator; /** * Decorates another {@link Queue} to provide additional behaviour. diff --git a/src/main/java/org/apache/commons/collections/queue/CircularFifoQueue.java b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java similarity index 99% rename from src/main/java/org/apache/commons/collections/queue/CircularFifoQueue.java rename to src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java index 6d22ac230..d80bb67d1 100644 --- a/src/main/java/org/apache/commons/collections/queue/CircularFifoQueue.java +++ b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.queue; +package org.apache.commons.collections4.queue; import java.io.IOException; import java.io.ObjectInputStream; @@ -27,7 +27,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Queue; -import org.apache.commons.collections.BoundedCollection; +import org.apache.commons.collections4.BoundedCollection; /** * CircularFifoQueue is a first-in first-out queue with a fixed size that diff --git a/src/main/java/org/apache/commons/collections/queue/PredicatedQueue.java b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java similarity index 95% rename from src/main/java/org/apache/commons/collections/queue/PredicatedQueue.java rename to src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java index df888af05..b4913c29a 100644 --- a/src/main/java/org/apache/commons/collections/queue/PredicatedQueue.java +++ b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.queue; +package org.apache.commons.collections4.queue; import java.util.Queue; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.collection.PredicatedCollection; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.collection.PredicatedCollection; /** * Decorates another {@link Queue} to validate that additions diff --git a/src/main/java/org/apache/commons/collections/queue/TransformedQueue.java b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java similarity index 96% rename from src/main/java/org/apache/commons/collections/queue/TransformedQueue.java rename to src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java index 2aab02536..ec934ffe8 100644 --- a/src/main/java/org/apache/commons/collections/queue/TransformedQueue.java +++ b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.queue; +package org.apache.commons.collections4.queue; import java.util.Queue; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.collection.TransformedCollection; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.collection.TransformedCollection; /** * Decorates another {@link Queue} to transform objects that are added. diff --git a/src/main/java/org/apache/commons/collections/queue/UnmodifiableQueue.java b/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java similarity index 96% rename from src/main/java/org/apache/commons/collections/queue/UnmodifiableQueue.java rename to src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java index 2f9471df6..253787665 100644 --- a/src/main/java/org/apache/commons/collections/queue/UnmodifiableQueue.java +++ b/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.queue; +package org.apache.commons.collections4.queue; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,8 +24,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.Queue; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.iterators.UnmodifiableIterator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; /** * Decorates another {@link Queue} to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/queue/package-info.java b/src/main/java/org/apache/commons/collections4/queue/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/collections/queue/package-info.java rename to src/main/java/org/apache/commons/collections4/queue/package-info.java index dd885add4..a351299e3 100644 --- a/src/main/java/org/apache/commons/collections/queue/package-info.java +++ b/src/main/java/org/apache/commons/collections4/queue/package-info.java @@ -31,4 +31,4 @@ * * @version $Id$ */ -package org.apache.commons.collections.queue; +package org.apache.commons.collections4.queue; diff --git a/src/main/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java rename to src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java index b286da8e2..b002381cd 100644 --- a/src/main/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java +++ b/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/org/apache/commons/collections/set/AbstractSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java similarity index 93% rename from src/main/java/org/apache/commons/collections/set/AbstractSetDecorator.java rename to src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java index 55d56ae3f..b12e627da 100644 --- a/src/main/java/org/apache/commons/collections/set/AbstractSetDecorator.java +++ b/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Set; -import org.apache.commons.collections.collection.AbstractCollectionDecorator; +import org.apache.commons.collections4.collection.AbstractCollectionDecorator; /** * Decorates another Set to provide additional behaviour. diff --git a/src/main/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java similarity index 98% rename from src/main/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java rename to src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java index e549331b5..7ef623374 100644 --- a/src/main/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java +++ b/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Comparator; import java.util.Set; diff --git a/src/main/java/org/apache/commons/collections/set/CompositeSet.java b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java similarity index 97% rename from src/main/java/org/apache/commons/collections/set/CompositeSet.java rename to src/main/java/org/apache/commons/collections4/set/CompositeSet.java index 2444d62f6..499ca0440 100644 --- a/src/main/java/org/apache/commons/collections/set/CompositeSet.java +++ b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.io.Serializable; import java.lang.reflect.Array; @@ -26,10 +26,10 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.iterators.EmptyIterator; -import org.apache.commons.collections.iterators.IteratorChain; -import org.apache.commons.collections.list.UnmodifiableList; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.iterators.EmptyIterator; +import org.apache.commons.collections4.iterators.IteratorChain; +import org.apache.commons.collections4.list.UnmodifiableList; /** * Decorates a set of other sets to provide a single unified view. @@ -39,7 +39,7 @@ import org.apache.commons.collections.list.UnmodifiableList; * If no strategy is provided then add is unsupported. *

      * From version 4.0, this class does not extend - * {@link org.apache.commons.collections.collection.CompositeCollection CompositeCollection} + * {@link org.apache.commons.collections4.collection.CompositeCollection CompositeCollection} * anymore due to its input restrictions (only accepts Sets). * See COLLECTIONS-424 * for more details. diff --git a/src/main/java/org/apache/commons/collections/set/ListOrderedSet.java b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java similarity index 98% rename from src/main/java/org/apache/commons/collections/set/ListOrderedSet.java rename to src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java index 72109c7ec..0d00c4fde 100644 --- a/src/main/java/org/apache/commons/collections/set/ListOrderedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.ArrayList; import java.util.Collection; @@ -24,9 +24,9 @@ import java.util.List; import java.util.ListIterator; import java.util.Set; -import org.apache.commons.collections.OrderedIterator; -import org.apache.commons.collections.iterators.AbstractIteratorDecorator; -import org.apache.commons.collections.list.UnmodifiableList; +import org.apache.commons.collections4.OrderedIterator; +import org.apache.commons.collections4.iterators.AbstractIteratorDecorator; +import org.apache.commons.collections4.list.UnmodifiableList; /** * Decorates another Set to ensure that the order of addition is diff --git a/src/main/java/org/apache/commons/collections/set/MapBackedSet.java b/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java similarity index 99% rename from src/main/java/org/apache/commons/collections/set/MapBackedSet.java rename to src/main/java/org/apache/commons/collections4/set/MapBackedSet.java index 7a22e5868..a7ff712c1 100644 --- a/src/main/java/org/apache/commons/collections/set/MapBackedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.io.Serializable; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/collections/set/PredicatedSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java similarity index 94% rename from src/main/java/org/apache/commons/collections/set/PredicatedSet.java rename to src/main/java/org/apache/commons/collections4/set/PredicatedSet.java index a64b4d53d..e175b7002 100644 --- a/src/main/java/org/apache/commons/collections/set/PredicatedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Set; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.collection.PredicatedCollection; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.collection.PredicatedCollection; /** * Decorates another Set to validate that all additions diff --git a/src/main/java/org/apache/commons/collections/set/PredicatedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java similarity index 97% rename from src/main/java/org/apache/commons/collections/set/PredicatedSortedSet.java rename to src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java index 13be8b2d8..53f8eed27 100644 --- a/src/main/java/org/apache/commons/collections/set/PredicatedSortedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Comparator; import java.util.SortedSet; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; /** * Decorates another SortedSet to validate that all additions diff --git a/src/main/java/org/apache/commons/collections/set/TransformedSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedSet.java similarity index 95% rename from src/main/java/org/apache/commons/collections/set/TransformedSet.java rename to src/main/java/org/apache/commons/collections4/set/TransformedSet.java index 92099cc53..1f8330d94 100644 --- a/src/main/java/org/apache/commons/collections/set/TransformedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/TransformedSet.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Set; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.collection.TransformedCollection; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.collection.TransformedCollection; /** * Decorates another Set to transform objects that are added. diff --git a/src/main/java/org/apache/commons/collections/set/TransformedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java similarity index 98% rename from src/main/java/org/apache/commons/collections/set/TransformedSortedSet.java rename to src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java index 62f2ed94b..380200b81 100644 --- a/src/main/java/org/apache/commons/collections/set/TransformedSortedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Comparator; import java.util.SortedSet; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Transformer; /** * Decorates another SortedSet to transform objects that are added. diff --git a/src/main/java/org/apache/commons/collections/set/UnmodifiableSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java similarity index 94% rename from src/main/java/org/apache/commons/collections/set/UnmodifiableSet.java rename to src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java index e9a537d83..603740dc0 100644 --- a/src/main/java/org/apache/commons/collections/set/UnmodifiableSet.java +++ b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Collection; import java.util.Iterator; import java.util.Set; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.iterators.UnmodifiableIterator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; /** * Decorates another Set to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java similarity index 96% rename from src/main/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java rename to src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java index a399a2cb5..67573cb89 100644 --- a/src/main/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.io.IOException; import java.io.ObjectInputStream; @@ -24,8 +24,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.SortedSet; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.iterators.UnmodifiableIterator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; /** * Decorates another SortedSet to ensure it can't be altered. diff --git a/src/main/java/org/apache/commons/collections/set/package-info.java b/src/main/java/org/apache/commons/collections4/set/package-info.java similarity index 97% rename from src/main/java/org/apache/commons/collections/set/package-info.java rename to src/main/java/org/apache/commons/collections4/set/package-info.java index 56d7698b6..0eb0975a6 100644 --- a/src/main/java/org/apache/commons/collections/set/package-info.java +++ b/src/main/java/org/apache/commons/collections4/set/package-info.java @@ -37,4 +37,4 @@ * * @version $Id$ */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; diff --git a/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java similarity index 90% rename from src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java rename to src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java index ba12e6ef8..c9f4f52a0 100644 --- a/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.splitmap; +package org.apache.commons.collections4.splitmap; import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.IterableGet; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.map.EntrySetToMapIteratorAdapter; +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} for the - * {@link org.apache.commons.collections.Get Get} implementation. + * {@link org.apache.commons.collections4.Get Get} implementation. * * @since 4.0 * @version $Id$ diff --git a/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java b/src/main/java/org/apache/commons/collections4/splitmap/TransformedMap.java similarity index 94% rename from src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java rename to src/main/java/org/apache/commons/collections4/splitmap/TransformedMap.java index 4b87aeb34..7c7f3f99f 100644 --- a/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java +++ b/src/main/java/org/apache/commons/collections4/splitmap/TransformedMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.splitmap; +package org.apache.commons.collections4.splitmap; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,9 +22,9 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Map; -import org.apache.commons.collections.Put; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.map.LinkedMap; +import org.apache.commons.collections4.Put; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.map.LinkedMap; /** * Decorates another {@link Map} to transform objects that are added. @@ -42,7 +42,7 @@ import org.apache.commons.collections.map.LinkedMap; * synchronization. *

      * The "put" and "get" type constraints of this class are mutually independent; - * contrast with {@link org.apache.commons.collections.map.TransformedMap} which, + * contrast with {@link org.apache.commons.collections4.map.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 >Object, Object>, defeating @@ -50,13 +50,13 @@ import org.apache.commons.collections.map.LinkedMap; *

      * On the downside, this class is not drop-in compatible with {@link java.util.Map} * but is intended to be worked with either directly or by {@link Put} and - * {@link org.apache.commons.collections.Get Get} generalizations. + * {@link org.apache.commons.collections4.Get Get} generalizations. * * @since 4.0 * @version $Id$ * - * @see org.apache.commons.collections.SplitMapUtils#readableMap(Get) - * @see org.apache.commons.collections.SplitMapUtils#writableMap(Put) + * @see org.apache.commons.collections4.SplitMapUtils#readableMap(Get) + * @see org.apache.commons.collections4.SplitMapUtils#writableMap(Put) */ public class TransformedMap extends AbstractIterableGetMapDecorator implements Put, Serializable { diff --git a/src/main/java/org/apache/commons/collections/splitmap/package-info.java b/src/main/java/org/apache/commons/collections4/splitmap/package-info.java similarity index 83% rename from src/main/java/org/apache/commons/collections/splitmap/package-info.java rename to src/main/java/org/apache/commons/collections4/splitmap/package-info.java index 1f4e85a9e..b4de18080 100644 --- a/src/main/java/org/apache/commons/collections/splitmap/package-info.java +++ b/src/main/java/org/apache/commons/collections4/splitmap/package-info.java @@ -16,8 +16,8 @@ */ /** * The "split map" concept is that of an object that implements - * the {@link org.apache.commons.collections.Put Put} and - * {@link org.apache.commons.collections.Get Get} interfaces, + * the {@link org.apache.commons.collections4.Put Put} and + * {@link org.apache.commons.collections4.Get Get} interfaces, * with differing generic types. This is like a pre-generics * {@link java.util.Map Map} whose input key/value constraints are * different than its output key/value constraints. While it would @@ -25,8 +25,8 @@ * key/value constraints, this would be a {@link java.util.Map Map} * and would therefore make little sense (any Commons Collections * {@link java.util.Map Map} implementation will also implement - * {@link org.apache.commons.collections.Put Put} and - * {@link org.apache.commons.collections.Get Get} with matching + * {@link org.apache.commons.collections4.Put Put} and + * {@link org.apache.commons.collections4.Get Get} with matching * generic parameters). *

      * The following decorators are provided: @@ -36,4 +36,4 @@ * * @version $Id$ */ -package org.apache.commons.collections.splitmap; +package org.apache.commons.collections4.splitmap; diff --git a/src/main/java/org/apache/commons/collections/trie/AbstractKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/AbstractKeyAnalyzer.java similarity index 97% rename from src/main/java/org/apache/commons/collections/trie/AbstractKeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/AbstractKeyAnalyzer.java index 37f369204..9d02fc974 100644 --- a/src/main/java/org/apache/commons/collections/trie/AbstractKeyAnalyzer.java +++ b/src/main/java/org/apache/commons/collections4/trie/AbstractKeyAnalyzer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; /** * TODO: add javadoc diff --git a/src/main/java/org/apache/commons/collections/trie/AbstractTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractTrie.java similarity index 98% rename from src/main/java/org/apache/commons/collections/trie/AbstractTrie.java rename to src/main/java/org/apache/commons/collections4/trie/AbstractTrie.java index 451bc9b21..2e508e619 100644 --- a/src/main/java/org/apache/commons/collections/trie/AbstractTrie.java +++ b/src/main/java/org/apache/commons/collections4/trie/AbstractTrie.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; import java.io.Serializable; import java.util.AbstractMap; import java.util.Map; -import org.apache.commons.collections.Trie; +import org.apache.commons.collections4.Trie; /** * This class provides some basic {@link Trie} functionality and diff --git a/src/main/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzer.java similarity index 99% rename from src/main/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzer.java index f9227fa7c..0dce8aa1b 100644 --- a/src/main/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzer.java +++ b/src/main/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; /** * A {@link KeyAnalyzer} for byte[]s. diff --git a/src/main/java/org/apache/commons/collections/trie/ByteKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/ByteKeyAnalyzer.java similarity index 98% rename from src/main/java/org/apache/commons/collections/trie/ByteKeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/ByteKeyAnalyzer.java index 5f4f0efff..1541fdca2 100644 --- a/src/main/java/org/apache/commons/collections/trie/ByteKeyAnalyzer.java +++ b/src/main/java/org/apache/commons/collections4/trie/ByteKeyAnalyzer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; /** * A {@link KeyAnalyzer} for {@link Byte}s. diff --git a/src/main/java/org/apache/commons/collections/trie/CharArrayKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/CharArrayKeyAnalyzer.java similarity index 99% rename from src/main/java/org/apache/commons/collections/trie/CharArrayKeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/CharArrayKeyAnalyzer.java index 712937b5c..23c4d8d01 100644 --- a/src/main/java/org/apache/commons/collections/trie/CharArrayKeyAnalyzer.java +++ b/src/main/java/org/apache/commons/collections4/trie/CharArrayKeyAnalyzer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; /** * An {@link KeyAnalyzer} for {@code char[]}s. diff --git a/src/main/java/org/apache/commons/collections/trie/CharacterKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/CharacterKeyAnalyzer.java similarity index 98% rename from src/main/java/org/apache/commons/collections/trie/CharacterKeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/CharacterKeyAnalyzer.java index f666e99af..10e2a3b52 100644 --- a/src/main/java/org/apache/commons/collections/trie/CharacterKeyAnalyzer.java +++ b/src/main/java/org/apache/commons/collections4/trie/CharacterKeyAnalyzer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; /** * A {@link KeyAnalyzer} for {@link Character}s. diff --git a/src/main/java/org/apache/commons/collections/trie/IntegerKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/IntegerKeyAnalyzer.java similarity index 98% rename from src/main/java/org/apache/commons/collections/trie/IntegerKeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/IntegerKeyAnalyzer.java index ad0db207b..6fb29ba40 100644 --- a/src/main/java/org/apache/commons/collections/trie/IntegerKeyAnalyzer.java +++ b/src/main/java/org/apache/commons/collections4/trie/IntegerKeyAnalyzer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; /** * A {@link KeyAnalyzer} for {@link Integer}s. diff --git a/src/main/java/org/apache/commons/collections/trie/KeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java similarity index 97% rename from src/main/java/org/apache/commons/collections/trie/KeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java index 8d16a16c3..5c3a7cbbd 100644 --- a/src/main/java/org/apache/commons/collections/trie/KeyAnalyzer.java +++ b/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; import java.io.Serializable; import java.util.Comparator; /** - * Defines the interface to analyze {@link org.apache.commons.collections.Trie Trie} keys on a bit level. + * Defines the interface to analyze {@link org.apache.commons.collections4.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. *

      diff --git a/src/main/java/org/apache/commons/collections/trie/LongKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/LongKeyAnalyzer.java similarity index 98% rename from src/main/java/org/apache/commons/collections/trie/LongKeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/LongKeyAnalyzer.java index 03b26a32e..b79569a6b 100644 --- a/src/main/java/org/apache/commons/collections/trie/LongKeyAnalyzer.java +++ b/src/main/java/org/apache/commons/collections4/trie/LongKeyAnalyzer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; /** * A {@link KeyAnalyzer} for {@link Long}s. diff --git a/src/main/java/org/apache/commons/collections/trie/PatriciaTrie.java b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java similarity index 99% rename from src/main/java/org/apache/commons/collections/trie/PatriciaTrie.java rename to src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java index bfd230f96..9bcf72fd4 100644 --- a/src/main/java/org/apache/commons/collections/trie/PatriciaTrie.java +++ b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; import java.util.AbstractMap; import java.util.AbstractSet; @@ -26,7 +26,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.SortedMap; -import org.apache.commons.collections.Trie; +import org.apache.commons.collections4.Trie; /** *

      PATRICIA {@link Trie}

      diff --git a/src/main/java/org/apache/commons/collections/trie/PatriciaTrieBase.java b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrieBase.java similarity index 99% rename from src/main/java/org/apache/commons/collections/trie/PatriciaTrieBase.java rename to src/main/java/org/apache/commons/collections4/trie/PatriciaTrieBase.java index 491f0e639..3e7341179 100644 --- a/src/main/java/org/apache/commons/collections/trie/PatriciaTrieBase.java +++ b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrieBase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; import java.util.AbstractCollection; import java.util.AbstractSet; @@ -25,7 +25,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections.Trie.Cursor.Decision; +import org.apache.commons.collections4.Trie.Cursor.Decision; /** * This class implements the base PATRICIA algorithm and everything that @@ -69,8 +69,8 @@ abstract class PatriciaTrieBase extends AbstractTrie { } /** - * Constructs a new {@link org.apache.commons.collections.Trie Trie} using the given {@link KeyAnalyzer} - * and initializes the {@link org.apache.commons.collections.Trie Trie} with the values from the + * Constructs a new {@link org.apache.commons.collections4.Trie Trie} using the given {@link KeyAnalyzer} + * and initializes the {@link org.apache.commons.collections4.Trie Trie} with the values from the * provided {@link Map}. */ public PatriciaTrieBase(final KeyAnalyzer keyAnalyzer, diff --git a/src/main/java/org/apache/commons/collections/trie/ShortKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/ShortKeyAnalyzer.java similarity index 98% rename from src/main/java/org/apache/commons/collections/trie/ShortKeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/ShortKeyAnalyzer.java index f936b7447..b2debe10d 100644 --- a/src/main/java/org/apache/commons/collections/trie/ShortKeyAnalyzer.java +++ b/src/main/java/org/apache/commons/collections4/trie/ShortKeyAnalyzer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; /** * A {@link KeyAnalyzer} for {@link Short}s. diff --git a/src/main/java/org/apache/commons/collections/trie/StringKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/StringKeyAnalyzer.java similarity index 99% rename from src/main/java/org/apache/commons/collections/trie/StringKeyAnalyzer.java rename to src/main/java/org/apache/commons/collections4/trie/StringKeyAnalyzer.java index 78317234a..eac7a12b4 100644 --- a/src/main/java/org/apache/commons/collections/trie/StringKeyAnalyzer.java +++ b/src/main/java/org/apache/commons/collections4/trie/StringKeyAnalyzer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; /** * An {@link KeyAnalyzer} for {@link String}s. diff --git a/src/main/java/org/apache/commons/collections/trie/SynchronizedTrie.java b/src/main/java/org/apache/commons/collections4/trie/SynchronizedTrie.java similarity index 97% rename from src/main/java/org/apache/commons/collections/trie/SynchronizedTrie.java rename to src/main/java/org/apache/commons/collections4/trie/SynchronizedTrie.java index 2b01b93f5..7394f768c 100644 --- a/src/main/java/org/apache/commons/collections/trie/SynchronizedTrie.java +++ b/src/main/java/org/apache/commons/collections4/trie/SynchronizedTrie.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; import java.io.Serializable; import java.util.Collection; @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; -import org.apache.commons.collections.Trie; -import org.apache.commons.collections.collection.SynchronizedCollection; +import org.apache.commons.collections4.Trie; +import org.apache.commons.collections4.collection.SynchronizedCollection; /** * A synchronized {@link Trie}. diff --git a/src/main/java/org/apache/commons/collections/trie/UnmodifiableTrie.java b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java similarity index 97% rename from src/main/java/org/apache/commons/collections/trie/UnmodifiableTrie.java rename to src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java index b27dcac14..992e35e5e 100644 --- a/src/main/java/org/apache/commons/collections/trie/UnmodifiableTrie.java +++ b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; import java.io.Serializable; import java.util.Collection; @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; -import org.apache.commons.collections.Trie; -import org.apache.commons.collections.Unmodifiable; +import org.apache.commons.collections4.Trie; +import org.apache.commons.collections4.Unmodifiable; /** * An unmodifiable {@link Trie}. diff --git a/src/main/java/org/apache/commons/collections/trie/package-info.java b/src/main/java/org/apache/commons/collections4/trie/package-info.java similarity index 92% rename from src/main/java/org/apache/commons/collections/trie/package-info.java rename to src/main/java/org/apache/commons/collections4/trie/package-info.java index 60479b605..5eeb55c55 100644 --- a/src/main/java/org/apache/commons/collections/trie/package-info.java +++ b/src/main/java/org/apache/commons/collections4/trie/package-info.java @@ -16,7 +16,7 @@ */ /** * This package contains implementations of the - * {@link org.apache.commons.collections.Trie Trie} interface. + * {@link org.apache.commons.collections4.Trie Trie} interface. *

      * The implementations are in the form of direct implementations and decorators. * A decorator wraps another implementation of the interface to add some @@ -35,4 +35,4 @@ * * @version $Id$ */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; diff --git a/src/test/java/org/apache/commons/collections/AbstractArrayListTest.java b/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/AbstractArrayListTest.java rename to src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java index 837d1f4e8..933c7dbca 100644 --- a/src/test/java/org/apache/commons/collections/AbstractArrayListTest.java +++ b/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.ArrayList; -import org.apache.commons.collections.list.AbstractListTest; +import org.apache.commons.collections4.list.AbstractListTest; /** * Abstract test class for ArrayList. diff --git a/src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java rename to src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java index 64d6f6791..003d918af 100644 --- a/src/test/java/org/apache/commons/collections/AbstractLinkedListTest.java +++ b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Arrays; import java.util.Collection; @@ -22,7 +22,7 @@ import java.util.LinkedList; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.collections.list.AbstractListTest; +import org.apache.commons.collections4.list.AbstractListTest; /** * Tests base {@link java.util.LinkedList} methods and contracts. diff --git a/src/test/java/org/apache/commons/collections/AbstractObjectTest.java b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/AbstractObjectTest.java rename to src/test/java/org/apache/commons/collections4/AbstractObjectTest.java index 8b298e946..603d5ab3e 100644 --- a/src/test/java/org/apache/commons/collections/AbstractObjectTest.java +++ b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -43,7 +43,7 @@ import java.io.Serializable; public abstract class AbstractObjectTest extends BulkTest { /** Current major release for Collections */ - public static final int COLLECTIONS_MAJOR_VERSION = 3; + public static final int COLLECTIONS_MAJOR_VERSION = 4; /** * JUnit constructor. @@ -209,9 +209,8 @@ public abstract class AbstractObjectTest extends BulkTest { //----------------------------------------------------------------------- /** * Get the version of Collections that this object tries to - * maintain serialization compatibility with. Defaults to 1, the - * earliest Collections version. (Note: some collections did not - * even exist in this version). + * maintain serialization compatibility with. Defaults to 4, due to + * the package change to collections4 introduced in version 4. * * This constant makes it possible for TestMap (and other subclasses, * if necessary) to automatically check SVN for a versionX copy of a @@ -224,7 +223,7 @@ public abstract class AbstractObjectTest extends BulkTest { * tested for compatibility with previous versions. */ public String getCompatibilityVersion() { - return "1"; + return "4"; } protected String getCanonicalEmptyCollectionName(final Object object) { diff --git a/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java b/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java rename to src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java index 76967808c..8a9ec1606 100644 --- a/src/test/java/org/apache/commons/collections/AbstractTreeMapTest.java +++ b/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.TreeMap; -import org.apache.commons.collections.map.AbstractMapTest; +import org.apache.commons.collections4.map.AbstractMapTest; /** * Tests TreeMap. diff --git a/src/test/java/org/apache/commons/collections/ArrayStackTest.java b/src/test/java/org/apache/commons/collections4/ArrayStackTest.java similarity index 86% rename from src/test/java/org/apache/commons/collections/ArrayStackTest.java rename to src/test/java/org/apache/commons/collections4/ArrayStackTest.java index 0b71ea601..a52875be6 100644 --- a/src/test/java/org/apache/commons/collections/ArrayStackTest.java +++ b/src/test/java/org/apache/commons/collections4/ArrayStackTest.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.EmptyStackException; +import org.apache.commons.collections4.ArrayStack; + import junit.framework.Test; /** @@ -107,5 +109,17 @@ public class ArrayStackTest extends AbstractArrayListTest { -1, stack.search("Missing Item")); } + + @Override + public String getCompatibilityVersion() { + return "4"; + } + +// public void testCreate() throws Exception { +// resetEmpty(); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/ArrayStack.emptyCollection.version4.obj"); +// resetFull(); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/ArrayStack.fullCollection.version4.obj"); +// } } diff --git a/src/test/java/org/apache/commons/collections/BagUtilsTest.java b/src/test/java/org/apache/commons/collections4/BagUtilsTest.java similarity index 86% rename from src/test/java/org/apache/commons/collections/BagUtilsTest.java rename to src/test/java/org/apache/commons/collections4/BagUtilsTest.java index d73d17525..6728ce481 100644 --- a/src/test/java/org/apache/commons/collections/BagUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/BagUtilsTest.java @@ -14,21 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import junit.framework.Test; -import org.apache.commons.collections.bag.HashBag; -import org.apache.commons.collections.bag.PredicatedBag; -import org.apache.commons.collections.bag.PredicatedSortedBag; -import org.apache.commons.collections.bag.SynchronizedBag; -import org.apache.commons.collections.bag.SynchronizedSortedBag; -import org.apache.commons.collections.bag.TransformedBag; -import org.apache.commons.collections.bag.TransformedSortedBag; -import org.apache.commons.collections.bag.TreeBag; -import org.apache.commons.collections.bag.UnmodifiableBag; -import org.apache.commons.collections.bag.UnmodifiableSortedBag; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.BagUtils; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.TransformerUtils; +import org.apache.commons.collections4.bag.HashBag; +import org.apache.commons.collections4.bag.PredicatedBag; +import org.apache.commons.collections4.bag.PredicatedSortedBag; +import org.apache.commons.collections4.bag.SynchronizedBag; +import org.apache.commons.collections4.bag.SynchronizedSortedBag; +import org.apache.commons.collections4.bag.TransformedBag; +import org.apache.commons.collections4.bag.TransformedSortedBag; +import org.apache.commons.collections4.bag.TreeBag; +import org.apache.commons.collections4.bag.UnmodifiableBag; +import org.apache.commons.collections4.bag.UnmodifiableSortedBag; +import org.apache.commons.collections4.functors.TruePredicate; /** * Tests for BagUtils factory methods. diff --git a/src/test/java/org/apache/commons/collections/BulkTest.java b/src/test/java/org/apache/commons/collections4/BulkTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/BulkTest.java rename to src/test/java/org/apache/commons/collections4/BulkTest.java index 40105ff13..ef3332f9f 100644 --- a/src/test/java/org/apache/commons/collections/BulkTest.java +++ b/src/test/java/org/apache/commons/collections4/BulkTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/ClosureUtilsTest.java rename to src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java index a24b6fe37..52037e2e8 100644 --- a/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.ArrayList; import java.util.Collection; @@ -24,11 +24,17 @@ import java.util.Map; import junit.framework.TestCase; -import org.apache.commons.collections.functors.EqualPredicate; -import org.apache.commons.collections.functors.ExceptionClosure; -import org.apache.commons.collections.functors.FalsePredicate; -import org.apache.commons.collections.functors.NOPClosure; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.ClosureUtils; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.PredicateUtils; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.functors.EqualPredicate; +import org.apache.commons.collections4.functors.ExceptionClosure; +import org.apache.commons.collections4.functors.FalsePredicate; +import org.apache.commons.collections4.functors.NOPClosure; +import org.apache.commons.collections4.functors.TruePredicate; /** * Tests the ClosureUtils class. diff --git a/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/CollectionUtilsTest.java rename to src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java index a72f91c51..1fa623ad0 100644 --- a/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; -import static org.apache.commons.collections.functors.EqualPredicate.equalPredicate; +import static org.apache.commons.collections4.functors.EqualPredicate.equalPredicate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; @@ -26,14 +26,23 @@ import static org.junit.Assert.fail; import java.util.*; -import org.apache.commons.collections.bag.HashBag; -import org.apache.commons.collections.collection.PredicatedCollection; -import org.apache.commons.collections.collection.SynchronizedCollection; -import org.apache.commons.collections.collection.TransformedCollection; -import org.apache.commons.collections.collection.UnmodifiableCollection; -import org.apache.commons.collections.functors.DefaultEquator; -import org.apache.commons.collections.functors.Equator; -import org.apache.commons.collections.queue.CircularFifoQueue; +import org.apache.commons.collections4.queue.CircularFifoQueue; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.ClosureUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.PredicateUtils; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.TransformerUtils; +import org.apache.commons.collections4.bag.HashBag; +import org.apache.commons.collections4.collection.PredicatedCollection; +import org.apache.commons.collections4.collection.SynchronizedCollection; +import org.apache.commons.collections4.collection.TransformedCollection; +import org.apache.commons.collections4.collection.UnmodifiableCollection; +import org.apache.commons.collections4.functors.DefaultEquator; +import org.apache.commons.collections4.functors.Equator; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java b/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java rename to src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java index 81f9b54b6..bf1e02ef3 100644 --- a/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; import java.util.StringTokenizer; +import org.apache.commons.collections4.EnumerationUtils; + import junit.framework.Test; /** diff --git a/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/FactoryUtilsTest.java rename to src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java index ce0084c65..890344a55 100644 --- a/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -26,8 +26,11 @@ import java.io.Serializable; import java.util.Date; import java.util.TimeZone; -import org.apache.commons.collections.functors.ConstantFactory; -import org.apache.commons.collections.functors.ExceptionFactory; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.FactoryUtils; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.functors.ConstantFactory; +import org.apache.commons.collections4.functors.ExceptionFactory; import org.junit.Test; /** diff --git a/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/IteratorUtilsTest.java rename to src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java index 3ec297e54..29b3d25a7 100644 --- a/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.ArrayList; import java.util.Arrays; @@ -25,11 +25,17 @@ import java.util.NoSuchElementException; import junit.framework.Test; -import org.apache.commons.collections.iterators.EmptyIterator; -import org.apache.commons.collections.iterators.EmptyListIterator; -import org.apache.commons.collections.iterators.EmptyMapIterator; -import org.apache.commons.collections.iterators.EmptyOrderedIterator; -import org.apache.commons.collections.iterators.EmptyOrderedMapIterator; +import org.apache.commons.collections4.IteratorUtils; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.OrderedIterator; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.ResettableIterator; +import org.apache.commons.collections4.ResettableListIterator; +import org.apache.commons.collections4.iterators.EmptyIterator; +import org.apache.commons.collections4.iterators.EmptyListIterator; +import org.apache.commons.collections4.iterators.EmptyMapIterator; +import org.apache.commons.collections4.iterators.EmptyOrderedIterator; +import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/test/java/org/apache/commons/collections/ListUtilsTest.java b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/ListUtilsTest.java rename to src/test/java/org/apache/commons/collections4/ListUtilsTest.java index f3ad7da82..08e8a8559 100644 --- a/src/test/java/org/apache/commons/collections/ListUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.ArrayList; import java.util.Arrays; @@ -25,8 +25,12 @@ import java.util.List; import junit.framework.Test; -import org.apache.commons.collections.functors.EqualPredicate; -import org.apache.commons.collections.list.PredicatedList; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.ListUtils; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.functors.EqualPredicate; +import org.apache.commons.collections4.list.PredicatedList; /** * Tests for ListUtils. diff --git a/src/test/java/org/apache/commons/collections/MapPerformance.java b/src/test/java/org/apache/commons/collections4/MapPerformance.java similarity index 98% rename from src/test/java/org/apache/commons/collections/MapPerformance.java rename to src/test/java/org/apache/commons/collections4/MapPerformance.java index f73bb563c..c52b8e741 100644 --- a/src/test/java/org/apache/commons/collections/MapPerformance.java +++ b/src/test/java/org/apache/commons/collections4/MapPerformance.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Collection; //import java.util.Collections; @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; //import java.util.TreeMap; -import org.apache.commons.collections.map.Flat3Map; +import org.apache.commons.collections4.map.Flat3Map; /** * MapPerformanceTest is designed to perform basic Map performance tests. diff --git a/src/test/java/org/apache/commons/collections/MapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/MapUtilsTest.java rename to src/test/java/org/apache/commons/collections4/MapUtilsTest.java index fa9ff9029..4633eab6f 100644 --- a/src/test/java/org/apache/commons/collections/MapUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -31,12 +31,20 @@ import java.util.ArrayList; import junit.framework.Test; -import org.apache.commons.collections.keyvalue.DefaultKeyValue; -import org.apache.commons.collections.keyvalue.DefaultMapEntry; -import org.apache.commons.collections.map.HashedMap; -import org.apache.commons.collections.map.LazyMap; -import org.apache.commons.collections.map.PredicatedMap; -import org.apache.commons.collections.collection.TransformedCollectionTest; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.FactoryUtils; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.IterableSortedMap; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.TransformerUtils; +import org.apache.commons.collections4.collection.TransformedCollectionTest; +import org.apache.commons.collections4.keyvalue.DefaultKeyValue; +import org.apache.commons.collections4.keyvalue.DefaultMapEntry; +import org.apache.commons.collections4.map.HashedMap; +import org.apache.commons.collections4.map.LazyMap; +import org.apache.commons.collections4.map.PredicatedMap; /** * Tests for MapUtils. diff --git a/src/test/java/org/apache/commons/collections/MockTestCase.java b/src/test/java/org/apache/commons/collections4/MockTestCase.java similarity index 98% rename from src/test/java/org/apache/commons/collections/MockTestCase.java rename to src/test/java/org/apache/commons/collections4/MockTestCase.java index bb6d42bea..ff290ffda 100644 --- a/src/test/java/org/apache/commons/collections/MockTestCase.java +++ b/src/test/java/org/apache/commons/collections4/MockTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java b/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/PredicateUtilsTest.java rename to src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java index d8f26743d..417f19124 100644 --- a/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; -import static org.apache.commons.collections.functors.NullPredicate.nullPredicate; -import static org.apache.commons.collections.functors.TruePredicate.truePredicate; +import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate; +import static org.apache.commons.collections4.functors.TruePredicate.truePredicate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; @@ -30,14 +30,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.collections.functors.AllPredicate; -import org.apache.commons.collections.functors.AbstractPredicateTest; -import org.apache.commons.collections.functors.EqualPredicate; -import org.apache.commons.collections.functors.ExceptionPredicate; -import org.apache.commons.collections.functors.FalsePredicate; -import org.apache.commons.collections.functors.NotNullPredicate; -import org.apache.commons.collections.functors.NullPredicate; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.PredicateUtils; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.TransformerUtils; +import org.apache.commons.collections4.functors.AbstractPredicateTest; +import org.apache.commons.collections4.functors.AllPredicate; +import org.apache.commons.collections4.functors.EqualPredicate; +import org.apache.commons.collections4.functors.ExceptionPredicate; +import org.apache.commons.collections4.functors.FalsePredicate; +import org.apache.commons.collections4.functors.NotNullPredicate; +import org.apache.commons.collections4.functors.NullPredicate; +import org.apache.commons.collections4.functors.TruePredicate; import org.junit.Test; /** diff --git a/src/test/java/org/apache/commons/collections/SetUtilsTest.java b/src/test/java/org/apache/commons/collections4/SetUtilsTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/SetUtilsTest.java rename to src/test/java/org/apache/commons/collections4/SetUtilsTest.java index 4fb480115..eee543eae 100644 --- a/src/test/java/org/apache/commons/collections/SetUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/SetUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.Arrays; import java.util.Collection; @@ -23,7 +23,9 @@ import java.util.Set; import junit.framework.Test; -import org.apache.commons.collections.set.PredicatedSet; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.SetUtils; +import org.apache.commons.collections4.set.PredicatedSet; /** * Tests for SetUtils. diff --git a/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java b/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java similarity index 92% rename from src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java rename to src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java index 8308bb187..8e02e5b08 100644 --- a/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java @@ -14,14 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections.functors.NOPTransformer; -import org.apache.commons.collections.map.HashedMap; -import org.apache.commons.collections.splitmap.TransformedMap; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.Put; +import org.apache.commons.collections4.SplitMapUtils; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.functors.NOPTransformer; +import org.apache.commons.collections4.map.HashedMap; +import org.apache.commons.collections4.splitmap.TransformedMap; /** * Tests for {@link TransformedMap} diff --git a/src/test/java/org/apache/commons/collections/TestUtils.java b/src/test/java/org/apache/commons/collections4/TestUtils.java similarity index 98% rename from src/test/java/org/apache/commons/collections/TestUtils.java rename to src/test/java/org/apache/commons/collections4/TestUtils.java index 54828dedb..9c1412467 100644 --- a/src/test/java/org/apache/commons/collections/TestUtils.java +++ b/src/test/java/org/apache/commons/collections4/TestUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import static org.junit.Assert.assertSame; diff --git a/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/TransformerUtilsTest.java rename to src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java index 5ad979eec..5b6af5fcc 100644 --- a/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections; +package org.apache.commons.collections4; import java.util.ArrayList; import java.util.Collection; @@ -24,14 +24,22 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.collections.functors.CloneTransformer; -import org.apache.commons.collections.functors.ConstantTransformer; -import org.apache.commons.collections.functors.EqualPredicate; -import org.apache.commons.collections.functors.ExceptionTransformer; -import org.apache.commons.collections.functors.FalsePredicate; -import org.apache.commons.collections.functors.NOPTransformer; -import org.apache.commons.collections.functors.StringValueTransformer; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.ClosureUtils; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.FactoryUtils; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.TransformerUtils; +import org.apache.commons.collections4.functors.CloneTransformer; +import org.apache.commons.collections4.functors.ConstantTransformer; +import org.apache.commons.collections4.functors.EqualPredicate; +import org.apache.commons.collections4.functors.ExceptionTransformer; +import org.apache.commons.collections4.functors.FalsePredicate; +import org.apache.commons.collections4.functors.NOPTransformer; +import org.apache.commons.collections4.functors.StringValueTransformer; +import org.apache.commons.collections4.functors.TruePredicate; /** * Tests the TransformerUtils class. diff --git a/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java rename to src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java index 67fd1844f..e03661c80 100644 --- a/src/test/java/org/apache/commons/collections/bag/AbstractBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.io.IOException; import java.io.Serializable; @@ -24,11 +24,12 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.collections.AbstractObjectTest; -import org.apache.commons.collections.Bag; +import org.apache.commons.collections4.AbstractObjectTest; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.bag.HashBag; /** - * Abstract test class for {@link org.apache.commons.collections.Bag Bag} methods and contracts. + * Abstract test class for {@link org.apache.commons.collections4.Bag Bag} methods and contracts. *

      * To use, simply extend this class, and implement * the {@link #makeObject} method. diff --git a/src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java similarity index 88% rename from src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java rename to src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java index daf762b38..8f0900b55 100644 --- a/src/test/java/org/apache/commons/collections/bag/AbstractSortedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; -import org.apache.commons.collections.SortedBag; +import org.apache.commons.collections4.SortedBag; /** * Abstract test class for - * {@link org.apache.commons.collections.SortedBag SortedBag} + * {@link org.apache.commons.collections4.SortedBag SortedBag} * methods and contracts. * * @since 3.0 diff --git a/src/test/java/org/apache/commons/collections/bag/HashBagTest.java b/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java similarity index 74% rename from src/test/java/org/apache/commons/collections/bag/HashBagTest.java rename to src/test/java/org/apache/commons/collections4/bag/HashBagTest.java index 172ba0e37..7e093a85a 100644 --- a/src/test/java/org/apache/commons/collections/bag/HashBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; -import org.apache.commons.collections.Bag; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.bag.HashBag; /** * Extension of {@link AbstractBagTest} for exercising the {@link HashBag} @@ -37,18 +38,18 @@ public class HashBagTest extends AbstractBagTest { @Override public String getCompatibilityVersion() { - return "3"; + return "4"; } // public void testCreate() throws Exception { -// Bag bag = makeBag(); -// writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/HashBag.emptyCollection.version3.obj"); -// bag = makeBag(); +// Bag bag = makeObject(); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/HashBag.emptyCollection.version4.obj"); +// bag = makeObject(); // bag.add("A"); // bag.add("A"); // bag.add("B"); // bag.add("B"); // bag.add("C"); -// writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/HashBag.fullCollection.version3.obj"); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/HashBag.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java similarity index 84% rename from src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java rename to src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java index b7c62c949..37e32c0b9 100644 --- a/src/test/java/org/apache/commons/collections/bag/PredicatedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.util.Set; -import org.apache.commons.collections.Bag; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.bag.HashBag; +import org.apache.commons.collections4.bag.PredicatedBag; +import org.apache.commons.collections4.functors.TruePredicate; /** * Extension of {@link AbstractBagTest} for exercising the {@link PredicatedBag} @@ -109,7 +111,7 @@ public class PredicatedBagTest extends AbstractBagTest { } try { decorateBag(new HashBag(), null); - fail("Expectiing IllegalArgumentException for null predicate."); + fail("Expecting IllegalArgumentException for null predicate."); } catch (final IllegalArgumentException e) { // expected } @@ -117,19 +119,19 @@ public class PredicatedBagTest extends AbstractBagTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { -// Bag bag = makeBag(); -// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedBag.emptyCollection.version3.1.obj"); -// bag = makeBag(); +// Bag bag = makeObject(); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedBag.emptyCollection.version4.obj"); +// bag = makeObject(); // bag.add("A"); // bag.add("A"); // bag.add("B"); // bag.add("B"); // bag.add("C"); -// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedBag.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedBag.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java similarity index 82% rename from src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java rename to src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java index 98b499b71..e40a254c3 100644 --- a/src/test/java/org/apache/commons/collections/bag/PredicatedSortedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; import java.util.Comparator; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.SortedBag; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.SortedBag; +import org.apache.commons.collections4.bag.PredicatedSortedBag; +import org.apache.commons.collections4.bag.TreeBag; +import org.apache.commons.collections4.functors.TruePredicate; /** * Extension of {@link AbstractSortedBagTest} for exercising the {@link PredicatedSortedBag} @@ -94,19 +96,19 @@ public class PredicatedSortedBagTest extends AbstractSortedBagTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { -// Bag bag = makeBag(); -// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedSortedBag.emptyCollection.version3.1.obj"); -// bag = makeBag(); +// org.apache.commons.collections4.Bag bag = makeObject(); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version4.obj"); +// bag = makeObject(); // bag.add("A"); // bag.add("A"); // bag.add("B"); // bag.add("B"); // bag.add("C"); -// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedSortedBag.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedSortedBag.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java similarity index 82% rename from src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java rename to src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java index 5b13633a8..72fe3b895 100644 --- a/src/test/java/org/apache/commons/collections/bag/TransformedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; -import org.apache.commons.collections.Bag; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.collection.TransformedCollectionTest; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.bag.HashBag; +import org.apache.commons.collections4.bag.TransformedBag; +import org.apache.commons.collections4.collection.TransformedCollectionTest; /** * Extension of {@link AbstractBagTest} for exercising the {@link TransformedBag} @@ -79,19 +81,19 @@ public class TransformedBagTest extends AbstractBagTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { -// Bag bag = makeBag(); -// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedBag.emptyCollection.version3.1.obj"); -// bag = makeBag(); +// Bag bag = makeObject(); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedBag.emptyCollection.version4.obj"); +// bag = makeObject(); // bag.add("A"); // bag.add("A"); // bag.add("B"); // bag.add("B"); // bag.add("C"); -// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedBag.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedBag.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java similarity index 78% rename from src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java rename to src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java index c31574dcc..c80c6ede9 100644 --- a/src/test/java/org/apache/commons/collections/bag/TransformedSortedBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java @@ -14,12 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; -import org.apache.commons.collections.Bag; -import org.apache.commons.collections.SortedBag; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.collection.TransformedCollectionTest; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.SortedBag; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.bag.TransformedBag; +import org.apache.commons.collections4.bag.TransformedSortedBag; +import org.apache.commons.collections4.bag.TreeBag; +import org.apache.commons.collections4.collection.TransformedCollectionTest; /** * Extension of {@link AbstractSortedBagTest} for exercising the {@link TransformedSortedBag} @@ -72,19 +75,19 @@ public class TransformedSortedBagTest extends AbstractSortedBagTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { -// Bag bag = makeBag(); -// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedSortedBag.emptyCollection.version3.1.obj"); -// bag = makeBag(); +// Bag bag = makeObject(); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedSortedBag.emptyCollection.version4.obj"); +// bag = makeObject(); // bag.add("A"); // bag.add("A"); // bag.add("B"); // bag.add("B"); // bag.add("C"); -// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedSortedBag.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedSortedBag.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/bag/TreeBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java similarity index 76% rename from src/test/java/org/apache/commons/collections/bag/TreeBagTest.java rename to src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java index 607749fed..926917d1c 100644 --- a/src/test/java/org/apache/commons/collections/bag/TreeBagTest.java +++ b/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bag; +package org.apache.commons.collections4.bag; -import org.apache.commons.collections.Bag; -import org.apache.commons.collections.SortedBag; +import org.apache.commons.collections4.Bag; +import org.apache.commons.collections4.SortedBag; +import org.apache.commons.collections4.bag.TreeBag; /** * Extension of {@link AbstractBagTest} for exercising the {@link TreeBag} @@ -68,18 +69,18 @@ public class TreeBagTest extends AbstractSortedBagTest { @Override public String getCompatibilityVersion() { - return "3"; + return "4"; } - // public void testCreate() throws Exception { - // Bag bag = makeBag(); - // writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/TreeBag.emptyCollection.version3.obj"); - // bag = makeBag(); - // bag.add("A"); - // bag.add("A"); - // bag.add("B"); - // bag.add("B"); - // bag.add("C"); - // writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/TreeBag.fullCollection.version3.obj"); - // } +// public void testCreate() throws Exception { +// Bag bag = makeObject(); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TreeBag.emptyCollection.version4.obj"); +// bag = makeObject(); +// bag.add("A"); +// bag.add("A"); +// bag.add("B"); +// bag.add("B"); +// bag.add("C"); +// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TreeBag.fullCollection.version4.obj"); +// } } diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java rename to src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java index 6a0723c0c..6f02fad8d 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.Collection; import java.util.HashMap; @@ -22,11 +22,11 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.BidiMap; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.iterators.AbstractMapIteratorTest; -import org.apache.commons.collections.map.AbstractIterableMapTest; +import org.apache.commons.collections4.BidiMap; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.iterators.AbstractMapIteratorTest; +import org.apache.commons.collections4.map.AbstractIterableMapTest; /** * Abstract test class for {@link BidiMap} methods and contracts. @@ -73,7 +73,7 @@ public abstract class AbstractBidiMapTest extends AbstractIterableMapTest< */ @Override public String getCompatibilityVersion() { - return "3"; + return "4"; } // BidiPut diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecoratorTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java similarity index 90% rename from src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecoratorTest.java rename to src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java index 8e8dca20e..d30d63f3c 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecoratorTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.collections.OrderedBidiMap; +import org.apache.commons.collections4.OrderedBidiMap; +import org.apache.commons.collections4.bidimap.AbstractOrderedBidiMapDecorator; +import org.apache.commons.collections4.bidimap.DualTreeBidiMap; /** * Test class for AbstractOrderedBidiMapDecorator. diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java rename to src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java index 1fc57e831..20443cbea 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.ArrayList; import java.util.Collections; @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.OrderedBidiMap; -import org.apache.commons.collections.iterators.AbstractMapIteratorTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.OrderedBidiMap; +import org.apache.commons.collections4.iterators.AbstractMapIteratorTest; /** * Abstract test class for {@link OrderedBidiMap} methods and contracts. diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapTest.java rename to src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java index 2fd954b93..953334a3b 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.ArrayList; import java.util.Collections; @@ -27,9 +27,9 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.SortedBidiMap; -import org.apache.commons.collections.map.AbstractSortedMapTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.SortedBidiMap; +import org.apache.commons.collections4.map.AbstractSortedMapTest; /** * Abstract test class for {@link SortedBidiMap} methods and contracts. diff --git a/src/test/java/org/apache/commons/collections/bidimap/DualHashBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java similarity index 78% rename from src/test/java/org/apache/commons/collections/bidimap/DualHashBidiMapTest.java rename to src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java index 2b45b9ea1..e64df27ed 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/DualHashBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.bidimap.DualHashBidiMap; /** * JUnit tests. @@ -52,8 +54,8 @@ public class DualHashBidiMapTest extends AbstractBidiMapTest { // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/DualHashBidiMap.emptyCollection.version3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/DualHashBidiMap.fullCollection.version3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualHashBidiMap.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java similarity index 79% rename from src/test/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMapTest.java rename to src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java index 4e487103a..f8eb4db37 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.bidimap.DualLinkedHashBidiMap; /** * JUnit tests. @@ -57,8 +59,8 @@ public class DualLinkedHashBidiMapTest extends AbstractBidiMapTest { // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMap2Test.java b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java similarity index 89% rename from src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMap2Test.java rename to src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java index ad3288a0f..9634e28a7 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMap2Test.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -28,10 +28,12 @@ import java.util.List; import java.util.TreeMap; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.SortedBidiMap; -import org.apache.commons.collections.comparators.ComparableComparator; -import org.apache.commons.collections.comparators.ReverseComparator; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.SortedBidiMap; +import org.apache.commons.collections4.bidimap.DualTreeBidiMap; +import org.apache.commons.collections4.comparators.ComparableComparator; +import org.apache.commons.collections4.comparators.ReverseComparator; /** * JUnit tests. @@ -144,7 +146,7 @@ public class DualTreeBidiMap2Test, V extends Comparable< @Override public String getCompatibilityVersion() { - return "3.Test2"; + return "4.Test2"; } /** @@ -157,8 +159,8 @@ public class DualTreeBidiMap2Test, V extends Comparable< // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/DualTreeBidiMap.emptyCollection.version3.Test2.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/DualTreeBidiMap.fullCollection.version3.Test2.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java similarity index 79% rename from src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMapTest.java rename to src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java index 465a2d78d..e0546cdde 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/DualTreeBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.bidimap.DualTreeBidiMap; /** * JUnit tests. @@ -52,8 +54,8 @@ public class DualTreeBidiMapTest, V extends Comparable, V extends Comparable> e @Override public String getCompatibilityVersion() { - return "3.3"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) map, "/tmp/TreeBidiMap.emptyCollection.version3.3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/TreeBidiMap.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) map, "/tmp/TreeBidiMap.fullCollection.version3.3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/TreeBidiMap.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java similarity index 88% rename from src/test/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMapTest.java rename to src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java index bb531a748..45ec1941b 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java @@ -14,14 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.HashMap; import java.util.Map; import junit.framework.Test; -import org.apache.commons.collections.BidiMap; -import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections4.BidiMap; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.bidimap.DualHashBidiMap; +import org.apache.commons.collections4.bidimap.UnmodifiableBidiMap; /** * JUnit tests. diff --git a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java similarity index 87% rename from src/test/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMapTest.java rename to src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java index d55fbb9db..8fb2e548c 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java @@ -14,15 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.Map; import java.util.TreeMap; import junit.framework.Test; -import org.apache.commons.collections.BidiMap; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.OrderedBidiMap; +import org.apache.commons.collections4.BidiMap; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.OrderedBidiMap; +import org.apache.commons.collections4.bidimap.TreeBidiMap; +import org.apache.commons.collections4.bidimap.UnmodifiableOrderedBidiMap; /** * JUnit tests. diff --git a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java similarity index 90% rename from src/test/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMapTest.java rename to src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java index d8383c473..879c952a6 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java @@ -14,14 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.bidimap; +package org.apache.commons.collections4.bidimap; import java.util.SortedMap; import java.util.TreeMap; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.SortedBidiMap; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.SortedBidiMap; +import org.apache.commons.collections4.bidimap.DualTreeBidiMap; +import org.apache.commons.collections4.bidimap.UnmodifiableSortedBidiMap; /** * JUnit tests. diff --git a/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java rename to src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java index d1d93c523..b1a3b9c40 100644 --- a/src/test/java/org/apache/commons/collections/collection/AbstractCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.commons.collections.AbstractObjectTest; +import org.apache.commons.collections4.AbstractObjectTest; /** * Abstract test class for {@link java.util.Collection} methods and contracts. @@ -90,7 +90,7 @@ import org.apache.commons.collections.AbstractObjectTest; * {@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.collections.map.AbstractMapTest AbstractTestMap} + * views of a map, {@link org.apache.commons.collections4.map.AbstractMapTest AbstractTestMap} * would override {@link #verify()} to make * sure the map is changed after the collection view is changed. *

      @@ -104,9 +104,9 @@ import org.apache.commons.collections.AbstractObjectTest; * Those methods should provide a confirmed collection implementation * that's compatible with your collection implementation. *

      - * If you're extending {@link org.apache.commons.collections.list.AbstractListTest AbstractListTest}, - * {@link org.apache.commons.collections.set.AbstractSetTest AbstractTestSet}, - * or {@link org.apache.commons.collections.bag.AbstractBagTest AbstractBagTest}, + * 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}, * 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.

      diff --git a/src/test/java/org/apache/commons/collections/collection/CompositeCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/collection/CompositeCollectionTest.java rename to src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java index 4508b27cc..d41f052d9 100644 --- a/src/test/java/org/apache/commons/collections/collection/CompositeCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.util.ArrayList; import java.util.Arrays; @@ -23,6 +23,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; +import org.apache.commons.collections4.collection.CompositeCollection; + /** * Extension of {@link AbstractCollectionTest} for exercising the * {@link CompositeCollection} implementation. @@ -371,14 +373,14 @@ public class CompositeCollectionTest extends AbstractCollectionTest { @Override public String getCompatibilityVersion() { - return "3.3"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "/tmp/CompositeCollection.emptyCollection.version3.3.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CompositeCollection.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "/tmp/CompositeCollection.fullCollection.version3.3.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CompositeCollection.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/collection/IndexedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/collection/IndexedCollectionTest.java rename to src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java index 4e71f636b..7653f261b 100644 --- a/src/test/java/org/apache/commons/collections/collection/IndexedCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import static java.util.Arrays.asList; @@ -24,8 +24,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.collection.IndexedCollection; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.collection.IndexedCollection; /** * Extension of {@link AbstractCollectionTest} for exercising the diff --git a/src/test/java/org/apache/commons/collections/collection/PredicatedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java similarity index 88% rename from src/test/java/org/apache/commons/collections/collection/PredicatedCollectionTest.java rename to src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java index 07051f54d..c4face208 100644 --- a/src/test/java/org/apache/commons/collections/collection/PredicatedCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.collection.PredicatedCollection; +import org.apache.commons.collections4.functors.TruePredicate; /** * Extension of {@link AbstractCollectionTest} for exercising the @@ -123,14 +124,14 @@ public class PredicatedCollectionTest extends AbstractCollectionTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedCollection.emptyCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedCollection.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedCollection.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedCollection.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/collection/SynchronizedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java similarity index 80% rename from src/test/java/org/apache/commons/collections/collection/SynchronizedCollectionTest.java rename to src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java index 8c29d69da..1974daf00 100644 --- a/src/test/java/org/apache/commons/collections/collection/SynchronizedCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import org.apache.commons.collections4.collection.SynchronizedCollection; + /** * Extension of {@link AbstractCollectionTest} for exercising the * {@link SynchronizedCollection} implementation. @@ -53,14 +55,14 @@ public class SynchronizedCollectionTest extends AbstractCollectionTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/SynchronizedCollection.emptyCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/SynchronizedCollection.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/SynchronizedCollection.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/SynchronizedCollection.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/collection/TransformedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java similarity index 88% rename from src/test/java/org/apache/commons/collections/collection/TransformedCollectionTest.java rename to src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java index bdb85c8f1..85448ca68 100644 --- a/src/test/java/org/apache/commons/collections/collection/TransformedCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.TransformerUtils; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.TransformerUtils; +import org.apache.commons.collections4.collection.TransformedCollection; /** * Extension of {@link AbstractCollectionTest} for exercising the {@link TransformedCollection} @@ -116,14 +117,14 @@ public class TransformedCollectionTest extends AbstractCollectionTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedCollection.emptyCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedCollection.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedCollection.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedCollection.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java similarity index 90% rename from src/test/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollectionTest.java rename to src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java index ca150a44e..4f3acb4ff 100644 --- a/src/test/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import org.apache.commons.collections.BoundedCollection; -import org.apache.commons.collections.list.FixedSizeList; +import org.apache.commons.collections4.BoundedCollection; +import org.apache.commons.collections4.collection.UnmodifiableBoundedCollection; +import org.apache.commons.collections4.list.FixedSizeList; /** * Extension of {@link AbstractCollectionTest} for exercising the @@ -78,6 +79,6 @@ public class UnmodifiableBoundedCollectionTest extends AbstractCollectionTest @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } } diff --git a/src/test/java/org/apache/commons/collections/collection/UnmodifiableCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java similarity index 83% rename from src/test/java/org/apache/commons/collections/collection/UnmodifiableCollectionTest.java rename to src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java index 5ac6226c1..e5077baa9 100644 --- a/src/test/java/org/apache/commons/collections/collection/UnmodifiableCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.collection; +package org.apache.commons.collections4.collection; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; +import org.apache.commons.collections4.collection.UnmodifiableCollection; + /** * Extension of {@link AbstractCollectionTest} for exercising the * {@link UnmodifiableCollection} implementation. @@ -71,14 +73,14 @@ public class UnmodifiableCollectionTest extends AbstractCollectionTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableCollection.emptyCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableCollection.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableCollection.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java rename to src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java index e39cbb881..1cafd5a8f 100644 --- a/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.io.FileNotFoundException; import java.io.IOException; @@ -24,7 +24,7 @@ import java.util.Comparator; import java.util.LinkedList; import java.util.List; -import org.apache.commons.collections.AbstractObjectTest; +import org.apache.commons.collections4.AbstractObjectTest; import org.junit.Test; /** @@ -78,15 +78,6 @@ public abstract class AbstractComparatorTest extends AbstractObjectTest { return false; } - /** - * Overrides superclass to set the compatability to version 2 - * as there were no Comparators in version 1.x. - */ - @Override - public String getCompatibilityVersion() { - return "2"; - } - //----------------------------------------------------------------------- /** * Reverse the list. diff --git a/src/test/java/org/apache/commons/collections/comparators/AbstractNullComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java similarity index 81% rename from src/test/java/org/apache/commons/collections/comparators/AbstractNullComparatorTest.java rename to src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java index 3047c2202..c2c5a4102 100644 --- a/src/test/java/org/apache/commons/collections/comparators/AbstractNullComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.util.Comparator; import java.util.LinkedList; import java.util.List; +import org.apache.commons.collections4.comparators.NullComparator; + import junit.framework.Test; import junit.framework.TestSuite; @@ -71,6 +73,16 @@ public abstract class AbstractNullComparatorTest extends AbstractComparatorTest< public String getCanonicalComparatorName(final Object object) { return super.getCanonicalComparatorName(object) + "1"; } + + @Override + public String getCompatibilityVersion() { + return "4"; + } + +// public void testCreate() throws Exception { +// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/NullComparator.version4.obj1"); +// } + } /** @@ -103,5 +115,15 @@ public abstract class AbstractNullComparatorTest extends AbstractComparatorTest< public String getCanonicalComparatorName(final Object object) { return super.getCanonicalComparatorName(object) + "2"; } + + @Override + public String getCompatibilityVersion() { + return "4"; + } + +// public void testCreate() throws Exception { +// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/NullComparator.version4.obj2"); +// } + } } diff --git a/src/test/java/org/apache/commons/collections/comparators/BooleanComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/comparators/BooleanComparatorTest.java rename to src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java index ecba85c19..df129f13d 100644 --- a/src/test/java/org/apache/commons/collections/comparators/BooleanComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import org.apache.commons.collections4.comparators.BooleanComparator; import org.junit.Test; /** @@ -59,9 +60,13 @@ public class BooleanComparatorTest extends AbstractComparatorTest { @Override public String getCompatibilityVersion() { - return "3"; + return "4"; } +// public void testCreate() throws Exception { +// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/BooleanComparator.version4.obj"); +// } + // tests // ------------------------------------------------------------------------ diff --git a/src/test/java/org/apache/commons/collections/comparators/ComparableComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java similarity index 78% rename from src/test/java/org/apache/commons/collections/comparators/ComparableComparatorTest.java rename to src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java index 8cc2f19cf..094428c50 100644 --- a/src/test/java/org/apache/commons/collections/comparators/ComparableComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.util.Comparator; import java.util.LinkedList; import java.util.List; +import org.apache.commons.collections4.comparators.ComparableComparator; + /** * Tests for ComparableComparator. * @@ -49,4 +51,13 @@ public class ComparableComparatorTest extends AbstractComparatorTest { return list; } + @Override + public String getCompatibilityVersion() { + return "4"; + } + +// public void testCreate() throws Exception { +// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/ComparableComparator.version4.obj"); +// } + } diff --git a/src/test/java/org/apache/commons/collections/comparators/ComparatorChainTest.java b/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/comparators/ComparatorChainTest.java rename to src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java index 51c2e4e01..ed0e8afd0 100644 --- a/src/test/java/org/apache/commons/collections/comparators/ComparatorChainTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.io.Serializable; import java.util.Comparator; import java.util.LinkedList; import java.util.List; +import org.apache.commons.collections4.comparators.ComparableComparator; +import org.apache.commons.collections4.comparators.ComparatorChain; import org.junit.Test; /** @@ -42,6 +44,15 @@ public class ComparatorChainTest extends AbstractComparatorTest chain = new ComparatorChain(); @@ -128,7 +139,6 @@ public class ComparatorChainTest extends AbstractComparatorTest { return "4"; } +// public void testCreate() throws Exception { +// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/FixedOrderComparator.version4.obj"); +// } + // // The tests // diff --git a/src/test/java/org/apache/commons/collections/comparators/ReverseComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java similarity index 84% rename from src/test/java/org/apache/commons/collections/comparators/ReverseComparatorTest.java rename to src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java index 6e247c652..eb73147ad 100644 --- a/src/test/java/org/apache/commons/collections/comparators/ReverseComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -25,6 +25,8 @@ import java.util.Comparator; import java.util.LinkedList; import java.util.List; +import org.apache.commons.collections4.comparators.ComparableComparator; +import org.apache.commons.collections4.comparators.ReverseComparator; import org.junit.Test; /** @@ -53,6 +55,15 @@ public class ReverseComparatorTest extends AbstractComparatorTest { return new ReverseComparator(Collections.reverseOrder()); } + @Override + public String getCompatibilityVersion() { + return "4"; + } + +// public void testCreate() throws Exception { +// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/ReverseComparator.version4.obj"); +// } + @Override public List getComparableObjectsOrdered() { final List list = new LinkedList(); @@ -67,7 +78,7 @@ public class ReverseComparatorTest extends AbstractComparatorTest { /** * Override this inherited test since Collections.reverseOrder * doesn't adhere to the "soft" Comparator contract, and we've - * already "cannonized" the comparator returned by makeComparator. + * already "canonized" the comparator returned by makeComparator. */ @Override @SuppressWarnings("unchecked") diff --git a/src/test/java/org/apache/commons/collections/comparators/TransformingComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java similarity index 81% rename from src/test/java/org/apache/commons/collections/comparators/TransformingComparatorTest.java rename to src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java index e3b61db07..2d447b2fa 100644 --- a/src/test/java/org/apache/commons/collections/comparators/TransformingComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators; +package org.apache.commons.collections4.comparators; import java.util.Comparator; import java.util.LinkedList; import java.util.List; -import org.apache.commons.collections.ComparatorUtils; -import org.apache.commons.collections.TransformerUtils; +import org.apache.commons.collections4.ComparatorUtils; +import org.apache.commons.collections4.TransformerUtils; +import org.apache.commons.collections4.comparators.ComparableComparator; /** * Test class for TransformingComparator. @@ -64,6 +65,10 @@ public class TransformingComparatorTest extends AbstractComparatorTest return "4"; } +// public void testCreate() throws Exception { +// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/TransformingComparator.version4.obj"); +// } + // // The tests // diff --git a/src/test/java/org/apache/commons/collections/comparators/sequence/SequencesComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/sequence/SequencesComparatorTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/comparators/sequence/SequencesComparatorTest.java rename to src/test/java/org/apache/commons/collections4/comparators/sequence/SequencesComparatorTest.java index dba8b163f..c7da7b1f1 100644 --- a/src/test/java/org/apache/commons/collections/comparators/sequence/SequencesComparatorTest.java +++ b/src/test/java/org/apache/commons/collections4/comparators/sequence/SequencesComparatorTest.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.comparators.sequence; +package org.apache.commons.collections4.comparators.sequence; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Random; +import org.apache.commons.collections4.comparators.sequence.CommandVisitor; +import org.apache.commons.collections4.comparators.sequence.SequencesComparator; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/org/apache/commons/collections/functors/AbstractAnyAllOnePredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/functors/AbstractAnyAllOnePredicateTest.java rename to src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java index a98b8504f..ac9765bc5 100644 --- a/src/test/java/org/apache/commons/collections/functors/AbstractAnyAllOnePredicateTest.java +++ b/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; + +import org.apache.commons.collections4.Predicate; -import org.apache.commons.collections.Predicate; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/org/apache/commons/collections/functors/AbstractClosureTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractClosureTest.java similarity index 92% rename from src/test/java/org/apache/commons/collections/functors/AbstractClosureTest.java rename to src/test/java/org/apache/commons/collections4/functors/AbstractClosureTest.java index a2010c270..d540127cf 100644 --- a/src/test/java/org/apache/commons/collections/functors/AbstractClosureTest.java +++ b/src/test/java/org/apache/commons/collections4/functors/AbstractClosureTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; -import org.apache.commons.collections.Closure; +import org.apache.commons.collections4.Closure; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/collections/functors/AbstractCompositePredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/functors/AbstractCompositePredicateTest.java rename to src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java index 64094e6a8..d5947cb21 100644 --- a/src/test/java/org/apache/commons/collections/functors/AbstractCompositePredicateTest.java +++ b/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/collections/functors/AbstractMockPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/functors/AbstractMockPredicateTest.java rename to src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java index d7e43849c..daa7ed191 100644 --- a/src/test/java/org/apache/commons/collections/functors/AbstractMockPredicateTest.java +++ b/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import static org.easymock.EasyMock.verify; import static org.easymock.EasyMock.replay; import org.junit.Before; import org.junit.After; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; import org.easymock.EasyMock; import java.util.ArrayList; diff --git a/src/test/java/org/apache/commons/collections/functors/AbstractPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractPredicateTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/functors/AbstractPredicateTest.java rename to src/test/java/org/apache/commons/collections4/functors/AbstractPredicateTest.java index 7a2156730..fd5a88bd4 100644 --- a/src/test/java/org/apache/commons/collections/functors/AbstractPredicateTest.java +++ b/src/test/java/org/apache/commons/collections4/functors/AbstractPredicateTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/collections/functors/AllPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/functors/AllPredicateTest.java rename to src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java index b97b986ab..f2cb1e5af 100644 --- a/src/test/java/org/apache/commons/collections/functors/AllPredicateTest.java +++ b/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.functors.AllPredicate; -import static org.apache.commons.collections.functors.AllPredicate.allPredicate; +import static org.apache.commons.collections4.functors.AllPredicate.allPredicate; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/collections/functors/CatchAndRethrowClosureTest.java b/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java similarity index 92% rename from src/test/java/org/apache/commons/collections/functors/CatchAndRethrowClosureTest.java rename to src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java index d17127605..111f76e54 100644 --- a/src/test/java/org/apache/commons/collections/functors/CatchAndRethrowClosureTest.java +++ b/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; import java.io.IOException; -import org.apache.commons.collections.Closure; -import org.apache.commons.collections.FunctorException; +import org.apache.commons.collections4.Closure; +import org.apache.commons.collections4.FunctorException; +import org.apache.commons.collections4.functors.CatchAndRethrowClosure; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/collections/functors/ComparatorPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/functors/ComparatorPredicateTest.java rename to src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java index a9476b641..12d541e24 100644 --- a/src/test/java/org/apache/commons/collections/functors/ComparatorPredicateTest.java +++ b/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; + +import static org.apache.commons.collections4.functors.ComparatorPredicate.*; -import static org.apache.commons.collections.functors.ComparatorPredicate.*; import java.util.Comparator; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/collections/functors/EqualPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/EqualPredicateTest.java similarity index 88% rename from src/test/java/org/apache/commons/collections/functors/EqualPredicateTest.java rename to src/test/java/org/apache/commons/collections4/functors/EqualPredicateTest.java index 13e2069b5..4dd024ade 100644 --- a/src/test/java/org/apache/commons/collections/functors/EqualPredicateTest.java +++ b/src/test/java/org/apache/commons/collections4/functors/EqualPredicateTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; -import static org.apache.commons.collections.functors.EqualPredicate.equalPredicate; -import static org.apache.commons.collections.functors.NullPredicate.nullPredicate; +import static org.apache.commons.collections4.functors.EqualPredicate.equalPredicate; +import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate; import static org.junit.Assert.assertSame; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/collections/functors/NullPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/NullPredicateTest.java similarity index 85% rename from src/test/java/org/apache/commons/collections/functors/NullPredicateTest.java rename to src/test/java/org/apache/commons/collections4/functors/NullPredicateTest.java index ceb338969..d0cacf601 100644 --- a/src/test/java/org/apache/commons/collections/functors/NullPredicateTest.java +++ b/src/test/java/org/apache/commons/collections4/functors/NullPredicateTest.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.functors; +package org.apache.commons.collections4.functors; -import static org.apache.commons.collections.functors.NullPredicate.nullPredicate; +import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate; import static org.junit.Assert.assertSame; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.functors.NullPredicate; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/collections/iterators/AbstractIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/iterators/AbstractIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java index b9095c946..4d9b5a030 100644 --- a/src/test/java/org/apache/commons/collections/iterators/AbstractIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.AbstractObjectTest; +import org.apache.commons.collections4.AbstractObjectTest; /** * Abstract class for testing the Iterator interface. diff --git a/src/test/java/org/apache/commons/collections/iterators/AbstractListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/iterators/AbstractListIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java index 6a20aa757..b7db7242b 100644 --- a/src/test/java/org/apache/commons/collections/iterators/AbstractListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.ListIterator; diff --git a/src/test/java/org/apache/commons/collections/iterators/AbstractMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/iterators/AbstractMapIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java index b0010cf0a..1cdfde002 100644 --- a/src/test/java/org/apache/commons/collections/iterators/AbstractMapIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.HashSet; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections.MapIterator; +import org.apache.commons.collections4.MapIterator; /** * Abstract class for testing the MapIterator interface. diff --git a/src/test/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java index cd7990495..f33c364c3 100644 --- a/src/test/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.HashSet; @@ -24,7 +24,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.apache.commons.collections.OrderedMapIterator; +import org.apache.commons.collections4.OrderedMapIterator; /** * Abstract class for testing the OrderedMapIterator interface. diff --git a/src/test/java/org/apache/commons/collections/iterators/ArrayIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java similarity index 98% rename from src/test/java/org/apache/commons/collections/iterators/ArrayIterator2Test.java rename to src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java index ca57eeec7..cafe66da6 100644 --- a/src/test/java/org/apache/commons/collections/iterators/ArrayIterator2Test.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; +import org.apache.commons.collections4.iterators.ArrayIterator; + /** * Tests the ArrayIterator with primitive type arrays. * diff --git a/src/test/java/org/apache/commons/collections/iterators/ArrayIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/iterators/ArrayIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java index e2b557b9d..0ed3014bc 100644 --- a/src/test/java/org/apache/commons/collections/iterators/ArrayIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; +import org.apache.commons.collections4.iterators.ArrayIterator; + /** * Tests the ArrayIterator to ensure that the next() method will actually * perform the iteration rather than the hasNext() method. diff --git a/src/test/java/org/apache/commons/collections/iterators/ArrayListIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java similarity index 93% rename from src/test/java/org/apache/commons/collections/iterators/ArrayListIterator2Test.java rename to src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java index 99c96cadb..5af64251c 100644 --- a/src/test/java/org/apache/commons/collections/iterators/ArrayListIterator2Test.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; + +import org.apache.commons.collections4.iterators.ArrayListIterator; /** * Test the ArrayListIterator class with primitives. diff --git a/src/test/java/org/apache/commons/collections/iterators/ArrayListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/iterators/ArrayListIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java index 6a886c897..5fa2df571 100644 --- a/src/test/java/org/apache/commons/collections/iterators/ArrayListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Arrays; import java.util.ListIterator; import java.util.NoSuchElementException; +import org.apache.commons.collections4.iterators.ArrayListIterator; + /** * Test the ArrayListIterator class. * diff --git a/src/test/java/org/apache/commons/collections/iterators/CollatingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/iterators/CollatingIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java index 3bc82b01e..e6f83a803 100644 --- a/src/test/java/org/apache/commons/collections/iterators/CollatingIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.List; -import org.apache.commons.collections.comparators.ComparableComparator; +import org.apache.commons.collections4.comparators.ComparableComparator; +import org.apache.commons.collections4.iterators.CollatingIterator; /** * Unit test suite for {@link CollatingIterator}. diff --git a/src/test/java/org/apache/commons/collections/iterators/FilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/iterators/FilterIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java index 39d2c4fe3..0afd12560 100644 --- a/src/test/java/org/apache/commons/collections/iterators/FilterIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; -import static org.apache.commons.collections.functors.TruePredicate.truePredicate; +import static org.apache.commons.collections4.functors.TruePredicate.truePredicate; import java.util.ArrayList; import java.util.Arrays; @@ -25,8 +25,10 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.functors.NotNullPredicate; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.functors.NotNullPredicate; +import org.apache.commons.collections4.iterators.ArrayIterator; +import org.apache.commons.collections4.iterators.FilterIterator; /** * Test the filter iterator. diff --git a/src/test/java/org/apache/commons/collections/iterators/FilterListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/iterators/FilterListIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java index eeb072a54..2389667c1 100644 --- a/src/test/java/org/apache/commons/collections/iterators/FilterListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Collection; @@ -23,9 +23,10 @@ import java.util.ListIterator; import java.util.Random; import junit.framework.TestCase; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.PredicateUtils; -import org.apache.commons.collections.list.GrowthList; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.PredicateUtils; +import org.apache.commons.collections4.iterators.FilterListIterator; +import org.apache.commons.collections4.list.GrowthList; import org.junit.Assert; /** diff --git a/src/test/java/org/apache/commons/collections/iterators/IteratorChainTest.java b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/iterators/IteratorChainTest.java rename to src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java index fd8605562..9d0eada4e 100644 --- a/src/test/java/org/apache/commons/collections/iterators/IteratorChainTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.collections.IteratorUtils; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.IteratorUtils; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.iterators.IteratorChain; /** * Tests the IteratorChain class. diff --git a/src/test/java/org/apache/commons/collections/iterators/IteratorIterableTest.java b/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/iterators/IteratorIterableTest.java rename to src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java index 87e1709bc..8040bbe4a 100644 --- a/src/test/java/org/apache/commons/collections/iterators/IteratorIterableTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java @@ -11,7 +11,7 @@ * KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Iterator; @@ -19,7 +19,8 @@ import java.util.List; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.iterators.IteratorIterable; /** * Tests for IteratorIterable. diff --git a/src/test/java/org/apache/commons/collections/iterators/LazyIteratorChainTest.java b/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/iterators/LazyIteratorChainTest.java rename to src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java index b362955ed..ff0d03088 100644 --- a/src/test/java/org/apache/commons/collections/iterators/LazyIteratorChainTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.collections.IteratorUtils; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.IteratorUtils; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.iterators.LazyIteratorChain; /** * Tests the LazyIteratorChain class. diff --git a/src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapper2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java similarity index 97% rename from src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapper2Test.java rename to src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java index ded75441d..951900865 100644 --- a/src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapper2Test.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableListIterator; +import org.apache.commons.collections4.ResettableListIterator; +import org.apache.commons.collections4.iterators.ListIteratorWrapper; /** * Tests the ListIteratorWrapper to insure that it behaves as expected when wrapping a ListIterator. diff --git a/src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapperTest.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapperTest.java rename to src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java index 5efb97542..c6e175ce9 100644 --- a/src/test/java/org/apache/commons/collections/iterators/ListIteratorWrapperTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableListIterator; +import org.apache.commons.collections4.ResettableListIterator; +import org.apache.commons.collections4.iterators.ListIteratorWrapper; /** * Tests the ListIteratorWrapper to insure that it simulates diff --git a/src/test/java/org/apache/commons/collections/iterators/LoopingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/iterators/LoopingIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java index fc1599440..3dbaa9925 100644 --- a/src/test/java/org/apache/commons/collections/iterators/LoopingIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.NoSuchElementException; +import org.apache.commons.collections4.iterators.LoopingIterator; + import junit.framework.TestCase; /** diff --git a/src/test/java/org/apache/commons/collections/iterators/LoopingListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/iterators/LoopingListIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java index bb0969be4..6e8411f47 100644 --- a/src/test/java/org/apache/commons/collections/iterators/LoopingListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.NoSuchElementException; +import org.apache.commons.collections4.iterators.LoopingListIterator; + import junit.framework.TestCase; /** diff --git a/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java index 51031363e..4c206a1e8 100644 --- a/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; + +import org.apache.commons.collections4.iterators.NodeListIterator; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/iterators/ObjectArrayIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java index d8395887b..b3c6b9812 100644 --- a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; +import org.apache.commons.collections4.iterators.ObjectArrayIterator; + /** * Tests the ObjectArrayIterator. * diff --git a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java similarity index 93% rename from src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIterator2Test.java rename to src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java index 458bebbc0..7c61dddbc 100644 --- a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIterator2Test.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; + +import org.apache.commons.collections4.iterators.ObjectArrayListIterator; /** * Tests the ObjectArrayListIterator class. diff --git a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java index a05c1ad68..92c9336b9 100644 --- a/src/test/java/org/apache/commons/collections/iterators/ObjectArrayListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Arrays; import java.util.ListIterator; import java.util.NoSuchElementException; +import org.apache.commons.collections4.iterators.ObjectArrayListIterator; + /** * Tests the ObjectArrayListIterator class. * diff --git a/src/test/java/org/apache/commons/collections/iterators/ObjectGraphIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/iterators/ObjectGraphIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java index b52d73190..a3068910d 100644 --- a/src/test/java/org/apache/commons/collections/iterators/ObjectGraphIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.collections.IteratorUtils; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.IteratorUtils; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.iterators.ObjectGraphIterator; /** * Testcase. diff --git a/src/test/java/org/apache/commons/collections/iterators/ReverseListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/iterators/ReverseListIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java index 993fde7f9..ccb9c7ada 100644 --- a/src/test/java/org/apache/commons/collections/iterators/ReverseListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Arrays; @@ -22,7 +22,8 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableListIterator; +import org.apache.commons.collections4.ResettableListIterator; +import org.apache.commons.collections4.iterators.ReverseListIterator; /** * Tests the ReverseListIterator. diff --git a/src/test/java/org/apache/commons/collections/iterators/SingletonIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java similarity index 94% rename from src/test/java/org/apache/commons/collections/iterators/SingletonIterator2Test.java rename to src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java index 366fb615f..45ca9223c 100644 --- a/src/test/java/org/apache/commons/collections/iterators/SingletonIterator2Test.java +++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.ResettableIterator; +import org.apache.commons.collections4.iterators.SingletonIterator; /** * Tests the SingletonIterator to ensure that the next() method will actually diff --git a/src/test/java/org/apache/commons/collections/iterators/SingletonIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/iterators/SingletonIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java index c051204c8..3214a3b76 100644 --- a/src/test/java/org/apache/commons/collections/iterators/SingletonIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableIterator; +import org.apache.commons.collections4.ResettableIterator; +import org.apache.commons.collections4.iterators.SingletonIterator; /** * Tests the SingletonIterator to ensure that the next() method will actually diff --git a/src/test/java/org/apache/commons/collections/iterators/SingletonListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/iterators/SingletonListIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java index 7f38b7d46..3c4f2fde4 100644 --- a/src/test/java/org/apache/commons/collections/iterators/SingletonListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.ResettableListIterator; +import org.apache.commons.collections4.ResettableListIterator; +import org.apache.commons.collections4.iterators.SingletonListIterator; /** * Tests the SingletonListIterator. diff --git a/src/test/java/org/apache/commons/collections/iterators/UniqueFilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/iterators/UniqueFilterIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java index 552c803ed..9ba4ce46a 100644 --- a/src/test/java/org/apache/commons/collections/iterators/UniqueFilterIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; +import org.apache.commons.collections4.iterators.UniqueFilterIterator; + /** * Tests the UniqueFilterIterator class. * diff --git a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/iterators/UnmodifiableIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java index 1a5703b9c..1e4c04494 100644 --- a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Arrays; @@ -22,7 +22,8 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.commons.collections.Unmodifiable; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.iterators.UnmodifiableIterator; /** * Tests the UnmodifiableIterator. diff --git a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/iterators/UnmodifiableListIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java index a73a1574c..b4e3ef4bf 100644 --- a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableListIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.ArrayList; import java.util.Arrays; @@ -22,7 +22,8 @@ import java.util.Collections; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections.Unmodifiable; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.iterators.UnmodifiableListIterator; /** * Tests the UnmodifiableListIterator. diff --git a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java similarity index 89% rename from src/test/java/org/apache/commons/collections/iterators/UnmodifiableMapIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java index eeb04c717..9097b37be 100644 --- a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableMapIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.bidimap.DualHashBidiMap; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.bidimap.DualHashBidiMap; +import org.apache.commons.collections4.iterators.UnmodifiableMapIterator; /** * Tests the UnmodifiableMapIterator. diff --git a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java similarity index 89% rename from src/test/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIteratorTest.java rename to src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java index 8a8ba2c42..e5cc61b0a 100644 --- a/src/test/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIteratorTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java @@ -14,16 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.iterators; +package org.apache.commons.collections4.iterators; import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.Unmodifiable; -import org.apache.commons.collections.map.ListOrderedMap; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator; +import org.apache.commons.collections4.map.ListOrderedMap; /** * Tests the UnmodifiableOrderedMapIterator. diff --git a/src/test/java/org/apache/commons/collections/keyvalue/AbstractMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/keyvalue/AbstractMapEntryTest.java rename to src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java index dddf91d37..423bf8da6 100644 --- a/src/test/java/org/apache/commons/collections/keyvalue/AbstractMapEntryTest.java +++ b/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/org/apache/commons/collections/keyvalue/DefaultKeyValueTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/keyvalue/DefaultKeyValueTest.java rename to src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java index 051521b3c..5a1ba5a70 100644 --- a/src/test/java/org/apache/commons/collections/keyvalue/DefaultKeyValueTest.java +++ b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.util.HashMap; import java.util.Map; +import org.apache.commons.collections4.keyvalue.DefaultKeyValue; + import junit.framework.TestCase; /** diff --git a/src/test/java/org/apache/commons/collections/keyvalue/DefaultMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/keyvalue/DefaultMapEntryTest.java rename to src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java index 237c927f3..77a53cebc 100644 --- a/src/test/java/org/apache/commons/collections/keyvalue/DefaultMapEntryTest.java +++ b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.util.Map; -import org.apache.commons.collections.KeyValue; +import org.apache.commons.collections4.KeyValue; +import org.apache.commons.collections4.keyvalue.DefaultKeyValue; +import org.apache.commons.collections4.keyvalue.DefaultMapEntry; /** * Test the DefaultMapEntry class. diff --git a/src/test/java/org/apache/commons/collections/keyvalue/MultiKeyTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/keyvalue/MultiKeyTest.java rename to src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java index 600a68f19..f9d49bd6e 100644 --- a/src/test/java/org/apache/commons/collections/keyvalue/MultiKeyTest.java +++ b/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -26,10 +26,12 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import org.apache.commons.collections4.keyvalue.MultiKey; + import junit.framework.TestCase; /** - * Unit tests for {@link org.apache.commons.collections.keyvalue.MultiKey}. + * Unit tests for {@link org.apache.commons.collections4.keyvalue.MultiKey}. * * @version $Id$ */ diff --git a/src/test/java/org/apache/commons/collections/keyvalue/TiedMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/keyvalue/TiedMapEntryTest.java rename to src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java index 6e26eab76..31f166f30 100644 --- a/src/test/java/org/apache/commons/collections/keyvalue/TiedMapEntryTest.java +++ b/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.util.HashMap; import java.util.Map; +import org.apache.commons.collections4.keyvalue.TiedMapEntry; + /** * Test the TiedMapEntry class. * diff --git a/src/test/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java similarity index 92% rename from src/test/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntryTest.java rename to src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java index 79b7a83d5..7b90f7fdf 100644 --- a/src/test/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntryTest.java +++ b/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.keyvalue; +package org.apache.commons.collections4.keyvalue; import java.util.Map; -import org.apache.commons.collections.KeyValue; -import org.apache.commons.collections.Unmodifiable; +import org.apache.commons.collections4.KeyValue; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.keyvalue.DefaultKeyValue; +import org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry; /** * Test the UnmodifiableMapEntry class. diff --git a/src/test/java/org/apache/commons/collections/list/AbstractLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/list/AbstractLinkedListTest.java rename to src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java index f05db4bc2..83b55d131 100644 --- a/src/test/java/org/apache/commons/collections/list/AbstractLinkedListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java @@ -14,18 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.Arrays; +import org.apache.commons.collections4.list.AbstractLinkedList; + /** * Test case for {@link AbstractLinkedList}. * - * @version $Revision$ - * - * @author Rich Dougherty + * @version $Id$ * @author David Hay - * @author Phil Steitz */ public abstract class AbstractLinkedListTest extends AbstractListTest { diff --git a/src/test/java/org/apache/commons/collections/list/AbstractListTest.java b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/list/AbstractListTest.java rename to src/test/java/org/apache/commons/collections4/list/AbstractListTest.java index b53c90d3f..8aea7b773 100644 --- a/src/test/java/org/apache/commons/collections/list/AbstractListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.io.IOException; import java.io.Serializable; @@ -31,9 +31,9 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.collection.AbstractCollectionTest; -import org.apache.commons.collections.iterators.AbstractListIteratorTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.collection.AbstractCollectionTest; +import org.apache.commons.collections4.iterators.AbstractListIteratorTest; /** * Abstract test class for {@link java.util.List} methods and contracts. @@ -46,12 +46,7 @@ import org.apache.commons.collections.iterators.AbstractListIteratorTest; * test case (method) your {@link List} fails or override one of the * protected methods from AbstractTestCollection. * - * @version $Revision$ - * - * @author Rodney Waldhoff - * @author Paul Jack - * @author Stephen Colebourne - * @author Neil O'Toole + * @version $Id$ */ public abstract class AbstractListTest extends AbstractCollectionTest { @@ -1074,18 +1069,6 @@ public abstract class AbstractListTest extends AbstractCollectionTest { assertEquals("Both lists are same size", size, list2.size()); } - /** - * Skip the serialized canonical tests for now. - * - * @return true - * - * TODO: store new serialized objects in CVS. - */ - @Override - protected boolean skipSerializedCanonicalTests() { - return true; - } - /** * Compare the current serialized form of the List * against the canonical version in SVN. diff --git a/src/test/java/org/apache/commons/collections/list/CursorableLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/list/CursorableLinkedListTest.java rename to src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java index cdbbf8190..42cdf30db 100644 --- a/src/test/java/org/apache/commons/collections/list/CursorableLinkedListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.ArrayList; import java.util.ConcurrentModificationException; @@ -26,15 +26,13 @@ import java.util.NoSuchElementException; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.list.CursorableLinkedList; /** * Test class. * - * @version $Revision$ - * - * @author Rodney Waldhoff - * @author Simon Kitching + * @version $Id$ */ public class CursorableLinkedListTest extends AbstractLinkedListTest { public CursorableLinkedListTest(final String testName) { @@ -1525,14 +1523,14 @@ public class CursorableLinkedListTest extends AbstractLinkedListTest { @Override public String getCompatibilityVersion() { - return "4.0"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/CursorableLinkedList.emptyCollection.version4.0.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CursorableLinkedList.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/CursorableLinkedList.fullCollection.version4.0.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CursorableLinkedList.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/list/FixedSizeListTest.java b/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java similarity index 79% rename from src/test/java/org/apache/commons/collections/list/FixedSizeListTest.java rename to src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java index a4c34dcbe..c4ebc9896 100644 --- a/src/test/java/org/apache/commons/collections/list/FixedSizeListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.apache.commons.collections4.list.FixedSizeList; + /** * Extension of {@link AbstractListTest} for exercising the {@link FixedSizeList} * implementation. * - * @since Commons Collections 3.0 - * @version $Revision$ - * - * @author Stephen Colebourne + * @since 3.0 + * @version $Id$ */ public class FixedSizeListTest extends AbstractListTest { @@ -59,14 +59,14 @@ public class FixedSizeListTest extends AbstractListTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/FixedSizeList.emptyCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/FixedSizeList.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/FixedSizeList.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/FixedSizeList.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/list/GrowthListTest.java b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java similarity index 91% rename from src/test/java/org/apache/commons/collections/list/GrowthListTest.java rename to src/test/java/org/apache/commons/collections4/list/GrowthListTest.java index a890509b2..ed9baaa67 100644 --- a/src/test/java/org/apache/commons/collections/list/GrowthListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; +import org.apache.commons.collections4.list.GrowthList; + /** * Extension of {@link AbstractListTest} for exercising the {@link GrowthList}. * - * @since Commons Collections 3.2 - * @version $Revision$ - * - * @author Stephen Colebourne + * @since 3.2 + * @version $Id$ */ public class GrowthListTest extends AbstractListTest { @@ -158,14 +158,14 @@ public class GrowthListTest extends AbstractListTest { //----------------------------------------------------------------------- @Override public String getCompatibilityVersion() { - return "3.2"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/GrowthList.emptyCollection.version3.2.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/GrowthList.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/GrowthList.fullCollection.version3.2.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/GrowthList.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/list/NodeCachingLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java similarity index 90% rename from src/test/java/org/apache/commons/collections/list/NodeCachingLinkedListTest.java rename to src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java index fab71fdcb..5fb11f44a 100644 --- a/src/test/java/org/apache/commons/collections/list/NodeCachingLinkedListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java @@ -14,22 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.Arrays; import java.util.LinkedList; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.list.NodeCachingLinkedList; /** * Test class for NodeCachingLinkedList, a performance optimised LinkedList. * - * @version $Revision$ - * - * @author Jeff Varszegi - * @author Phil Steitz + * @version $Id$ */ public class NodeCachingLinkedListTest extends AbstractLinkedListTest { @@ -49,7 +47,7 @@ public class NodeCachingLinkedListTest extends AbstractLinkedListTest { @Override public String getCompatibilityVersion() { - return "3"; + return "4"; } //----------------------------------------------------------------------- @@ -145,11 +143,11 @@ public class NodeCachingLinkedListTest extends AbstractLinkedListTest { // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, -// "D:/dev/collections/data/test/NodeCachingLinkedList.emptyCollection.version3.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), +// "src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, -// "D:/dev/collections/data/test/NodeCachingLinkedList.fullCollection.version3.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), +// "src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version4.obj"); // } /** diff --git a/src/test/java/org/apache/commons/collections/list/PredicatedListTest.java b/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java similarity index 89% rename from src/test/java/org/apache/commons/collections/list/PredicatedListTest.java rename to src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java index a7dfaab16..7ab307563 100644 --- a/src/test/java/org/apache/commons/collections/list/PredicatedListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java @@ -14,22 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.ArrayList; import java.util.List; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.functors.TruePredicate; +import org.apache.commons.collections4.list.PredicatedList; /** * Extension of {@link AbstractListTest} for exercising the * {@link PredicatedList} implementation. * - * @since Commons Collections 3.0 - * @version $Revision$ - * - * @author Phil Steitz + * @since 3.0 + * @version $Id$ */ public class PredicatedListTest extends AbstractListTest { @@ -139,14 +138,14 @@ public class PredicatedListTest extends AbstractListTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedList.emptyCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedList.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedList.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedList.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/list/SetUniqueListTest.java b/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/list/SetUniqueListTest.java rename to src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java index 09f1110fb..6f995d3da 100644 --- a/src/test/java/org/apache/commons/collections/list/SetUniqueListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.ArrayList; import java.util.Arrays; @@ -25,14 +25,13 @@ import java.util.List; import java.util.ListIterator; import java.util.Set; +import org.apache.commons.collections4.list.SetUniqueList; + /** * JUnit tests. * - * @since Commons Collections 3.0 - * @version $Revision$ - * - * @author Matthew Hawthorne - * @author Tom Dunham + * @since 3.0 + * @version $Id$ */ public class SetUniqueListTest extends AbstractListTest { @@ -444,14 +443,14 @@ public class SetUniqueListTest extends AbstractListTest { //----------------------------------------------------------------------- @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/SetUniqueList.emptyCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/SetUniqueList.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/SetUniqueList.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/SetUniqueList.fullCollection.version4.obj"); // } // TODO: Generics diff --git a/src/test/java/org/apache/commons/collections/list/TransformedListTest.java b/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java similarity index 88% rename from src/test/java/org/apache/commons/collections/list/TransformedListTest.java rename to src/test/java/org/apache/commons/collections4/list/TransformedListTest.java index ce0d6bbf6..d3e905c71 100644 --- a/src/test/java/org/apache/commons/collections/list/TransformedListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java @@ -14,24 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.ListIterator; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.collection.TransformedCollectionTest; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.collection.TransformedCollectionTest; +import org.apache.commons.collections4.list.TransformedList; /** * Extension of {@link AbstractListTest} for exercising the {@link TransformedList} * implementation. * - * @since Commons Collections 3.0 - * @version $Revision$ - * - * @author Stephen Colebourne + * @since 3.0 + * @version $Id$ */ public class TransformedListTest extends AbstractListTest { @@ -132,14 +131,14 @@ public class TransformedListTest extends AbstractListTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedList.emptyCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedList.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedList.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedList.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/list/TreeListTest.java b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/list/TreeListTest.java rename to src/test/java/org/apache/commons/collections4/list/TreeListTest.java index a5d57050c..0a70db06b 100644 --- a/src/test/java/org/apache/commons/collections/list/TreeListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java @@ -14,22 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.List; import java.util.ListIterator; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.list.TreeList; /** * JUnit tests * - * @since Commons Collections 3.1 - * @version $Revision$ - * - * @author Joerg Schmuecker + * @since 3.1 + * @version $Id$ */ public class TreeListTest extends AbstractListTest { diff --git a/src/test/java/org/apache/commons/collections/list/UnmodifiableListTest.java b/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java similarity index 91% rename from src/test/java/org/apache/commons/collections/list/UnmodifiableListTest.java rename to src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java index bf3f73ac1..e472636a9 100644 --- a/src/test/java/org/apache/commons/collections/list/UnmodifiableListTest.java +++ b/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.list; +package org.apache.commons.collections4.list; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; +import org.apache.commons.collections4.list.UnmodifiableList; + /** * Extension of {@link AbstractListTest} for exercising the * {@link UnmodifiableList} implementation. * - * @since Commons Collections 3.0 - * @version $Revision$ - * - * @author Phil Steitz + * @since 3.0 + * @version $Id$ */ public class UnmodifiableListTest extends AbstractListTest { @@ -165,14 +165,14 @@ public class UnmodifiableListTest extends AbstractListTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableList.emptyCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableList.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableList.fullCollection.version3.1.obj"); +// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableList.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/map/AbstractIterableMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/map/AbstractIterableMapTest.java rename to src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java index 0ad08c9b7..99d7a268d 100644 --- a/src/test/java/org/apache/commons/collections/map/AbstractIterableMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.Map; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.iterators.AbstractMapIteratorTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.iterators.AbstractMapIteratorTest; /** * Abstract test class for {@link IterableMap} methods and contracts. diff --git a/src/test/java/org/apache/commons/collections/map/AbstractMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/map/AbstractMapTest.java rename to src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java index 5e7a8f65e..9de9fcb5d 100644 --- a/src/test/java/org/apache/commons/collections/map/AbstractMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.Serializable; import java.util.ArrayList; @@ -29,12 +29,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.collections.AbstractObjectTest; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.collection.AbstractCollectionTest; -import org.apache.commons.collections.keyvalue.DefaultMapEntry; -import org.apache.commons.collections.set.AbstractSetTest; +import org.apache.commons.collections4.AbstractObjectTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.collection.AbstractCollectionTest; +import org.apache.commons.collections4.keyvalue.DefaultMapEntry; +import org.apache.commons.collections4.set.AbstractSetTest; /** * Abstract test class for {@link java.util.Map} methods and contracts. diff --git a/src/test/java/org/apache/commons/collections/map/AbstractOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/map/AbstractOrderedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java index 251dfe0f2..39960ec7a 100644 --- a/src/test/java/org/apache/commons/collections/map/AbstractOrderedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.ArrayList; import java.util.Arrays; @@ -25,11 +25,11 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.TreeMap; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.OrderedMapIterator; -import org.apache.commons.collections.comparators.NullComparator; -import org.apache.commons.collections.iterators.AbstractOrderedMapIteratorTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.OrderedMapIterator; +import org.apache.commons.collections4.comparators.NullComparator; +import org.apache.commons.collections4.iterators.AbstractOrderedMapIteratorTest; /** * Abstract test class for {@link OrderedMap} methods and contracts. diff --git a/src/test/java/org/apache/commons/collections/map/AbstractSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/map/AbstractSortedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java index 53d1d1dde..649d3df83 100644 --- a/src/test/java/org/apache/commons/collections/map/AbstractSortedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.ArrayList; import java.util.Arrays; @@ -25,7 +25,7 @@ import java.util.Map.Entry; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections4.BulkTest; /** * Abstract test class for {@link java.util.SortedMap} methods and contracts. diff --git a/src/test/java/org/apache/commons/collections/map/CaseInsensitiveMapTest.java b/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java similarity index 90% rename from src/test/java/org/apache/commons/collections/map/CaseInsensitiveMapTest.java rename to src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java index 2e04ef303..bb4b0565a 100644 --- a/src/test/java/org/apache/commons/collections/map/CaseInsensitiveMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.HashMap; import java.util.Locale; @@ -22,7 +22,9 @@ import java.util.Map; import java.util.Set; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.map.CaseInsensitiveMap; /** * Tests for the {@link CaseInsensitiveMap} implementation. @@ -46,7 +48,7 @@ public class CaseInsensitiveMapTest extends AbstractIterableMapTest @Override public String getCompatibilityVersion() { - return "3"; + return "4"; } //------------------------------------------------------------------------- @@ -107,14 +109,12 @@ public class CaseInsensitiveMapTest extends AbstractIterableMapTest assertSame(map.get("1"), cloned.get("1")); } - /* - public void testCreate() throws Exception { - resetEmpty(); - writeExternalFormToDisk((java.io.Serializable) map, "/home/phil/jakarta-commons/collections/data/test/CaseInsensitiveMap.emptyCollection.version3.obj"); - resetFull(); - writeExternalFormToDisk((java.io.Serializable) map, "/home/phil/jakarta-commons/collections/data/test/CaseInsensitiveMap.fullCollection.version3.obj"); - } - */ +// public void testCreate() throws Exception { +// resetEmpty(); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version4.obj"); +// resetFull(); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version4.obj"); +// } // COLLECTIONS-294 public void testLocaleIndependence() { diff --git a/src/test/java/org/apache/commons/collections/map/CompositeMapTest.java b/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/map/CompositeMapTest.java rename to src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java index 6095cc7b4..0f11d787c 100644 --- a/src/test/java/org/apache/commons/collections/map/CompositeMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.Map; import java.util.HashMap; import java.util.Collection; +import org.apache.commons.collections4.map.CompositeMap; + /** * Extension of {@link AbstractMapTest} for exercising the * {@link CompositeMap} implementation. @@ -208,14 +210,14 @@ public class CompositeMapTest extends AbstractIterableMapTest { @Override public String getCompatibilityVersion() { - return "3.3"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) map, "/tmp/CompositeMap.emptyCollection.version3.3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/CompositeMap.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) map, "/tmp/CompositeMap.fullCollection.version3.3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/CompositeMap.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/map/DefaultedMapTest.java b/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java similarity index 89% rename from src/test/java/org/apache/commons/collections/map/DefaultedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java index 9230c245a..0b67e4a0f 100644 --- a/src/test/java/org/apache/commons/collections/map/DefaultedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java @@ -14,16 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections.Factory; -import org.apache.commons.collections.FactoryUtils; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.functors.ConstantFactory; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.FactoryUtils; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.functors.ConstantFactory; +import org.apache.commons.collections4.map.DefaultedMap; /** * Extension of {@link AbstractMapTest} for exercising the @@ -132,18 +133,18 @@ public class DefaultedMapTest extends AbstractIterableMapTest { @Override public String getCompatibilityVersion() { - return "3.2"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "c:/commons/collections/data/test/DefaultedMap.emptyCollection.version3.2.obj"); +// "src/test/resources/data/test/DefaultedMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "c:/commons/collections/data/test/DefaultedMap.fullCollection.version3.2.obj"); +// "src/test/resources/data/test/DefaultedMap.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/map/EmptyMapMutator.java b/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java similarity index 94% rename from src/test/java/org/apache/commons/collections/map/EmptyMapMutator.java rename to src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java index fe34a1fc4..a4b4c01c7 100644 --- a/src/test/java/org/apache/commons/collections/map/EmptyMapMutator.java +++ b/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.Map; import java.util.Collection; +import org.apache.commons.collections4.map.CompositeMap; + /** * This class is used in TestCompositeMap. When testing serialization, * the class has to be separate of TestCompositeMap, else the test diff --git a/src/test/java/org/apache/commons/collections/map/FixedSizeMapTest.java b/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java similarity index 84% rename from src/test/java/org/apache/commons/collections/map/FixedSizeMapTest.java rename to src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java index 0039d2301..6605378e1 100644 --- a/src/test/java/org/apache/commons/collections/map/FixedSizeMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections.IterableMap; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.map.FixedSizeMap; /** * Extension of {@link AbstractMapTest} for exercising the {@link FixedSizeMap} @@ -58,17 +59,18 @@ public class FixedSizeMapTest extends AbstractIterableMapTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/FixedSizeMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/FixedSizeMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/FixedSizeMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/FixedSizeMap.fullCollection.version4.obj"); // } + } diff --git a/src/test/java/org/apache/commons/collections/map/FixedSizeSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java similarity index 87% rename from src/test/java/org/apache/commons/collections/map/FixedSizeSortedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java index a9e59365e..dac6d7177 100644 --- a/src/test/java/org/apache/commons/collections/map/FixedSizeSortedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.SortedMap; import java.util.TreeMap; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.map.FixedSizeSortedMap; /** * Extension of {@link AbstractSortedMapTest} for exercising the {@link FixedSizeSortedMap} @@ -72,17 +73,18 @@ public class FixedSizeSortedMapTest extends AbstractSortedMapTest { //----------------------------------------------------------------------- @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/FixedSizeSortedMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/FixedSizeSortedMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version4.obj"); // } + } diff --git a/src/test/java/org/apache/commons/collections/map/Flat3MapTest.java b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/map/Flat3MapTest.java rename to src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java index 47de79cb8..b5d0ee8f9 100644 --- a/src/test/java/org/apache/commons/collections/map/Flat3MapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -24,10 +24,12 @@ import java.util.Iterator; import java.util.Map; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.iterators.AbstractMapIteratorTest; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.iterators.AbstractMapIteratorTest; +import org.apache.commons.collections4.map.Flat3Map; /** * JUnit tests. @@ -394,18 +396,18 @@ public class Flat3MapTest extends AbstractIterableMapTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/Flat3Map.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/Flat3Map.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/Flat3Map.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/Flat3Map.fullCollection.version4.obj"); // } public void testCollections261() { diff --git a/src/test/java/org/apache/commons/collections/map/HashedMapTest.java b/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java similarity index 84% rename from src/test/java/org/apache/commons/collections/map/HashedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/HashedMapTest.java index 4ff50ba3d..7aac4d75d 100644 --- a/src/test/java/org/apache/commons/collections/map/HashedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.map.HashedMap; /** * JUnit tests. @@ -41,7 +43,7 @@ public class HashedMapTest extends AbstractIterableMapTest { @Override public String getCompatibilityVersion() { - return "3"; + return "4"; } @SuppressWarnings("unchecked") @@ -64,9 +66,9 @@ public class HashedMapTest extends AbstractIterableMapTest { // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/HashedMap.emptyCollection.version3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/HashedMap.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/HashedMap.fullCollection.version3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/HashedMap.fullCollection.version4.obj"); // } /** diff --git a/src/test/java/org/apache/commons/collections/map/IdentityMap.java b/src/test/java/org/apache/commons/collections4/map/IdentityMap.java similarity index 97% rename from src/test/java/org/apache/commons/collections/map/IdentityMap.java rename to src/test/java/org/apache/commons/collections4/map/IdentityMap.java index b349ae7d2..9fc9f679f 100644 --- a/src/test/java/org/apache/commons/collections/map/IdentityMap.java +++ b/src/test/java/org/apache/commons/collections4/map/IdentityMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,6 +22,9 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Map; +import org.apache.commons.collections4.map.AbstractHashedMap; +import org.apache.commons.collections4.map.ListOrderedMap; + /** * A Map implementation that matches keys and values based * on == not equals(). diff --git a/src/test/java/org/apache/commons/collections/map/LRUMapTest.java b/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/map/LRUMapTest.java rename to src/test/java/org/apache/commons/collections4/map/LRUMapTest.java index c1322f52f..0f8fcca79 100644 --- a/src/test/java/org/apache/commons/collections/map/LRUMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.ArrayList; import java.util.HashMap; @@ -23,10 +23,12 @@ import java.util.List; import java.util.Map; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.ResettableIterator; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.ResettableIterator; +import org.apache.commons.collections4.map.LRUMap; /** * JUnit tests. @@ -63,7 +65,7 @@ public class LRUMapTest extends AbstractOrderedMapTest { @Override public String getCompatibilityVersion() { - return "3"; + return "4"; } //----------------------------------------------------------------------- @@ -828,9 +830,9 @@ public class LRUMapTest extends AbstractOrderedMapTest { // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/LRUMap.emptyCollection.version3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/LRUMap.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/LRUMap.fullCollection.version3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/LRUMap.fullCollection.version4.obj"); // } /** diff --git a/src/test/java/org/apache/commons/collections/map/LazyMapTest.java b/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java similarity index 86% rename from src/test/java/org/apache/commons/collections/map/LazyMapTest.java rename to src/test/java/org/apache/commons/collections4/map/LazyMapTest.java index bcba8b1a1..904aaaf08 100644 --- a/src/test/java/org/apache/commons/collections/map/LazyMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java @@ -14,16 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; -import static org.apache.commons.collections.map.LazyMap.lazyMap; +import static org.apache.commons.collections4.map.LazyMap.lazyMap; import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections.Factory; -import org.apache.commons.collections.FactoryUtils; -import org.apache.commons.collections.Transformer; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.FactoryUtils; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.map.LazyMap; import org.junit.Test; /** @@ -88,17 +89,18 @@ public class LazyMapTest extends AbstractIterableMapTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/LazyMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/LazyMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/LazyMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/LazyMap.fullCollection.version4.obj"); // } + } diff --git a/src/test/java/org/apache/commons/collections/map/LazySortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java similarity index 88% rename from src/test/java/org/apache/commons/collections/map/LazySortedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java index f0d7e7515..694c3ae45 100644 --- a/src/test/java/org/apache/commons/collections/map/LazySortedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java @@ -14,19 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; -import static org.apache.commons.collections.map.LazySortedMap.lazySortedMap; +import static org.apache.commons.collections4.map.LazySortedMap.lazySortedMap; import java.util.Comparator; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.collections.Factory; -import org.apache.commons.collections.FactoryUtils; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.TransformerUtils; +import org.apache.commons.collections4.Factory; +import org.apache.commons.collections4.FactoryUtils; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.TransformerUtils; +import org.apache.commons.collections4.map.LazySortedMap; import org.junit.Test; /** @@ -123,17 +124,17 @@ public class LazySortedMapTest extends AbstractSortedMapTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/LazySortedMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/LazySortedMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/LazySortedMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/LazySortedMap.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/map/LinkedMapTest.java b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/map/LinkedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java index bd6e02feb..4b8494237 100644 --- a/src/test/java/org/apache/commons/collections/map/LinkedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.ArrayList; import java.util.Iterator; @@ -22,11 +22,13 @@ import java.util.List; import java.util.Map; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.ResettableIterator; -import org.apache.commons.collections.list.AbstractListTest; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.ResettableIterator; +import org.apache.commons.collections4.list.AbstractListTest; +import org.apache.commons.collections4.map.LinkedMap; /** * JUnit tests. @@ -58,7 +60,7 @@ public class LinkedMapTest extends AbstractOrderedMapTest { @Override public String getCompatibilityVersion() { - return "3"; + return "4"; } //----------------------------------------------------------------------- @@ -283,9 +285,9 @@ public class LinkedMapTest extends AbstractOrderedMapTest { // public void testCreate() throws Exception { // resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/LinkedMap.emptyCollection.version3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/LinkedMap.emptyCollection.version4.obj"); // resetFull(); -// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/LinkedMap.fullCollection.version3.obj"); +// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/LinkedMap.fullCollection.version4.obj"); // } /** diff --git a/src/test/java/org/apache/commons/collections/map/ListOrderedMap2Test.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java similarity index 95% rename from src/test/java/org/apache/commons/collections/map/ListOrderedMap2Test.java rename to src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java index 79a2777c9..8d7bbe4b5 100644 --- a/src/test/java/org/apache/commons/collections/map/ListOrderedMap2Test.java +++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java @@ -14,16 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.ArrayList; import java.util.List; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.list.AbstractListTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.list.AbstractListTest; +import org.apache.commons.collections4.map.ListOrderedMap; /** * Extension of {@link AbstractOrderedMapTest} for exercising the {@link ListOrderedMap} @@ -203,7 +204,7 @@ public class ListOrderedMap2Test extends AbstractOrderedMapTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { diff --git a/src/test/java/org/apache/commons/collections/map/ListOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/map/ListOrderedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java index 3af44f14f..984c9496f 100644 --- a/src/test/java/org/apache/commons/collections/map/ListOrderedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.ArrayList; import java.util.HashMap; @@ -24,9 +24,10 @@ import java.util.TreeMap; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.list.AbstractListTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.list.AbstractListTest; +import org.apache.commons.collections4.map.ListOrderedMap; /** * Extension of {@link AbstractOrderedMapTest} for exercising the {@link ListOrderedMap} @@ -478,18 +479,18 @@ public class ListOrderedMapTest extends AbstractOrderedMapTest { //----------------------------------------------------------------------- @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/ListOrderedMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/ListOrderedMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/ListOrderedMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/ListOrderedMap.fullCollection.version4.obj"); // } /** diff --git a/src/test/java/org/apache/commons/collections/map/MultiKeyMapTest.java b/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/map/MultiKeyMapTest.java rename to src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java index 8626e7f8f..11ddfd839 100644 --- a/src/test/java/org/apache/commons/collections/map/MultiKeyMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java @@ -14,14 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.Map; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.keyvalue.MultiKey; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.keyvalue.MultiKey; +import org.apache.commons.collections4.map.LRUMap; +import org.apache.commons.collections4.map.MultiKeyMap; /** * JUnit tests. @@ -439,18 +442,18 @@ public class MultiKeyMapTest extends AbstractIterableMapTest extends AbstractObjectTest { @Override public String getCompatibilityVersion() { - return "3.3"; + return "4"; } @Override @@ -387,16 +388,6 @@ public class MultiValueMapTest extends AbstractObjectTest { return new MultiValueMap(); } -// public void testCreate() throws Exception { -// writeExternalFormToDisk( -// (java.io.Serializable) makeEmptyMap(), -// "/tmp/MultiValueMap.emptyCollection.version3.3.obj"); -// -// writeExternalFormToDisk( -// (java.io.Serializable) makeObject(), -// "/tmp/MultiValueMap.fullCollection.version3.3.obj"); -// } - public void testEmptyMapCompatibility() throws Exception { final Map map = makeEmptyMap(); final Map map2 = (Map) readExternalFormFromDisk(getCanonicalEmptyCollectionName(map)); @@ -413,4 +404,14 @@ public class MultiValueMapTest extends AbstractObjectTest { assertEquals("Map had extra values", 0, map2.size()); } +// public void testCreate() throws Exception { +// writeExternalFormToDisk( +// (java.io.Serializable) makeEmptyMap(), +// "src/test/resources/data/test/MultiValueMap.emptyCollection.version4.obj"); +// +// writeExternalFormToDisk( +// (java.io.Serializable) makeObject(), +// "src/test/resources/data/test/MultiValueMap.fullCollection.version4.obj"); +// } + } diff --git a/src/test/java/org/apache/commons/collections/map/PassiveExpiringMapTest.java b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java similarity index 92% rename from src/test/java/org/apache/commons/collections/map/PassiveExpiringMapTest.java rename to src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java index e22e09536..f113903c1 100644 --- a/src/test/java/org/apache/commons/collections/map/PassiveExpiringMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.HashMap; import java.util.Map; @@ -22,8 +22,9 @@ import java.util.concurrent.TimeUnit; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.map.PassiveExpiringMap.ExpirationPolicy; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.map.PassiveExpiringMap; +import org.apache.commons.collections4.map.PassiveExpiringMap.ExpirationPolicy; public class PassiveExpiringMapTest extends AbstractMapTest { @@ -55,13 +56,13 @@ public class PassiveExpiringMapTest super(testName); } - // public void testCreate() throws Exception { - // writeExternalFormToDisk((java.io.Serializable) makeObject(), - // "PassiveExpiringMap.emptyCollection.version4.obj"); - // - // writeExternalFormToDisk((java.io.Serializable) makeFullMap(), - // "PassiveExpiringMap.fullCollection.version4.obj"); - // } +// public void testCreate() throws Exception { +// writeExternalFormToDisk((java.io.Serializable) makeObject(), +// "src/test/resources/data/test/PassiveExpiringMap.emptyCollection.version4.obj"); +// +// writeExternalFormToDisk((java.io.Serializable) makeFullMap(), +// "src/test/resources/data/test/PassiveExpiringMap.fullCollection.version4.obj"); +// } @Override public String getCompatibilityVersion() { diff --git a/src/test/java/org/apache/commons/collections/map/PredicatedMapTest.java b/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java similarity index 90% rename from src/test/java/org/apache/commons/collections/map/PredicatedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java index 0ad2d0002..fe0e93b41 100644 --- a/src/test/java/org/apache/commons/collections/map/PredicatedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.functors.TruePredicate; +import org.apache.commons.collections4.map.PredicatedMap; /** * Extension of {@link AbstractMapTest} for exercising the @@ -125,17 +126,18 @@ public class PredicatedMapTest extends AbstractIterableMapTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/PredicatedMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/PredicatedMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/PredicatedMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/PredicatedMap.fullCollection.version4.obj"); // } + } diff --git a/src/test/java/org/apache/commons/collections/map/PredicatedSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/map/PredicatedSortedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java index f282deb7b..f4517757e 100644 --- a/src/test/java/org/apache/commons/collections/map/PredicatedSortedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.Comparator; import java.util.HashMap; @@ -23,8 +23,9 @@ import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.functors.TruePredicate; +import org.apache.commons.collections4.map.PredicatedSortedMap; /** * Extension of {@link PredicatedMapTest} for exercising the @@ -172,17 +173,18 @@ public class PredicatedSortedMapTest extends AbstractSortedMapTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/PredicatedSortedMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/PredicatedSortedMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/PredicatedSortedMap.fullCollection.version4.obj"); // } + } diff --git a/src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java b/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java similarity index 93% rename from src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java rename to src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java index cac42e4fc..c0a8d4dd4 100644 --- a/src/test/java/org/apache/commons/collections/map/ReferenceIdentityMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.lang.ref.WeakReference; import java.util.Iterator; @@ -22,9 +22,10 @@ import java.util.Map; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.map.AbstractReferenceMap.ReferenceStrength; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.map.ReferenceIdentityMap; +import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength; /** * Tests for ReferenceIdentityMap. @@ -71,9 +72,20 @@ public class ReferenceIdentityMapTest extends AbstractIterableMapTest extends AbstractIterableMapTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } +// public void testCreate() throws Exception { +// resetEmpty(); +// writeExternalFormToDisk( +// (java.io.Serializable) map, +// "src/test/resources/data/test/ReferenceMap.emptyCollection.version4.obj"); +// resetFull(); +// writeExternalFormToDisk( +// (java.io.Serializable) map, +// "src/test/resources/data/test/ReferenceMap.fullCollection.version4.obj"); +// } + //----------------------------------------------------------------------- @SuppressWarnings("unchecked") public void testNullHandling() { diff --git a/src/test/java/org/apache/commons/collections/map/SingletonMapTest.java b/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java similarity index 89% rename from src/test/java/org/apache/commons/collections/map/SingletonMapTest.java rename to src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java index c73c0f866..54344b2fb 100644 --- a/src/test/java/org/apache/commons/collections/map/SingletonMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java @@ -14,15 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.HashMap; import junit.framework.Test; -import org.apache.commons.collections.BoundedMap; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.KeyValue; -import org.apache.commons.collections.OrderedMap; +import org.apache.commons.collections4.BoundedMap; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.KeyValue; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.map.ListOrderedMap; +import org.apache.commons.collections4.map.SingletonMap; +import org.apache.commons.collections4.map.UnmodifiableOrderedMap; /** * JUnit tests. @@ -171,17 +174,18 @@ public class SingletonMapTest extends AbstractOrderedMapTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/SingletonMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/SingletonMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/SingletonMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/SingletonMap.fullCollection.version4.obj"); // } + } diff --git a/src/test/java/org/apache/commons/collections/map/StaticBucketMapTest.java b/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/map/StaticBucketMapTest.java rename to src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java index a51896c0b..469d65504 100644 --- a/src/test/java/org/apache/commons/collections/map/StaticBucketMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.map.StaticBucketMap; /** * Unit tests. diff --git a/src/test/java/org/apache/commons/collections/map/TransformedMapTest.java b/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java similarity index 91% rename from src/test/java/org/apache/commons/collections/map/TransformedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java index f5695632d..f89f124aa 100644 --- a/src/test/java/org/apache/commons/collections/map/TransformedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java @@ -14,16 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.TransformerUtils; -import org.apache.commons.collections.collection.TransformedCollectionTest; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.TransformerUtils; +import org.apache.commons.collections4.collection.TransformedCollectionTest; +import org.apache.commons.collections4.map.TransformedMap; /** * Extension of {@link AbstractMapTest} for exercising the {@link TransformedMap} @@ -137,17 +138,18 @@ public class TransformedMapTest extends AbstractIterableMapTest { //----------------------------------------------------------------------- @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/TransformedMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/TransformedMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/TransformedMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/TransformedMap.fullCollection.version4.obj"); // } + } diff --git a/src/test/java/org/apache/commons/collections/map/TransformedSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java similarity index 92% rename from src/test/java/org/apache/commons/collections/map/TransformedSortedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java index 9c11c3636..0552daede 100644 --- a/src/test/java/org/apache/commons/collections/map/TransformedSortedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.Map; import java.util.Set; @@ -23,10 +23,11 @@ import java.util.TreeMap; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.TransformerUtils; -import org.apache.commons.collections.collection.TransformedCollectionTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.TransformerUtils; +import org.apache.commons.collections4.collection.TransformedCollectionTest; +import org.apache.commons.collections4.map.TransformedSortedMap; /** * Extension of {@link AbstractSortedMapTest} for exercising the {@link TransformedSortedMap} @@ -162,17 +163,17 @@ public class TransformedSortedMapTest extends AbstractSortedMapTest //----------------------------------------------------------------------- @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/TransformedSortedMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/TransformedSortedMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/TransformedSortedMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/TransformedSortedMap.fullCollection.version4.obj"); // } } diff --git a/src/test/java/org/apache/commons/collections/map/UnmodifiableMapTest.java b/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java similarity index 86% rename from src/test/java/org/apache/commons/collections/map/UnmodifiableMapTest.java rename to src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java index 3560ed00d..b38d4c0a5 100644 --- a/src/test/java/org/apache/commons/collections/map/UnmodifiableMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.Unmodifiable; +import org.apache.commons.collections4.IterableMap; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.map.UnmodifiableMap; /** * Extension of {@link AbstractMapTest} for exercising the @@ -82,17 +83,18 @@ public class UnmodifiableMapTest extends AbstractIterableMapTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/UnmodifiableMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/UnmodifiableMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/UnmodifiableMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/UnmodifiableMap.fullCollection.version4.obj"); // } + } diff --git a/src/test/java/org/apache/commons/collections/map/UnmodifiableOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java similarity index 85% rename from src/test/java/org/apache/commons/collections/map/UnmodifiableOrderedMapTest.java rename to src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java index 08401deb5..ea3aaf979 100644 --- a/src/test/java/org/apache/commons/collections/map/UnmodifiableOrderedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.map; +package org.apache.commons.collections4.map; import java.util.HashMap; -import org.apache.commons.collections.OrderedMap; -import org.apache.commons.collections.Unmodifiable; +import org.apache.commons.collections4.OrderedMap; +import org.apache.commons.collections4.Unmodifiable; +import org.apache.commons.collections4.map.ListOrderedMap; +import org.apache.commons.collections4.map.UnmodifiableOrderedMap; /** * Extension of {@link AbstractOrderedMapTest} for exercising the @@ -81,17 +83,18 @@ public class UnmodifiableOrderedMapTest extends AbstractOrderedMapTest extends AbstractSortedMapTest @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { // resetEmpty(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/UnmodifiableSortedMap.emptyCollection.version3.1.obj"); +// "src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj"); // resetFull(); // writeExternalFormToDisk( // (java.io.Serializable) map, -// "D:/dev/collections/data/test/UnmodifiableSortedMap.fullCollection.version3.1.obj"); +// "src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version4.obj"); // } + } diff --git a/src/test/java/org/apache/commons/collections/overview.html b/src/test/java/org/apache/commons/collections4/overview.html similarity index 100% rename from src/test/java/org/apache/commons/collections/overview.html rename to src/test/java/org/apache/commons/collections4/overview.html diff --git a/src/test/java/org/apache/commons/collections/queue/CircularFifoQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/queue/CircularFifoQueueTest.java rename to src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java index b48104be7..762c60cf5 100644 --- a/src/test/java/org/apache/commons/collections/queue/CircularFifoQueueTest.java +++ b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.queue; +package org.apache.commons.collections4.queue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -28,8 +28,9 @@ import java.util.NoSuchElementException; import java.util.Queue; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.collection.AbstractCollectionTest; + +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.collection.AbstractCollectionTest; /** * Test cases for CircularFifoQueue. diff --git a/src/test/java/org/apache/commons/collections/queue/PredicatedQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java similarity index 95% rename from src/test/java/org/apache/commons/collections/queue/PredicatedQueueTest.java rename to src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java index 31aaf679a..6019a2cc4 100644 --- a/src/test/java/org/apache/commons/collections/queue/PredicatedQueueTest.java +++ b/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.queue; +package org.apache.commons.collections4.queue; import java.util.Arrays; import java.util.Collection; @@ -22,8 +22,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Queue; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.collection.PredicatedCollectionTest; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.collection.PredicatedCollectionTest; /** * Extension of {@link PredicatedCollectionTest} for exercising the diff --git a/src/test/java/org/apache/commons/collections/queue/TransformedQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/queue/TransformedQueueTest.java rename to src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java index 14cbe0f3d..00da6dc19 100644 --- a/src/test/java/org/apache/commons/collections/queue/TransformedQueueTest.java +++ b/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.queue; +package org.apache.commons.collections4.queue; import java.util.Arrays; import java.util.LinkedList; import java.util.Queue; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.collection.AbstractCollectionTest; -import org.apache.commons.collections.collection.TransformedCollectionTest; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.collection.AbstractCollectionTest; +import org.apache.commons.collections4.collection.TransformedCollectionTest; /** * Extension of {@link AbstractCollectionTest} for exercising the diff --git a/src/test/java/org/apache/commons/collections/queue/UnmodifiableQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java similarity index 96% rename from src/test/java/org/apache/commons/collections/queue/UnmodifiableQueueTest.java rename to src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java index 1bb954eb1..795a3fc97 100644 --- a/src/test/java/org/apache/commons/collections/queue/UnmodifiableQueueTest.java +++ b/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.queue; +package org.apache.commons.collections4.queue; import java.util.Arrays; import java.util.Collection; import java.util.LinkedList; import java.util.Queue; -import org.apache.commons.collections.collection.AbstractCollectionTest; +import org.apache.commons.collections4.collection.AbstractCollectionTest; /** * Extension of {@link AbstractCollectionTest} for exercising the diff --git a/src/test/java/org/apache/commons/collections/set/AbstractSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java similarity index 97% rename from src/test/java/org/apache/commons/collections/set/AbstractSetTest.java rename to src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java index 152cc1df6..09dea0c27 100644 --- a/src/test/java/org/apache/commons/collections/set/AbstractSetTest.java +++ b/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Arrays; import java.util.Collection; @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.commons.collections.collection.AbstractCollectionTest; +import org.apache.commons.collections4.collection.AbstractCollectionTest; /** * Abstract test class for {@link Set} methods and contracts. diff --git a/src/test/java/org/apache/commons/collections/set/AbstractSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/set/AbstractSortedSetTest.java rename to src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java index 0c058bc55..42e4a73a1 100644 --- a/src/test/java/org/apache/commons/collections/set/AbstractSortedSetTest.java +++ b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Iterator; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections4.BulkTest; /** * Abstract test class for {@link SortedSet} methods and contracts. diff --git a/src/test/java/org/apache/commons/collections/set/CompositeSetTest.java b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java similarity index 90% rename from src/test/java/org/apache/commons/collections/set/CompositeSetTest.java rename to src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java index 67ad40ed1..5a7fb855b 100644 --- a/src/test/java/org/apache/commons/collections/set/CompositeSetTest.java +++ b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.collections.set.CompositeSet.SetMutator; +import org.apache.commons.collections4.set.CompositeSet.SetMutator; /** * Extension of {@link AbstractSetTest} for exercising the @@ -152,14 +152,14 @@ public class CompositeSetTest extends AbstractSetTest { @Override public String getCompatibilityVersion() { - return "3.3"; + return "4"; } -// public void testCreate() throws Exception { -// resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "/tmp/CompositeSet.emptyCollection.version3.3.obj"); -// resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "/tmp/CompositeSet.fullCollection.version3.3.obj"); -// } + public void testCreate() throws Exception { + resetEmpty(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CompositeSet.emptyCollection.version4.obj"); + resetFull(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CompositeSet.fullCollection.version4.obj"); + } } diff --git a/src/test/java/org/apache/commons/collections/set/EmptySetMutator.java b/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java similarity index 97% rename from src/test/java/org/apache/commons/collections/set/EmptySetMutator.java rename to src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java index 9f9840e40..b53669ba3 100644 --- a/src/test/java/org/apache/commons/collections/set/EmptySetMutator.java +++ b/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Collection; import java.util.List; diff --git a/src/test/java/org/apache/commons/collections/set/ListOrderedSet2Test.java b/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java similarity index 98% rename from src/test/java/org/apache/commons/collections/set/ListOrderedSet2Test.java rename to src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java index 1644df644..1d294c8cf 100644 --- a/src/test/java/org/apache/commons/collections/set/ListOrderedSet2Test.java +++ b/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.ArrayList; import java.util.Iterator; @@ -156,7 +156,7 @@ public class ListOrderedSet2Test extends AbstractSetTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } // public void testCreate() throws Exception { diff --git a/src/test/java/org/apache/commons/collections/set/ListOrderedSetTest.java b/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java similarity index 94% rename from src/test/java/org/apache/commons/collections/set/ListOrderedSetTest.java rename to src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java index 32130094c..6d6a83be6 100644 --- a/src/test/java/org/apache/commons/collections/set/ListOrderedSetTest.java +++ b/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.ArrayList; import java.util.Collection; @@ -282,14 +282,14 @@ public class ListOrderedSetTest @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } - // public void testCreate() throws Exception { - // resetEmpty(); - // writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/ListOrderedSet.emptyCollection.version3.1.obj"); - // resetFull(); - // writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/ListOrderedSet.fullCollection.version3.1.obj"); - // } + public void testCreate() throws Exception { + resetEmpty(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/ListOrderedSet.emptyCollection.version4.obj"); + resetFull(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/ListOrderedSet.fullCollection.version4.obj"); + } } diff --git a/src/test/java/org/apache/commons/collections/set/MapBackedSet2Test.java b/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java similarity index 96% rename from src/test/java/org/apache/commons/collections/set/MapBackedSet2Test.java rename to src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java index 98814263b..b280d1d7a 100644 --- a/src/test/java/org/apache/commons/collections/set/MapBackedSet2Test.java +++ b/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Iterator; import java.util.Set; -import org.apache.commons.collections.map.LinkedMap; +import org.apache.commons.collections4.map.LinkedMap; /** * JUnit test. diff --git a/src/test/java/org/apache/commons/collections/set/MapBackedSetTest.java b/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java similarity index 70% rename from src/test/java/org/apache/commons/collections/set/MapBackedSetTest.java rename to src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java index 1089ad01f..3bfecb5e8 100644 --- a/src/test/java/org/apache/commons/collections/set/MapBackedSetTest.java +++ b/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Set; -import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.collections4.map.HashedMap; /** * JUnit test. @@ -39,14 +39,14 @@ public class MapBackedSetTest extends AbstractSetTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } -// public void testCreate() throws Exception { -// resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/MapBackedSet.emptyCollection.version3.1.obj"); -// resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/MapBackedSet.fullCollection.version3.1.obj"); -// } + public void testCreate() throws Exception { + resetEmpty(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/MapBackedSet.emptyCollection.version4.obj"); + resetFull(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/MapBackedSet.fullCollection.version4.obj"); + } } diff --git a/src/test/java/org/apache/commons/collections/set/PredicatedSetTest.java b/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java similarity index 86% rename from src/test/java/org/apache/commons/collections/set/PredicatedSetTest.java rename to src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java index 03e6e76bd..218526f16 100644 --- a/src/test/java/org/apache/commons/collections/set/PredicatedSetTest.java +++ b/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.HashSet; import java.util.Set; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.functors.TruePredicate; /** * Extension of {@link AbstractSetTest} for exercising the @@ -112,14 +112,14 @@ public class PredicatedSetTest extends AbstractSetTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } -// public void testCreate() throws Exception { -// resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedSet.emptyCollection.version3.1.obj"); -// resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedSet.fullCollection.version3.1.obj"); -// } + public void testCreate() throws Exception { + resetEmpty(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedSet.emptyCollection.version4.obj"); + resetFull(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedSet.fullCollection.version4.obj"); + } } diff --git a/src/test/java/org/apache/commons/collections/set/PredicatedSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java similarity index 86% rename from src/test/java/org/apache/commons/collections/set/PredicatedSortedSetTest.java rename to src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java index 2873daa65..8dd780475 100644 --- a/src/test/java/org/apache/commons/collections/set/PredicatedSortedSetTest.java +++ b/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Arrays; import java.util.Comparator; @@ -24,9 +24,9 @@ import java.util.TreeSet; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.functors.TruePredicate; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.collections4.functors.TruePredicate; /** * Extension of {@link AbstractSortedSetTest} for exercising the @@ -120,14 +120,14 @@ public class PredicatedSortedSetTest extends AbstractSortedSetTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } -// public void testCreate() throws Exception { -// resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedSortedSet.emptyCollection.version3.1.obj"); -// resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedSortedSet.fullCollection.version3.1.obj"); -// } + public void testCreate() throws Exception { + resetEmpty(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version4.obj"); + resetFull(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedSortedSet.fullCollection.version4.obj"); + } } diff --git a/src/test/java/org/apache/commons/collections/set/TransformedSetTest.java b/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java similarity index 85% rename from src/test/java/org/apache/commons/collections/set/TransformedSetTest.java rename to src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java index 67d5e0c81..5a0d6b631 100644 --- a/src/test/java/org/apache/commons/collections/set/TransformedSetTest.java +++ b/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.collection.TransformedCollectionTest; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.collection.TransformedCollectionTest; /** * Extension of {@link AbstractSetTest} for exercising the {@link TransformedSet} @@ -101,14 +101,14 @@ public class TransformedSetTest extends AbstractSetTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } -// public void testCreate() throws Exception { -// resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedSet.emptyCollection.version3.1.obj"); -// resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedSet.fullCollection.version3.1.obj"); -// } + public void testCreate() throws Exception { + resetEmpty(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedSet.emptyCollection.version4.obj"); + resetFull(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedSet.fullCollection.version4.obj"); + } } diff --git a/src/test/java/org/apache/commons/collections/set/TransformedSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java similarity index 84% rename from src/test/java/org/apache/commons/collections/set/TransformedSortedSetTest.java rename to src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java index 4af898594..cec1e7c95 100644 --- a/src/test/java/org/apache/commons/collections/set/TransformedSortedSetTest.java +++ b/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Arrays; import java.util.TreeSet; @@ -23,9 +23,9 @@ import java.util.SortedSet; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.collection.TransformedCollectionTest; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.collection.TransformedCollectionTest; /** * Extension of {@link AbstractSortedSetTest} for exercising the {@link TransformedSortedSet} @@ -92,14 +92,14 @@ public class TransformedSortedSetTest extends AbstractSortedSetTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } -// public void testCreate() throws Exception { -// resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedSortedSet.emptyCollection.version3.1.obj"); -// resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedSortedSet.fullCollection.version3.1.obj"); -// } + public void testCreate() throws Exception { + resetEmpty(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedSortedSet.emptyCollection.version4.obj"); + resetFull(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedSortedSet.fullCollection.version4.obj"); + } } diff --git a/src/test/java/org/apache/commons/collections/set/UnmodifiableSetTest.java b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java similarity index 79% rename from src/test/java/org/apache/commons/collections/set/UnmodifiableSetTest.java rename to src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java index b82c387ac..01b1e4db6 100644 --- a/src/test/java/org/apache/commons/collections/set/UnmodifiableSetTest.java +++ b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.Arrays; import java.util.HashSet; @@ -22,7 +22,7 @@ import java.util.Set; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections4.BulkTest; /** * Extension of {@link AbstractSetTest} for exercising the @@ -66,14 +66,14 @@ public class UnmodifiableSetTest extends AbstractSetTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } -// public void testCreate() throws Exception { -// resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableSet.emptyCollection.version3.1.obj"); -// resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableSet.fullCollection.version3.1.obj"); -// } + public void testCreate() throws Exception { + resetEmpty(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableSet.emptyCollection.version4.obj"); + resetFull(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableSet.fullCollection.version4.obj"); + } } diff --git a/src/test/java/org/apache/commons/collections/set/UnmodifiableSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java similarity index 89% rename from src/test/java/org/apache/commons/collections/set/UnmodifiableSortedSetTest.java rename to src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java index 32eeec24c..87e752547 100644 --- a/src/test/java/org/apache/commons/collections/set/UnmodifiableSortedSetTest.java +++ b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.set; +package org.apache.commons.collections4.set; import java.util.ArrayList; import java.util.Arrays; @@ -25,7 +25,7 @@ import java.util.TreeSet; import junit.framework.Test; -import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections4.BulkTest; /** * Extension of {@link AbstractSortedSetTest} for exercising the @@ -140,14 +140,14 @@ public class UnmodifiableSortedSetTest extends AbstractSortedSetTest { @Override public String getCompatibilityVersion() { - return "3.1"; + return "4"; } -// public void testCreate() throws Exception { -// resetEmpty(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableSortedSet.emptyCollection.version3.1.obj"); -// resetFull(); -// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableSortedSet.fullCollection.version3.1.obj"); -// } + public void testCreate() throws Exception { + resetEmpty(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj"); + resetFull(); + writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version4.obj"); + } } diff --git a/src/test/java/org/apache/commons/collections/splitmap/TransformedMapTest.java b/src/test/java/org/apache/commons/collections4/splitmap/TransformedMapTest.java similarity index 87% rename from src/test/java/org/apache/commons/collections/splitmap/TransformedMapTest.java rename to src/test/java/org/apache/commons/collections4/splitmap/TransformedMapTest.java index 7163fe4ba..c201e7339 100644 --- a/src/test/java/org/apache/commons/collections/splitmap/TransformedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/splitmap/TransformedMapTest.java @@ -14,21 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.splitmap; +package org.apache.commons.collections4.splitmap; import java.io.*; import java.math.BigInteger; import java.util.HashMap; -import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.functors.NOPTransformer; +import org.apache.commons.collections4.BulkTest; +import org.apache.commons.collections4.MapIterator; +import org.apache.commons.collections4.Transformer; +import org.apache.commons.collections4.functors.NOPTransformer; /** * Tests for {@link TransformedMap} * * TODO fix version, add Serialization tests + * FIXME the serialization result is stored as TransformedSplitMap.versionX.obj + * to distinguish it from the one for o.a.c.c.map.TransformedMap. * * @since 4.0 * @version $Id$ @@ -124,7 +126,7 @@ public class TransformedMapTest extends BulkTest { NOPTransformer.nopTransformer(), NOPTransformer.nopTransformer() ); - final ObjectInputStream in = new ObjectInputStream( new FileInputStream( TEST_DATA_PATH+"/TransformedMap.emptyCollection.version3.2.obj" ) ); + final ObjectInputStream in = new ObjectInputStream( new FileInputStream( TEST_DATA_PATH+"/TransformedSplitMap.emptyCollection.version4.obj" ) ); final Object readObject = in.readObject(); in.close(); @@ -143,7 +145,7 @@ public class TransformedMapTest extends BulkTest { map.put( "e", "f" ); map.put( "g", "h" ); - final ObjectInputStream in = new ObjectInputStream( new FileInputStream( TEST_DATA_PATH+"TransformedMap.fullCollection.version3.2.obj" ) ); + final ObjectInputStream in = new ObjectInputStream( new FileInputStream( TEST_DATA_PATH+"TransformedSplitMap.fullCollection.version4.obj" ) ); final Object readObject = in.readObject(); in.close(); @@ -151,15 +153,15 @@ public class TransformedMapTest extends BulkTest { assertFalse( "Map should not be empty", readMap.size() == 0 ); assertEquals( map.entrySet(), readMap.entrySet() ); } -// + // public void testCreate() throws IOException { -// TransformedMap map = TransformedMap.decorate( +// TransformedMap map = TransformedMap.transformingMap( // new HashMap(), -// NOPTransformer.getInstance(), -// NOPTransformer.getInstance() ); +// NOPTransformer.nopTransformer(), +// NOPTransformer.nopTransformer() ); // // ObjectOutputStream out = new ObjectOutputStream( -// new FileOutputStream( "data/test/TransformedMap.emptyCollection.version3.2.obj" ) ); +// new FileOutputStream( "src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj" ) ); // out.writeObject( map ); // // map.put( "a", "b" ); @@ -168,7 +170,7 @@ public class TransformedMapTest extends BulkTest { // map.put( "g", "h" ); // // out = new ObjectOutputStream( -// new FileOutputStream( "data/test/TransformedMap.fullCollection.version3.2.obj" ) ); +// new FileOutputStream( "src/test/resources/data/test/TransformedSplitMap.fullCollection.version4.obj" ) ); // out.writeObject( map ); // } } diff --git a/src/test/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzerTest.java b/src/test/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzerTest.java similarity index 98% rename from src/test/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzerTest.java rename to src/test/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzerTest.java index b0b5085c5..d15ba4938 100644 --- a/src/test/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzerTest.java +++ b/src/test/java/org/apache/commons/collections4/trie/ByteArrayKeyAnalyzerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; import java.math.BigInteger; import java.util.Map; diff --git a/src/test/java/org/apache/commons/collections/trie/PatriciaTrieTest.java b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java similarity index 99% rename from src/test/java/org/apache/commons/collections/trie/PatriciaTrieTest.java rename to src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java index eadf318fc..fdeaf5ea5 100755 --- a/src/test/java/org/apache/commons/collections/trie/PatriciaTrieTest.java +++ b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.trie; +package org.apache.commons.collections4.trie; import java.io.BufferedReader; import java.io.InputStream; @@ -33,7 +33,7 @@ import java.util.StringTokenizer; import java.util.TreeMap; import java.util.Map.Entry; -import org.apache.commons.collections.Trie.Cursor; +import org.apache.commons.collections4.Trie.Cursor; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/resources/data/test/ArrayStack.emptyCollection.version1.obj b/src/test/resources/data/test/ArrayStack.emptyCollection.version1.obj deleted file mode 100644 index 2591e235edbf402e2c88e9039470b8131e3f199d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmZ4UmVvdnh(R;IC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4m8lMTwQcC5g$|vi<#A zuj@;?Gchn!6fp>AC6*=Xm6l}YK$Q4o7MD~sUXq=8JaH~F1EVJcOL1mZYDED95R|h3 H39bqNSfVC^ diff --git a/src/test/resources/data/test/ArrayStack.emptyCollection.version4.obj b/src/test/resources/data/test/ArrayStack.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..8b4837763245d90e0ef9ac8f62681a58a07b749a GIT binary patch literal 115 zcmZ4UmVvdnh(RmAC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^djzvX@mBA&6$=R~~ z{adf=OS&^LFjN#V2xldhCF+%yWadDW_+%EBR5V_aoq0TQE;9q8Cj(1yW>soM0Rs?} Jvj7RM3IKO5Cbs|p literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/ArrayStack.fullCollection.version1.obj b/src/test/resources/data/test/ArrayStack.fullCollection.version1.obj deleted file mode 100644 index 9a623e4dcb0916dd0317e098bf2c6365e486fad5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmZ4UmVvdnh(R;IC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4m8lMTwQcC5g$|vi<#A zuj@;?Gchn!6fp>AC6*=Xm6l}YK$Q4o7MD~sUXq=8JaH~F1EVJcOL1mZYDED90|QGr X3y|b0VPG@_Vq+jSDP*W)V6FfF{u(K7 diff --git a/src/test/resources/data/test/ArrayStack.fullCollection.version4.obj b/src/test/resources/data/test/ArrayStack.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..8a2540607e668e2bd79a9757ae3f18b91262eeaf GIT binary patch literal 522 zcmZ4UmVvdnh(RmAC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^djzvX@mBA&6$=R~~ z{adf=OS&^LFjN#V2xldhCF+%yWadDW_+%EBR5V_aoq0TQE;9q8Cj(1yW>soM0Rsbr za5)QzEMZ_MVPN*pO9fgh2-cmGn3t~SnOBmUo?0aIXu*>2jqMgpAib<*i8-aIKwAV5 z>ikM`lTwS?)=ZVuN<1!f6I8=Hd&P$LikoyL!_(k&-HvE_eD#`FQ7dA<_6$CUe7{x#aZlG#Dg!Ml8dFj^O zPbQq{SH2Ha?1icr>|O?*5(bWtjLf2vRFET>3{60UDXKY6l_jZj{1RH;1$>nOn&X6G Hjz9$fx6z?M literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/BooleanComparator.version3.obj b/src/test/resources/data/test/BooleanComparator.version3.obj deleted file mode 100644 index d91b6b88621b14f406477a2b611a2ef7dca17c03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94 zcmZ4UmVvdnh`}bmC|xhHATc>3RWCU|H#a}87)a;jq$ZbSLfE+liA9Me`9;NgPWkyc msfl^c`7j~L)OqR4lIJioF)&6kaF!I6rn+So6_->LFaQ9Wc_OU< diff --git a/src/test/resources/data/test/BooleanComparator.version4.obj b/src/test/resources/data/test/BooleanComparator.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..b5901f5184afab3b79dcbd3680ae642f354d87e6 GIT binary patch literal 95 zcmZ4UmVvdnh`~0$C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)@Y!Ggr1#FG4?Vm+t) m{G8OpJZHF&Wa_;1Wyy0GnHU(O7&uFcN>kl3i;7Ds3K#&i^djN_ literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version3.obj b/src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version3.obj deleted file mode 100644 index cedcdcd3df32e014443c464a5a12a4bd7e55ca7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 89 zcmZ4UmVvdnh`}_!C|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$xej#i^co#i@D4 knI)NJslJH?b1xo!t03RWCU|H#a}87)a;jq$ZbS0@)^dxrqgO&WXjTo_WQo mdBvF}nPsWIi3M{n9(}7QmdC)%z)(?8&SUSu00IIaq5=TxK^?pR literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version3.obj b/src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version3.obj deleted file mode 100644 index eddebf0fd68fadc90635d4565b51c383bd78da5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 340 zcmXX?J5I$g5L_wAgMtPMYN+T^AW?%vMZqC9VR548cunk=_d>xO zbcp-2`v{^c857PEJO&Su|d+GCt^-Vi*Y#%tuV@MLxn8!t)IDYonW`7nOf_)H)a>NS`%Ig{XjDlAD$t6K-%$X~I*9j3ZVLaYb5Ung z+3^^l7Dl6fmGv6^h5c6I8-37erX#2N+^sm__lz!^cSZV>}oy7N3BZDbZ#ZUwX= dPq5cO6ph1otT?x@C7mWq8kw2xc{Om^{{rR|Yq9_U literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/CircularFifoQueue.emptyCollection.version4.obj b/src/test/resources/data/test/CircularFifoQueue.emptyCollection.version4.obj index 6cb4deaad5aeae423e1cc392f5800e07f79c6405..c9dd8935cf0b3ea7b274c984c19756061cadbd10 100644 GIT binary patch delta 19 acmYdE3RWCU|H#a}87)a;jq$ZbSLfE+liA9Me`9;Ng&iP<= YQcfzA1r+`LWv1$myp85e3=93RWCU|H#a}87)a;jq$ZbS0@)@Y!Ggr1#FG4?Vm)UF ZJ1Hj>$^wf1{xVZ_N8UzrCI*Iz0sw)SA%Oq@ literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/ComparatorChain.version2.obj b/src/test/resources/data/test/ComparatorChain.version2.obj deleted file mode 100644 index 66dcce07b3bdf6104313e8f1b7192aedbfc0a0e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 426 zcmZ4UmVvdnh`}nqC|xhHATc>3RWCU|H#a}87)a;jq$ZbSLfE+liA9Me`9;Ng&iOF5 zb4Frj-q%0I`)gM&Tg1e`9L2zqS?rUaoSmBD!@v(T2dW3Gu7p9rCo8cmQNOe#Ge_Si zv$(|Chk+-*C?&NhGcVmKv!u9$K?q3&P$W3D#JZw@0q8zqkWM|2PCdt>qQpv&_KLM$xI9kV1pTfMuGqn7XbB?jSm0- diff --git a/src/test/resources/data/test/ComparatorChain.version4.obj b/src/test/resources/data/test/ComparatorChain.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..2dc99454a6fe50d0179322ac34b44ab19754e462 GIT binary patch literal 428 zcmZ4UmVvdnh`~C)C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)@Y!Ggr1#FG4?Vm)U# z+c_gKGwUsL&neB#L-_ZBSH)M0#OiP+ zkc}L`0P@UBNv#0e%1~U$P{+Uqw3!jkVyXZ-LIB}%h>!CAcGOv#tX2d%JDPzd3G8pC gXs?Qb(jo>Bt-!KXXk+PQCI$wu!Hhs7L4c_O0M74?;s5{u literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/CompositeCollection.emptyCollection.version3.3.obj b/src/test/resources/data/test/CompositeCollection.emptyCollection.version3.3.obj deleted file mode 100644 index 4c19ee1571e3493b130742b888602f574a7270ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 253 zcmZ4UmVvdnh`~0$C|xhHATc>3RWCU|H#a}87)a;jq$ZbSqO$dz^K%RGi!)17o#FE8 ze-*z?+RM3!iGeAafjKcJr-VT~+9xZqEK$F-Br``Jq0-uifjzghB(WsFsDvTV2WYE4 z#8!Q%tw0)XD-s)M1ct3D2xEOAMp{=Clor9P)&p4$bS=y{>$@IW3Dxx}XPFonDhe2Y Gpa1|Df?b3F diff --git a/src/test/resources/data/test/CompositeCollection.emptyCollection.version4.obj b/src/test/resources/data/test/CompositeCollection.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..61bac56315a45cbdb517e6b2a632eb1ecaa3eedd GIT binary patch literal 258 zcmZ4UmVvdnh`}zuC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)@=96jg!+=Be#%#u`R zxPp?4tlz>;))q1`F!?YrC+6goFbMc$C6*=XmzHGa==)?AmstBSu;-SRB$nhCl`sVP z0PWL<*ryM*4@e{IL*nRTu}=kIwJ*d>>xu%PH-tfU>VfRkb1W)KtOQwH(RfLA=JCY2 Z%nXd43@pW&RjCyP3_wuM0wlO93ILsVT|WQ- literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/CompositeCollection.fullCollection.version3.3.obj b/src/test/resources/data/test/CompositeCollection.fullCollection.version3.3.obj deleted file mode 100644 index b0daa230f1a1453a9247b0c308f868b3cfee81f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmZ4UmVvdnh`~0$C|xhHATc>3RWCU|H#a}87)a;jq$ZbSqO$dz^K%RGi!)17o#FE8 ze-*z?+RM3!iGeAafjKcJr-VT~+9xZqEK$F-Br``Jq0-uifjzghB(WsFsDvTV2WYE4 z#8!Q%tw0)XD-s)M1ct3D2xEOAMp{=Clor9P)&p4$bS=y{>$@IW3Dxx}XPFonDhe1F z7+8S*76dsGqS7O=I3qZ3RWCU|H#a}87)a;jq$ZbS0@)@=96jg!+=Be#%#u`R zxPp?4tlz>;))q1`F!?YrC+6goFbMc$C6*=XmzHGa==)?AmstBSu;-SRB$nhCl`sVP z0PWL<*ryM*4@e{IL*nRTu}=kIwJ*d>>xu%PH-tfU>VfRkb1W)KtOQwH(RfLA=JCY2 z%nXd43@pW&RjCyP3=9k`3RWCU|H#a}87)a;jq$ZbSg4nr<1$xf;xdr*fnI);d zi3O{ZBYhWKUA2#ifhn4S6Q~0sQ^Ft+?UR*QmZ)D^l9{6qRA}wPz@A%Ll30>oRKj56 z1GGjTVvRo38Xyg~MjvR6KC(3`Kofi+x~(e;N{e8|>w%2d0~!DS!G^Y1?mpa13=9)>Irgp14!Ol}NZIr)hxZi&f2CwVe(mShyA7H8z= uq*N5xI{*z}VBjg|0FnYAW(CkRBO-#vHMgLo65-Zca^gHs{CnBJjsgJV%X)VJ diff --git a/src/test/resources/data/test/CompositeMap.emptyCollection.version4.obj b/src/test/resources/data/test/CompositeMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..488cbe01c70dd66d941ce2ba19009b389d83e4b5 GIT binary patch literal 357 zcmZ4UmVvdnh`}JgC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgO&iT0o`Nf$f zslJH?tCJ&r7hGMnkBNaPnt>Cj1tL?zAQ0`7l~|UjUs{rxqYqSQ?Zd#HTUwG>l3!H9 zVCw_4M;~I3KGYr{jj%@_XpcU!Jt{yWd?DJcD+)@BVCL(A%+~{%|Np^;wpZ>x+)NA% z6$K0o42(eU2!fmdQR0zUoB>qE%6{wMVX=gZ%nVF!3|u++i79T0$v`)GGH{k;6r~nt w?GCprjJv*jsYqJWu?4*}$#>01JY9761SM literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/CompositeMap.fullCollection.version3.3.obj b/src/test/resources/data/test/CompositeMap.fullCollection.version3.3.obj deleted file mode 100644 index 9262aadd41d056c013e4e898768698b2e692d3ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 605 zcma)4J5Iwu6nx}MfC4Ch3Q-`@*%B>CARz)siKtN;HqK%P*6d=hlbC{%jyq5T1t&m4 zoPdHR6$KR%XMlNj_>>f$+1)quWmjj0@1(_(HIUh!#l_&yCM!CD_4h) zPjiRQMJm*3LTS;d3lCe`qnZsO83$T*24-Uu4Tu){|+vzCfST3adsdzQ+5xuTS% zO2$|y#!{jR0_xJ*stH^%< diff --git a/src/test/resources/data/test/CompositeMap.fullCollection.version4.obj b/src/test/resources/data/test/CompositeMap.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..65229b18aa2cf97db0141543355f12601fb597b0 GIT binary patch literal 608 zcma)4Jx{|h5Ix$YAHV<%z=Rl(*b)S66#@xSKx)N|y5OcJDL8dVoHk)#WaB?D0|UPR z3GoXUSUNEHe1P|NZ`W{kh+mDi9?B5l!HCX7vbp$^nZ! zq?zU6^UM6nYmo|dniP_C>de7Rhg4Nw$RkgRP7-YIpaIe1paNXRHy0=}`%J`Kk#Ww` z^$WV93StAkDukj^#(hO)SISO1MOtOFLeOL`>-Lb9F#^R?DbWb1MJi(mpicF;5ZEha zjDX?F$U|I{PHwYH1c6$(T+aj4BFY3%3*}>C1DMy~%uy3+f$6bTWO{4^h?vn9OnYd8 igqIL0X2`go;2<~t^Dg$_nU3#ixU?|+adcD4F60MtgUJs7 literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/CompositeSet.emptyCollection.version3.3.obj b/src/test/resources/data/test/CompositeSet.emptyCollection.version3.3.obj deleted file mode 100644 index 1e13dcc4f533d594bae5117ccbee0c94a61f0e3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 465 zcmZ4UmVvdnh(SNUC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4o5WC3?>Jxdr*fnI);g zsU?qhUx|LR!c>QefuW*^!Ipq-gh>cPoZ+Uc|5f}pX)os@CI+Tx2Ij<^oDv4{XrHXa zvPAvTlFS@^gi3242KL<2lEjkyq7sHcAE2%J5I5^X-3+ARZbo7Qjet5GVU`Ml=?gK^ zx}u=82xhe&$ZDW#Va8eC_0USFu1`4&@^JwJ0|O&4)C56}gsAjLEY1Li%PyDJsnd3B zH(>^;D(3;J6R>vxl0Z-a)L=v)pg_Uwnp;p(2{a1osw|nKOC_?G%w}R>^kLvk&d)1J X%*;zoDPiD83L>C#pz8}6>KHfxfjOtQ diff --git a/src/test/resources/data/test/CompositeSet.emptyCollection.version4.obj b/src/test/resources/data/test/CompositeSet.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..6937c372aa4d7e4dc056eec827c4308db9faf903 GIT binary patch literal 374 zcmZ4UmVvdnh`}JgC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^d#i=EF&iT0o`Nf$f zslllw?q3Cqc-Q>3VPatNVPH3RWCU|H#a}87)a;jq$ZbSg4o5WC3?>Jxdr*fnI);g zsU?qhUx|LR!c>QefuW*^!Ipq-gh>cPoZ+Uc|5f}pX)os@CI+Tx2Ij<^oDv4{XrHXa zvPAvTlFS@^gi3242KL<2lEjkyq7sHcAE2%J5I5^X-3+ARZbo7Qjet5GVU`Ml=?gK^ zx}u=82xhe&$ZDW#Va8eC_0USFu1`4&@^JwJ0|O&4)C56}gsAjLEY1Li%PyDJsnd3B zH(>^;D(3;JQ?Pdck_-$&aP>KfdFgtdc_pdosYODM7A*PR*lxkZ!05@qT9%konhFe0 z0kFAXb$+F}NvTC`Yo^L_PkGP{vz(=bfi)zfC^Z#mC_h4Ra0W17GJMU2O%iSe0gViX z8Cl3s$H2wF4OGpCQ0-J%k~+sPq2*n`R~evUCltj3KpR{$(=$qddXSvsl3$vXliINP zke6omZx)~~7ZhC%B4EEVpgPMfCqJ>|*4vYdZrgl#1JvV&s^kIFs}9N)mzg TrIax6Bc)lOa$s@-IgSGW3;`h6 diff --git a/src/test/resources/data/test/CompositeSet.fullCollection.version4.obj b/src/test/resources/data/test/CompositeSet.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..6cb2231c91110e1cc0658b19d4817a4cae5b4b33 GIT binary patch literal 775 zcma))KWG#|6o+5-_K256b4e@>2-?`}DxO5Rs4-rm7dEGODJ?QNhuw|4JL~M*%btZ8 z@K2FK3nK^$B9>=mp;(EH2v$}S3q>rA*aQm^d~;{q+s1QG3?#~bLQP_&j=lbJEP zo@u!emM!S_V`L~K!ZC{sX4hc;HPD_KOfs0ghW%uj@8aboq#nmqyrJTalTxylawMzo z$M3&k4|C901wC@F@FWC)z7?I;0fI(S=nRV-%6wV5v3~Ex^HL5V30H=wZtsaHS^-88 zK#97H#{%1^2FPtLN54FJ@^kgpQB7&`P3FZskx=Ypcj{`fzr^Lu_WJnX-Op>9il#s< zx(rvLKqnm`U*}C8AZUk<{JT~i4yP$~hrY_0pBO7GZk#7qecPpC24Ijv797brQM*#g z5`kS_`+Dcy?R}pJn#)4!VE{wQTOxkOwH?gz(=Fr=YKzyupWE6){B(vdBIq?Y;0U?1 zffDz$JL?IC8=G$*f1LdBjmX&yIrRzvVaI~wO5{8swCBGnB3|=m9&r(2xMxVIoF+^CZT}x!#`ysN literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/CursorableLinkedList.emptyCollection.version4.obj b/src/test/resources/data/test/CursorableLinkedList.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..552ef3db4f89e2b61022035c6bc86f6e005e8628 GIT binary patch literal 85 zcmZ4UmVvdnh`}3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;Jdd{Uq#rZ{v jNja%LnR(f%DLz2Ks)agRwtTBP$jrb{QBcmp00b2Pb9f({ literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/CursorableLinkedList.fullCollection.version4.obj b/src/test/resources/data/test/CursorableLinkedList.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..5a3696f61f123abe0028bc6db29eef075063bd05 GIT binary patch literal 492 zcmZ4UmVvdnh`}3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;Jdd{Uq#rZ{v zNja%LnR(f%DLz2Ks)agRwtTBP$jrb{QBcmpz`!6}!oX0%!0exw3N%JsDWb5_3vZD~cEd5bFF&bCXhw+SW{!<(~4On+aqt z&{U=p2G)>_qSVxa;zEWx29QN8a9facyX2Pw-Pf@Bke6omZx)~>E-*_#+E^V#fEs}S z=rn$Wm2Nrti6yt*o?LX>=EEDH9ye4y2S6TT4Nfgf%>&Y|nduoNB@8TnnLr=H+`@%w zU~oo$QAvicxv)vXtstO*!6*hYa06BIA*}bw&r7%Nelp=qzw&*cVlPz1VD~cclrV6F nWMmeVq=Fp5WM~2+Oi|5osw_#JSZea|9{?Qn#8E literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/DefaultedMap.emptyCollection.version3.2.obj b/src/test/resources/data/test/DefaultedMap.emptyCollection.version3.2.obj deleted file mode 100644 index 7ac1eb0c7aed78d413299ebc6618e8a81ae7bbac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 395 zcmZ4UmVvdnh(SNUC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$r*2X^EvdC8;UC zi3JP{g0BjX+)8FNElbQPO)X&%^2tgpOVrOv%uCnzPs#%7wXP@t8g50v@U+sr zcTC_0fpl0m$&pVhv_HblE6_hY&_yEn+hd5Xt>R=!Z zcd$NGCBy;d#5%wk=+~0Oyb`GH^D121bECC5z_xQ{!ek2>>KGU+3P4^H1o>F6v?Mb} z&m*xo0~j)_?6(dc7E8Fu%)sQvz?GAqm;y1(lYz4&qbRjFBR?mlqQKsP0R(u;Ie?@9 Ih*?nq0N1yQE&u=k diff --git a/src/test/resources/data/test/DefaultedMap.emptyCollection.version4.obj b/src/test/resources/data/test/DefaultedMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..ef1f681fc40a75a9456f1fa10e9f46a98fd777f6 GIT binary patch literal 442 zcmZ4UmVvdnh`}JgC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOE~#mWr8y<3 zDZYsX3=D#=3Xj}MW@cdYVPGvw%qdMRVbJvf8lw*}MjvVnkVY7zA5xT3mv=#^0e$GsoYzc#qPgY`CqJB)(ep?w&H#oZEBmd3hs6>uGBYr_F>vMNC#FCQ_hjHK$tX%K&dAS6sVJ~_U;qK0 NatIGJP<3;)I5er-j2 zvGo%KD}TUyv(Z)qIcM(U+{etrC)k+=SLwjP6#Y;*zKUa&WW-Vm-$ZZ(P3Clf?f(vNK)V`DOrw5Xotwnx zo87v5FZzkzz#X*8lvkVQjh);?(mBE`q?@rj?@!N*mv3#D>BF2}6jG9Mw&rP6 z*HO(;3@}P4S~EGUYf){HzkalocUd;j36vUo6?Nz~C$2-8DN&_zk`c1nlNgekiBp1l iDnd3)Oz9RO8FoOgQBmKTSsAE|l}wzByq-l^l;t-SQ`k5F diff --git a/src/test/resources/data/test/DefaultedMap.fullCollection.version4.obj b/src/test/resources/data/test/DefaultedMap.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..c4541b52d4d869b43e6cdada5f61cc6968681ef3 GIT binary patch literal 693 zcma)3Jxjzu6nuI)J+;z8EG-04FcGm3EEE(`II*!4!I#`#65V9uW^;G3@W0sGYb)A| ztv^Aq@((zhiyxf^GP5)L_PxpG_MMu!rd6dwmop9`;RY&6RGNdO6oHAcUUw7D++ES- zLK@LILqJMx(2gAqQwhsR{_7Escbf*c+=Dh7+nhf^W$d`+NlxXhkS6$N^fBR|05- nNs!n94$tW7jJ5*lvDIK3+X2FJe93l(B}mMYvP6c8dxOCzt99xA literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/DualHashBidiMap.emptyCollection.version3.obj b/src/test/resources/data/test/DualHashBidiMap.emptyCollection.version3.obj deleted file mode 100644 index c8c4318951929ca12ebe885324996c377cc018b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmZ4UmVvdnh`}tsC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4ju!DVe#61$r)}i8&sL z#TiaOzHedy1Ji^BQ=C!<3V_B4W+j#->Xnvc=IDV`0adWF-#U0$Ea4(E1CtvA qS5AInid$lGNq&(h17}G_QEG8Ueojh7fxQC*2ndvOfJhLtq5=SGQ870F diff --git a/src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj b/src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..90a5a17c684180e8bd6fcb4e5f52d64f12acec62 GIT binary patch literal 155 zcmZ4UmVvdnh`~I+C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dNtr2`xrqgOE~SY% z9*M;nPC&kIVgUowgauQh1p}BF7%B>Y<_KmbmL=+ymSpDWfm8uiu(IDecvvjqA~OS% t8v|EPeqxGSVsc4-ktYLZNk&m>aYlYlN=1Ra0|N-~lyd+{0T8pI0sxWzF=zk) literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/DualHashBidiMap.fullCollection.version3.obj b/src/test/resources/data/test/DualHashBidiMap.fullCollection.version3.obj deleted file mode 100644 index a5448baad7450d3d6a71f1dbb763a57f77987abe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 409 zcmXX?F;2uV5L{i7yMyj15G5U53JO{fLMJGY=xNv_#tt~=$Z>KBub`pl0ek}S0$TpS zA8ytV$um1MyXzz$zm#>J&Yagdw_F;Pm#%5trUP56%1}#P)K%SZn_u;8uemdq(6`*u z?DhTaesz}+jV;!!o_OHA54Fvu3mw_w=kx3E;X9$(n)a>ZYRzSE{)YB~@v1Y9d+n;SX$k)gp)moP~C-Dkj{r{I6u!wbTd}0b5#&HLwUV#1p diff --git a/src/test/resources/data/test/DualHashBidiMap.fullCollection.version4.obj b/src/test/resources/data/test/DualHashBidiMap.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..76dfe97b0821b432c0450c884fdf203e4d2359d9 GIT binary patch literal 410 zcmXX>F;2uV5L{iHyMyj15G5U53WP)nLg)kq5te4ynvQJ z@CRlMmOSH`9edaBKNNQ@ow~M2xZ$j{N#^R>Z91@s&3uLPNs?B1RdbVE_AFQ2l^4)A z+|cah?e%VT8xf5S-dR2Jz)9~bNi>B-y!ih3+`s>dXtt(Zah$I?^RB(79bdM#E1l$H zb9PR;4z^3+A@*M5X+E&@_SlnovJ)r{8oaefBB%!*JS__6@^rGEmj5T1F&A8IkO~YV zdTq_`a8cz8cCQwCT(Z~Q*bU^@B_!?6i;NP7#+-X(d b11LqTV;dkmlL~7OB}nuVnJ`1(VH|$}d@_ME literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj b/src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj index 91074a9df7647f5f8cd2a0b51a7176ba2e210104..1a86e2dcbf5d150a6a6e14b8be22009688419a24 100644 GIT binary patch delta 21 dcmcc0c#V-`&07Z6;vxpyi5zl_CKJ`x0{~EH2FL&a delta 19 bcmcb{c$JZ3&07Z6;vxo{i5zkh)zis08DBIwEzGB diff --git a/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version3.Test2.obj b/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version3.Test2.obj deleted file mode 100644 index 56783aa7815545d60954796a7897491c776d596d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmZ4UmVvdnh`}tsC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4ju!DVe#61$r)}i8&!f zsi{stzHedy1Ji^BQ=3RWCU|H#a}87)a;jq$ZbSg4ju!DVe#61$r)}i8&!f zsi{stzHedy1Ji^BQ= qK-&aCa(W;+J&<8QgLn>pv(r`0dWLRLAwwMlBT!R03j+{TQ~&^Qj64JY diff --git a/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj b/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj new file mode 100644 index 0000000000000000000000000000000000000000..7bd0dc183afa2b0d01360bb6c4074c359a6d3ff6 GIT binary patch literal 390 zcmZ4UmVvdnh`~I+C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dNtr2`xrqgOE~SY% zAw{XFPC&kIVgUowgauQh1p}EGn0y$xfI15jixNxni%J;8e6kYD67@?ff23RWCU|H#a}87)a;jq$ZbS0@)^dNtr2`xrqgOE~SY% zAw{XFPC&kIVgUowgauQh1p}EGn0y$xfI15jixNxni%J;8e6kYD67@?qII5 literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version3.Test2.obj b/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version3.Test2.obj deleted file mode 100644 index fdab60ce58a4e803f70a9920db01721d704940dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 634 zcmb7ByH3ME5Zoj-peRi!_=6}Fjzj?k2qd5k1&EGnog9wC#b@lZ^C*z`0~!iCJ|GQL zwDgESprxZjG&IZ|7C~tc&Cbp4?aYmC`bKV=(7H+jk7Mrigx67nfr?U~l%k_UbN0h- zIN;dZ&sZKOLhOPca7^W^+v}71VTDR7?F~$VHNhnM8B?{B&P>xh&6Fp3?=Dto+VD7SX8aL5wM?A*m1`s36ry zMNuZ@nHb}K&N35g7=i*^%dugnwc={gbbCTdg(ZuSasrk1uw(#qF;J@Ok72b`oY2Hj zO5$ki-x+SshdmmjezX7+B0lqc7AZ B*wp|4 diff --git a/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj b/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj new file mode 100644 index 0000000000000000000000000000000000000000..2a746e07b27ed3cc03f0d5a95f681d6109a03830 GIT binary patch literal 671 zcmb7CyH3ME5ZuIeKv5(V3jQEUg(D%P6bOWXG87;>s&jHU4riaS&(5Pj;tyyj==gv% zP|?yO{(zQ_4$;sscUUAyNQh>~GkZHbck=X=oHU`fOnjHctlQ^qSB9aCQlJpLs{(wl zyI#->LKeGw852hd=R4s0ET;11&DC-Jz@l=8s+f#f!jw!Dt#k$~XRS;HqP6?2Z**uW zXCmV>>5R^)G>Q>o^REyy|I|I?IZx6#pXT)G@viiIQKr(5C^P@<|M(XHJu$c9nEnOMb3~n zg-}#62*FZej4rAsDd!-lAk|1lQ6|JGALG1v*flgk0gmCAFx^^lv=E&>7eZplAgpX( zrhN=)0A283RWCU|H#a}87)a;jq$ZbSg4j8k#U*-fnH8xi!I@R5 zK0w|>3vO=f#G{N%3=9=T46elJcT6fSDN0N(2~I7_Ow7rwN=(WD8|9LkoL`h!l3%3i z^hEPpZ*?{^(98m$tAw)>%M$fUOEPox9E*w)D?#>FG+vUOc|370GXtY114}W`H5CO6 MKv2#CB)BRn0Hq8{d;kCd diff --git a/src/test/resources/data/test/FixedSizeList.emptyCollection.version4.obj b/src/test/resources/data/test/FixedSizeList.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..dbaee55e5d025f5df73e1ab5b7378047e036d72a GIT binary patch literal 412 zcmZ4UmVvdnh`}hoC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdTyB&sVTvk zRjEEe-a`v+ZtKLOj7$s+6-5kgL>b_iR9sS&m|PN^T9lcXlUbFRlmj-)B{ey}D6u5J zNY&|y=C|JJY-X^bRwNk;aunPkyV7g-j(^H}PNeG)e$|7y(HZW2xS?Tt1cY}lTWG?> z!05xkh0s&NAm)>mSeB??T9TQgkI-mcQ2-2EVUUy_NJ`JKs3@@#3RWCU|H#a}87)a;jq$ZbSg4j8k#U*-fnH8xi!I@R5 zK0w|>3vO=f#G{N%3=9=T46elJcT6fSDN0N(2~I7_Ow7rwN=(WD8|9LkoL`h!l3%3i z^hEPpZ*?{^(98m$tAw)>%M$fUOEPox9E*w)D?#>FG+vUOc|370GXtY114}W`H5CO6 z3=G2MEFiLkfuV$f**`B8s9O-MJ0~$OUC%SGBsD#?Na)dmCEpv{Eto)hS<4c0N>hPu z7eJ`2}F41^TFA z^C2(I?B6UvOI%=(a)xhA4{GyT!UvpuTgj+#C1A|cvWZ(v>=0jNTlb@Gv z-Th?3nSSN_K*e6Dioxz>;3;9?2+7DSDoF)7g2~VXM3|zQ<5XFaI>#@e3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdTyB&sVTvk zRjEEe-a`v+ZtKLOj7$s+6-5kgL>b_iR9sS&m|PN^T9lcXlUbFRlmj-)B{ey}D6u5J zNY&|y=C|JJY-X^bRwNk;aunPkyV7g-j(^H}PNeG)e$|7y(HZW2xS?Tt1cY}lTWG?> z!05xkh0s&NAm)>mSeB??T9TQgkI-mcQ2-2EVUUy_NJ`JKs3@@#hOmAb?QkSDKrYTGX~?sx0@E2i>3$0GZ8H!oV7mQIwimP+Z7R$G`;? zVu9O&q}wIG6c{TFn-6(uX8&dZTH*q;1f-4IK?JA~2!KxGM_B2Wlb={}>+Q)!w{1SW z0qSu>)pG#kA=cp3veY~v?V6dMQBuOd;+F~ZA_?iowB-{!D8W@aX zAOkm0H6OxypZvUZ>+UBL&h#ta2P*bLRSb4715XJ9M@U9yQAsMu5ln_AAi@;Y9H+{X Z)H!|$E$;%p$^gxALNQ060_0Zq3IP0P5hVZs literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/FixedSizeMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/FixedSizeMap.emptyCollection.version3.1.obj deleted file mode 100644 index a22abc377e6a618b1718361e5506c450b63ce6e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmZ4UmVvdnh(SNUC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$u6o6{#t~nN_L2 zi3REDOc&SlT`XZ{V5len>KDvPEKAfYEy>K$^GGbt0IFbRzjg4iSi(hS1|~NKuAKbD m6t~3WlKdi12F{X3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOZkZLSDZ!al zslJH?>FG=t*YjO0VP;^cC;%EDn3Y(Ts8?E&nWN{CSeyY=!ODK?;9;?Zi_8p6ZVX&G p`H3lRiOD7TMV<_tB^gDj#TofIDHR3w4h$f`Q_cY-1whP-3IJ$sFY*8Y literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/FixedSizeMap.fullCollection.version3.1.obj b/src/test/resources/data/test/FixedSizeMap.fullCollection.version3.1.obj deleted file mode 100644 index a865775f224d14e24f5ebd590ab2ef3be02acd41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmXX?F;2uV5L{i7yW$onsiZ0yKQ8Yny#@TxGH@76;`ECuo zz&eeTJUbUD1rCw2ow~F((sE`rl1?e8z`;Wv*!HNClK1EWC1aGe7_ppLG9`yu4WhE< zW(##@G}2c!UBA&gZ6d9-b9Fgk;`)Cl@yYeD0i}Q&2dAZFgJD9_)$^@@Qp8pqKoptA XZ=7)4%xI+Ab&?bkGt2W*;4qGV*=BvX diff --git a/src/test/resources/data/test/FixedSizeMap.fullCollection.version4.obj b/src/test/resources/data/test/FixedSizeMap.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..39ce1bd60d1e8a726126141e2df8ede3d462cc7c GIT binary patch literal 399 zcmXX=F;2uV5L{i7yMqD=3Pedq7a>FsRRjeUA7GOhC$Kq(#K|RB@FFDMfOtV#{=gq@ zHeks!p4qWIAHNi}4PCm%#$0n&m^gD)S9yosCp5xA!65nxKAQ7#8zP?YNrhpa+9g5>T;mo_{o(_D`n6_||5B1G0={no4 zf#=vKwWp|O>5QlF)r?nf^iCnXt+^2Kw4Ay3w6f0S>4@0+{{%B)%jE{CnPCLa&fy`T ziqUltK#dkg1heJLFhc9v0=|-lQ{KS@s<1};09CZJ0IKj68i&BYJI#EjQGxat1+2A0 VAiOXY)<2XW@t4Sm4m0<|um@X}edhoG literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version3.1.obj deleted file mode 100644 index bdfaf67e3a03a2c9edf584da3b2b8ea0a4d53ae5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmZ4UmVvdnh`}_!C|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$u6o6{#t~nN_L5 z`9&qEDZYsX+KIP3?O)rtGBYq#6aY;T%t|av)GIB?%+U)eN=*f-;5qosPFFSS88ZW; n4+9s_1~DIyVttTeeP_71bwxozIST_2R8#-}KtVRZ diff --git a/src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version4.obj b/src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..65475c7e621eaeda8e94fffb03deeace7c11c9db GIT binary patch literal 156 zcmZ4UmVvdnh`}tsC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOZkZLSDZ!al zsloY0C8;UCi3Qq;w><4%+qg0_FjN!(jSK$3n@xX1*+gV_{~mNHR~BO p1EUWE7trW}#G=F!pne81ACO{wkYasjxVUviK|whS0}xbH003uJHuV4i literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version4.obj similarity index 73% rename from src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version3.1.obj rename to src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version4.obj index 0260e21b9f2b6b7a91404fa005f6a47c6a9f53ac..0390613ec169e2094d8447196bda4be5400890bb 100644 GIT binary patch delta 22 dcmZ3)yqK9|&07Z6;vxpKi5zl_CL7gi7y(ZA22B6} delta 20 bcmZ3?yoi}&&07Z6;vxpqi5zkp)oU05L}CUQ diff --git a/src/test/resources/data/test/Flat3Map.emptyCollection.version3.1.obj b/src/test/resources/data/test/Flat3Map.emptyCollection.version3.1.obj deleted file mode 100644 index 2f30ffa204ebbe7d10eb2d73d85f4df9c0eb907c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 71 zcmZ4UmVvdnh(SBQC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$u5di6zFqi3N)p VzSKP|Y?;B#z)(?8&cXl$6#%`E8BqWL diff --git a/src/test/resources/data/test/Flat3Map.emptyCollection.version4.obj b/src/test/resources/data/test/Flat3Map.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..891277be38a973f592fdb0b360876b855dee7a27 GIT binary patch literal 72 zcmZ4UmVvdnh(Ra6C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOZaIl1#=eOK Xiy6MuJuGaQ!OXx=QBcmp00b2P(>EE0 literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/Flat3Map.fullCollection.version3.1.obj b/src/test/resources/data/test/Flat3Map.fullCollection.version3.1.obj deleted file mode 100644 index 3e3665812d43a49a2ba6419c6aef19d3cb3a511d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmXX>F>=B{4AhLzByI8u3T9l8KcveeWal_D$mp;SgHurD5%jctiU-i;0a+b1yOMTS zce>uG9C})4A1aRAw7zPz>vTJSMSPRiR(Bk$PvP|O#qmOar`zuLTo4`O!4c7WqGF|* z$N|Sh<-yNI63sGWPz>Hf1zJ<{4;r9ZTQ7p-Eb~L{v)Y@=f!AB8nK5u1KP@pIS@ziY z5>&tI3DxVfvJLP=(4>0=fR?L;TjY$)67qk5)}#)02Sif_Ts`5%%$5u~SklPMY==4E K7g& diff --git a/src/test/resources/data/test/Flat3Map.fullCollection.version4.obj b/src/test/resources/data/test/Flat3Map.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..795ff11808387da96fabef25645191359686290f GIT binary patch literal 323 zcmXX>F;c@o4AhLzA#L)BG>i+#8`9+wvU8j>$kExpIB|+pJc6ED6L*_E`r zr_<**mE%BBkFC{ajbU2>3PrbgMRK`{o8v%bd48BMC(Mw zi)tbVoD!86zY$5a$c#ZTdJh$7P0cqnK(n@91j$9_KXu6JU@8Ybo}gyNz`gqU3G<2N z>|;-NS|xf2s)u^UhUI@{@4y*Bvz`$HTDlf)kv1|*$iD(wlRDTP5KS3y{EWSsEg5vQ Nq>-7~&U3)&`U{-QXKVlf literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/GrowthList.emptyCollection.version3.2.obj b/src/test/resources/data/test/GrowthList.emptyCollection.version3.2.obj deleted file mode 100644 index 8a053235443e5a368e3ad21e9d0539ecddb548cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmZ4UmVvdnh(RyEC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4j8k#U*;~Mfv3=89qSf z|NnosstY~b!NkB&QN-X%jAqBA;*z4o3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdhSK}0>>z)(@d;6{{g$E4ztqQvBq;MAhb#GK5k#H5^5kXbIN$@xWzCHY0F zPERzy^;TyygAKJJ$xsx7>`JfQJN_x_IgzeIcvKJOMrXL+;jRnYBOttc*+LU021XwS zE`**E1~H$k#Ii*F(vr*^eS}8qiUMH33WKEdKvH^+MMa5~Aa_3RWCU|H#a}87)a;jq$ZbSg4j8k#U*;~Mfv3=89qSf z|NnosstY~b!NkB&QN-X%jAqBA;*z4o4mL=wtrUKnA zfKcaGnwykb)V5}-EccWL-5{@l%w{TKU=7JAN=+>&E@Y@X&?UG*#^ijj+ zLtdKMzgd8mxWFs{Y2$DZ0cr#SpwsvfR=VZnCzjlLdveijn-6b*dfZU;8~}NUH8`~_ zH4jL;W~OJ9lrXUPWdeN&a|;)$fx#L1MI{-&=E5ckw}OBM2BR3rzztN*hp^r!KQG<7 z`^khe{mS=&ioH-3gWb!(Q^LRzl95?dk_vJJlc5QSFhw=Tsj?(>j$cB{yMV7UKy#c> J%n_)l00334#_#|D diff --git a/src/test/resources/data/test/GrowthList.fullCollection.version4.obj b/src/test/resources/data/test/GrowthList.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..69a4598d23b3ccb1289d182887a59939627a632a GIT binary patch literal 816 zcmZ4UmVvdnh(SNUC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdhSK}0>>z)(@d;6{{g$E4ztqQvBq;MAhb#GK5k#H5^5kXbIN$@xWzCHY0F zPERzy^;TyygAKJJ$xsx7>`JfQJN_x_IgzeIcvKJOMrXL+;jRnYBOttc*+LU021XwS zE`**E1~H$k#Ii*F(vr*^eS}8qiUMH33WKEdKvH^+MMa5~Aa_J|j+&PmKm*YnIPNli~J5_+^?$@j)~3!p1J z8Cc5_b4pWz5g>q2=U1AWlv>obW~warln33Q5CECYRKma-l2MeJT2NfbP{+Up6k>tf zf~4CezZ4iN4Vw>nX=eXs0b1e$vjn7#+d%}V5eR@z<40KOmXn`Ya_jBMMYnA}yaDQQ zL)CKt5Z5z~Yw)^dZbGT&M;HXXF=^WcZp3nHBh$PrA2CLqET)f}hFlGHhV W2`%pezRCd2aY8XipaSGp_6h(#8xsNm literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/HashBag.emptyCollection.version3.obj b/src/test/resources/data/test/HashBag.emptyCollection.version3.obj deleted file mode 100644 index e74098603ffad0455657634bf825a1b705e7ddc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 70 zcmZ4UmVvdnh(RmAC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4juk>3SZC#TibC=}SJ@ Uxc*xqn9R(;P*G6M!T diff --git a/src/test/resources/data/test/HashBag.emptyCollection.version4.obj b/src/test/resources/data/test/HashBag.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..6fd5e3512cbbfb86e3bbcef3518d010a5f9504fd GIT binary patch literal 71 zcmZ4UmVvdnh(SBQC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xt9*M;nPKoJD WKH0ebTOpXt%)n4lP|m^t1Qh_aU>MZ^ literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/HashBag.fullCollection.version3.obj b/src/test/resources/data/test/HashBag.fullCollection.version3.obj deleted file mode 100644 index 9ec9081807626af2259bfff1c36f452a4d094d3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmZ4UmVvdnh(RmAC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4juk>3SZC#TibC=}SJ@ nxc*xqn9R(;P*G6M!oa}5T*AQU2xc(>S3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xt9*M;nPKoJD nKH0ebTOpXt%)n4lP|m`@z`$I>z~~5OF#%alaF#Qe#aICV)GHiw literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/HashedMap.emptyCollection.version3.obj b/src/test/resources/data/test/HashedMap.emptyCollection.version3.obj deleted file mode 100644 index fa5d88d3ed426d61678855d0f7efb9fd20507f6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80 zcmZ4UmVvdnh(Ra6C|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$rKd#Tlt7zKI3T b^|{>m{EI&@GcZ&Xl=Ij-Fo1vnh^PPnjwl%) diff --git a/src/test/resources/data/test/HashedMap.emptyCollection.version4.obj b/src/test/resources/data/test/HashedMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..bd1d9797667007ea553aeac6e2d8f5e81ee1d781 GIT binary patch literal 81 zcmZ4UmVvdnh(R~MC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgO9*M;nsVTmR d1<&=l-1z*9KQJ>eR1}o+*gG(QfB=Z7005<}8B_oO literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/HashedMap.fullCollection.version3.obj b/src/test/resources/data/test/HashedMap.fullCollection.version4.obj similarity index 83% rename from src/test/resources/data/test/HashedMap.fullCollection.version3.obj rename to src/test/resources/data/test/HashedMap.fullCollection.version4.obj index 9e7abbe96530c7563d344b336eb817d1bafeed9e..3185f410e5d19b66431620e2dca11e7a444be22e 100644 GIT binary patch delta 22 dcmX@jbcTsz&07Z6;vxp!i5zl_CL7gM839y*20Z`( delta 20 bcmX@Zbef4{&07Z6;vxo}i5zkp)m0e*NnQpB diff --git a/src/test/resources/data/test/LRUMap.emptyCollection.version3.obj b/src/test/resources/data/test/LRUMap.emptyCollection.version3.obj deleted file mode 100644 index eff363cee87ff5055d485b45a9ed302592edc4a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmZ4UmVvdnh(R;IC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$sU~p}vU)-y1`I dPGnoMj+ud>qM%%Wfq@~#-T_E5Ff@RO3IM*58X^Dy diff --git a/src/test/resources/data/test/LRUMap.emptyCollection.version4.obj b/src/test/resources/data/test/LRUMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..3a8ee54a5a69433cc0c318575865348bc6d5d1d9 GIT binary patch literal 104 zcmZ4UmVvdnh(RmAC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOK0%?ri3Q&q zLw-(VTe6Osfia3fs5m(>FEpAe_YqaZG^xY=s&X8v+vVzx!_V9O@B94YtDvI? zTEvF?Ri8Rp8s|r@#q0uYPl;%KeS?$e72hJ!j4gLPYAxK3i3%1;R6csIQ1bx5`49UH zdqAmnl;nc8U`K@YF-KTq63s34oX~`f3%rnl$JYCGJ*lHLBKl0JgNaTK9i7Q7ShnU| t1VZs-G$Q7R5^xEc{63RWCU|H#a}87)a;jq$ZbSg4nr<1$sV-Rh7Pp1$j@W zG|j6Nn8M7!=)=ICmY7_UUsPGbpyLBHLLXv;KGX;x4L3qRq$n}3I4!>@H?_#Rq5x>8 z6#+ZbO7lQw7wfq}>_9SLVbVd(*zKQpFoE2_kqK2$!k|IO5m1#72bdG<0B2wjlqBYr zKy{y2;o6=Xt;GShoih_ATf!jZla*MOsGpOVm#*)hlm!etphY0B3WCJ-N=q_x^gI%a zGk~GU%6{wMVX=gZ%nVF!3|u++i761nJsCJlGKx}*GxBp%Dhli!7(hUvoC8FHm=zTO Dnmd}F diff --git a/src/test/resources/data/test/LazyMap.emptyCollection.version4.obj b/src/test/resources/data/test/LazyMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..ac3db2612437d42c05be834028da28d94b4d9832 GIT binary patch literal 439 zcmZ4UmVvdnh(SBQC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOK8aP8zKI2S zPp34^s}z{R%)scwz@Cq>)>Irgp14!Ol}NZIr)hx5W_tgI7>2$Qj0V4b5be_>>U_DfTx@TND6?M G6%_#LTAQN) literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/LazyMap.fullCollection.version3.1.obj b/src/test/resources/data/test/LazyMap.fullCollection.version3.1.obj deleted file mode 100644 index 60efc78f140060532b632c15b9698f76a72a0c99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 685 zcma)4Jx|;~5FN1Z11g|EDJdd_AY@BvB0&KX5(4R>H0cmh#&>(RVeK{RJ>Quk1;62H zB>ME17Uc&-Y3Wm@${)xZpA)4cmi*q%*PGeVe*Q_F($b!>ali!+6BP_imYKW+YpsSZ zm2<{LFyPzz9T)kJ`Q3fJG52U?K)o>!ow2o}{Q)Gxr9{|Dfd5K_A1vqP*w{?j!&!lz z2ha2zPjb;NgVSY?e*_+)$JdvOUtd;bhJM;6INE(~h&FRMz}x>F-~=mhoV&LA+spMu zcCpuQy04{wqK>u(S6p$ZIgi8l(G`}5Msn3n@dp!^>fnsa1Y7L%o*ut$fBf#z>M5;j z!=t76IjyO`^1hM7Lq7iP$z#D^ZR)%@J)F4*y!!Z*J%lZ93}3#*CsGiv9K^<+Yh0 x4JZb((b$hPClC`7Z`@1;6vJhb0ffW2qJ6=Q6N!(goKE65e;1wiRZgL+pzYU_1j+!_9bpgm;5c*5@jsvD zZqx5;y=wk!^1AD2sei%~4m4*`a2TH81~Ey#c2RVH>=NxCa1rAs+ug^z`;W&DEt=V< zIc<1Yn}4NQ7h6@tMh~a?&MwKbeBJ}D;9bfcwI{5{%8_@f%8fJnN%PRo)n~08b*egX z)QyZ8h9%m1%?e_hBTh1ORTV;OWDJaeLP|3R0ZMDEw8mbist~-$6ftxu(j4*yM4*sJ wNgkk(q9Q;cE=6JwSf8=g87lSQ|o3xJ{Np8x;= literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/LazySortedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/LazySortedMap.emptyCollection.version3.1.obj deleted file mode 100644 index 4ee9e516bbc731453421f7c52611f57f7d65d873..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmZ4UmVvdnh`}JgC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$sV-Rh7Z{MJ1^z zzKI2@>kcdLbvaiV6VdDz?%9 diff --git a/src/test/resources/data/test/LazySortedMap.emptyCollection.version4.obj b/src/test/resources/data/test/LazySortedMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..d150b34a0228db1b804b9a954c7be03559ba0cbd GIT binary patch literal 505 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOK8aP8!TCic zsVTmR1*+=~EAMqVV9Lb6P*KF7O{{*P&b+5nn&wpsOkrkV^kHC6OH3}wFRCnI(DebD zp$~C`KGY3B8sP^0kfOxA;3RWCU|H#a}87)a;jq$ZbSg4nr<1$sW2dD*EczKI33 bKQ6SXl(}ayGcZ&Xl=Ij-Fo1vnh^PPns#O{p diff --git a/src/test/resources/data/test/LinkedMap.emptyCollection.version4.obj b/src/test/resources/data/test/LinkedMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..de86081d9fda05d7b791d2db540349267158829a GIT binary patch literal 81 zcmZ4UmVvdnh(R~MC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOKACyhsVTmR d1+_mew5gQ2XE8G{R1}o+*gG(QfB=Z7006<-8cqNJ literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/LinkedMap.fullCollection.version3.obj b/src/test/resources/data/test/LinkedMap.fullCollection.version3.obj deleted file mode 100644 index 63f4ab345782651efc0e84391b666d70fcde670a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmXYsF;2ul3`H#^3lvnG03jqAlwvOc9St19$(l)6Cmxd7>}Dk>ISq&5BJ`Ae4@8=H zp8xlc^Z8AyX{1{lL&cGsR;tGO-i8TPRhrcKz2{gxcEeUSPaNNVzCNz!hnIrr5clVI z_vFtd&PAdX2kr*cTDhGQ6|9=5d^U5ac?9772geLYKljqSX;04aCJBhFKPFIItY4&I! diff --git a/src/test/resources/data/test/LRUMap.fullCollection.version3.obj b/src/test/resources/data/test/LinkedMap.fullCollection.version4.obj similarity index 61% rename from src/test/resources/data/test/LRUMap.fullCollection.version3.obj rename to src/test/resources/data/test/LinkedMap.fullCollection.version4.obj index d40bce461cb006038d1f65b96f12275813d1d10e..695c69e477ae919d555630689d0e551c03e2948f 100644 GIT binary patch delta 58 zcmX@ZbcTsz&07Z6;vxp!i5zljCVIJv1$sW2dD*EczKI33KQ6SXl(}ayGcZ&Xl=Ij- LFo1x3RWCU|H#a}87)a;jq$ZbSg4nr<1$sW2#U=hlDXB%N zDZYsXs(12DzZ<_#V`gCVVc^cpD^4wf$d)h&_+%xPCF+-!Waj9DG+9>^0Id)P3F?6a z^&E?e5-UM66^)l3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOKAFWO{zWON zMX4#ii3O^6@=d=RzfWUkVDw?&&de)LErQ6FFbMc$C6*=XmzHGa=z}y_R}=v45C#eA zfdus&i;5B}K{6GMmt!STx4coa%14i$xlpiOH3}wFY;vIEXgQJEzZc#NvSBXcL15gz*EivBn3dsiV6VZ CCruv! literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/ListOrderedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/ListOrderedMap.fullCollection.version3.1.obj deleted file mode 100644 index 3e3d5eab8cec1f84f88fb92aaa772ea4c049b436..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 573 zcmYLFJx?1!5S`#VY(4`fi2w2y*IAN*z%xM*}x2kX5{hLS`9)K<00Fu zSNU+}a^+P1mF?c6`SkDO-}4r|>d{g)^2$9`1FiKgxaNa#sPsW>I&3UPY{X<1li6qI zcp59s&xf6>Uwn;6PAT!#Of{B>x|0OB6)5F`t5Kj9YYptP6PyJ~`kG6Sb7O#oQVYF`FS&Db{Zy8hzz3;Po5rtROi zckjO4w`lH!7PaC0ga^U6Q(6e6Q@%7hZ|u=Ad=qU>I>23g-S6~+7R8${>qy?%h+X)= zPIVk!vmUFM?8LQrCbHLo=Eaq;wp5(NDO%$4Le^1$X^B_RBAW_ZLj@~J{5HP69bo}k ktSs3j=;dU>Ho)ZC!j_@KQ6*jt)OkLs@Ojj5_PS~Q16gXULI3~& diff --git a/src/test/resources/data/test/ListOrderedMap.fullCollection.version4.obj b/src/test/resources/data/test/ListOrderedMap.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..1d03465cb37c181620fe2b60260cac944bc351a3 GIT binary patch literal 574 zcmYLFyG|QH6urc|*gz7%5Clb}G*P-m;!#lm4Fbt1zreM3*xh98naqsswF@LZgMvTc zClCcSlqkP|C}}x!6NzHao^xMw?!9@Y)H~WTuE^MOuT)vj^!sMu@z+}QLIu8)_1R{f z%7>pWS5D=pY`_0CyRX|X=M9?a&_Xrv%Kgg*TI&4b5pNDdr8i^KUTyKlN(^Q(m>oLD zlbES5AHQDR^EHN?P~xkpsx1+<#|dyFP|5{YgFp?|8rWqgI1Q9^HJ1?Q#sCYYP+Y+A zBv7+3ChtxVNebgpl$J{CSoT{XodCBWeC%n2zD2=U{g4MHW@u}8U4Hj^%)Z3BY4hp! zZtd)$K_8B2UK`GjxEG8&p}9~xo+DJtaShY literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/ListOrderedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/ListOrderedSet.emptyCollection.version3.1.obj deleted file mode 100644 index 9ef613cd9fae279f6944f15dcba6a3b5b4118ab9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4o5WC3-%Y#U=hlDXB%N zDZ!~Fe=g7a_Dkk%FcSl#4+95K9xPSDAmEdgSeB??T9TQg57J>>QN-X(gz1h+#U(|F z$tA(5MVW~?nN^8NIjKNvTvC(sixNxniv;<^L!kHq2( zpwe9~ty8D%*lq$=QO?7_z#w4n03?B+q5`Nx7@@3RWCU|H#a}87)a;jq$ZbS0@)^d#i=EFKAFWO{zWON zMX4#lsU?3d&-?aE=4~(&1EUWE2T&d?Rl*?Pla*MOs9#!=nWGQVVO>$g;6jY?j!DHO zMTyBJ!Kp==i8+~7iAg!BKzm$Llkq7>wFx7%ITjTqR)Rvg eqVbaK%;Sl3nHd;88CZ%lt5PcpK)T9Vzs?3%63V`` zbkP!~jk@VKo4yy&)pgNS4&Mi;^qLc>X*q`y=L}T8-rW24qu4bPu&oAZT91|#;|{Z9B$ROKKc}<~H6Gv? zon!PfBCtvNw0d=Q?aAXxq*&+!fI}xoi2(U6y(>IRpY#-3DDxlgKm5LY{W$Gl5>g%E zwvoE#qPdZ--flKfURz%+Wp2G+NpLU?(-fp;Y>CJ%`g>}__NB7V9xGI4H_p>c^b}}y$3q3_8QYNx`AwpHbW6BPaawZP!!V@4LhlI2q!f$%yM)WHOSfN$ zyGcG2EpV1F`sn!uje-txVv$i|>|^X~G1H73BhMIQWEuMzLyQb#FXI5Cz=#I!4u1pk Cl_5vStfp!k8}A_XVi>Y#|Dkq)(jI`}*X%_Wn%{Bqpo_kZ5!f49x^P^sT6cuPKaqP__WI9@AtPifA%+3A8ac?2%o!; zBqR!FS%VGMrEUz8k#z**{w02-WJ|%yQsqKthCa_q2FE!$UbY02mgtUe%q;iD`uqSG zIrM*#Ud+qn_RX%<7Y}`IO#W{%UJJ_B0gttcX`SuN^F->|gS#2GjIifO=xM9N6SGbY zTkoc(6lzL2!E6neeVV(pwEX08hIXvYMgd^p=r9r>DFHmkU}i-bGbOKZk^Fq;{*Q$# zLpXa3f(>TWIrfuqv)%s{>(vq$msgh3k?WrpY3~{a`s{OX9>RDPkPuXPgPRh32M)Dv zhw+4QFGbZXA+?i-Q<P1rnnf`Yh+xR1COAhc=2->HtYjCzTzh+U-$#_jJ0)5S zAWCyH=pWZBn(XvP=On*boVxh!)c1b$M?3t4gg{X@xdi`&NrT&tn>Q>b*P5&MJ{(#9 zie|pU9DW5LAvCG!LUL}R+SXUjs^h13;nC~y{WHG;=;k`zo$jf@p~XWEx+(8HjtIf# z=(Beg-lcE6VYmGBRsyy@&)wFOvjMbIq;?Vd2vI_+M%+OdAfyQ~LN8$tAwftIb`kax KdI)jCZs!kkqBrsY literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/MapBackedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/MapBackedSet.emptyCollection.version3.1.obj deleted file mode 100644 index 5c34fb61bd00bec03361acbcc23fd5c7efb1230d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 203 zcmZ4UmVvdnh(SNUC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4o5WC3?Pz1x|^{*{LbP zsU@)iN*%NES9LQnF!?ZWrIhC8R)!_!l%|$22>E0smL=-vB<7{-`zK`q4Y2lMV9re} zC}H4-NR^gk=I8?rv#uy809vg>z-pjYJ&(lVjMNmMp6B{pZhZd5AD9^!DhkSZ>>U_D JKmbHk006iwL>B-6 diff --git a/src/test/resources/data/test/MapBackedSet.emptyCollection.version4.obj b/src/test/resources/data/test/MapBackedSet.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..8a4c2c0ef869e1984065105c1636b8ef522d443c GIT binary patch literal 205 zcmZ4UmVvdnh`}JgC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^d#i=EFzKI1+iOJci zDZ!~Fu>ndQv+`GUGchpvFmR=m=H^z0CFYc-mM{qUWF?j*>gOcprR)1AWdTjF_F-Vo zO)My3;D<<+mSpDW0}ZpTC@28htxL#mpk6(X#Nv$96riT(`dn^&{>2}d85k-G%6aS^ L7(hS(L{tC(E9^vp literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/MapBackedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/MapBackedSet.fullCollection.version3.1.obj deleted file mode 100644 index b02dd61df1d7a7196202500de84b927a0515f01b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 622 zcmaix%_~Gv7{*_BX3&t2VM&RV(!D97M$yEC#*B>YlruAL_g-_q+dd^bk6g8p67Hqw6Ngbw3 K5gbU7uJ{R-F~sx$ diff --git a/src/test/resources/data/test/MapBackedSet.fullCollection.version4.obj b/src/test/resources/data/test/MapBackedSet.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..a0bcab2763fe8d24c57e566635985c216878ce11 GIT binary patch literal 624 zcmaiv%_~Gv7{*_BX3&t2VM&RVg*()U8buQm8Z$DoQ_jr1-FvxT?mc&mjVPfkSg?_W zWFvUTJDFMNpXBf*fO!tsOC^66SEUYtA38ymi zq6OQg?5_W^iIqp0t749zr*JS{mvY~H00n!gc5n#9YNIbi zUX3DK7TNNc$x%Tk^l)_Yv9{SSLB$vZ@}gtGfrgSU=@}VxHqQ22YxeGG9iOk(=fbC-xZyHxsF^y_64bA1aouA4=H=@6cHr%qpm;fSK>!D- zC-SFa!ZMZU_T%pLPRAWl<7HGa2cXt=#e9`?l|<<@=Fy~sKdG5Wd-b%cIUI}sq@LcA NI!KQq)|Vn(;S2iP#a;ja literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.0.obj b/src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.0.obj deleted file mode 100644 index 3e5f4d5c0eab3fd187b7bc3242db517bb732749d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmZ4UmVvdnh(RyEC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$w@vIVG9isg=Ho r1<&=l-1z*9KQJ>eR1^TU>ky&cBe6ImH3eOBIgh;q0|*F!h>8jT*6%QO diff --git a/src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.obj b/src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..dad0648c305e1b37e1483a317d08ea8735aea536 GIT binary patch literal 146 zcmZ4UmVvdnh(SNUC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOzNI-Onck_D tzKI3T^|{>m{EI&@GcZ&X0QKt3RWCU|H#a}87)a;jq$ZbSg4nr<1$w@vIVG9isg=Ho z1<&=l-1z*9KQJ>eR1^TU>ky&cBe6ImH3eOBIgh;q0|+PpF%Qrv0|G{6r&g9F=9H$w zon!l>^k(_-r>sm2jL{4%KRi1ezsp+XjLXQ?K`QF%W0kp=Gffek8iXsL9ggU>{ z+@#c^wlz~_xu-nnh8f0OT*y$zzzH@M#$tnuvBOy$B@9faK430ODM%qZPzw`Wni0-o z0xC3eL{|vX!3|f#0#f6QriK}$Mi@?r0M!_~U{k{lQo{!#ctL91(A2PkWJEv&SfK=n z#RF4q>W!wF385O~C?_;&7Lc?soPZb$RA}OkO(EDqUXW_A^Y}puJ<$|`y@}*JkQZFh f)PQXTt3h?Wi3gfOuwRAIoCo4c0F5>Es;B?}${Nrn diff --git a/src/test/resources/data/test/MultiKeyMap.fullCollection.version4.obj b/src/test/resources/data/test/MultiKeyMap.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..845e14b5117b7e5ab5e4885a81c71ccceff9c06b GIT binary patch literal 834 zcmZ4UmVvdnh(SNUC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOzNI-Onck_D zzKI3T^|{>m{EI&@GcZ&X0QKtVmL=wt zrotU$`=j(``SGW$Obm?C3@kwD;t~eoXrHXavPAuy#JqHU|D-ISPpm5nN{e6;dLRis zsKkVG5%UF#HFKCi-T^uT6eNNm?GRO-c_pdosYODM7A*PR*lq!|#*={+?1YLU1_6XR zztY^K)S|XEQ)RiQJm`iQ##~&;P{+UtHWtQWgNw1lSsWz{Or}0yE=ws$Av;hD6I_}R z&SC;8G;%~&2-3j~SHl8Q3RWCU|H#a}87)a;jq$ZbSg4nr<1$w@vIVG84i8-aI zzKI17U3Yr@4&Uj?%)scwAc#=vmY7_UUsPGbpy2~FQXgWZKGaAc4L4FBs?xfm0BFAx zsrIV`rKUk$2Q^5u;5=hMOnMg+$VIHlIf+$OB@BW-S&3zd`ZH5w&iN(c0>&l84 zgh8Tur6rj;dX7a!iIqN?#U&Mumt3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOzNI-OnPG`J zrK!G&1rJ?!di@UH>B-E%=))k0Q0tbMT#{c@S;C;{12j_~Vx~USOdyRgQy;3-x}pH+ z0%ww4pc0gt26Z6RB+Y{Ji~%v}T}&W1u_osvR#lZS2>N6tmL=-vB<7{-JLe=87X$4p zD`F4^iRzV>Waj8O78NB{`eYWDR5V_aoq0TQF3?Y&3@pW&RjFX72_lqwBo=1?J)>Irgp14!Ol}NZIr)hx5EpndaF%2gr50!8=cH5=*gG(Q08cpwkQ4whD=Gk@Ab@26 literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/MultiValueMap.fullCollection.version3.3.obj b/src/test/resources/data/test/MultiValueMap.fullCollection.version3.3.obj deleted file mode 100644 index c6d5aa549179e0236c6567f2d98f3db71f6ee3eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 475 zcmZ4UmVvdnh`}JgC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$w@vIVG84i8-aI zzKI17U3Yr@4&Uj?%)scwAc#=vmY7_UUsPGbpy2~FQXgWZKGaAc4L4FBs?xfm0BFAx zsrIV`rKUk$2Q^5u;5=hMOnMg+$VIHlIf+$OB@BW-S&3zd`ZH5w&iN(c0>&l84 zgh8Tur6rj;dX7a!iIqN?#U&Mumt3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOzNI-OnPG`J zrK!G&1rJ?!di@UH>B-E%=))k0Q0tbMT#{c@S;C;{12j_~Vx~USOdyRgQy;3-x}pH+ z0%ww4pc0gt26Z6RB+Y{Ji~%v}T}&W1u_osvR#lZS2>N6tmL=-vB<7{-JLe=87X$4p zD`F4^iRzV>Waj8O78NB{`eYWDR5V_aoq0TQF3?Y&3@pW&RjFX72_lqwBo=1?J)>Irgp14!Ol}NZIr)hx5EpndaF%2gr50!8=cH5=*gG(Q08cpwkQ4x7mJ$ZWl;T2$ zItDf%kFlHuNOA$iOe%mx5*7&~kVGAC~KHhQBeT^W1W%{ literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version3.obj b/src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version3.obj deleted file mode 100644 index 209bd4e00eab5703293c6d0132fbf5047a4a8fc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmZ4UmVvdnh`}3RWCU|H#a}87)a;jq$ZbSg4j8k#U*-v`6;Q+KqZ-Z z={}ix*{LZ$K+*V}_qJK@vFBuFVDw}V$W5%s%q`6YsY(sbtV*pYU|?VnDQ5wa3>5&C C&LwUD diff --git a/src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version4.obj b/src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..f70df10ccf42dc3599525cce3c00af2ffeac330c GIT binary patch literal 109 zcmZ4UmVvdnh`}nqC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdVcvSsm?$( znR)3xnR(f%DLz2a_?`E*S?{suWM*LWWDv+rtjNqQ%>}7S4bH4etten%U=S&10g?3RWCU|H#a}87)a;jq$ZbSg4j8k#U*-v`6;Q+KqZ-Z z={}ix*{LZ$K+*V}_qJK@vFBuFVDw}V$W5%s%q`6YsY(sbtV*pYU|?VnDQ5wa!X*q0 zB@E2|d8t7A1hW#$67_Nt^V0P^^GZ_FQ;UQiEm-osvE70RWDaXtVoqslMG=DlLY-e} zZc=Jd+nTAe+*2NOGchoL&1NcLU=7JAN=+>&E@Y@<09nKWw*^VJOMYomPHMyELtdKM zzgd8mxWFs{X=8N|0cr#SpwsvfR=VZnCzjlLdveijn-6b*dfZU;8~}NUH8`~_H4jL; zW~OJ9lrXUPWdeN&a|;)$fx#L1MI{-&=E5ckw}OBM2BR3rzztN*hp^r!KQG<7`^khe z{mS=&ioH-3gWb!(Q^LRzl95?dk_vJJlc5QSFhw=Tsj?(>j$cB{yMV7UKy#c>%n_&n E0JsUC=Kufz diff --git a/src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version4.obj b/src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..97cd575f7f72df001039b4dc7b5564fd24d8bea8 GIT binary patch literal 516 zcmZ4UmVvdnh`}nqC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdVcvSsm?$( znR)3xnR(f%DLz2a_?`E*S?{suWM*LWWDv+rtjNqQ%>}7S4bH4etten%U=S&10g}Qc z3=Aa<%>H?)Knn%463Y_xauV~>^*r-RQqxn5gdQze^1ZR$f(c{}YguAWX=+6gg8)LE zUukYqYEj#osj}Qt9&|G?Fo4ZwDq&y^$tX%qEhsKzsAB+G!~(YkNw-UWX;MyV!{$R? zn%TcufR?zxECFd_br1n+1OlMb_z_mR<>V)p+SyYk=as-p135YO7HOHy4Bz2BoLd&~=uQEV$oKVaW Gr~m*dxu6^X literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/NullComparator.version2.obj1 b/src/test/resources/data/test/NullComparator.version2.obj1 deleted file mode 100644 index 056e48b4e98269bb5f0685552252e42e608a6d0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmZ4UmVvdnh`}3RWCU|H#a}87)a;jq$ZbSLfE+liA9Me`9;Ngex*4% z&iOF@dW$l>^*b5CsUDf>89oexdHH#$s!JHee6kYD67@?3RWCU|H#a}87)a;jq$ZbSLfE+liA9Me`9;Ngex*4% z&iOF@dW$l>^*b5CsUDf>89oexdHH#$s!JHee6kYD67@?3RWCU|H#a}87)a;jq$ZbS0@)@Y!Ggr1#FG4?Vm-go zoE&F3f4xPS-ufSrx=ajAQ4BnJK)GVaqEwH}^b8*c!MyxDRMjO6Vm?`kWr_NwC7C(; l2ve*p3K)Uza3IAUP~Ay6sR(m^f0?PeBX6TQ69Yp<0RXOYQ*ZzP literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/NullComparator.version4.obj2 b/src/test/resources/data/test/NullComparator.version4.obj2 new file mode 100644 index 0000000000000000000000000000000000000000..5bfbfd95a73f025fec2e973e7a1fc5e048ce4cf2 GIT binary patch literal 221 zcmZ4UmVvdnh`}nqC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)@Y!Ggr1#FG4?Vm-go zoE&F3f4xPS-ufSrx=ajAQ4BnJK)GVaqEwH}^b8*c!MyxDRMjO6Vm?`kWr_NwC7C(; l2ve*p3K)Rya3IAUP~Ay6sR(m^f0?PeBX6TQ69Yp<0RXNbQ*QtO literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/PassiveExpiringMap.emptyCollection.version4.obj b/src/test/resources/data/test/PassiveExpiringMap.emptyCollection.version4.obj index 9a961c7b6a73cd9f6e2a2f912d8983695ce66c37..3574211e062697e06c8407e6c67953675e4ad95a 100644 GIT binary patch delta 44 ucmdnOyq%e2&07Z6;vxpK$x@7Rj3yJ+!Wlg$*2x1|b88qQA%c@F7;69_$qYOI delta 38 scmdnayoH%#&07Z6;vxpq$uf*`6V<~RJto%6Pn=)F7y%NPY|U5$0P3C#r2qf` diff --git a/src/test/resources/data/test/PassiveExpiringMap.fullCollection.version4.obj b/src/test/resources/data/test/PassiveExpiringMap.fullCollection.version4.obj index d724556dddcaa470f6d5608c1ed1825a7d2de01c..ab281b1ef702fc73305736e7899acd8f0a7c040e 100644 GIT binary patch delta 48 zcmZ3%zM7q5&07Z6;vxpKi5zl_CX)l1#3$N1FnUg`lV>#9ICm-|V3RWCU|H#a}87)a;jq$ZbSg4juk>3RW0sVSMsi6yBi zPKoJv9L}cy71}(7iGiV_h{2A4c7#z#rZ~gR-_E>n%aMX*WlRi=J`9`%FndZEw0wXD z>qFe74|NxihPz82?j~!XD*}mkg=122Nl{{QNpNaWW@1ieRbo<3D#AT3smb|8i6!|( zVS5CGcQ0FL!VL6f0Wg@f2-pA$CXdA83}65)`DEkzZ-rnoSZg^80}xbH0F5vuU_@GJ cUNX?;V!e=}(p0$j^sY|1c`#5-2Nc`|02p|r5&!@I diff --git a/src/test/resources/data/test/PredicatedBag.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedBag.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..1ebdd003c33acec3550f5fd7fbbf693e812482e6 GIT binary patch literal 467 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xt0Y#}PnaPPI zsVPp0>31B?rvDY%JcWsYp`wVvo{)ZoVMxX}!)@5kyl~5rf@Nh)42(VuoCPq8N*J_# zfF|ohT&53o8IVS}OdswlYoI&aNN|T^QgKO9VsZ(>6)vgC`9+B(`9)!S1cY}lTWA7y z4j00@5(Y7!ti-ZJ{nC=m9DRgF>xu$kAZin`92AHiiNzVf;9K&^#`WI{!DMD&@D-G^ oFaSXX&SIB?BE;tQS&LnhN*2-qk5L4+g5~fFh#+0PKRTQUCw| literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/PredicatedBag.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedBag.fullCollection.version3.1.obj deleted file mode 100644 index 1af48edc220eab44858b9f7b3c49e6458e76c28a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 466 zcmZ4UmVvdnh`}JgC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4juk>3RW0sVSMsi6yBi zPKoJv9L}cy71}(7iGiV_h{2A4c7#z#rZ~gR-_E>n%aMX*WlRi=J`9`%FndZEw0wXD z>qFe74|NxihPz82?j~!XD*}mkg=122Nl{{QNpNaWW@1ieRbo<3D#AT3smb|8i6!|( zVS5CGcQ0FL!VL6f0Wg@f2-pA$CXdA83}65)`DEkzZ-rnoSZg^80|Ntd2?L`en8gHS vIfGe@K$a6ktfB&FfhhqC(n|A^f$l2S3n?m1g?nD_>Xe%Y1J!gukx>8uTurC2 diff --git a/src/test/resources/data/test/PredicatedBag.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedBag.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..8024c4644d6ad4f244ab6576bb73812bd4c998fb GIT binary patch literal 497 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xt0Y#}PnaPPI zsVPp0>31B?rvDY%JcWsYp`wVvo{)ZoVMxX}!)@5kyl~5rf@Nh)42(VuoCPq8N*J_# zfF|ohT&53o8IVS}OdswlYoI&aNN|T^QgKO9VsZ(>6)vgC`9+B(`9)!S1cY}lTWA7y z4j00@5(Y7!ti-ZJ{nC=m9DRgF>xu$kAZin`92AHiiNzVf;9K&^#`WI{!DMD&@D-G^ zFfcGMmoP9of>}&JmJ^)i3}!J_04*>hWI3RWCU|H#a}87)a;jq$ZbSqO$b@ic(WDlM_o)Q=H)n zwlgo>a-?8c850Ae4+CcbOhpNUmJiTieTc#OP=kRq++cmUY1S1*41vVE!ZE41q$n}D zBsjGwGchN#DlsW172zJ2)a3l4#FG4?uss68yO%9AVP;^cC;<9XI4iL%QLnTlGe^&{ zs3@`0C$qSuqVbaK%;Sl3nHd;88CZ%lt5Pcp7=WOh1xRpJQ~9O@|3&IRMxtg@FJ7 diff --git a/src/test/resources/data/test/PredicatedCollection.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedCollection.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..f5402db38aa4f01a1349f83f73842c58acd5ba72 GIT binary patch literal 390 zcmZ4UmVvdnh`~O;C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)@=9KC>|)RfHR#FEq$ zXSj;(%nP?1DOgs<#K7poz*zuOQNp0@12kD5VzNHeWFU<&Ss!kkbwv?_8wu`kOe!uZ zN=z<6xWXkhIlm~eB)=$ZkAU#*WeZKf&f!8>SHd9Xla*MOs9#!=nWK-;XkAeN33RWCU|H#a}87)a;jq$ZbSqO$b@ic(WDlM_o)Q=H)n zwlgo>a-?8c850Ae4+CcbOhpNUmJiTieTc#OP=kRq++cmUY1S1*41vVE!ZE41q$n}D zBsjGwGchN#DlsW172zJ2)a3l4#FG4?uss68yO%9AVP;^cC;<9XI4iL%QLnTlGe^&{ zs3@`0C$qSuqVbaK%;Sl3nHd;88CZ%lt5Pcp7#JAX%UOUVR|x~7ArKn_u_+Ln1F;bh qn*gy{MFr4EQv!}oE6qy=x};byq^L9%?p?jBQ*Is%RMTMsISc>;eu^gm diff --git a/src/test/resources/data/test/PredicatedCollection.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedCollection.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..d51a26774620bce637e6492b516fcd6eb06d452e GIT binary patch literal 418 zcmZ4UmVvdnh`~O;C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)@=9KC>|)RfHR#FEq$ zXSj;(%nP?1DOgs<#K7poz*zuOQNp0@12kD5VzNHeWFU<&Ss!kkbwv?_8wu`kOe!uZ zN=z<6xWXkhIlm~eB)=$ZkAU#*WeZKf&f!8>SHd9Xla*MOs9#!=nWK-;XkAeN33RWCU|H#a}87)a;jq$ZbSg4j8k#U*+HMX4#7$%!SY zDLz2%hUwNzYF4W~Vq##ZC}OZ9U;x4}Bx9W6Hf(2JxaCN}vN9$HMjr;w0+>Z53|c-w zgY_XU(}%hYNW)#G4|kL`&=rBiyTUQ4xTGjCxgC(G+_q%vH%!R!dZ!BiF&0anK^onMMa5~ppd9&yd*pGc;Z}U21ZW?mg3B+ w)QSQIASh=65?mD(Ky9W39F|s^mkhM6STCfgG!^b8y{l7h9t>2|0R?dZ04!aeYybcN diff --git a/src/test/resources/data/test/PredicatedList.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedList.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..549b012c6e85cebc749def7a3e10b3203ed242f1 GIT binary patch literal 456 zcmZ4UmVvdnh`~6&C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdI3eLDVfQM zC8;SsK<soM0Rs?}vj7RM3ZO1CLQYOA%}WNlsaP+hs5BMsTfM7OZXOI&(*cEl0RRh# Br*{AV literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/PredicatedList.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedList.fullCollection.version3.1.obj deleted file mode 100644 index 1e1410bdcddd2b508d43f3c2ae7a6773e1e81649..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 454 zcmZ4UmVvdnh`}hoC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4j8k#U*+HMX4#7$%!SY zDLz2%hUwNzYF4W~Vq##ZC}OZ9U;x4}Bx9W6Hf(2JxaCN}vN9$HMjr;w0+>Z53|c-w zgY_XU(}%hYNW)#G4|kL`&=rBiyTUQ4xTGjCxgC(G+_q%vH%!R!dZ!BiF&0anK^onMMa5~ppd9&yd*pGc;Z}U21ZW?mg3B+ z)QSQI1_t(W79h!0!oX+<#Ku5u3dH6>Yy`w6Kx|e~0W{K-fTPn&^OAusDb@=qDourZ RSMTbSn+F5cbU?vh000q)qY?lB diff --git a/src/test/resources/data/test/PredicatedList.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedList.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..bd3b6e816cae070c03a1edd776e7f27a4f45d85b GIT binary patch literal 484 zcmZ4UmVvdnh`~6&C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdI3eLDVfQM zC8;SsK<soM0RsaAdpQe`3RWCU|H#a}87)a;jq$ZbSg4nr<1$qHRsVSMsi6yBi zzKI2C_ukx`KTmZFGXs+k15b8pC0w?ILCXhdnm)udeW+!PGfw7_h=p<7DPD(4yOD@STD%J}rLej5yb;`|yfoeKT3=9V)(xFv#2^JL&G$tX%K&dAS6sVJ~_U;qJu Mat;s)VpdcD0Dv26CIA2c diff --git a/src/test/resources/data/test/PredicatedMap.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..fb9bf8d1bcd7c4c2b96090d7d7c4a407e76d8123 GIT binary patch literal 308 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgO0Y#}PnaPPI zsVTmR1!?!*+?+p8bqg~ClMe$=c4{SDwuC|32WXr=#5jGZaX=bjoIYH!wGRVdSz=CU zDqN(Hp^kyEq5$Y9GeV9^E6qzT$uBC_3n@Y}K=105n+F5cbeI?zDhfcRu>j2y%t|av z)GIB?%+d2mEY1LWfR+8$!NXz+7l9sdW8likPfT%31exZ^z*&+}lvH P0zBm$KvDq2tf&A0c%5p& literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/PredicatedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedMap.fullCollection.version3.1.obj deleted file mode 100644 index 0eedaedcee9e94bf20922d4fbf3f3c1fef8b8a63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 556 zcmah`J5Iwu5FHZd0|F!{5G4&DA><$=Dhj9~kb(pf2ViV(Y{MpN?2Y44a0+U;03{cQ zH~|GkC^!M!fj1_K=&hNT$BBEM zsv!2+s^E;1?&sI!>2dR=N|g>R-l)+mYiXwgx7M#)Yw8A`xwU4shaFnZSr61qxutuW zD-x`9@Xt!!LEpC~&D_iMPrv*AFd1KL?N*42M9dsmtz2`??!d;{J>e|E`nAT#_;u~- z4ePgQK^qR*EN-VXZ=+OYk%%5+1MjM(YS$P`4luV=8>(%sE!9hgP|cJ= z7MLeUmv@8e@f}p4^h8Q)Skz0F9*@&9n@W~Lj{C@#48g&--It3jS!#sF1l|Y}n$wfC zkIVpNKnYNd!H%anf|-!0VYwAh0^5@cAc9(m-!j6uk|8*u$)r$gn}2qADDBZK!+vI+|2IH?md5#n`+usI$%8EUMQHS;#dt*u$00x5zhN8<_SC3 z!jC*|gn!19{^!^D>2c$wPPHyA-iUHmHMHGDTzeANp2mTHwnDZA8v0@(Y*cyzJ3QzI%8o8};E`I_gPWhRpBgr^}M;5I)-ud7#Y zctD31q~d;u+q6@fH=!13sH9&cN5^EpwP6dmj(;UF{nU)6HKKVuI`iTXJ$r-8o$@#gt`FX`a pIwvPJxg-UssW944yeJ1`Wm+0&`{Wm;>n9c@CTFDTC+Fwp=I0dy p>71O@;r6 delta 63 zcmcb^e4UwN&07Z6;vxo3RWCU|H#a}87)a;jq$ZbSg4o5WC3*oxsVSMsi6yBi z!Ko$R8pIn%aMX*WlRi=J`9`%FndZEw0wXD z>qFe74|NxihPz82?j~!XD*}mkg=122Nl{{QNpNaWW@1ieRbo<3D#AT3smb|8i6!|( zVS5CGcQ0FL!VL6f0Wg>Zvl7b^^-4=JbM!nCi!*@Xu*;=&>a-o(Au7sw7#J7?>>Yq4 n5L8qEb(j)xQ(9?WGSH%8y^x~PRJd>Su1>jmFi=eg6uJcfYH6F> diff --git a/src/test/resources/data/test/PredicatedSet.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedSet.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..6447fc6ea0f1932d0c62f60b504fb195c60ce120 GIT binary patch literal 449 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^d#i=EF0Y#}PnaPPI zsVTv!CEpsvBM&V7c9@BQp`wVvo{)ZoVMxX}!)@5kyl~5rf@Nh)42(VuoCPq8N*J_# zfF|ohT&53o8IVS}OdswlYoI&aNN|T^QgKO9VsZ(>6)vgC`9+B(`9)!S1cY}lTWA7y z4j00@5(Y7!ti-ZJ{nC=m9DRgF>xu$kAPRz{^gvR29*M;nz(CsN(mHk8j_oGQz(6V} w=V4%A5U_Uul0Z-a)L=%)wP~e!$w226>xC4Rroug{cXi6mgMn%~pr9`R02JG#<^TWy literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/PredicatedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSet.fullCollection.version3.1.obj deleted file mode 100644 index 3faca8f23e1ccf7e10df95d7620be28c1104f40f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmZ4UmVvdnh`}JgC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4o5WC3*oxsVSMsi6yBi z!Ko$R8pIn%aMX*WlRi=J`9`%FndZEw0wXD z>qFe74|NxihPz82?j~!XD*}mkg=122Nl{{QNpNaWW@1ieRbo<3D#AT3smb|8i6!|( zVS5CGcQ0FL!VL6f0Wg>Zvl7b^^-4=JbM!nCi!*@Xu*;=&>a-o(Au7sw7#J7?>>Yq4 z0|R>r1EVnzn*y;p5E}up2@snBv0+68&@@v5?oBJrO9nckSTCfgG!^bsy{l7h9t>2| I0fl@400-irfdBvi diff --git a/src/test/resources/data/test/PredicatedSet.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedSet.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..5df948ff8d613e70c2c4a3769ffbb58e3aebb656 GIT binary patch literal 477 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^d#i=EF0Y#}PnaPPI zsVTv!CEpsvBM&V7c9@BQp`wVvo{)ZoVMxX}!)@5kyl~5rf@Nh)42(VuoCPq8N*J_# zfF|ohT&53o8IVS}OdswlYoI&aNN|T^QgKO9VsZ(>6)vgC`9+B(`9)!S1cY}lTWA7y z4j00@5(Y7!ti-ZJ{nC=m9DRgF>xu$kAPRz{^gvR29*M;nz(CsN(mHk8j_oGQz(6V} z=V4%A5U_Uuk_-&&B@B$lKx_oWhCpl%#AZNj3dANAK*P)k`6R70FB$06V!e=}(o}dL Q=v|$1^I)Kw4k%g*0Jey!i~s-t literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version3.1.obj deleted file mode 100644 index 4494f63de65463759eff5960d260a46bdbc1f88e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 506 zcmZ4UmVvdnh`}tsC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4juk>3RW0sVSMsi6yBi z!TCi%(kU@r|MsPPUhU2sObiSaMGOWc83NRP$Kh=HU!l!YAlmH+Xh*mQ$tlioM{Z|c zxaCN}vN9$HMjr;w0+?e<7_@wV2J1sSrw{cUkcN9sAMP=0peF)}cZFk8aY<2Pa!GJ% zQD$OJW>sQRPAbAZE~&}+MTsT(MPYjcgm*7nXu=E(qyk`AYZ0&k6xJa{sj0vKnliQW y;Em_EbHG{)%2^nIprQh3hA9Cv(n|A^fmRm-4Ju8A`%mxcl$!?w)pS7NT>t>ep}&y; diff --git a/src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version4.obj b/src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..e6c1a15c57593018b2ebb5f410a0d9754c1ef031 GIT binary patch literal 538 zcmZ4UmVvdnh`~I+C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xt0Y#}PnaPPI zsVTwvML^OiFrP&Kpb&3>8HThNPJS)PKj}Z2DiJ%~K%y?Fs2eI0?xy&Tw~b zXI{AFNWro)CI&_y2F?PQb4wVseSjwGL;R-?^&gN%_)j11H*26j+(>YTV^VQRQDSll z!WAy5$@xWzCHX~Rdjy1cFI#8=b`BT9x)KI4pRB~PME%l|%p84$M(c_KU{q)mvK$l@ zAw{XFz~GxQwesMN=eKj1fx%x;P|m^t1QkFt%m|s0R+^U#bYU^jpwd*h-}SCexp^>9 JO$QVk1pq!e$p!!b literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/PredicatedSortedBag.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedBag.fullCollection.version3.1.obj deleted file mode 100644 index f1a62a184a4f6140da3b6f0226b3082ac9bddb97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 536 zcmZ4UmVvdnh`}tsC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4juk>3RW0sVSMsi6yBi z!TCi%(kU@r|MsPPUhU2sObiSaMGOWc83NRP$Kh=HU!l!YAlmH+Xh*mQ$tlioM{Z|c zxaCN}vN9$HMjr;w0+?e<7_@wV2J1sSrw{cUkcN9sAMP=0peF)}cZFk8aY<2Pa!GJ% zQD$OJW>sQRPAbAZE~&}+MTsT(MPYjcgm*7nXu=E(qyk`AYZ0&k6xJa{sj0vKnliQW z;Em_EbHG{)%2^l~7??{K7#+bZCLqfR&T3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xt0Y#}PnaPPI zsVTwvML^OiFrP&Kpb&3>8HThNPJS)PKj}Z2DiJ%~K%y?Fs2eI0?xy&Tw~b zXI{AFNWro)CI&_y2F?PQb4wVseSjwGL;R-?^&gN%_)j11H*26j+(>YTV^VQRQDSll z!WAy5$@xWzCHX~Rdjy1cFI#8=b`BT9x)KI4pRB~PME%l|%p84$M(c_KU{q)mvK$l@ zAw{XFz~GxQwesMN=eKj1fx%x;P|m`@z`$I>z~~5OF#%alaF#Qe#aIEf!Hkd%X{C9| aK=&5|ttm}~hm79UDK`%Ws_B5@ssI4qz09Nl literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version3.1.obj deleted file mode 100644 index 192eb72952dcb74d9706191535ac9ffb6058814a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmZ4UmVvdnh`}tsC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$qHRsVSMsi6yBi z!TCi%(ibSUV3PNaDMCF=3=9=T30xLRu;2EMYyoYGXdNFhTV15-r-&|jtmoRn6Ymt2xxRIC?Lgrr~Z z>Xe%Y1J!gu-YNhY1_~m3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgO0Y#}PnaPPI zsVTwvML^OQD7Ijd_l_w-JxmM?6-5k&q?rQLpLXxf&H3|Gw=gp>`7rQgr&hx4C}Gg{ z0UD41Dz05S~}OoCa7Wr=#FC7C%u#i^-45AYoPW~Zx~^^BQ;(T9Nx=*oh` gqC}u+B@ALdAjSG1#rn>0aqEhLf^rrHAgHJS0F0iAaR2}S literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/PredicatedSortedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedMap.fullCollection.version3.1.obj deleted file mode 100644 index e6ba6c66af64c87a4a01c7643db17bc69fa4c858..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmb7BF;2rk5L{v>peRBj1wBPTLSQ2#Xd=;2Vk8iJ;No1Igp1GE=isE^1ym?C@Bm5* z+B||H4J8${)XX}OMTcl+ZfAGr_V%8?sGP)fsN=v9k?_0H@%3P!!vw69^i7Y?0}(lA zv26EzVPyM4$G}r)PxmLUllonWD2r+DUnXepynoIf9~v(fl{~6l$x(5Ip=}Rt?tCP7 zF%q~K$t`M|9<2_AN@by3(=C;<2=6-hW28G|dkKPzH0UeQ`# z426@LocKP+1EsEQdQ5ev8(TKBlvPn?xSjicJg-?l42HHnDU$dcVsKYQ-3My}B19eG$HISRkfO~*! Uc_X*@WtE&cJJKn#z+smC02~I|@Bjb+ diff --git a/src/test/resources/data/test/PredicatedSortedMap.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedSortedMap.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..93ced45884f8545214c8475bab0d514394811eb4 GIT binary patch literal 643 zcmb7BF;2rk5L{v>peRBj1wBQe0BnH}6p?5sF%k$qaB(h9!o_Fob8u4d0xFamcmO2@ zZ5~09hLQ?eYG$1%&>@-`@9gf}?)vGIib+fdIu0BW3BN5JU-x=COu$M>-*oW3=k!G6 zoW`=*@r9Aia~%UupgrClzl^H41)?mbo&UL@zxDPpdAP4VTU7959H^Qqxf=mJ$n8#$SiqweGt`3m%m*Wh7z&H$$r)7rR{S9?kW77Dd-K5mgNpMIbt% zp;FF$LzYm=kPYOZA>d*Ir@=4}h6wD25^c0IajvB`L?8!&ln8(biUF=Qzymo$SPZmo zHU_9zntegE1D&uP6F0S`QZOv#48g*0iBJaGMLNH;p>n9hFjWdFUuO+; WfNXg!H+ZvB&YT_S6j@+D%f11UINQVk literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version3.1.obj deleted file mode 100644 index 94805825159312f8edc294ca234cf71f58908e99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 481 zcmZ4UmVvdnh`}tsC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4o5WC3*oxsVSMsi6yBi z!TCiXGPR_!KjU5eq&ZWV7#J#w7z{`=B(>yQgLveDrQZ%iwA&HTj&Ki>Q=H+B+|Imk z%aMX*WlRi=J`9`%FvpfKX!!sQ)`xgbAL=Gz6RD^q6Qj_zG5=-)n!uALV?_Rdhgc%q}1;DTt%t|av)GIB?%+U)eN=*d@ zzG^jKc?hU=GQ*Is%RMP3RWCU|H#a}87)a;jq$ZbS0@)^d#i=EF0Y#}PnaPPI zsVTwvMIbV@q_IEaUHqguQC!;q~emI#N-l$ zD_l~O^NSKo@{7Xu2ng?9w$KFZ94>@)B@ALdS&3zd`lThAIr<2V))fW7s1O86>4Bv5 zLW)vTfq{H?M!@8$Z`-4pfq`65P|m^t1QkG)W`vxXR+^U#bVo7Jpwd*h5B082xp^>9 JO$QX_1pt)!z#RYp literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/PredicatedSortedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/PredicatedSortedSet.fullCollection.version3.1.obj deleted file mode 100644 index 780265b21bbcb9e7a05c50dbf160df48dc2849eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 848 zcmb8t&nrYx6bJCjn9wA@k|ZP{zuu7FO)0Ta5|NUH?mWkMdNc32@4hiv$ZX8QLNUt1 z!W34P%7O*)FIZS8*|TKp&fq(C*u48$oO}A7bKltu^E!g{St6uyo9oM@=~g&wMI3dS zCh5{h+aak<3R*ODE@^Sv66r6=_|Ed{!tP-*m$8^&o&Re>@@=zn?)v2I_VfDCFW0kq zenc5T$O}*E{LVg&=CYh|R%m~Rm8^AKHTHiF=l>c`ofyuK!2)WCslTTf4mwhBT~3oQ zxM{5Oph?+0qoiAcOH0gNm6Tterg}VTNw(T`=?af>&6S3!%?Kj3#>a!nz5SQOe5S%) z%VUhyqR`}#kTw>P6e3afe02OCPYkFT$Cx+DO_x;Ul1#%)-GmzslGr-iukj_Hw$ppH zRkIvtm2I#BB@g6<@}WY=2NglZP$^UnRX~+c6;ut?Ky^?()BrU?%}@)}26aGws0-?b odZB)35DLU%YT>=Vy#10J(ba=G>fKzzU!&b8A8w|a+B4h!05Saiod5s; diff --git a/src/test/resources/data/test/PredicatedSortedSet.fullCollection.version4.obj b/src/test/resources/data/test/PredicatedSortedSet.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..0adbfb5be67e02eacbc7a499d87e18e1ec5e9566 GIT binary patch literal 879 zcmb8tu}eZh7y$57lQ4-iDT%O%sEF!4B+J4fq6h>DqX?oQ&gZ4Z)Azb}&zvHc92$aB zXlO_%C&!?nhNAw3hK3;8ZM3yh>w9hDa`%I~`|kU`yK)6tHH!QSjR{!AQk)2ql1wTo zjnA@7B$nXz2^wKSn38Bh!i+@M6|Z#Zk%6e zcHT(oUouOO=bfc^`=XZ8W@HK>oBEe7LlYq$S!~oN{?^B5qdpO83-CHtTF7HDqA`jk zW@NEUB!yz8(9H*j>%LU<)zj%Pu4AY-w1?AJ)LB9nje~)V%AdknTM}wZ!UiRTH~IY{ zd|s&Jwk^ELs(R3d5E_7uGET*WV2Y6#q1~TX*WcOP9KSG#tZ6LkgjeIJ2dwW~)sqoI zkIMy*J^yi1Yr4vVnY4X$h-_RIkQLMpvVrWNPEZ%f337pYKyFYUs2}734T6S1!=Mq+ z7-$?c0h$7dATMYdGz0R3=0SlB@Aqu8U$LvFB>wCge>a`LhZ0`%Z%=EZll5-@0O>>r A2><{9 literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version3.1.obj deleted file mode 100644 index 64ebde74bd202b44503eac98e28c972b640407cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97 zcmZ4UmVvdnh`~I+C|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$sfLX{kl2dC94s sDXDoSnI)CJi3RU+ryc+G>B19c28N1)azO?L1|~4JcK}ih3<3oe01*u#VE_OC diff --git a/src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version4.obj b/src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..7b262fe838744ff26945ca6001986d310dd5a1e1 GIT binary patch literal 98 zcmZ4UmVvdnh`}PiC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOL8)n}MX7no ush%mRc_o=8mA;7u?{cRd|Mls@6J`d6ih^=M1_lNuFt&F9QVa|N1r-1+A|aLl literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version3.1.obj b/src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version3.1.obj deleted file mode 100644 index 6d42d87b07e8a85b27fe192d0b1421759156112a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmXYsJyOFk5QTT}4-7*?MN3ELf`*c`6g1pm?QCREWJ$5*Bu>FGI0g5hSU2vXMbtBTs8_v5WIFhoAoK zWP{M091z=JRN~DISRS)W1H$@tB7&;z-3TgTh^``y649Gbv@&T ui)Dvm7W;r8RH5cmy6gnFTwaBlJ9?!X3~I$%e7a1IBLy4o916+z;rI`;?ReV& diff --git a/src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version4.obj b/src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..dd85eb88c0339100bf69c65ee0e6b903fb1119dc GIT binary patch literal 375 zcmXv~F;c@Y5WFFBV1R}n(9yYIDCnT2py3B+=OTNMC1J}>oPuZY3jRUMBWR(Zq+(B# z6x!9^Y4;?(e^W8^bQ^kGa^$*^vJPDr`~Y@N>eOO?Q+6E7Cs|7`zLtlT_|&HPk>gMI z_VM@o`L!V0#?1v09p!a*4|(YX)akIqf(MnQ27V z%#6b6-kD>HgWn2L3=k)b4MPK`lEw|W2h_MmoC}D{tlf%tdDu=x>LLVC1?yY`R3BSz xJ$#w9VDTMz$TBkurgE%Pl~m$>*Dv%+XGmHHj5I(rj%^65YQ}X>_PZ%={{iiac?19e literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/ReferenceMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/ReferenceMap.emptyCollection.version3.1.obj deleted file mode 100644 index 13e2efc9964fc0ca761d93d21fb1c51df9342191..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 89 zcmZ4UmVvdnh(SNUC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$sfLX{kl2dC951 ki3OrlPBG8$3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOL8)n}MX7no mslJH?qEk*W&+z29&dk72QBW?(z`(!+#`X?Cih)6(paKA+pBo|o literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/ReferenceMap.fullCollection.version3.1.obj b/src/test/resources/data/test/ReferenceMap.fullCollection.version4.obj similarity index 67% rename from src/test/resources/data/test/ReferenceMap.fullCollection.version3.1.obj rename to src/test/resources/data/test/ReferenceMap.fullCollection.version4.obj index d0824bbcb116c3b3504f86c40756fb500c8096fe..4dd7b798fe9eeacc39feae01ac38f12bf4217f24 100644 GIT binary patch delta 22 dcmaFI^qz@h&07Z6;vxovi5zl_CL7f}7y(+N2B`o5 delta 20 bcmaFQ^p1&R&07Z6;vxq9i5zkp)jb#iPVNSD diff --git a/src/test/resources/data/test/ReverseComparator.version2.obj b/src/test/resources/data/test/ReverseComparator.version4.obj similarity index 52% rename from src/test/resources/data/test/ReverseComparator.version2.obj rename to src/test/resources/data/test/ReverseComparator.version4.obj index 2dea524d159652ba91339386e52720092dc7aaec..e54a8dacdf6bc05c75e3d311779c7fcb1b290e43 100644 GIT binary patch delta 21 ccmZ3_xPg&l&07Z6;vxpyi5zl_CKJ^<0ZLK^RsaA1 delta 19 acmdnMxSo+?&07Z6;vxo{i5zkh)jI({xCS8r diff --git a/src/test/resources/data/test/SequencedHashMap.emptyCollection.version2.obj b/src/test/resources/data/test/SequencedHashMap.emptyCollection.version2.obj deleted file mode 100644 index 8f750ab5baaeaec56126b676b25eb066c3536a0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 75 zcmZ4UmVvdnh(SNUC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4n^Sg{7%^$*CzGiNzVd Zi3NJElqRoKQWN4~V5lf4XJG(>3IHL<8KwXL diff --git a/src/test/resources/data/test/SequencedHashMap.fullCollection.version2.obj b/src/test/resources/data/test/SequencedHashMap.fullCollection.version2.obj deleted file mode 100644 index 4dfc23179fecb3230957ed0bdd6b2624e18d5eae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmXYrK~BR!3`H%G78a~}ge+heBu>GG6(?{~GpTUmX=c(kUGx$?1rjGi;tqTdZ2p@! z{^R89hgNB#C!0dUk-J`+&W6Fp1gc7xcYc18{VZcA+ZRs#E63)$zJAsZn|q>DJXS=s z$yBwq0LF5pRk3v=>!; zVqJ)f+hDeB7c}nvPu@Dpqbgd3z9W?#NSDQCEJV7n7b~Q{3RWCU|H#a}87)a;jq$ZbSg4j8k#U*;dsU@L#nT4gP zK0sdbgNs^6>bTUH7#MvRn2S?ON*MTkvJ%S@^-D`KbM%2~tt*NcT!}H)F{!wuC^5Mt zIJGD5`H*9wE|(F56|=U7yfSP61Z zMdKyena307GBYrGGO!e9R;5-HFaSY03y|Qdr~qmcL}>F!EY1KrahFT$)M-1mn}7{2 P=K-n|uy+8GKu`ey)~#V{ diff --git a/src/test/resources/data/test/SetUniqueList.emptyCollection.version4.obj b/src/test/resources/data/test/SetUniqueList.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..d18b84222e15f137d82eef7b0b38afc7c5fafb86 GIT binary patch literal 485 zcmZ4UmVvdnh`}hoC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdcmnBp?R5w zrKvtZUh;#BT1V=*)R-6;eHfUFQ%g!1_ z^_&T85JA@=!axt^MrU}izzq%CBOttc*+LU=P;epilrV@Pg$P2UbwvR%%!NULr3VTu zJ;$P=#7dAmD;h7!&ODwtmzjallYyl;vnsWsfB^`~S%3srMIl2S14ji=uOLFNM`CdX eFtB&Iv`(G2W4j3`gbK=efXW5z9e^YdQ~&@OJ*`>* literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/SetUniqueList.fullCollection.version3.1.obj b/src/test/resources/data/test/SetUniqueList.fullCollection.version3.1.obj deleted file mode 100644 index 37a21b6bf5f7c12e83b48cf225b762b5ca975798..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 769 zcma))PiWIn9LIlaQ=M(ux^{?D3xX(Yhm1i*VS-!fh8?wvnfJYhNAg^nWG^pWHeopM z&tZrjoFFKOc-+l{;z>jh!HXW}!67?3@uD8Q`1@synwvR%-b?cPe!st8UN&|h6G#~I zq@^>TnKsu=uif_C09VK1rV_MwM4)tot1GTp2zdkV%&m_jZ&$J>Q_$0ZbikE@{>D|- zVWXiE&M4N7M-ry~$9J+7D9KD^a4DE0mRZY*BWm3ABvYO|QQaQ?b?4fA8X)qq+Y;sI zl%r2d$(E>}X!TS1;XC#?4Lxqt_8FX|4w(*fLXN!`x^>O4-Qx1r#(Ft-e`_s8ZJ=vPL1xyLocqB7tUxb5($N1O zUCj$|mg~>o%nZ-}(a^rOXHS9y6N4zh3q}3iuxZC*YIEoP)6Zvrd_&E2QuCTd$r!xD zU0kPxW#gyUngVCr>mr*pG;B{Q`@-o`Wp48_8X5^h$YFI~H@@My*7(}?y$^Sff5GCJ zWO3XtXPD*nsYb4U;23zeX0qcLKI>3?n%Vwc%B6|{xh#? zH`gD$d{K!{dNGe_$IeZ}nME2dPskAt63T@5MW0XG0^u;>5Ftw#Ae0D0gd>DO!al=gh2 diff --git a/src/test/resources/data/test/SetUniqueList.fullCollection.version4.obj b/src/test/resources/data/test/SetUniqueList.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..01c6dc862b6c27eb1aa67cfe5e5ded5b135f3e68 GIT binary patch literal 972 zcmb7?O=uHQ6oqf|12u_Fn$(KeNI?|pVu}(`jA$EUFeOGY)pcKnM`qf|O#0>}omMCo z{8<#yg%tz^6>-&_3q@Us2t{zC3l|l%NWqO25!8hn?;S~|S*clklZ1QDJ#*e$T!Wx3 zV2>p#3ac?y8}5!QS1rM$C3a+12Yy^WJK+aF z(*yryN?}_@hw5+NFMS*T z{|cc0I$hSP<9VEW@O)%o;#UCevrT&vM231$f*%w`y=6JWVsd%y<=uA&zkWtdu3htt zUL{!K4Q}G|s9w?V{sf9TzFRXzsNJxnSwd>Z_a#ze%csz=)Mf}_obK}07c8@qo?pHC z>dN*HI6Trm?B<1tgw9b-7m`y5-|iG)Z@W)sTJoF4vGZR}e(yt{Oq);4p{$(_O8y*& zdziNu|oV~Dc{n5h|UD?`H1XuPS9QNwuLy+(?KLdI;MHn+aWnErhLvBw-Vw PpU_JP5fX$xLbvl9Y%n-f literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/SingletonMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/SingletonMap.emptyCollection.version3.1.obj deleted file mode 100644 index 89dbcbcdf5c2518c5d9ec01a8401f7af2373681f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$sW2#U=hlDXB%N zDZYsXs(12DzZ<_#V`gCVVc^cpD^4wf$d)h&_+%xPCF+-!Waj9DG+9>^0Id)P3F?6a z^&E?e5-UM66^)l3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOp?SIaDVb@R ziAg!B{zWONMX4#ii3J6((tO`vQ{BbPz)(>DG|Gq=qkJ-pOAtn=-pM!pZu~xtnSs%V zfjcv=IJF2OTf!jVla*MOs9#!=nWGQVWDT}M7$m3%64Y}nDoU&b$y796lAU=xaW2ph zPX?Ca%&OFi0tO%`X8{si6+o8>B6N8q7H0t6&dPr4;9;?Zi_8p6ZVX&G`H3lRiOD7T jMV<_tB^gDj#TofIDHR3w4j^+Fc*;3|qyUInQBeT^Y36F7 literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/SingletonMap.fullCollection.version3.1.obj b/src/test/resources/data/test/SingletonMap.fullCollection.version3.1.obj deleted file mode 100644 index ef4b9674295cf65571862f84b91b350249806a32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmZ4UmVvdnh(SNUC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$x1mdFeT+CHZ;2 zi3KgZ2W(DFaCBy3VDe#L&Q7f?VG#1kN-Rs%&q>Tn*Y{7#0_wE(VPGvw%qdMRWT<0c ztSA85BM4HX2U4TwnOBmUo?0aIXu*>2jqMgp42+&o3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgO!I^pKIjJT2 zdA^ASExZS8PEBxhW@2FSVPMWqtt?>>^2tgpOVrOv%uCnzPs##nwf13PElbQPO)X@o zV_>W(09qsnQlke_qvx4dlA4}cB=l&(lJAY}7EBC`o>1i#MGOK6b$+F}NvTC`Yo^L_ YPkGSI#K2Hdz`(%3SPU|h8OUM+0BEK_`2YX_ literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/SynchronizedCollection.emptyCollection.version3.1.obj b/src/test/resources/data/test/SynchronizedCollection.emptyCollection.version4.obj similarity index 58% rename from src/test/resources/data/test/SynchronizedCollection.emptyCollection.version3.1.obj rename to src/test/resources/data/test/SynchronizedCollection.emptyCollection.version4.obj index 48c0c012cc3ebfd9b7d554cf4c17e1ba1f67e23d..fc11bea43bc3f39fc90b3709b6a9e6a2d5e31e45 100644 GIT binary patch delta 21 dcmcb_c$tx7&07Z6;vxpei5zl_CKJ`x002-C2EzaV delta 19 bcmcc2c!`l?&07Z6;vxozi5zkh)z<(3MB@gI diff --git a/src/test/resources/data/test/SynchronizedCollection.fullCollection.version3.1.obj b/src/test/resources/data/test/SynchronizedCollection.fullCollection.version4.obj similarity index 85% rename from src/test/resources/data/test/SynchronizedCollection.fullCollection.version3.1.obj rename to src/test/resources/data/test/SynchronizedCollection.fullCollection.version4.obj index 05b8b71e1b96ebdaf6afa31593e7dae09f007d24..d9450cff589de289ba07a6ba026f20cced6f1a00 100644 GIT binary patch delta 22 dcmaFK@`{CH&07Z6;vxpei5zl_CL7h9nE+bC2Cx7C delta 20 bcmaFG@{)yP&07Z6;vxozi5zkp)t#9DPWJ|T diff --git a/src/test/resources/data/test/TransformedBag.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedBag.emptyCollection.version3.1.obj deleted file mode 100644 index 28ee32051a09329cd30860060c1f2eb2d6a7930e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4juk>3ShWiFw6o`9-;@ zDNc#$-q!al7Okx4WMW{bC}OZDpdVotvN6tZ8!8q$d|y(`H;ajZ(T9P%1a4DN34@Lg z&}@B(+w`Gs1JZD}=_A}#WDRsmAn{IdOezLim0S{>T9lcXlUbFRl#_~ZlS^uHeoZS7Z;1A__Z5&$iyrM3V7 diff --git a/src/test/resources/data/test/TransformedBag.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedBag.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..b643a8e9eba78d75d63e247afbb225444301718a GIT binary patch literal 474 zcmZ4UmVvdnh`}hoC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xtAw`LK#cBCP zxv42miRs?f_be8ztmtH7V5lf!a3Ev=!Zc)aoZ)sS)zVvNoI~dLZfv>0Wc`F30V#bN{__i3}6^8`DEkzZ-rnoGcXJb p%2^nIpaN)wIUys`O7oI|4lLI5^AAAsyX;(PTl-bzz%T?F2LMU2uJ!-` literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TransformedBag.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedBag.fullCollection.version3.1.obj deleted file mode 100644 index e494e44b5aa22d3297e3e6668a66601d2c28c394..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 473 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4juk>3ShWiFw6o`9-;@ zDNc#$-q!al7Okx4WMW{bC}OZDpdVotvN6tZ8!8q$d|y(`H;ajZ(T9P%1a4DN34@Lg z&}@B(+w`Gs1JZD}=_A}#WDRsmAn{IdOezLim0S{>T9lcXlUbFRl#_~ZlS^uHeo=m=&p w0a?yq79)`51QDyK09s&1z=E{WykwxeiuL^b1CV?#J6GD)epNXz5P|Ll0JLJMQ~&?~ diff --git a/src/test/resources/data/test/TransformedBag.fullCollection.version4.obj b/src/test/resources/data/test/TransformedBag.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..f0bdff7101d04d4699bb13ac657f1458bd472665 GIT binary patch literal 504 zcmZ4UmVvdnh`}hoC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xtAw`LK#cBCP zxv42miRs?f_be8ztmtH7V5lf!a3Ev=!Zc)aoZ)sS)zVvNoI~dLZfv>0Wc`F30V#bN{__i3}6^8`DEkzZ-rnoGcXJb z%2^l~7??{K7#+bZCLqfR&T3RWCU|H#a}87)a;jq$ZbSqO$cuiW2jR)AEaQQ&XJb zDk>H_d|y(`H;ajZ(T9P%1g@m0gh9s#XtqAYY<;NNKpJkgKEl8v>xv?VK;oU^m{bh3 zD!C*$wJ0+&C$lOsDJK=-CYRLY{G!B?{GzZu0>ZnOEi_?fV5lendR90qu`E%qv?Mb} z&#|Z|vC=2AxTK=-lI+amiF2757(E$SiZiQHD+(BZpqvFra8*3RWCU|H#a}87)a;jq$ZbS0@)@=9KDdD#Ju9P{G!~{ z6lb`SiiHl}mlX5OVq#$QVc;%-D=8{r(DeZtt`9L>A8I&|Mi{P-FtNzGqKLtb1jjfg z6$33xEmSeB??T9TQgkI-mcQ2-1H zVUUy_NJ`JKs3@`0C$qSuqVbaK%;Sl3nHd;88CZ%lt5Pcp7=WOh1xRpJ0CkxYa&lT} cUNX>4#d?1J0Z87Johxl?zp5M3RWCU|H#a}87)a;jq$ZbSqO$cuiW2jR)AEaQQ&XJb zDk>H_d|y(`H;ajZ(T9P%1g@m0gh9s#XtqAYY<;NNKpJkgKEl8v>xv?VK;oU^m{bh3 zD!C*$wJ0+&C$lOsDJK=-CYRLY{G!B?{GzZu0>ZnOEi_?fV5lendR90qu`E%qv?Mb} z&#|Z|vC=2AxTK=-lI+amiF2757(E$SiZiQHD+(AG7}(2MfFxH51EV1j8w0T^5Ss(B r5fGaIu~|h0&`2`^j!rAhO9r~6SkKQt0Lj0ybER$VSCs>U4d^le*2|0d diff --git a/src/test/resources/data/test/TransformedCollection.fullCollection.version4.obj b/src/test/resources/data/test/TransformedCollection.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..d3c5818fef300b9f3346cfa3d445fc5d2c11c459 GIT binary patch literal 424 zcmZ4UmVvdnh`}MhC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)@=9KDdD#Ju9P{G!~{ z6lb`SiiHl}mlX5OVq#$QVc;%-D=8{r(DeZtt`9L>A8I&|Mi{P-FtNzGqKLtb1jjfg z6$33xEmSeB??T9TQgkI-mcQ2-1H zVUUy_NJ`JKs3@`0C$qSuqVbaK%;Sl3nHd;88CZ%lt5Pcp7#JAX%UOUVR|x~7ArKn_ xu_+Ln1F;bhn*gy{1<*uuLf%O$%}WNlw^+~5KL9BxWamoT+OH}H1}Q^D0RYAfl+FME literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TransformedList.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedList.emptyCollection.version3.1.obj deleted file mode 100644 index d1c2b16d560801bd094ae45624ab0141d1e4a66a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmZ4UmVvdnh`~6&C|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4j8k#U*+nMTvREY57ID zsVP1{KHsOW(Q7v+hB7fQR1`7T6EFc`8nQXga62j%I(%PJ%r}dPfzgM7y991kQ3->N z572CVi0kyBt^?9=*Xbi1R%8uyN+9u0aZD-(T9sT9oLZEbn3GwRn3R)>aFa`Fa(+=_ zNq$k-9s%Lq%NCk21HD=R3@+iU#Ii)a(vr*^J;$P=#7asoM0Rs?}vj7RMiVC1MGXf4vE6qy=+E%RR=O2LNC)v5uw)U&afk6Yb9ROBepx*!h diff --git a/src/test/resources/data/test/TransformedList.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedList.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..34b1fbb56b4535f5342529d035cefd3a80013e0e GIT binary patch literal 463 zcmZ4UmVvdnh`}VkC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdLc!LdBth@ zMY*XdK0rR-r?1g#Hz$TNF)&mVF*p!10%0DqLC$bnDi%6?UsB9Bi;02Jhk?5UZdXwW zgRT$IaD9mT^r7wp(g^qIBb-)b4Rnkf36610Dh67XT!L_kOKNg{QDRAcQP>^<;oZv? znt+|eg|M)MLChyBu`E%)v?Mb}AED8@q5v3}!XPOeAE?ql#zIO=tBEdM`f|SBJ$<>CzV|M@b`T4q zLkAsnP%Ky}4pOI%I*5x1PLA!Mh@%xLlnyR_ui9L0syDpv-SPeYefOoaxDQ6N*LIKA!6(1x!BPN zmj<_&Rpw~|dMc3C9Vw~dLu9A+>k;Y_2%D zb`=S0F+xaVcP5gr2;c2r`2O(IgJWN?c{JX<;};HS*jM+M)YOKR76oy|@M?wh-fgl#h#KeFtB%>k)L|Q_mR3@!RU}5RSTw{ad3+Lz5Wk6Iy zFm!+c1`w4fsu)n2I>LZh5E2t(89<1UB7{_R=)$`|<9Mp@aA*78|Nr0Jz10m!2NFyn z+dAtq+u^z`IvwE$Gl!jpBMHb>}fi#M6MuGCrmY* zO!`dBBY#?-x$|>+^9cD&Bz*D_6_4%KNwcAEQ>z4eeQJ8B3yVvK&zyZZN8L=f@dp(E BB&7fV literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TransformedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedMap.emptyCollection.version3.1.obj deleted file mode 100644 index 881bd7d32f3a8443e58ee8f4b1452470f0783969..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$rSxiFw6o`9-;@ zDZW6Z<@OI^KSmWWGcfru@MWh~BBYB-7<7Dq2I@l$)Q1`fq~QkYBdNCbVGt-w%qdMp z5-Vh=V_>W(0J_YKfXmWK^O8&Qi;DI9`~#2-kew@SYrm>|783(QMFGe(7NA*zS&3zd zdZi_qIeH$6#Th_fu(IDecvvjqBG4CZ3|u++i79T0Amcn4I7>2$Qj0V4b5be_>>U_D NK%krhM1q(V6#$P9Y&!q| diff --git a/src/test/resources/data/test/TransformedMap.emptyCollection.version3.2.obj b/src/test/resources/data/test/TransformedMap.emptyCollection.version3.2.obj deleted file mode 100644 index 010748cdddc1f87d725eed6fe42cecc6abbcbb9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmZ4UmVvdnh`}tsC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4o3cIhiH7i3NHgMTvRE zY57IDsVTmR1wrR#*3LJHOJZhV@?qf1POU^p7nLyR_yA4ShnT7lH5Ew1P1Q$IZSBJ# zP?nfenu;V=$WX_?SW!TP^U_N5l1uW7iuL^b1CR`mohxl?zp8u|69Yp<0mw8Kpjm=h ziDij;r6rj;dLD_z89-mKvfny*SS;Zp&=+nDTsirPDQ<}%<2)HSOEQX5i!<_bQYs4U R9T-4>r3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOAw`LK#cBCP zxv43>K(*!e4`M$?6)-a}`7rQhr&c1Qi%J-DeSjwFLrm0%nh2y3Ch8+8xAtKWC`-&K zO+^wbWT<0ctSA7w&76?i(n|A^OY)0~_5Az;kW7%BD{X7Ps(cm`14Bgt$T$|DVS-tS zWr=#FC7C&T9*M;nK!32Z-#U0$Ea4*1A8rg>Ir)hxZiyh{JQ+AkGKx}*GxBp%Dhli! Q7(jrhoC8P-fS45(0F8}o)&Kwi literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TransformedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedMap.fullCollection.version3.1.obj deleted file mode 100644 index be8bb3974f94e16634369422b9878cbd4f78f59e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 564 zcmah`%SyvQ6uq`dTLnd3h#-PHHp_nwM}22mNan+30>Ymo~lGb803iZsL&cKiM1 zb>->}Q}k(0Y2o(;+a1xY2@{!yTKQ$%J0Sj6iw6OM{NjK+x848g(`@9-e=hT4JFzFVO~ zXR_k*N@qv|@&?&xY`IE=Fk@mhs80ptjfpq|h>acKZ7Q^@8G;q)lq;DyS@3ukFfYq* Db>g}; diff --git a/src/test/resources/data/test/TransformedMap.fullCollection.version3.2.obj b/src/test/resources/data/test/TransformedMap.fullCollection.version3.2.obj deleted file mode 100644 index 7a41b3463e77b4de21b451caa91fc98c0de1ff91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmZ4UmVvdnh`}tsC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4o3cIhiH7i3NHgMTvRE zY57IDsVTmR1wrR#*3LJHOJZhV@?qf1POU^p7nLyR_yA4ShnT7lH5Ew1P1Q$IZSBJ# zP?nfenu;V=$WX_?SW!TP^U_N5l1uW7iuL^b1CR`mohxl?zp8u|69Yp<0mw8Kpjm=h ziDij;r6rj;dLD_z89-mKvfny*SS;Zp&=+nDTsirPDQ<}%<2)HSOEQX5i!<_bQYs4U o9T-4>r_gXwRh|1K)IS5<3V>$COGZx+n(-Gd`w!Yp! zHf}%hjy^35$$~z!ai_FoBE@wiMNp=_W3u07(FX2dt*3_EdT2uqUf;DHTJQ?KD}YtG;)Ae=vn}+Ffk@}fRj7;N4TS`!1Oq3GCQ^dgy#$evpp<9qL&aAW~ezY%Rf4Q By3POq literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TransformedQueue.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedQueue.emptyCollection.version4.obj index 4d586a11400a4c6afb7600d5db0015286bd431f4..af01fcc215bdbc9593e1844e85a7d40ec2e3bca6 100644 GIT binary patch delta 74 zcmX@ae4LqO&07Z6$<>TXj3yJ+R2dy6*E7linOQcBx)Ybn3z_JL6eZ>rr{x#rrWRRO U6fw9#6@2YvG>0%J&t+5v08irxb( U7~H_}8^0fB*mh delta 66 zcmcb|c9V@`&07Z6;vxpqiN10Z)m0hoL3EA{qt3*Y@`CyyMTvREY57IDsYTWmMGUS$ R$&Ei1m>A7~jLDYFssQ5t6@&l) diff --git a/src/test/resources/data/test/TransformedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedSet.emptyCollection.version3.1.obj deleted file mode 100644 index a6e376b87425801a02e9e3429421b1cedb81f6b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 426 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4o5WC3+!6iFw6o`9-;@ zDZ!~FEcR2a_x7I?Vq##ZC}OZDpdVotvN6tZ8!8q$d|y(`H;ajZ(T9P%1a4DN34@Lg z&}@B(+w`Gs1JZD}=_A}#WDRsmAn{IdOezLim0S{>T9lcXlUbFRl#_~ZlS^uHeoKLE))vU83RWCU|H#a}87)a;jq$ZbS0@)^d#i=EFAw`LK#cBCP zxv43^sUS)zVvNoI~dLZfv>0Wc^9K~j1kDLs$G;tXI&?Q&_II&H^x6J}sY x6_oQZFfa(%I{--_r~qm(C*<0+(!6A#bBgu+`~#4DDmz!&)_zqvFvNhy0sylsrGo$f literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TransformedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedSet.fullCollection.version3.1.obj deleted file mode 100644 index 402382ba37fadfe930b10c336158ccb3887de53d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 827 zcmZ4UmVvdnh`}(wC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4o5WC3+!6iFw6o`9-;@ zDZ!~FEcR2a_x7I?Vq##ZC}OZDpdVotvN6tZ8!8q$d|y(`H;ajZ(T9P%1a4DN34@Lg z&}@B(+w`Gs1JZD}=_A}#WDRsmAn{IdOezLim0S{>T9lcXlUbFRl#_~ZlS^uHeo2jqMgd?|L$@mL=wtrUG3q05%t_&aX5#DYd9= z%~Vo+& z16A`OR6A9cq|Wh6Xn7a#RR*Zo2}Q90&&ai9*8XrJjEc7u>*NbK<5UhmZj#EFtGS#=B1V}aD-%J7L}xeM3@Xs;R?A*K(;aa p=cQIu04+2lkVw)>^OAuvU##cnAApp;WamoT+OH}HCR1R9006~Q6^j4> diff --git a/src/test/resources/data/test/TransformedSet.fullCollection.version4.obj b/src/test/resources/data/test/TransformedSet.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..d8a1cd89f2ae5c918c87c3cb7b40fd3d8f04ed25 GIT binary patch literal 857 zcmb7?&ubGw6vv-w0-BZ@Q}Ln&!IKAfQC2EMNvtv064PRW=T6qw-RNc}&c03KMHKvT z=%F5r2T`z6JV6t)tG)CP4< z^*uVvh0PUz^nL=im0_6rR+`{YnZ?aN>CC_Bc#YDTQ8Jz5Fs1(pbF%KUnN3lWBHBs| zQu_Ss%-E|Z%T_N^Ix-~KQ@$wL!VIY4nGu-lw78VJ!Yd=ZGR_F!!X#;>$i`w_Y|bs!V8cemg#Bt{;LGdI_g`i z-SOeOUlzkAv{*3VUxur&gLg@SR2ADO2@;2o_K(w?aA%}ab(JRf?8KNgw|0)bs{gz~ znKbtSQZ-j2GBp}eWhI^5;Ln6V@j0}wj;+8xmXl?!d<4?zberK{2BMWZ<2)5VUh9*SG=s>-SDyVyS x?b*BOgO`3KnJvcI-M!S%VQONl@tF^#&GX?Km6_Rr(Hnob_eB2b0*^2^<2Sgf9;5&O literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TransformedSortedBag.emptyCollection.version3.1.obj b/src/test/resources/data/test/TransformedSortedBag.emptyCollection.version3.1.obj deleted file mode 100644 index 8c38659eeacf213c9ac4fe8114691e1ef439733e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmZ4UmVvdnh`~I+C|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4juk>3ShWiFw6o`9-;@ zDZ%+gC8;S+iRphDm)?%JbaxvQ14Bg-gCS|A0QGxY-?Lb>vZ52B-=2Vego}_J;|zCa z#X^VgON#ksF)=XuFmRW^-CI<`pyLBHTOZ;>eW(wCG~9>!2;UW11HBSRyi**Lih))o zmjtI4WhUliRwX9oq$1qplA4@flvt8q6t+h|c=xh}Cd|N~DgXw#76BU|L7til45cYk zD-Ygyeme)OwV<4Z0SGE8fM%ExFe9xrFBxccv7VoQ0Fnn~=Sth!uPO(I6VNFD=$ylx diff --git a/src/test/resources/data/test/TransformedSortedBag.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedSortedBag.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..02420ab876ae9d9806a4f28b81faa14156d2cf7f GIT binary patch literal 546 zcmZ4UmVvdnh`}PiC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xtAw`LK#cBCP zxv43^`9&qEDNc#$e;SwGj<|Gp8xsRVMG=D$iN*j8@V35Zv1nyQC&T~;LIxllh3p(> zxKk?@I(%PJ%r}dPfzgM7y9Dmyq7nvOAE4p-5KrnuJqe@{p43Npu*e$d8#fXh(pc&?b%t$NEO9r~ISkKQt0Lk;RbER$V LSCs<;5ojI&@JP)O literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TransformedSortedBag.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedSortedBag.fullCollection.version3.1.obj deleted file mode 100644 index b98e583ea8306bc2cc517e75d7d6fdf5a9ab2144..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmZ4UmVvdnh`~I+C|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4juk>3ShWiFw6o`9-;@ zDZ%+gC8;S+iRphDm)?%JbaxvQ14Bg-gCS|A0QGxY-?Lb>vZ52B-=2Vego}_J;|zCa z#X^VgON#ksF)=XuFmRW^-CI<`pyLBHTOZ;>eW(wCG~9>!2;UW11HBSRyi**Lih))o zmjtI4WhUliRwX9oq$1qplA4@flvt8q6t+h|c=xh}Cd|N~DgXw#76BU|L7til45cYk zD-Ygyeme)OwV<4Zfq{X!gn`i!%whtvoZu{HFpIIG0%(I70UOdv^OAuME7tS#4?yz1 Q>|AME`&H$@Py{*@0Pu&$IsgCw diff --git a/src/test/resources/data/test/TransformedSortedBag.fullCollection.version4.obj b/src/test/resources/data/test/TransformedSortedBag.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..59c4b4c87434d2158d4d8b6fa056052034afedec GIT binary patch literal 576 zcmZ4UmVvdnh`}PiC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xtAw`LK#cBCP zxv43^`9&qEDNc#$e;SwGj<|Gp8xsRVMG=D$iN*j8@V35Zv1nyQC&T~;LIxllh3p(> zxKk?@I(%PJ%r}dPfzgM7y9Dmyq7nvOAE4p-5KrnuJqe@{p43Npu*e$d8#fXh3RWCU|H#a}87)a;jq$ZbSg4nr<1$rSxiFw6o`9-;@ zDZ%+gC8;UCi3M%lW$YE!ulkr67%GYw3`sKus6VmX{z2@=r~+mNCLadA?9@txB}F9+ zIzB)H^&!sEhdK*L!=0s%q}tktL7*%#r!*BwtdOCOfvKVZ=sz<8E=w!TOD@STD%SJ! z4?r?NcCNIo{i^a=Anz4`Oaq0LU{+#TqF!l9W)3h&Qd5Dx;5qosPFFSS88ZW;4+9s_ jp#_OWi9q8@7{q))iuFN?^_}73))fT>3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOAw`LK#cBCP zxv43^`9&qEDZYsXZQW(;71po%m>3u;iWrPYGzMruV!8c;*pE>K%nVFE41C$Cl?Ypk zN*Hu~fF|lg9HtL-7?4IdOdm~0{y{r@SB~kYSuGm21XwS lE}&Bj5{nXn#+5LL`G6GbgB0sK!^N#D3JS_u7=WOn0swR(j5`1T literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TransformedSortedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/TransformedSortedMap.fullCollection.version3.1.obj deleted file mode 100644 index a52118607d886ec3e404967d038d11b3d4e9c360..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 648 zcmb7ByH3ME5L^-`AcPQ5&>#v5L<6>7U=JI-gvp`fHe;scQQ z0mM)6CsY(j6g1S#8U*PO&5mbwcW!t6_(rwV(w4T7FN|pSq~F$YtdkU|lx({`f5*c3 z$5te1SKC;2jUUT-Tzg{AfXxu9PRn$M^2C#Fi3kfzV&@b?kxXf=dk z@HJNOJr?k1tYDgi)=ZTak_N@F2SVo)QjfSsfHkc$H@4t9U^Mq$jrBceG+ zH4%w^;;3F??x-r1a^xX0X$iP^h+pKgB$pswONk!Z893L~8X_W-NJyU z5XK{|JFOuqCceKQdXY}qj)9wcQYjeLON3CxzcDBSY#?1;+RI_-LyeK{a*EQX` diff --git a/src/test/resources/data/test/TransformedSortedMap.fullCollection.version4.obj b/src/test/resources/data/test/TransformedSortedMap.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..ea7d60b58c61c5794eafe45fd871b2802157f573 GIT binary patch literal 652 zcmb7BJxc>Y5FL|C6cJGi8?mqutK5MI3PCMw&kxW_u-GJv8tOIzATzA&QQlYU#ru})H;QnKy(_}=hi zVf+&-lC-OBEIY^AI@#G5=H@n^EShh36{5n@`af-8AO^cHXCJ4gN|lgiFXZs|73-)G z!ZG+BEEo+2{2eS9D{qE0mkX82G3}DBsZtoMxcS#?-7IN4ZBzf?@Mz3o`C(~$_i=E~ z8ydFbd(EGVT=<#mD_liN>@oBFxzkuZf34C)NYfbA2rFRcXffpCfQy5@AH7)^Gw_IL z!BI^_qMtabmzX=M3Z)!*h)h}nE*|1HxhlyOh}Tl0hjs?eb+v|w$Rv^y1QDbb;bcQR zP$GoMNb62(h>EGv7ep`8Dcdn{Q%@=d!+MDjs`xtwWq@_0%Tqg=PIQuFN+7jq9HTMpzJZ&ojnvqPOBi3RWCU|H#a}87)a;jq$ZbSg4o5WC3+!6iFw6o`9-;@ zDZ%+gB|tK@3RWCU|H#a}87)a;jq$ZbS0@)^d#i=EFAw`LK#cBCP zxv43^`9&o_GPUHz{>u686UyS47#J#w7>r0YCbfjceya7}{&PYQ0~`n$fN&JDbDZH$ ztyt*reMvFjEG7m<9|rCcxQmNQ7<7GrhU-H-sSouekVbe?AK}3wYoKr3NN|i}QZdl7 z*Nb<1AF|C~6Efj+#JCqNY)9 tlm|6~nnQU}izr_%2LqpPbN8{dD#L~9QfMRG@@!mp&L#g-7G58W`v8 ztdzrDhxGhE^2FnPtDJy$aPz+5obPHBh zr3%l2LxM%Qu)$>AN*he0yXywy@TL6o-+ zUCA<43?_4fZ9e(@kN1^OtE3J)At(KbeK{|SIi6KT`$ws0!j1Gaw}j>vG)gIq`t2%p zQLdM^oG@zBEVu|ELwHb?^^6eLIn7Yk`*Bxo9G4=HFizZgS2jqx&Ku(k!)sFI@yr@o8H>wBaNA;lwP=lxdDu^0Jji5$RW2kY| z1ZomBg%VNIs9Dq;DvX*(Nky1<_^(%y&glwVyCo#oQomkQ@FuVjeJH@ogmHfXq(lfB literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj b/src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..f0cc10c72f91bb04016863a478fafd3ee23f9bdd GIT binary patch literal 321 zcmZ4UmVvdnh`~I+C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^d#RWN;CAo}L`WBvFzEUKjn#)3s}D66NF$8ZM^bL> z!yr(Wm{XdHBv!~!$G})oK#T*^O7oIS@{5Y~{QLuuOpu)`ZEL@(d=?V}Lq!3|I2NE` zf?0`WiF&0anK^nMiNzT}f3ULOI(S$t;Udr3RWCU|H#a}87)a;jq$ZbS0@)^d#RWN;CAo}L`WBvFzEUKjn#)3s}D66NF$8ZM^bL> z!yr(Wm{XdHBv!~!$G})oK#T*^O7oIS@{5Y~{QLuuOpu)`ZEL@(d=?V}Lq!3|I2NE` zf?0`WiF&0anK^nMiNzT}f3ULOI(S$t;Udr%FL0C6f1rvY&?5T^ifA`mB4Q~&@oXLXSP literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TransformingComparator.version4.obj b/src/test/resources/data/test/TransformingComparator.version4.obj index 19d010103af5aa76a58a59bad769dbc34b90c0f4..c13321055808335245072db32fd82b27744912dc 100644 GIT binary patch delta 105 zcmX@lbeoA|&07Z6;vxp8iF@Q2O(v=(GwM$4k{2=24=GB_D^ANV%1te@t|$PiaDb?| vWjJxSyq<|(T4`Q#Nq$kWUT{fKW?p(&Voqr)lAa8k%Zc_XY5_cwLT>Y delta 90 zcmcc3be@T0&07Z6;vxpe$^49R6V;O$btZPp^Xi8bCFT{U3RWCU|H#a}87)a;jq$ZbSg4juk>3ShWsi{th=~Jdw W9=!4Vb`CQGLq$PBIST_2Q~&_Z=^9i3 diff --git a/src/test/resources/data/test/TreeBag.emptyCollection.version4.obj b/src/test/resources/data/test/TreeBag.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..607687f2abb5d645fd4a3cc926930d7c299f624b GIT binary patch literal 72 zcmZ4UmVvdnh(SBQC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xtAw{XFPKoJL YrdA%j@%(lUGXq0KK|whS0}xaI0OXGvi2wiq literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TreeBag.fullCollection.version3.obj b/src/test/resources/data/test/TreeBag.fullCollection.version3.obj deleted file mode 100644 index 987570e115f8e8fa17afcc3605c89ae15a6c8011..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmZ4UmVvdnh(RmAC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4juk>3ShWsi{th=~Jdw m9=!4Vb`CQGLq$PBIST^=19J%jqa&Eb1Y|kES3RWCU|H#a}87)a;jq$ZbS0@)^dNr~xtAw{XFPKoJL ordA%j@%(lUGXq0KK|whS0|Ntd2?L`en8gHSIl)=ZU>0Kq05*XhCjbBd literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/TreeBidiMap.emptyCollection.version3.3.obj b/src/test/resources/data/test/TreeBidiMap.emptyCollection.version3.3.obj deleted file mode 100644 index d74791e3555c509e2dfb7ea02d47f01aaec7d875..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 260 zcmZ4UmVvdnh`}hoC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4ju!DVe#61$rSxsi{st zwr^rV@(sQC_P(t1ObpDP47|DdDVb@R$%$a)o(!CM`6;Q+`K5U!(F`0#`S~S&Kz<2> zRkRP#B7KNO`cR92G~6P6s73ln7O8;rT2~Y>KtX8{)Ep8W3^Av=a7kB%M`|Y%0|VGd Hrh)?MW&$NO{@3Znk~dx81z0Z3J&3 zdQcJk2Oj+a`YXJ8_AYo6Z_d13^4=~>(i}1~Z}!c6-^^s**WXYd$FL@2-(?Z=hTQe! zXe7fiY9Y9%0s!zY<$!l& z5~?0FV=2`Ro)tXkZ6i=S1!`wNsHZ^f45)1Z-K5x!(+B`o=$FJs=0WfiNxw|MnB+1>h|PY?fozf*;!Jy`LW@DjlkA9UGx*g?|Rmm!)Sn!8LSya&sD z!Mvl66f#y&?d|oTHeiY=xYpY~WGAdGSm?Jqaul(c^#$L+_6dHV+jk7Fpn@sz6Ax`q zD-Qgjap+Lmbxc+rErcPnMNZ62_64#r0xKOVsFRu(nPtf$oj$|n)KJcg%Og5W2#iBHFD{Q) zXFdx;1r4pO*eEg;Q)R1K7+(~T9On56*L*pq{~{@i z`#F#?LCB@~3^>EqLj;Sy~q4meWzA z2uF$1f-H@zqzj&{=5jUyJ&%SS#G2t$njjBc!^kz9L}7--Zt~Jpc`o%A{1z>ILu;!J zy_H9X7ByvG3*#%zpQq}a$pm|Z(#~CY5@O05o4n~*CYFOP@IsVkV=*jelk2=Q*3U4? z8EiO#ZCc3RWCU|H#a}87)a;jq$ZbSqO$cu^K$c3GSe~>lX6m> z;Y$9j-d(%U`d>H`14Bg-Lm=_SIVKgC6eT8?1g92dCgx;Tp&ILwnw(#hSdw29wnspC z_p*g1%s}%CfDRVUN-Rs%D=o>)(Q_;+O04wBEH0^Nyd*pGc;Z}U21ZW?mg3B+)QSQI MASh=65?mD(0Dae2r~m)} diff --git a/src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..24a998026c012e6a315083cc107b849a05c824d4 GIT binary patch literal 263 zcmZ4UmVvdnh`}+xC|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)@=9KF!I-29Zxw9Le$ zoK$DHnm?;|*DkdF7tX}MP*KF-MuK^cNyQ~aiOD4hvs_Y>^NSKo@{7Xu2ng?9w$Ox$ zfzgM73*n#=1~H$k#Ii*F(vr*^eS}8qiUOc#gh5hzASpe^qN2n~pUmQtipEQ_Gmj_E ZWoBUXWMC=ItV*pYU;u)079hb@0RZX*U=#oV literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/UnmodifiableCollection.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableCollection.fullCollection.version3.1.obj deleted file mode 100644 index 0034a9af67cbde8200e1a10ac8b3da234e9e2161..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 643 zcmZ4UmVvdnh`}MhC|xhHATc>3RWCU|H#a}87)a;jq$ZbSqO$cu^K$c3GSe~>lX6m> z;Y$9j-d(%U`d>H`14Bg-Lm=_SIVKgC6eT8?1g92dCgx;Tp&ILwnw(#hSdw29wnspC z_p*g1%s}%CfDRVUN-Rs%D=o>)(Q_;+O04wBEH0^Nyd*pGc;Z}U21ZW?mg3B+)QSQI z1_t4B77$s&z)-@#?4Oqk)GY|sos*cCuIHIolA4}cB=l&(lJAY}7EB<$tYwKgrKv!F z2q4t?mF6a;7PYOJD$70PK{v>oAhVfD7+6Cxic(VxiVGR)7}$YAEO1+pbi3r20)wkz z^C2(I?B6UvOI%=(a)xhA4{GyT!UvpuTgj+#C1A|cvWZ(v>=0jNTlb@Gv z-Th?3nSSN_K*e6Dioxz>;3;9?2+7DSDoF)7g2~VXM3|zQ<5XFaI>#@e3RWCU|H#a}87)a;jq$ZbS0@)@=9KF!I-29Zxw9Le$ zoK$DHnm?;|*DkdF7tX}MP*KF-MuK^cNyQ~aiOD4hvs_Y>^NSKo@{7Xu2ng?9w$Ox$ zfzgM73*n#=1~H$k#Ii*F(vr*^eS}8qiUOc#gh5hzASpe^qN2n~pUmQtipEQ_Gmj_E zWoBUXWMC=ItV*pYU|?VnE@uIeB@7HD49xy{sX*O=VBI;1dFgtdc_pdosYODM7A*PR z*lq!Ig(m}RSz=CUD$t7p2z7p?xk;%-ZEL2=a!+~C4GIB}*-Rx2tRWdisi_6Ug$#8J z96%u!xGhM!UGhtTA=$9`ke6omZx)~>E-*_#+Bh9VfEs}S=rn$Wm2Nrti6yt*o?LX> z=EEDH9ye4y2S6TT4Nfgf%>&Y|nduoNB@8TnnLr=H+`@%wU~oo$QAvicxv)vXtstO* z!6*hYa06BIA*}bw&r7%Nelp=qzw&*cVlPz1VD~cclrV6FWMmeVq=Fp5WM~2+Oi|5o Xsw_#JSZea|9{?a30#S literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/UnmodifiableList.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableList.emptyCollection.version3.1.obj deleted file mode 100644 index c7f049547ddc8c15a80a1fc2c3d28ad033abf471..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmZ4UmVvdnh`}VkC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4j8k#U*;7dAa#1nQ57c zNja%LK!NDC(^r1k)V44&FjN#VxDsQ8V^VQRQDSmQaB5LzVoqii%qW-C4p< diff --git a/src/test/resources/data/test/UnmodifiableList.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableList.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..2d132cca107d4577ef2390524fe675a6d4539e60 GIT binary patch literal 415 zcmZ4UmVvdnh`}_!C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdZBr_`6-!c znTbg`sXjn~=(f{We%aKvFflMx6fw9FWrkx?aY<2Pa!GJ%QD$OJW);jVm(=9^qQsK? zB2}j+n%{b>vzft$T9ITZ$Wd^E>`JfQJN_x_IgzeIcvlbRMrU{kzzq%CBOttc*+LU0 z21XwSE`**E1~H$k#Ii*F(vr*^eS}8qiUMHp3WKEdKvH^+MMa5~Aa_3RWCU|H#a}87)a;jq$ZbSg4j8k#U*;7dAa#1nQ57c zNja%LK!NDC(^r1k)V44&FjN#VxDsQ8V^VQRQDSmQaB5LzVoqii%qW-C!VUP)?tYLU>R1xvm+wp%cP^s<&E=9H!a z-7bJo=U1AWlv>obW~warln31)uYt^FDq&y^$tX%qEhsKzsAFIU3bDX#LDKD#UkVJI zhRuh(G_!xR04;HWSpw3=;UEIk2n0Z<@guBs%gIkHx%KwsqT4nf-T?Kuq3SsR@(^oq zYFTO?kao>X&nPKjVDZZY`Vi(8E>r`9GxCc{GJMU2O%iSe0SydBF_3{9sG1L9y-$8# zx^?%H31|A1?*kQkp(+Numw~5*fg>a%v#2B$3RWCU|H#a}87)a;jq$ZbS0@)^dIhn;JdZBr_`6-!c znTbg`sXjn~=(f{We%aKvFflMx6fw9FWrkx?aY<2Pa!GJ%QD$OJW);jVm(=9^qQsK? zB2}j+n%{b>vzft$T9ITZ$Wd^E>`JfQJN_x_IgzeIcvlbRMrU{kzzq%CBOttc*+LU0 z21XwSE`**E1~H$k#Ii*F(vr*^eS}8qiUMHp3WKEdKvH^+MMa5~Aa_J|j+&PmKm*YnIPNli~J5_+^?$@j)~ z3!p1J8Cc5_b4pWz5g>q2=U1AWlv>obW~warln33Q5CECYRKma-l2MeJT2NfbP{+Up z6k>tff~4CezZ4k54Vw>nX=eXs0b1e$vjn7#+d%}V5eR@z<40KOmXn`Ya_jBMMYnA} zyaDQQL)CKt5Z5z~Yw)^dZbGT&M;HXXF=^WcZp3nHBh$PrA2CLqET)f}hF alGHhV2`%pezRCd2aY8XipaSGp_6h)L;}ntr literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/UnmodifiableMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableMap.emptyCollection.version3.1.obj deleted file mode 100644 index a5786598e0edba13503b28da543a8cffbc0fbdd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ4UmVvdnh`}hoC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$v=*x%nxXX_<*h zIjO#h1**UA__=ufU}a`ts3-s$A()j|mZ(=+l9{9DkyxAoRKd!A>)>Irgp14!Ol}NZ pIr)hxZi&ey`9+=#oFy4Wsl^%jIVlwd_6`gnAW+T$B03RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOp?SIaDVb@R ziAg!BzKI2@zwh|Dc>Q2yW?-l&0Gc6~l~|UjS6Y&pqvw%WoB>q9%6{wMVX=gZ%nVF! s3|u++i79T0$tC$ko(!BN8AYkZ8TmOW6$SPV3?RT$&H*F^K+K8?05vi(YXATM literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/UnmodifiableMap.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableMap.fullCollection.version3.1.obj deleted file mode 100644 index 91ae85a2ba2b2522178c653506b8ca23c923e692..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmXX?u}*|Q5S<9zo!4n$ENzS(#r=R5=AtIr**m}4dX2r(T+C+V{3GtreFI_4x(q zcf4HyPp}R>1sf4hA+YxpZOxf;o@Nt62wG#{0{a?v&#prqB>Vyus6Ey=hY_=hwI|_b zavOCy=c0l;F@*5RjH_pQrKP8NE|Mi9CNBPW+CEB$7*GqOad4P8wiu?QYChcxsD&>z c0Ynky_>&`!n;1fvORJqq8fJZ72<(U94;M*)F#rGn diff --git a/src/test/resources/data/test/UnmodifiableMap.fullCollection.version4.obj b/src/test/resources/data/test/UnmodifiableMap.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..8ce8a1f3a7cb03c987c294f67f0dd6a80555b8c5 GIT binary patch literal 402 zcmXX=F;2uV5L}Vu?x2GLQPLo~6hIFJIsp=N^lTDe64=~^#FtAbcoCmKynq(*1$rbJ zW&@Ty)Y<#dq5j=+7jh#&Z*btk~V$OxVBKq`ug;Y zZ0)UQzUMwn|`z&EmR!cQ=PCUR$efF{~e08RJ`jYHtyoo2k#m_U1s Z0=C*A5MG!F+aE@d_)BC!hmpI!{{@;0e_#Lr literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version3.1.obj deleted file mode 100644 index 89b4d0670c8b9ec3e88f1978b93359839b80f3f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmZ4UmVvdnh`}3RWCU|H#a}87)a;jq$ZbSg4nr<1$v=*x%nxXX_<*h zIjR0dDXB%NDZYsX1+UV4-(OSR#mvA^Q2;c_kO-4}GK)(PCaB)YH~nt>K8=}y(T9OM zGp{(c2qIg;AmEdgSeB??T9TQg57J}}wn7*rs0R|%b1W)KtOUtaG+vUOc|370&=5}s zmg3B+)QSQIASh=65?mEPhY2Edc_bER0G-ate(T_2v4o4v3`}keTsirPDQ=0$CHY03 g44fqyMXALZ`8g>S1@;aga~K55IY13RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOp?SIaDVb@R ziAg!B{zWONMX4#ii3J6((tO`vQ{BbPz)(>DG|Gq=qkJ-pOAtn=-pM!pZu~xtnSs%V zfjcv=IJF2OTf!jVla*MOs9#!=nWGQVWDT}M7$m3%64Y}nDoU&b$y796lAU=xaW2ph zPX?Ca%&OFi0tO%`X8{si6+o8>B6N8q7H0t6&dPr4;9;?Zi_8p6ZVX&G`H3lRiOD7T jMV<_tB^gDj#TofIDHR3w4j^+Fc*;3|qyUInQBeT^Y36F7 literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version3.1.obj deleted file mode 100644 index 6077984d81c6491d80f7e62a6c373d52b3cbdf8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 648 zcma)2J#Q015FNNPb`m}k2LebS(L{6?0ZM@=2u+koj;QDv`_^{{d*03N`h0c~iJw7{ ze~@257g10{L4ooMkfM}nc{?DbrMP$VX5P%so0D_uctAk`DpfWzb!{ddf34Lh zR57mEX747o$*Xb2L#^JrTsf5=u(iL(2Nyp#za&Jh#iVEdF=?AxACxnNDL=(|%q(B-{08KR%~pg?>95=u$SnF~@{iamSIea*e+(=Y0HN6(EbGqyaeR5mnCW5ynTt<^Bp z;Loy#ZFW3vOi_<&&b2yng>tGmWNUwp4lloLeNKp4i%~oOGip%#a5ZAoJ(cVD`#6p2tl4;o{NhIe)~E14@0pP^~4R z{wxJP2-M+{>v5ojwFc(w1Q&tQTyq66G6q;Gh2j#&&jWQ!V~Tu^NLm_?qE4l>j%Du@ z(kXBU!pEK@G!_Lj^+X<+n~81V$J*7duh~~{tkeDeP?DH@fcR)*_ za>`dm7p;Bq5_=QfpY?!`@%7{MDeH-PPbai#Bd%iyJT#5`PM{mIov1E~<6R=|#r(qv zHxZ7PNO%n$vaYDrK)rwGir&C%cqM!pJm-b*Tj&ydMBRlFXGJYZofF;zho!<-z+sQ@ Q+u$%+cpn_*P20Bp16ah$8vp8v0N3RWCU|H#a}87)a;jq$ZbSg4o5WC3>NGx%nxXX_<*h zIjO;^B~gaW;%pvWiA)R(6-5lrL>S3RWCU|H#a}87)a;jq$ZbS0@)^d#i=EFp?SIaDVb@R ziAg!B!Ko!thRxz^9$kq{3=9=T3@*f&;FwfgQk0ln5}aC;nV6GV1vSYfH95a1u_V7p zkpD~eG;uy@X0VYKq#0QPH)g*O`!~*$d)Gl+=0?aEgh%yY4s?e59d2mY9s%Lq%NCk2 zF);cta3S=RFo^kNC6*=XmzHGa=p!^*R}=sPRuCkm2a?kBNG#3(2HP%|)~VBWY&QY< Yv7nrXfq_B5-T_DgK}8`$9Rqs>0FQ5vi~s-t literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/UnmodifiableSet.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableSet.fullCollection.version3.1.obj deleted file mode 100644 index 888e6adceb2a45e4ac67d5886980698e4327b163..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 604 zcmZ4UmVvdnh`}hoC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4o5WC3>NGx%nxXX_<*h zIjO;^B~gaW;%pvWiA)R(6-5lrL>ShPu6#$zHR_9lmo0MAAwq~j< z_ml_SAg>ev4Pz-`U=7JAN=*g1f*+weI3vHPB*WKS*d*ar5YWtEn3;tPbqs6_+(6ZQ z2-QxNC8=}#5?bB`e3bzzc0y4s0JOq2Gd-gOs0YbCF8QUv&~4a!$V)T(Hw#dg3yLlW z5wK?&P@UzLlb={}>+Q)!w{1SW0qSu>)pLM>p@f0S&;-?WKKXg+*4+aDnMEb3AQ2`*Q@BE|5|C}o{&}et F6#xebzT5x+ diff --git a/src/test/resources/data/test/UnmodifiableSet.fullCollection.version4.obj b/src/test/resources/data/test/UnmodifiableSet.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..a0903c1fc0ed58a2ddbe48c42107773cdbf070b1 GIT binary patch literal 805 zcmZ4UmVvdnh`~6&C|xhHATc>3RWCU|H#a}87)a;jq$ZbS0@)^d#i=EFp?SIaDVb@R ziAg!B!Ko!thRxz^9$kq{3=9=T3@*f&;FwfgQk0ln5}aC;nV6GV1vSYfH95a1u_V7p zkpD~eG;uy@X0VYKq#0QPH)g*O`!~*$d)Gl+=0?aEgh%yY4s?e59d2mY9s%Lq%NCk2 zF);cta3S=RFo^kNC6*=XmzHGa=p!^*R}=sPRuCkm2a?kBNG#3(2HP%|)~VBWY&QY< zv7nrXfq_B6-T_E5FbI_}Fd+2gB<7{-dFGX*rl%GOJzB8jdt z3;7YI1ZU(Im1Ovu3!5a|3If^{46_Sl3>O18(2$UfqSRENE+UBL&h#ta z2Ws*{)dcbw0|O7pUK5~x*Ua>c5>)+8l_jZj{1RH;1$>nO>UToXFHpk3;+L71TEf8W zp9iuS$+>Ph`H3aB-kw}^+vdX?piVawoel>W7)ls8LNYRoN>WqvfLf8l%O$@Qn1~xT ZAM(=7{>=i^>w>CR1ng>t3XsRyD*z9~2(17B literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version3.1.obj deleted file mode 100644 index d8bcab94554bfd0f363cfb5c143fa0e0710b6811..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmZ4UmVvdnh`}PiC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4nr<1$v=*x%nxXX_<*h zIjO<VKvoHWbMFjx8OFA0> diff --git a/src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..7eb1c626e7d9fd21903198cdf4cb6ceb1f2220c5 GIT binary patch literal 159 zcmZ4UmVvdnh`}3RWCU|H#a}87)a;jq$ZbS0@)^dxrqgOp?SIaDVb@R ziAg!B!TCicsVTmR1pyOwUjBPD;srAULq!45B*Co2vP8YolFS^vkfPL7pbDOY-|Tc% svz{?CF#0fX0ZlJREJ`c^>Sqx10V&o8Db{y}i(6L|6qK_t06|3s0ObNYPyhe` literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version4.obj similarity index 73% rename from src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version3.1.obj rename to src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version4.obj index 6a0104d542422acbcb520fe0d0b75b71e01ef109..f58fb9dac10b565e2c992dfded41206aa2830605 100644 GIT binary patch delta 22 dcmZ3=yo{M+&07Z6;vxpii5zl_CL7i2839k323Y_A delta 20 bcmZ3+yp)+^&07Z6;vxo%i5zkp)$17nMDhkC diff --git a/src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version3.1.obj deleted file mode 100644 index abedad76e653d00f0cdcd8f24eae61f8f4737895..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmZ4UmVvdnh`}PiC|xhHATc>3RWCU|H#a}87)a;jq$ZbSg4o5WC3>NGx%nxXX_<*h zIjO<xRQ{T2n OgH;rivoHWbMFjxvXDt%| diff --git a/src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj b/src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..ce0c85af21db4d889870379d9526bb238f26fcf3 GIT binary patch literal 397 zcmZ4UmVvdnh`}3RWCU|H#a}87)a;jq$ZbS0@)^d#i=EFp?SIaDVb@R ziAg!B!TCicsVTv!C12k&AFT38KEceuP*KESM~pd+NyQ~aiOD5!Gh9-W^NSKo@{7)Y zUS|9^$dHK%Y?uW}hNYIkjoB~6{*CkG-gOXT+z1(i@TeZlY0hxJ!wn7FBOttc*+LU0 z21XwSE`**E1~H$k#Ii*F(vr*^eS}8qiUMH33WB8cKvH@kMX9O40J}RQVDi+r?a`nB SD<~*uVE}@PLWVj9_6h)lT9fJk literal 0 HcmV?d00001 diff --git a/src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version3.1.obj b/src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version3.1.obj deleted file mode 100644 index 4b46e50a8705f530c9da6c68b0632c0ee83108a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 487 zcmX}lu}Z^G6vpw>#voEetB8nH5fKsbiilY82?`=Yb#l5*k1=wS8*grEa1dPV;HU*h z2gkmIn=c`VdvOw1lMLT+|f_x)y-DlKw*Ql*?3nl6Lo?l=uQY#xS#M(z3Qv08l0W0mBZ?x@H* zkPD4N6HpDBgr=Z6Gz-l^^Uwmc2sNN(Xa!n@)}VE01KNbPplxUe+J*L@edqu>%(8!v CHgjJ9 diff --git a/src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version4.obj b/src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version4.obj new file mode 100644 index 0000000000000000000000000000000000000000..20cc239867c6c96d0367d283556f6be026228299 GIT binary patch literal 764 zcmb8rK}!Nb90l-E6ElfSsfe(Mh=^!KG*W~hia?NvtS+6#buwe!-DXEyIs{$v(6NM$ z1>s5h0u|A%PJMzPx=V+sPC>gy&tr9(AI!{~`M-LDxD8Gc8qZ5qr}8F~WUW}#RKr>o zg~_5|IVKrQNULg5%M~^XG^?-jY^0V^(30Crd}wMrGYDOxJhX2qA+ws8BU8 zrBuQ4j0c`i&p-AnaqGbpahIu5VphZcW?=K&VyT#A{GeV9`Hr6s?O}B*%wcSkJ<@K; z1-T&)Vx{B0Vo6wLBr4pGzyJD