This is an automated email from the ASF dual-hosted git repository.
kevinclair pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new b75e222 [type:refactor] modify null judgment (#2721)
b75e222 is described below
commit b75e2224f70fb2968008b7fc9afb455c1c2bf52d
Author: kaitoShy <[email protected]>
AuthorDate: Thu Jan 6 17:54:29 2022 +0800
[type:refactor] modify null judgment (#2721)
* [type:refactor] modify null judgment
* delete invalid import
---
.../java/org/apache/shenyu/admin/model/page/PageParameter.java | 4 ++--
.../org/apache/shenyu/admin/model/page/PageResultUtils.java | 3 ++-
.../shenyu/admin/service/impl/DataPermissionServiceImpl.java | 10 +++++-----
.../src/main/java/org/apache/shenyu/admin/utils/AesUtils.java | 6 +++---
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/page/PageParameter.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/page/PageParameter.java
index 5656daf..31dcfa4 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/page/PageParameter.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/page/PageParameter.java
@@ -55,8 +55,8 @@ public class PageParameter implements Serializable {
* @param pageSize page size.
*/
public PageParameter(final Integer currentPage, final Integer pageSize) {
- this.currentPage = currentPage == null || currentPage <= 0 ? 1 :
currentPage;
- this.pageSize = pageSize == null || pageSize <= 0 ? DEFAULT_PAGE_SIZE
: pageSize;
+ this.currentPage = Objects.isNull(currentPage) || currentPage <= 0 ? 1
: currentPage;
+ this.pageSize = Objects.isNull(currentPage) || pageSize <= 0 ?
DEFAULT_PAGE_SIZE : pageSize;
this.offset = (this.currentPage - 1) * this.pageSize;
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/page/PageResultUtils.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/page/PageResultUtils.java
index 13bb9d2..98dc136 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/page/PageResultUtils.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/page/PageResultUtils.java
@@ -19,6 +19,7 @@ package org.apache.shenyu.admin.model.page;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.function.Supplier;
/**
@@ -37,7 +38,7 @@ public class PageResultUtils {
*/
public static <T> CommonPager<T> result(final PageParameter pageParameter,
final Supplier<Integer> countSupplier, final Supplier<List<T>> listSupplier) {
Integer count = countSupplier.get();
- if (count != null && count > 0) {
+ if (Objects.nonNull(count) && count > 0) {
return new CommonPager<>(new
PageParameter(pageParameter.getCurrentPage(), pageParameter.getPageSize(),
count), listSupplier.get());
}
return new CommonPager<>(new
PageParameter(pageParameter.getCurrentPage(), pageParameter.getPageSize(), 0),
Collections.emptyList());
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DataPermissionServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DataPermissionServiceImpl.java
index be01d19..467945f 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DataPermissionServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DataPermissionServiceImpl.java
@@ -36,6 +36,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
@@ -156,9 +157,8 @@ public class DataPermissionServiceImpl implements
DataPermissionService {
Supplier<Stream<SelectorDO>> selectorDOStreamSupplier = () ->
selectorMapper.selectByQuery(selectorQuery).stream();
List<String> selectorIds =
selectorDOStreamSupplier.get().map(SelectorDO::getId).collect(Collectors.toList());
- Set<String> hasDataPermissionSelectorIds =
dataPermissionMapper.selectDataIds(selectorIds,
- userId, AdminDataPermissionTypeEnum.SELECTOR.ordinal())
- .stream().collect(Collectors.toSet());
+ Set<String> hasDataPermissionSelectorIds = new
HashSet<>(dataPermissionMapper.selectDataIds(selectorIds,
+ userId, AdminDataPermissionTypeEnum.SELECTOR.ordinal()));
selectorList = selectorDOStreamSupplier.get().map(selectorDO -> {
boolean isChecked =
hasDataPermissionSelectorIds.contains(selectorDO.getId());
@@ -186,8 +186,8 @@ public class DataPermissionServiceImpl implements
DataPermissionService {
Supplier<Stream<RuleDO>> ruleDOStreamSupplier = () ->
ruleMapper.selectByQuery(ruleQuery).stream();
List<String> ruleIds =
ruleDOStreamSupplier.get().map(RuleDO::getId).collect(Collectors.toList());
- Set<String> hasDataPermissionRuleIds =
dataPermissionMapper.selectDataIds(ruleIds, userId,
-
AdminDataPermissionTypeEnum.RULE.ordinal()).stream().collect(Collectors.toSet());
+ Set<String> hasDataPermissionRuleIds = new
HashSet<>(dataPermissionMapper.selectDataIds(ruleIds, userId,
+ AdminDataPermissionTypeEnum.RULE.ordinal()));
selectorList = ruleDOStreamSupplier.get().map(ruleDO -> {
boolean isChecked =
hasDataPermissionRuleIds.contains(ruleDO.getId());
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/AesUtils.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/AesUtils.java
index dd2fbd8..9f5fc89 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/AesUtils.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/AesUtils.java
@@ -17,7 +17,7 @@
package org.apache.shenyu.admin.utils;
-import java.util.Optional;
+import org.apache.commons.lang3.StringUtils;
/**
* The type Aes utils.
@@ -33,7 +33,7 @@ public class AesUtils {
* @return the string
*/
public static String aesEncryption(final String src, final String aesKey,
final String iv) {
- if (Optional.ofNullable(src).isPresent() && !src.isEmpty()) {
+ if (StringUtils.isNotEmpty(src)) {
return CipherUtils.encryptHex(src, aesKey, iv);
}
return null;
@@ -48,7 +48,7 @@ public class AesUtils {
* @return the string
*/
public static String aesDecryption(final String src, final String aesKey,
final String iv) {
- if (Optional.ofNullable(src).isPresent() && !src.isEmpty()) {
+ if (StringUtils.isNotEmpty(src)) {
return CipherUtils.decryptStr(src, aesKey, iv);
}
return null;
