You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2021/08/30 16:12:22 UTC
[shardingsphere] branch master updated: Move authority to
shardingsphere-kernel module (#12118)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 672dc2a Move authority to shardingsphere-kernel module (#12118)
672dc2a is described below
commit 672dc2ae735c0178eb5f954cdea9d10f909d4a40
Author: Liang Zhang <te...@163.com>
AuthorDate: Tue Aug 31 00:08:42 2021 +0800
Move authority to shardingsphere-kernel module (#12118)
* Move shardingsphere-infra-authority to shardingsphere-kernel
* Move shardingsphere-infra-authority to shardingsphere-kernel
* Rename shardingsphere-kernel-authority
* Rename shardingsphere-kernel-authority
---
pom.xml | 1 +
shardingsphere-infra/pom.xml | 1 -
.../shardingsphere-infra-context/pom.xml | 2 +-
.../shardingsphere-jdbc-core/pom.xml | 2 +-
.../pom.xml | 9 ++++-----
.../shardingsphere-kernel-authority}/pom.xml | 8 ++++----
.../shardingsphere-kernel-authority-api}/pom.xml | 4 ++--
.../api/config/AuthorityRuleConfiguration.java | 0
.../authority/model/AccessSubject.java | 0
.../authority/model/PrivilegeType.java | 0
.../authority/model/ShardingSpherePrivileges.java | 0
.../authority/spi/AuthorityProvideAlgorithm.java | 0
.../shardingsphere-kernel-authority-common}/pom.xml | 6 +++---
.../authority/checker/AuthorityChecker.java | 0
.../authority/constant/AuthorityOrder.java | 0
.../natived/NativeAuthorityProviderAlgorithm.java | 0
.../natived/builder/StoragePrivilegeBuilder.java | 0
.../natived/builder/StoragePrivilegeHandler.java | 0
.../natived/builder/StoragePrivilegeMerger.java | 0
.../builder/dialect/MySQLPrivilegeHandler.java | 0
.../builder/dialect/OraclePrivilegeHandler.java | 2 +-
.../builder/dialect/PostgreSQLPrivilegeHandler.java | 0
.../builder/dialect/SQLServerPrivilegeHandler.java | 0
.../natived/model/privilege/NativePrivileges.java | 0
.../privilege/admin/AdministrativePrivileges.java | 0
.../privilege/database/DatabasePrivileges.java | 0
.../model/privilege/database/SchemaPrivileges.java | 0
.../model/privilege/database/TablePrivileges.java | 0
.../natived/model/subject/SchemaAccessSubject.java | 0
.../natived/model/subject/TableAccessSubject.java | 0
...ivilegesPermittedAuthorityProviderAlgorithm.java | 0
.../schema/builder/SchemaPrivilegeBuilder.java | 4 ++--
...PrivilegesPermittedShardingSpherePrivileges.java | 0
...ivilegesPermittedAuthorityProviderAlgorithm.java | 0
.../authority/rule/AuthorityRule.java | 0
.../rule/builder/AuthorityRuleBuilder.java | 0
.../DefaultAuthorityRuleConfigurationBuilder.java | 0
.../authority/rule/builder/DefaultUser.java | 0
.../yaml/config/YamlAuthorityRuleConfiguration.java | 0
.../AuthorityRuleConfigurationYamlSwapper.java | 0
...provider.natived.builder.StoragePrivilegeHandler | 0
...ngsphere.authority.spi.AuthorityProvideAlgorithm | 0
...e.shardingsphere.infra.executor.check.SQLChecker | 0
...lder.level.DefaultKernelRuleConfigurationBuilder | 0
...phere.infra.rule.builder.scope.GlobalRuleBuilder | 0
...yaml.config.swapper.YamlRuleConfigurationSwapper | 0
.../authority/checker/AuthorityCheckerTest.java | 0
.../authority/merge/PrivilegeMergeTest.java | 0
.../NativeAuthorityProviderAlgorithmTest.java | 0
.../builder/StoragePrivilegeBuilderTest.java | 4 +---
.../builder/dialect/MySQLPrivilegeHandlerTest.java | 0
.../builder/dialect/OraclePrivilegeHandlerTest.java | 0
.../dialect/PostgreSQLPrivilegeHandlerTest.java | 0
.../dialect/SQLServerPrivilegeHandlerTest.java | 0
.../simple/AllPrivilegesProviderAlgorithmTest.java | 21 +++++++++------------
...egesPermittedAuthorityProviderAlgorithmTest.java | 12 ++++++------
.../shardingsphere-cluster-mode-core/pom.xml | 2 +-
.../shardingsphere-proxy-backend/pom.xml | 2 +-
.../shardingsphere-proxy-common/pom.xml | 2 +-
59 files changed, 38 insertions(+), 44 deletions(-)
diff --git a/pom.xml b/pom.xml
index dad78f7..ca372e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
<module>shardingsphere-db-protocol</module>
<module>shardingsphere-infra</module>
<module>shardingsphere-mode</module>
+ <module>shardingsphere-kernel</module>
<module>shardingsphere-jdbc</module>
<module>shardingsphere-proxy</module>
diff --git a/shardingsphere-infra/pom.xml b/shardingsphere-infra/pom.xml
index 872ab58..3ed0c87 100644
--- a/shardingsphere-infra/pom.xml
+++ b/shardingsphere-infra/pom.xml
@@ -40,6 +40,5 @@
<module>shardingsphere-infra-context</module>
<module>shardingsphere-infra-datetime</module>
<module>shardingsphere-infra-optimize</module>
- <module>shardingsphere-infra-authority</module>
</modules>
</project>
diff --git a/shardingsphere-infra/shardingsphere-infra-context/pom.xml b/shardingsphere-infra/shardingsphere-infra-context/pom.xml
index 913a833..80be33d 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/pom.xml
+++ b/shardingsphere-infra/shardingsphere-infra-context/pom.xml
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-authority-api</artifactId>
+ <artifactId>shardingsphere-kernel-authority-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/pom.xml b/shardingsphere-jdbc/shardingsphere-jdbc-core/pom.xml
index 1159a2b..38a7964 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/pom.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/pom.xml
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-authority-common</artifactId>
+ <artifactId>shardingsphere-kernel-authority-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/pom.xml b/shardingsphere-kernel/pom.xml
similarity index 85%
copy from shardingsphere-infra/shardingsphere-infra-authority/pom.xml
copy to shardingsphere-kernel/pom.xml
index 625bae5..7ec8519 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/pom.xml
+++ b/shardingsphere-kernel/pom.xml
@@ -22,15 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra</artifactId>
+ <artifactId>shardingsphere</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-authority</artifactId>
- <name>${project.artifactId}</name>
+ <artifactId>shardingsphere-kernel</artifactId>
<packaging>pom</packaging>
+ <name>${project.artifactId}</name>
<modules>
- <module>shardingsphere-infra-authority-api</module>
- <module>shardingsphere-infra-authority-common</module>
+ <module>shardingsphere-kernel-authority</module>
</modules>
</project>
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/pom.xml b/shardingsphere-kernel/shardingsphere-kernel-authority/pom.xml
similarity index 84%
rename from shardingsphere-infra/shardingsphere-infra-authority/pom.xml
rename to shardingsphere-kernel/shardingsphere-kernel-authority/pom.xml
index 625bae5..275d149 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/pom.xml
+++ b/shardingsphere-kernel/shardingsphere-kernel-authority/pom.xml
@@ -22,15 +22,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra</artifactId>
+ <artifactId>shardingsphere-kernel</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-authority</artifactId>
+ <artifactId>shardingsphere-kernel-authority</artifactId>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<modules>
- <module>shardingsphere-infra-authority-api</module>
- <module>shardingsphere-infra-authority-common</module>
+ <module>shardingsphere-kernel-authority-api</module>
+ <module>shardingsphere-kernel-authority-common</module>
</modules>
</project>
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/pom.xml b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/pom.xml
similarity index 92%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/pom.xml
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/pom.xml
index f24a1f9..519d43a 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/pom.xml
+++ b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-authority</artifactId>
+ <artifactId>shardingsphere-kernel-authority</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-authority-api</artifactId>
+ <artifactId>shardingsphere-kernel-authority-api</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/src/main/java/org/apache/shardingsphere/authority/api/config/AuthorityRuleConfiguration.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/src/main/java/org/apache/shardingsphere/authority/api/config/AuthorityRuleConfiguration.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/src/main/java/org/apache/shardingsphere/authority/api/config/AuthorityRuleConfiguration.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/src/main/java/org/apache/shardingsphere/authority/api/config/AuthorityRuleConfiguration.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/src/main/java/org/apache/shardingsphere/authority/model/AccessSubject.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/src/main/java/org/apache/shardingsphere/authority/model/AccessSubject.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/src/main/java/org/apache/shardingsphere/authority/model/AccessSubject.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/src/main/java/org/apache/shardingsphere/authority/model/AccessSubject.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/src/main/java/org/apache/shardingsphere/authority/model/PrivilegeType.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/src/main/java/org/apache/shardingsphere/authority/model/PrivilegeType.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/src/main/java/org/apache/shardingsphere/authority/model/PrivilegeType.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/src/main/java/org/apache/shardingsphere/authority/model/PrivilegeType.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/src/main/java/org/apache/shardingsphere/authority/model/ShardingSpherePrivileges.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/src/main/java/org/apache/shardingsphere/authority/model/ShardingSpherePrivileges.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/src/main/java/org/apache/shardingsphere/authority/model/ShardingSpherePrivileges.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/src/main/java/org/apache/shardingsphere/authority/model/ShardingSpherePrivileges.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvideAlgorithm.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvideAlgorithm.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvideAlgorithm.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvideAlgorithm.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/pom.xml b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/pom.xml
similarity index 89%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/pom.xml
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/pom.xml
index 0cb84c4..6bef6a1 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/pom.xml
+++ b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-authority</artifactId>
+ <artifactId>shardingsphere-kernel-authority</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-infra-authority-common</artifactId>
+ <artifactId>shardingsphere-kernel-authority-common</artifactId>
<name>${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-authority-api</artifactId>
+ <artifactId>shardingsphere-kernel-authority-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/constant/AuthorityOrder.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/constant/AuthorityOrder.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/constant/AuthorityOrder.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/constant/AuthorityOrder.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithm.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeBuilder.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeBuilder.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeBuilder.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeBuilder.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeHandler.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeHandler.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeHandler.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeHandler.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeMerger.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeMerger.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeMerger.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeMerger.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/MySQLPrivilegeHandler.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/MySQLPrivilegeHandler.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/MySQLPrivilegeHandler.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/MySQLPrivilegeHandler.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/OraclePrivilegeHandler.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/OraclePrivilegeHandler.java
similarity index 99%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/OraclePrivilegeHandler.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/OraclePrivilegeHandler.java
index 784917c..4efb72a 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/OraclePrivilegeHandler.java
+++ b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/OraclePrivilegeHandler.java
@@ -154,7 +154,7 @@ public final class OraclePrivilegeHandler implements StoragePrivilegeHandler {
fillSysPrivileges(privilegeCache, userPrivilegeMap);
}
- private void fillSysPrivileges(final Map<ShardingSphereUser, List<PrivilegeType>> privilegeCache, final Map<ShardingSphereUser, NativePrivileges> userPrivilegeMap) throws SQLException {
+ private void fillSysPrivileges(final Map<ShardingSphereUser, List<PrivilegeType>> privilegeCache, final Map<ShardingSphereUser, NativePrivileges> userPrivilegeMap) {
for (Entry<ShardingSphereUser, List<PrivilegeType>> entry : privilegeCache.entrySet()) {
userPrivilegeMap.get(entry.getKey()).getAdministrativePrivileges().getPrivileges().addAll(entry.getValue());
}
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/PostgreSQLPrivilegeHandler.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/PostgreSQLPrivilegeHandler.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/PostgreSQLPrivilegeHandler.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/PostgreSQLPrivilegeHandler.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/SQLServerPrivilegeHandler.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/SQLServerPrivilegeHandler.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/SQLServerPrivilegeHandler.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/SQLServerPrivilegeHandler.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/NativePrivileges.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/NativePrivileges.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/NativePrivileges.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/NativePrivileges.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/admin/AdministrativePrivileges.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/admin/AdministrativePrivileges.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/admin/AdministrativePrivileges.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/admin/AdministrativePrivileges.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/DatabasePrivileges.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/DatabasePrivileges.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/DatabasePrivileges.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/DatabasePrivileges.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/SchemaPrivileges.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/SchemaPrivileges.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/SchemaPrivileges.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/SchemaPrivileges.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/TablePrivileges.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/TablePrivileges.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/TablePrivileges.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/privilege/database/TablePrivileges.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/subject/SchemaAccessSubject.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/subject/SchemaAccessSubject.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/subject/SchemaAccessSubject.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/subject/SchemaAccessSubject.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/subject/TableAccessSubject.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/subject/TableAccessSubject.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/subject/TableAccessSubject.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/natived/model/subject/TableAccessSubject.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/builder/SchemaPrivilegeBuilder.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/builder/SchemaPrivilegeBuilder.java
similarity index 96%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/builder/SchemaPrivilegeBuilder.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/builder/SchemaPrivilegeBuilder.java
index 9ebcaf7..24b4c42 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/builder/SchemaPrivilegeBuilder.java
+++ b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/builder/SchemaPrivilegeBuilder.java
@@ -57,7 +57,7 @@ public final class SchemaPrivilegeBuilder {
*/
private static void checkSchemas(final String mappingProp) {
Preconditions.checkArgument(!"".equals(mappingProp), "user-schema-mappings configuration `%s` can not be null", mappingProp);
- Arrays.asList(mappingProp.split(",")).stream().forEach(each -> Preconditions.checkArgument(0 < each.indexOf("@") && 0 < each.indexOf("="),
+ Arrays.stream(mappingProp.split(",")).forEach(each -> Preconditions.checkArgument(0 < each.indexOf("@") && 0 < each.indexOf("="),
"user-schema-mappings configuration `%s` is invalid, the configuration format should be like `username@hostname=schema`", each));
}
@@ -77,7 +77,7 @@ public final class SchemaPrivilegeBuilder {
private static Map<ShardingSphereUser, Set<String>> convertSchemas(final String mappingProp) {
String[] mappings = mappingProp.split(",");
Map<ShardingSphereUser, Set<String>> result = new HashMap<>(mappings.length, 1);
- Arrays.asList(mappings).stream().forEach(each -> {
+ Arrays.asList(mappings).forEach(each -> {
String[] userSchemaPair = each.trim().split("=");
String yamlUser = userSchemaPair[0];
String username = yamlUser.substring(0, yamlUser.indexOf("@"));
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/model/privilege/SchemaPrivilegesPermittedShardingSpherePrivileges.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/model/privilege/SchemaPrivilegesPermittedShardingSpherePrivileges.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/model/privilege/SchemaPrivilegesPermittedShardingSpherePrivileges.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/schema/model/privilege/SchemaPrivilegesPermittedShardingSpherePrivileges.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesPermittedAuthorityProviderAlgorithm.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesPermittedAuthorityProviderAlgorithm.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesPermittedAuthorityProviderAlgorithm.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesPermittedAuthorityProviderAlgorithm.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/AuthorityRuleBuilder.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilder.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilder.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilder.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilder.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultUser.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultUser.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultUser.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultUser.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityRuleConfiguration.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityRuleConfiguration.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityRuleConfiguration.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/yaml/config/YamlAuthorityRuleConfiguration.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationYamlSwapper.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationYamlSwapper.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationYamlSwapper.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/AuthorityRuleConfigurationYamlSwapper.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.provider.natived.builder.StoragePrivilegeHandler b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.provider.natived.builder.StoragePrivilegeHandler
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.provider.natived.builder.StoragePrivilegeHandler
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.provider.natived.builder.StoragePrivilegeHandler
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.spi.AuthorityProvideAlgorithm b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.spi.AuthorityProvideAlgorithm
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.spi.AuthorityProvideAlgorithm
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.spi.AuthorityProvideAlgorithm
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.check.SQLChecker b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.check.SQLChecker
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.check.SQLChecker
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.executor.check.SQLChecker
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.level.DefaultKernelRuleConfigurationBuilder b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.level.DefaultKernelRuleConfigurationBuilder
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.level.DefaultKernelRuleConfigurationBuilder
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.level.DefaultKernelRuleConfigurationBuilder
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.scope.GlobalRuleBuilder b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.scope.GlobalRuleBuilder
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.scope.GlobalRuleBuilder
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.scope.GlobalRuleBuilder
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/merge/PrivilegeMergeTest.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/merge/PrivilegeMergeTest.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/merge/PrivilegeMergeTest.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/merge/PrivilegeMergeTest.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithmTest.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithmTest.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithmTest.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/NativeAuthorityProviderAlgorithmTest.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeBuilderTest.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeBuilderTest.java
similarity index 98%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeBuilderTest.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeBuilderTest.java
index ebc2a81..72e6277 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeBuilderTest.java
+++ b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/StoragePrivilegeBuilderTest.java
@@ -21,7 +21,6 @@ import org.apache.shardingsphere.authority.model.PrivilegeType;
import org.apache.shardingsphere.authority.provider.natived.model.privilege.NativePrivileges;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
-import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.junit.Test;
import javax.sql.DataSource;
@@ -76,8 +75,7 @@ public final class StoragePrivilegeBuilderTest {
DataSource dataSource = mockDataSourceForPrivileges(users);
Collection<DataSource> dataSourceList = Collections.singletonList(dataSource);
when(result.getResource().getAllInstanceDataSources()).thenReturn(dataSourceList);
- Collection<ShardingSphereRule> empty = Collections.emptyList();
- when(result.getRuleMetaData().getRules()).thenReturn(empty);
+ when(result.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
return result;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/MySQLPrivilegeHandlerTest.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/MySQLPrivilegeHandlerTest.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/MySQLPrivilegeHandlerTest.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/MySQLPrivilegeHandlerTest.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/OraclePrivilegeHandlerTest.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/OraclePrivilegeHandlerTest.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/OraclePrivilegeHandlerTest.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/OraclePrivilegeHandlerTest.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/PostgreSQLPrivilegeHandlerTest.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/PostgreSQLPrivilegeHandlerTest.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/PostgreSQLPrivilegeHandlerTest.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/PostgreSQLPrivilegeHandlerTest.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/SQLServerPrivilegeHandlerTest.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/SQLServerPrivilegeHandlerTest.java
similarity index 100%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/SQLServerPrivilegeHandlerTest.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/natived/builder/dialect/SQLServerPrivilegeHandlerTest.java
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesProviderAlgorithmTest.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesProviderAlgorithmTest.java
similarity index 63%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesProviderAlgorithmTest.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesProviderAlgorithmTest.java
index 2112a0b..7f09f5f 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesProviderAlgorithmTest.java
+++ b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPrivilegesProviderAlgorithmTest.java
@@ -17,27 +17,24 @@
package org.apache.shardingsphere.authority.provider.simple;
-import java.util.Collections;
-import java.util.Optional;
import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
import org.apache.shardingsphere.authority.provider.natived.model.subject.SchemaAccessSubject;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.junit.Test;
-import static org.junit.Assert.assertNotNull;
+import java.util.Collections;
+import java.util.Optional;
+
import static org.junit.Assert.assertTrue;
public final class AllPrivilegesProviderAlgorithmTest {
-
+
@Test
public void assertFindPrivileges() {
- AllPrivilegesPermittedAuthorityProviderAlgorithm authorityProviderAlgorithm = new AllPrivilegesPermittedAuthorityProviderAlgorithm();
- Optional<ShardingSpherePrivileges> shardingSpherePrivilegesOptional = authorityProviderAlgorithm
- .findPrivileges(new Grantee("TestUser", "testHost"));
- assertNotNull(shardingSpherePrivilegesOptional.get());
- assertTrue(shardingSpherePrivilegesOptional.get().hasPrivileges("testSchema"));
- assertTrue(shardingSpherePrivilegesOptional.get().hasPrivileges(Collections.emptyList()));
- assertTrue(shardingSpherePrivilegesOptional.get()
- .hasPrivileges(new SchemaAccessSubject("testSchema"), Collections.emptyList()));
+ Optional<ShardingSpherePrivileges> actual = new AllPrivilegesPermittedAuthorityProviderAlgorithm().findPrivileges(new Grantee("TestUser", "testHost"));
+ assertTrue(actual.isPresent());
+ assertTrue(actual.get().hasPrivileges("testSchema"));
+ assertTrue(actual.get().hasPrivileges(Collections.emptyList()));
+ assertTrue(actual.get().hasPrivileges(new SchemaAccessSubject("testSchema"), Collections.emptyList()));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/SchemaPrivilegesPermittedAuthorityProviderAlgorithmTest.java b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/SchemaPrivilegesPermittedAuthorityProviderAlgorithmTest.java
similarity index 83%
rename from shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/SchemaPrivilegesPermittedAuthorityProviderAlgorithmTest.java
rename to shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/SchemaPrivilegesPermittedAuthorityProviderAlgorithmTest.java
index dd44cfe..d54bcc7 100644
--- a/shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/SchemaPrivilegesPermittedAuthorityProviderAlgorithmTest.java
+++ b/shardingsphere-kernel/shardingsphere-kernel-authority/shardingsphere-kernel-authority-common/src/test/java/org/apache/shardingsphere/authority/provider/simple/SchemaPrivilegesPermittedAuthorityProviderAlgorithmTest.java
@@ -34,9 +34,9 @@ public final class SchemaPrivilegesPermittedAuthorityProviderAlgorithmTest {
@Test
public void assertFindPrivileges() {
SchemaPrivilegesPermittedAuthorityProviderAlgorithm algorithm = new SchemaPrivilegesPermittedAuthorityProviderAlgorithm();
- Properties properties = new Properties();
- properties.setProperty(SchemaPrivilegesPermittedAuthorityProviderAlgorithm.PROP_USER_SCHEMA_MAPPINGS, "root@localhost=test, user1@127.0.0.1=db_dal_admin, user1@=test, user1@=test1");
- algorithm.setProps(properties);
+ Properties props = new Properties();
+ props.setProperty(SchemaPrivilegesPermittedAuthorityProviderAlgorithm.PROP_USER_SCHEMA_MAPPINGS, "root@localhost=test, user1@127.0.0.1=db_dal_admin, user1@=test, user1@=test1");
+ algorithm.setProps(props);
algorithm.init(Collections.emptyMap(), Collections.singletonList(new ShardingSphereUser("user1", "", "127.0.0.2")));
Optional<ShardingSpherePrivileges> privileges = algorithm.findPrivileges(new Grantee("user1", "127.0.0.2"));
assertTrue(privileges.isPresent());
@@ -46,9 +46,9 @@ public final class SchemaPrivilegesPermittedAuthorityProviderAlgorithmTest {
@Test
public void assertRefreshPrivileges() {
SchemaPrivilegesPermittedAuthorityProviderAlgorithm algorithm = new SchemaPrivilegesPermittedAuthorityProviderAlgorithm();
- Properties properties = new Properties();
- properties.setProperty(SchemaPrivilegesPermittedAuthorityProviderAlgorithm.PROP_USER_SCHEMA_MAPPINGS, "root@localhost=test, user1@127.0.0.1=db_dal_admin, user1@=test, user1@=test1");
- algorithm.setProps(properties);
+ Properties props = new Properties();
+ props.setProperty(SchemaPrivilegesPermittedAuthorityProviderAlgorithm.PROP_USER_SCHEMA_MAPPINGS, "root@localhost=test, user1@127.0.0.1=db_dal_admin, user1@=test, user1@=test1");
+ algorithm.setProps(props);
algorithm.init(Collections.emptyMap(), Collections.singletonList(new ShardingSphereUser("root", "", "localhost")));
Optional<ShardingSpherePrivileges> privileges1 = algorithm.findPrivileges(new Grantee("root", "localhost"));
assertTrue(privileges1.isPresent());
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/pom.xml b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/pom.xml
index 142103a..283aacf 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/pom.xml
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/pom.xml
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-authority-common</artifactId>
+ <artifactId>shardingsphere-kernel-authority-common</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
index 3b0e206..5867d90 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/pom.xml
@@ -114,7 +114,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-authority-common</artifactId>
+ <artifactId>shardingsphere-kernel-authority-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
index 042a5b6..c7bee3e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/pom.xml
@@ -74,7 +74,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-authority-common</artifactId>
+ <artifactId>shardingsphere-kernel-authority-common</artifactId>
<version>${project.version}</version>
</dependency>