diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 2407f1dbf..a2b107616 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -47,6 +47,7 @@ Major changes since 3.2.1 Changes since 4.0-alpha1 ------------------------ + o [COLLECTIONS-494] Moved "Equator" interface to base package for consistency. Thanks to Emmanuel Bourg. o [COLLECTIONS-488] Added "CollectionsUtils#matchesAll(Iterable, Predicate)" to test if all elements of a collection match a given predicate. Thanks to Josh Cain. o [COLLECTIONS-485] Accept wildcard input where possible, e.g. in copy-constructors, Unmodifiable* decorators @@ -158,6 +159,7 @@ New features Changed classes / methods ------------------------- + o [COLLECTIONS-494] Moved "Equator" interface to base package for consistency. Thanks to Emmanuel Bourg. o [COLLECTIONS-485] Accept wildcard input where possible, e.g. in copy-constructors, Unmodifiable* decorators and iterators. Thanks to Hollis Waite. o [COLLECTIONS-480] Narrow return type of "BidiMap#values()" to Set as the values are required to be unique. Thanks to Hollis Waite. diff --git a/src/changes/changes.xml b/src/changes/changes.xml index ce80f19b3..d2cff28eb 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -21,7 +21,26 @@ - + + + Moved "Equator" interface to base package for consistency. + Added "CollectionsUtils#matchesAll(Iterable, Predicate)" to test if all elements of a collection match a given predicate. diff --git a/src/main/java/org/apache/commons/collections4/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java index f3ce5339a..5cce30876 100644 --- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java +++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java @@ -36,7 +36,6 @@ 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; import org.apache.commons.collections4.iterators.CollatingIterator; import org.apache.commons.collections4.iterators.PermutationIterator; diff --git a/src/main/java/org/apache/commons/collections4/functors/Equator.java b/src/main/java/org/apache/commons/collections4/Equator.java similarity index 97% rename from src/main/java/org/apache/commons/collections4/functors/Equator.java rename to src/main/java/org/apache/commons/collections4/Equator.java index 739b202ad..813fa9d63 100644 --- a/src/main/java/org/apache/commons/collections4/functors/Equator.java +++ b/src/main/java/org/apache/commons/collections4/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.collections4.functors; +package org.apache.commons.collections4; /** * An equation function, which determines equality between objects of type T. diff --git a/src/main/java/org/apache/commons/collections4/ListUtils.java b/src/main/java/org/apache/commons/collections4/ListUtils.java index 6f463da27..e723f762f 100644 --- a/src/main/java/org/apache/commons/collections4/ListUtils.java +++ b/src/main/java/org/apache/commons/collections4/ListUtils.java @@ -26,7 +26,6 @@ import java.util.List; import org.apache.commons.collections4.bag.HashBag; import org.apache.commons.collections4.functors.DefaultEquator; -import org.apache.commons.collections4.functors.Equator; import org.apache.commons.collections4.list.FixedSizeList; import org.apache.commons.collections4.list.LazyList; import org.apache.commons.collections4.list.PredicatedList; diff --git a/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java index 937a7da50..d6acdde4a 100644 --- a/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java +++ b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java @@ -18,6 +18,8 @@ package org.apache.commons.collections4.functors; import java.io.Serializable; +import org.apache.commons.collections4.Equator; + /** * Default {@link Equator} implementation. * diff --git a/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java index 7a8923764..e6f5dfc21 100644 --- a/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java @@ -20,6 +20,7 @@ import static org.apache.commons.collections4.functors.NullPredicate.nullPredica import java.io.Serializable; +import org.apache.commons.collections4.Equator; import org.apache.commons.collections4.Predicate; /** diff --git a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java index 2d66c518c..690a5e957 100644 --- a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java +++ b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java @@ -18,8 +18,8 @@ package org.apache.commons.collections4.sequence; import java.util.List; +import org.apache.commons.collections4.Equator; import org.apache.commons.collections4.functors.DefaultEquator; -import org.apache.commons.collections4.functors.Equator; /** * This class allows to compare two objects sequences. diff --git a/src/site/xdoc/release_4_0.xml b/src/site/xdoc/release_4_0.xml index 800d7f9d4..5f4bc4fa9 100644 --- a/src/site/xdoc/release_4_0.xml +++ b/src/site/xdoc/release_4_0.xml @@ -155,6 +155,7 @@ have changed.

Changed classes / methods

    +
  • Moved "Equator" interface to base package for consistency.
  • Accept wildcard input where possible, e.g. in copy-constructors, Unmodifiable* decorators and iterators.
  • Narrow return type of "BidiMap#values()" to Set as the values are required to be unique.
  • Made field "collection" in class "AbstractCollectionDecorator" private and added setter "setCollection(Collection)" with scope protected to set the decorated collection during de-serialization.