From bdb9a34222aa3ee23b908473e1e6bad02cd3c7f1 Mon Sep 17 00:00:00 2001 From: guning Date: Sat, 16 Sep 2023 14:56:06 +0800 Subject: [PATCH 1/2] Simplify method CollectionUtils#isEqualCollection --- .../apache/commons/collections4/CollectionUtils.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/org/apache/commons/collections4/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java index 28b5f3a67d..af225d9faf 100644 --- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java +++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java @@ -624,15 +624,7 @@ public static boolean isEqualCollection(final Collection a, final Collection< return false; } final CardinalityHelper helper = new CardinalityHelper<>(a, b); - if (helper.cardinalityA.size() != helper.cardinalityB.size()) { - return false; - } - for (final Object obj : helper.cardinalityA.keySet()) { - if (helper.freqA(obj) != helper.freqB(obj)) { - return false; - } - } - return true; + return helper.cardinalityA.equals(helper.cardinalityB); } /** From 7ecba336881952fe31f23564b281137c6b10b28e Mon Sep 17 00:00:00 2001 From: guning Date: Wed, 7 Aug 2024 00:13:16 +0800 Subject: [PATCH 2/2] Simplify method CollectionUtils#isEqualCollection --- .../apache/commons/collections4/CollectionUtils.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/org/apache/commons/collections4/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java index d6d8d342ec..c57bf1a299 100644 --- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java +++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java @@ -1206,15 +1206,7 @@ public static boolean isEqualCollection(final Collection a, final Collection< return false; } final CardinalityHelper helper = new CardinalityHelper<>(a, b); - if (helper.cardinalityA.size() != helper.cardinalityB.size()) { - return false; - } - for (final Object obj : helper.cardinalityA.keySet()) { - if (helper.freqA(obj) != helper.freqB(obj)) { - return false; - } - } - return true; + return helper.cardinalityA.equals(helper.cardinalityB); } /**