You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2021/04/07 12:03:20 UTC
[shardingsphere] branch master updated: Remove
ShardingSphereAuthority.findUser() (#9973)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun 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 3cc4b21 Remove ShardingSphereAuthority.findUser() (#9973)
3cc4b21 is described below
commit 3cc4b2119f9bda1afd7cfe7243796091dd98785c
Author: Liang Zhang <te...@163.com>
AuthorDate: Wed Apr 7 20:02:40 2021 +0800
Remove ShardingSphereAuthority.findUser() (#9973)
---
.../authority/engine/ShardingSphereAuthority.java | 8 --------
.../authority/engine/impl/DefaultAuthority.java | 7 +------
.../authority/GovernanceAuthorityContext.java | 14 +++++++-------
.../impl/GovernanceBootstrapInitializerTest.java | 19 +++----------------
.../impl/StandardBootstrapInitializerTest.java | 22 +++++-----------------
.../swapper/YamlProxyConfigurationSwapperTest.java | 21 ++++-----------------
6 files changed, 20 insertions(+), 71 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-authority/shardingsphere-authority-common/src/main/java/org/apache/shardingsphere/authority/engine/ShardingSphereAuthority.java b/shardingsphere-features/shardingsphere-authority/shardingsphere-authority-common/src/main/java/org/apache/shardingsphere/authority/engine/ShardingSphereAuthority.java
index 8b59275..3a7e329 100644
--- a/shardingsphere-features/shardingsphere-authority/shardingsphere-authority-common/src/main/java/org/apache/shardingsphere/authority/engine/ShardingSphereAuthority.java
+++ b/shardingsphere-features/shardingsphere-authority/shardingsphere-authority-common/src/main/java/org/apache/shardingsphere/authority/engine/ShardingSphereAuthority.java
@@ -52,14 +52,6 @@ public interface ShardingSphereAuthority {
Collection<ShardingSphereUser> getAllUsers();
/**
- * Find user.
- *
- * @param grantee grantee
- * @return found user
- */
- Optional<ShardingSphereUser> findUser(Grantee grantee);
-
- /**
* Find Privileges.
*
* @param grantee grantee
diff --git a/shardingsphere-features/shardingsphere-authority/shardingsphere-authority-common/src/main/java/org/apache/shardingsphere/authority/engine/impl/DefaultAuthority.java b/shardingsphere-features/shardingsphere-authority/shardingsphere-authority-common/src/main/java/org/apache/shardingsphere/authority/engine/impl/DefaultAuthority.java
index 2555164..5c76961 100644
--- a/shardingsphere-features/shardingsphere-authority/shardingsphere-authority-common/src/main/java/org/apache/shardingsphere/authority/engine/impl/DefaultAuthority.java
+++ b/shardingsphere-features/shardingsphere-authority/shardingsphere-authority-common/src/main/java/org/apache/shardingsphere/authority/engine/impl/DefaultAuthority.java
@@ -47,12 +47,7 @@ public final class DefaultAuthority implements ShardingSphereAuthority {
}
@Override
- public Optional<ShardingSphereUser> findUser(final Grantee grantee) {
- return authority.keySet().stream().filter(each -> each.getGrantee().equals(grantee)).findFirst();
- }
-
- @Override
public Optional<ShardingSpherePrivileges> findPrivileges(final Grantee grantee) {
- return findUser(grantee).map(authority::get);
+ return authority.keySet().stream().filter(each -> each.getGrantee().equals(grantee)).findFirst().map(authority::get);
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/GovernanceAuthorityContext.java b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/GovernanceAuthorityContext.java
index 342c731..9542af1 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/GovernanceAuthorityContext.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/authority/GovernanceAuthorityContext.java
@@ -83,16 +83,16 @@ public final class GovernanceAuthorityContext implements MetaDataAwareEventSubsc
}
private Collection<ShardingSphereUser> getNewUsers(final Collection<ShardingSphereUser> users) {
- return users.stream().filter(each -> !AuthorityContext.getInstance().getAuthority().findUser(each.getGrantee()).isPresent()).collect(Collectors.toList());
+ return users.stream().filter(each -> !metaDataContexts.getUsers().findUser(each.getGrantee()).isPresent()).collect(Collectors.toList());
}
private Map<ShardingSphereUser, ShardingSpherePrivileges> getModifiedUsers(final Collection<ShardingSphereUser> users) {
Map<ShardingSphereUser, ShardingSpherePrivileges> result = new HashMap<>(users.size(), 1);
for (ShardingSphereUser each : users) {
- Optional<ShardingSphereUser> user = AuthorityContext.getInstance().getAuthority().findUser(each.getGrantee());
+ Optional<ShardingSphereUser> user = metaDataContexts.getUsers().findUser(each.getGrantee());
if (user.isPresent()) {
- Optional<ShardingSpherePrivileges> privilege = AuthorityContext.getInstance().getAuthority().findPrivileges(user.get().getGrantee());
- privilege.ifPresent(optional -> result.put(user.get(), optional));
+ Optional<ShardingSpherePrivileges> privileges = AuthorityContext.getInstance().getAuthority().findPrivileges(user.get().getGrantee());
+ privileges.ifPresent(optional -> result.put(user.get(), optional));
}
}
return result;
@@ -104,16 +104,16 @@ public final class GovernanceAuthorityContext implements MetaDataAwareEventSubsc
Optional<StoragePrivilegeLoader> loader = TypedSPIRegistry.findRegisteredService(StoragePrivilegeLoader.class, databaseType.getName(), new Properties());
if (loader.isPresent()) {
Map<ShardingSphereUser, ShardingSpherePrivileges> privileges = StoragePrivilegeBuilder.build(databaseType, metaDataContexts.getMetaDataMap().values(), users);
- authority.getAuthority().putAll(getPrivilegesWithPassword(authority, privileges));
+ authority.getAuthority().putAll(getPrivilegesWithPassword(privileges));
}
AuthorityContext.getInstance().init(authority);
}
- private Map<ShardingSphereUser, ShardingSpherePrivileges> getPrivilegesWithPassword(final ShardingSphereAuthority authority, final Map<ShardingSphereUser, ShardingSpherePrivileges> privileges) {
+ private Map<ShardingSphereUser, ShardingSpherePrivileges> getPrivilegesWithPassword(final Map<ShardingSphereUser, ShardingSpherePrivileges> privileges) {
Map<ShardingSphereUser, ShardingSpherePrivileges> result = new HashMap<>(privileges.size(), 1);
for (Map.Entry<ShardingSphereUser, ShardingSpherePrivileges> entry : privileges.entrySet()) {
if (privileges.containsKey(entry.getKey())) {
- Optional<ShardingSphereUser> user = authority.findUser(entry.getKey().getGrantee());
+ Optional<ShardingSphereUser> user = metaDataContexts.getUsers().findUser(entry.getKey().getGrantee());
Preconditions.checkState(user.isPresent());
result.put(user.get(), entry.getValue());
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
index c118550..4380c4c 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
@@ -27,11 +27,9 @@ import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.context.metadata.impl.StandardMetaDataContexts;
-import org.apache.shardingsphere.authority.engine.ShardingSphereAuthority;
-import org.apache.shardingsphere.authority.engine.impl.DefaultAuthority;
-import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
+import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUsers;
import org.apache.shardingsphere.proxy.config.ProxyConfiguration;
import org.apache.shardingsphere.proxy.config.ProxyConfigurationLoader;
import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
@@ -49,7 +47,6 @@ import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
@@ -115,9 +112,7 @@ public final class GovernanceBootstrapInitializerTest extends AbstractBootstrapI
assertNotNull(actual);
assertSchemaDataSources(actual.getSchemaDataSources());
assertSchemaRules(actual.getSchemaRules());
- ShardingSphereAuthority authority = new DefaultAuthority();
- authority.init(getPrivileges(actual.getUsers()));
- assertAuthority(authority);
+ assertUsers(new ShardingSphereUsers(actual.getUsers()));
assertProps(actual.getProps());
}
@@ -197,15 +192,7 @@ public final class GovernanceBootstrapInitializerTest extends AbstractBootstrapI
assertThat(props.getProperty("algorithm-expression"), is(expectedAlgorithmExpr));
}
- private Map<ShardingSphereUser, ShardingSpherePrivileges> getPrivileges(final Collection<ShardingSphereUser> users) {
- Map<ShardingSphereUser, ShardingSpherePrivileges> privileges = new HashMap<>(users.size(), 1);
- for (ShardingSphereUser each : users) {
- privileges.put(each, new ShardingSpherePrivileges());
- }
- return privileges;
- }
-
- private void assertAuthority(final ShardingSphereAuthority actual) {
+ private void assertUsers(final ShardingSphereUsers actual) {
Optional<ShardingSphereUser> rootUser = actual.findUser(new Grantee("root", ""));
assertTrue(rootUser.isPresent());
assertThat(rootUser.get().getPassword(), is("root"));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
index ed110f2..ef379ec 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
@@ -20,13 +20,11 @@ package org.apache.shardingsphere.proxy.initializer.impl;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
-import org.apache.shardingsphere.authority.engine.ShardingSphereAuthority;
-import org.apache.shardingsphere.authority.engine.impl.DefaultAuthority;
-import org.apache.shardingsphere.infra.metadata.user.yaml.config.YamlUserConfiguration;
-import org.apache.shardingsphere.infra.metadata.user.yaml.config.YamlUsersConfiguration;
-import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
+import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUsers;
+import org.apache.shardingsphere.infra.metadata.user.yaml.config.YamlUserConfiguration;
+import org.apache.shardingsphere.infra.metadata.user.yaml.config.YamlUsersConfiguration;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.yaml.config.YamlRuleConfiguration;
import org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper;
@@ -112,9 +110,7 @@ public final class StandardBootstrapInitializerTest extends AbstractBootstrapIni
private void assertProxyConfiguration(final ProxyConfiguration actual) {
assertSchemaDataSources(actual.getSchemaDataSources());
assertSchemaRules(actual.getSchemaRules());
- ShardingSphereAuthority authority = new DefaultAuthority();
- authority.init(getPrivileges(actual.getUsers()));
- assertAuthority(authority);
+ assertUsers(new ShardingSphereUsers(actual.getUsers()));
assertProps(actual.getProps());
}
@@ -152,15 +148,7 @@ public final class StandardBootstrapInitializerTest extends AbstractBootstrapIni
assertThat(((FixtureRuleConfiguration) actual).getName(), is("testRule"));
}
- private Map<ShardingSphereUser, ShardingSpherePrivileges> getPrivileges(final Collection<ShardingSphereUser> users) {
- Map<ShardingSphereUser, ShardingSpherePrivileges> privileges = new HashMap<>(users.size(), 1);
- for (ShardingSphereUser each : users) {
- privileges.put(each, new ShardingSpherePrivileges());
- }
- return privileges;
- }
-
- private void assertAuthority(final ShardingSphereAuthority actual) {
+ private void assertUsers(final ShardingSphereUsers actual) {
Optional<ShardingSphereUser> rootUser = actual.findUser(new Grantee("root", ""));
assertTrue(rootUser.isPresent());
assertThat(rootUser.get().getPassword(), is("root"));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
index 5a609ff..a548410 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
@@ -21,12 +21,11 @@ import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceCente
import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceConfiguration;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
-import org.apache.shardingsphere.authority.engine.impl.DefaultAuthority;
-import org.apache.shardingsphere.infra.metadata.user.yaml.config.YamlUserConfiguration;
-import org.apache.shardingsphere.infra.metadata.user.yaml.config.YamlUsersConfiguration;
-import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
+import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUsers;
+import org.apache.shardingsphere.infra.metadata.user.yaml.config.YamlUserConfiguration;
+import org.apache.shardingsphere.infra.metadata.user.yaml.config.YamlUsersConfiguration;
import org.apache.shardingsphere.infra.yaml.config.YamlRuleConfiguration;
import org.apache.shardingsphere.proxy.config.ProxyConfiguration;
import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
@@ -104,21 +103,9 @@ public final class YamlProxyConfigurationSwapperTest {
}
private void assertAuthority(final ProxyConfiguration proxyConfig) {
- DefaultAuthority authority = new DefaultAuthority();
- authority.init(getPrivileges(proxyConfig.getUsers()));
- assertNotNull(authority);
- Optional<ShardingSphereUser> user = authority.findUser(new Grantee("user1", ""));
+ Optional<ShardingSphereUser> user = new ShardingSphereUsers(proxyConfig.getUsers()).findUser(new Grantee("user1", ""));
assertTrue(user.isPresent());
assertThat(user.get().getPassword(), is("pass"));
- assertNotNull(authority);
- }
-
- private Map<ShardingSphereUser, ShardingSpherePrivileges> getPrivileges(final Collection<ShardingSphereUser> users) {
- Map<ShardingSphereUser, ShardingSpherePrivileges> privileges = new HashMap<>(users.size(), 1);
- for (ShardingSphereUser each : users) {
- privileges.put(each, new ShardingSpherePrivileges());
- }
- return privileges;
}
private YamlProxyConfiguration getYamlProxyConfiguration() {