You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by li...@apache.org on 2022/10/11 01:16:44 UTC
[shenyu] branch master updated: [ISSUE #4063] exclude null list (#4065)
This is an automated email from the ASF dual-hosted git repository.
likeguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 257623b7e [ISSUE #4063] exclude null list (#4065)
257623b7e is described below
commit 257623b7ec19f6ba51ff8202867fd24b19184cd1
Author: moremind <he...@hotmail.com>
AuthorDate: Tue Oct 11 09:16:34 2022 +0800
[ISSUE #4063] exclude null list (#4065)
* [ISSUE #4063] fix issue 4063
* [ISSUE #4063] fix issue 4063
* [ISSUE #4063] fix issue 4063
* [ISSUE #4063] fix issue 4063
* [ISSUE #4063] fix issue 4063
* [ISSUE #4063] fix issue 4063
---
.../main/java/org/apache/shenyu/admin/controller/RuleController.java | 2 +-
.../java/org/apache/shenyu/admin/controller/SelectorController.java | 2 +-
.../src/main/java/org/apache/shenyu/admin/utils/ListUtil.java | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/RuleController.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/RuleController.java
index f512f17f2..b84331c52 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/RuleController.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/RuleController.java
@@ -77,7 +77,7 @@ public class RuleController implements PagedController<RuleQueryCondition, RuleV
@RequestParam @NotNull final Integer pageSize) {
final RuleQueryCondition condition = new RuleQueryCondition();
condition.setUserId(SessionUtil.visitor().getUserId());
- condition.setSelectors(ListUtil.list(selectorId));
+ condition.setSelectors(ListUtil.of(selectorId));
condition.setKeyword(name);
return searchAdaptor(new PageCondition<>(currentPage, pageSize, condition));
}
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/SelectorController.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/SelectorController.java
index 601bbe0ed..33115a337 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/SelectorController.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/SelectorController.java
@@ -77,7 +77,7 @@ public class SelectorController implements PagedController<SelectorQueryConditio
@RequestParam @NotNull final Integer pageSize) {
final SelectorQueryCondition condition = new SelectorQueryCondition();
condition.setUserId(SessionUtil.visitor().getUserId());
- condition.setPlugin(ListUtil.list(pluginId));
+ condition.setPlugin(ListUtil.of(pluginId));
condition.setKeyword(name);
return searchAdaptor(new PageCondition<>(currentPage, pageSize, condition));
}
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ListUtil.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ListUtil.java
index 353895480..9409985ed 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ListUtil.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ListUtil.java
@@ -19,7 +19,6 @@ package org.apache.shenyu.admin.utils;
import org.apache.commons.collections4.CollectionUtils;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -55,11 +54,11 @@ public final class ListUtil {
*
* @param t e
* @param <T> type
- * @return list
+ * @return unmodifiable list
*/
@SafeVarargs
public static <T> List<T> of(final T... t) {
- return new ArrayList<>(list(t));
+ return Collections.unmodifiableList(Stream.of(t).filter(Objects::nonNull).collect(Collectors.toList()));
}
/**