From 5ba1dde50d11435609d3c02126b9b3a26fcb57a0 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Tue, 30 Nov 2021 11:59:34 +0800
Subject: [PATCH] fix code

---
 .../java/cn/hutool/core/collection/CollUtil.java   | 14 +++++++-------
 .../cn/hutool/core/collection/CollUtilTest.java    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
index 329c37d5d..fb6783402 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
@@ -1315,20 +1315,20 @@ public class CollUtil {
 	}
 
 	/**
-	 * 移除集合中的多个元素，并将结果存放到生成的新集合中后返回
+	 * 移除集合中的多个元素，并将结果存放到生成的新集合中后返回<br>
 	 * 此方法直接修改原集合
 	 *
 	 * @param <T>              集合类型
 	 * @param <E>              集合元素类型
 	 * @param targetCollection 被操作移除元素的集合
-	 * @param filter           用于是否移除判断的过滤器
+	 * @param predicate        用于是否移除判断的过滤器
 	 * @return 移除结果的集合
+	 * @since 5.7.17
 	 */
-	@SuppressWarnings("unchecked")
-	public static <T extends Collection<E>, E> T removeWithAddIf(T targetCollection, Predicate<? super E> filter) {
-		Collection<E> resultCollection = new ArrayList<>();
-		removeWithAddIf(targetCollection, resultCollection, filter);
-		return (T) resultCollection;
+	public static <T extends Collection<E>, E> List<E> removeWithAddIf(T targetCollection, Predicate<? super E> predicate) {
+		final List<E> removed = new ArrayList<>();
+		removeWithAddIf(targetCollection, removed, predicate);
+		return removed;
 	}
 
 	/**
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
index 833d4a79b..bd889916f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
@@ -45,7 +45,7 @@ public class CollUtilTest {
 		ArrayList<Integer> exceptRemovedList = CollUtil.newArrayList(2, 3);
 		ArrayList<Integer> exceptResultList = CollUtil.newArrayList(1);
 
-		ArrayList<Integer> resultList = CollUtil.removeWithAddIf(list, ele -> 1 == ele);
+		List<Integer> resultList = CollUtil.removeWithAddIf(list, ele -> 1 == ele);
 		Assert.assertEquals(list, exceptRemovedList);
 		Assert.assertEquals(resultList, exceptResultList);