diff --git a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegeProvider.java b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegeProvider.java index 14c3f0a651e4e..a0e98166cbff0 100644 --- a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegeProvider.java +++ b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegeProvider.java @@ -19,7 +19,6 @@ import com.google.common.base.Preconditions; import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges; -import org.apache.shardingsphere.authority.provider.database.privilege.DatabasePermittedPrivileges; import org.apache.shardingsphere.authority.spi.PrivilegeProvider; import org.apache.shardingsphere.infra.metadata.user.Grantee; import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser; diff --git a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedPrivileges.java b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivileges.java similarity index 95% rename from kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedPrivileges.java rename to kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivileges.java index bfcdbd586385b..298e92cbbc5e3 100644 --- a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedPrivileges.java +++ b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivileges.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.authority.provider.database.privilege; +package org.apache.shardingsphere.authority.provider.database; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.authority.constant.AuthorityConstants; diff --git a/kernel/authority/provider/database/src/test/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedPrivilegesTest.java b/kernel/authority/provider/database/src/test/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesTest.java similarity index 95% rename from kernel/authority/provider/database/src/test/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedPrivilegesTest.java rename to kernel/authority/provider/database/src/test/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesTest.java index e7d62ff273af6..e60877db9256c 100644 --- a/kernel/authority/provider/database/src/test/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedPrivilegesTest.java +++ b/kernel/authority/provider/database/src/test/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.authority.provider.database.privilege; +package org.apache.shardingsphere.authority.provider.database; import org.apache.shardingsphere.authority.constant.AuthorityConstants; import org.junit.jupiter.api.Test; diff --git a/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegeProvider.java b/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegeProvider.java index 91b7fe7d78522..2785373e5f296 100644 --- a/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegeProvider.java +++ b/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegeProvider.java @@ -18,7 +18,6 @@ package org.apache.shardingsphere.authority.provider.simple; import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges; -import org.apache.shardingsphere.authority.provider.simple.privilege.AllPermittedPrivileges; import org.apache.shardingsphere.authority.spi.PrivilegeProvider; import org.apache.shardingsphere.infra.metadata.user.Grantee; import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser; diff --git a/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/privilege/AllPermittedPrivileges.java b/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivileges.java similarity index 93% rename from kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/privilege/AllPermittedPrivileges.java rename to kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivileges.java index 579ea0430f0db..40e3bd67044ac 100644 --- a/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/privilege/AllPermittedPrivileges.java +++ b/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivileges.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.authority.provider.simple.privilege; +package org.apache.shardingsphere.authority.provider.simple; import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges; diff --git a/kernel/authority/provider/simple/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegeProviderTest.java b/kernel/authority/provider/simple/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegeProviderTest.java index 80c693e6c60f7..e40135d95e7be 100644 --- a/kernel/authority/provider/simple/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegeProviderTest.java +++ b/kernel/authority/provider/simple/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegeProviderTest.java @@ -18,7 +18,6 @@ package org.apache.shardingsphere.authority.provider.simple; import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges; -import org.apache.shardingsphere.authority.provider.simple.privilege.AllPermittedPrivileges; import org.apache.shardingsphere.authority.spi.PrivilegeProvider; import org.apache.shardingsphere.infra.metadata.user.Grantee; import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser; diff --git a/kernel/authority/provider/simple/src/test/java/org/apache/shardingsphere/authority/provider/simple/privilege/AllPermittedPrivilegesTest.java b/kernel/authority/provider/simple/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesTest.java similarity index 93% rename from kernel/authority/provider/simple/src/test/java/org/apache/shardingsphere/authority/provider/simple/privilege/AllPermittedPrivilegesTest.java rename to kernel/authority/provider/simple/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesTest.java index d22c7626267b2..9e3ce7421d2ba 100644 --- a/kernel/authority/provider/simple/src/test/java/org/apache/shardingsphere/authority/provider/simple/privilege/AllPermittedPrivilegesTest.java +++ b/kernel/authority/provider/simple/src/test/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.authority.provider.simple.privilege; +package org.apache.shardingsphere.authority.provider.simple; import org.junit.jupiter.api.Test; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java index adc2a9ead2362..28e7d9090b9e3 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.admin.executor; -import org.apache.shardingsphere.authority.provider.database.privilege.DatabasePermittedPrivileges; +import org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivileges; import org.apache.shardingsphere.authority.rule.AuthorityRule; import org.apache.shardingsphere.infra.config.props.ConfigurationProperties; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java index a615194359f2a..ef4696dcd2c5a 100644 --- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java +++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.information; -import org.apache.shardingsphere.authority.provider.database.privilege.DatabasePermittedPrivileges; +import org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivileges; import org.apache.shardingsphere.authority.rule.AuthorityRule; import org.apache.shardingsphere.infra.config.props.ConfigurationProperties; import org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData;