You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2021/06/24 12:24:25 UTC
[shardingsphere] branch master updated: For code format (#10997)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new eca525f For code format (#10997)
eca525f is described below
commit eca525f9f25ca5b09990f674697aab9b6ecbcf60
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Jun 24 20:23:51 2021 +0800
For code format (#10997)
---
.../apache/shardingsphere/authority/checker/AuthorityChecker.java | 5 +----
.../apache/shardingsphere/infra/executor/check/SQLCheckEngine.java | 1 -
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java b/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
index 77d1065..513ba3a 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
+++ b/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
@@ -67,10 +67,7 @@ public final class AuthorityChecker implements SQLChecker<AuthorityRule> {
@Override
public boolean check(final Grantee grantee, final BiPredicate<Object, Object> validator, final Object cipher, final AuthorityRule authorityRule) {
Optional<ShardingSphereUser> user = authorityRule.findUser(grantee);
- if (user.isPresent()) {
- return validator.test(user.get(), cipher);
- }
- return false;
+ return user.filter(shardingSphereUser -> validator.test(shardingSphereUser, cipher)).isPresent();
}
private PrivilegeType getPrivilege(final SQLStatement sqlStatement) {
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
index 1452462..476fce1 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
@@ -101,7 +101,6 @@ public final class SQLCheckEngine {
return true;
}
-
/**
* Check authentication.
* @param user user