[#5993] refacor: Move the JdbcAuthorizationPlugin to authorization-co…

…mmon module
apache · Dec 25, 2024 · 7892e92 · 7892e92
1 parent c2d1b1e
commit 7892e92
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 107 deletions.
diff --git a/authorizations/authorization-common/build.gradle.kts b/authorizations/authorization-common/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
   }
   implementation(libs.bundles.log4j)
   implementation(libs.commons.lang3)
+  implementation(libs.commons.dbcp2)
   implementation(libs.guava)
   implementation(libs.javax.jaxb.api) {
     exclude("*")

diff --git a/...ization/jdbc/JdbcAuthorizationPlugin.java → ...ation/common/JdbcAuthorizationPlugin.java b/...ization/jdbc/JdbcAuthorizationPlugin.java → ...ation/common/JdbcAuthorizationPlugin.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.authorization.jdbc;
+package org.apache.gravitino.authorization.common;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
@@ -40,7 +40,6 @@
 import org.apache.gravitino.authorization.RoleChange;
 import org.apache.gravitino.authorization.SecurableObject;
 import org.apache.gravitino.authorization.User;
-import org.apache.gravitino.authorization.common.JdbcAuthorizationProperties;
 import org.apache.gravitino.connector.authorization.AuthorizationPlugin;
 import org.apache.gravitino.exceptions.AuthorizationPluginException;
 import org.apache.gravitino.meta.AuditInfo;

diff --git a/...horization/jdbc/JdbcAuthorizationSQL.java → ...rization/common/JdbcAuthorizationSQL.java b/...horization/jdbc/JdbcAuthorizationSQL.java → ...rization/common/JdbcAuthorizationSQL.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.authorization.jdbc;
+package org.apache.gravitino.authorization.common;
 
 import java.util.List;
 import org.apache.gravitino.MetadataObject;

diff --git a/...uthorization/jdbc/JdbcMetadataObject.java → ...horization/common/JdbcMetadataObject.java b/...uthorization/jdbc/JdbcMetadataObject.java → ...horization/common/JdbcMetadataObject.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.authorization.jdbc;
+package org.apache.gravitino.authorization.common;
 
 import com.google.common.base.Preconditions;
 import java.util.List;

diff --git a/...ino/authorization/jdbc/JdbcPrivilege.java → ...o/authorization/common/JdbcPrivilege.java b/...ino/authorization/jdbc/JdbcPrivilege.java → ...o/authorization/common/JdbcPrivilege.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.authorization.jdbc;
+package org.apache.gravitino.authorization.common;
 
 import org.apache.gravitino.authorization.AuthorizationPrivilege;
 import org.apache.gravitino.authorization.Privilege;

diff --git a/...thorization/jdbc/JdbcSecurableObject.java → ...orization/common/JdbcSecurableObject.java b/...thorization/jdbc/JdbcSecurableObject.java → ...orization/common/JdbcSecurableObject.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.authorization.jdbc;
+package org.apache.gravitino.authorization.common;
 
 import java.util.List;
 import org.apache.gravitino.MetadataObject;

diff --git a/...c/JdbcSecurableObjectMappingProvider.java → ...n/JdbcSecurableObjectMappingProvider.java b/...c/JdbcSecurableObjectMappingProvider.java → ...n/JdbcSecurableObjectMappingProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.authorization.jdbc;
+package org.apache.gravitino.authorization.common;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;

diff --git a/...ion/jdbc/JdbcAuthorizationPluginTest.java → ...n/common/TestJdbcAuthorizationPlugin.java b/...ion/jdbc/JdbcAuthorizationPluginTest.java → ...n/common/TestJdbcAuthorizationPlugin.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.authorization.jdbc;
+package org.apache.gravitino.authorization.common;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -34,15 +34,14 @@
 import org.apache.gravitino.authorization.SecurableObject;
 import org.apache.gravitino.authorization.SecurableObjects;
 import org.apache.gravitino.authorization.User;
-import org.apache.gravitino.authorization.common.JdbcAuthorizationProperties;
 import org.apache.gravitino.meta.AuditInfo;
 import org.apache.gravitino.meta.GroupEntity;
 import org.apache.gravitino.meta.RoleEntity;
 import org.apache.gravitino.meta.UserEntity;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class JdbcAuthorizationPluginTest {
+public class TestJdbcAuthorizationPlugin {
   private static List<String> expectSQLs = Lists.newArrayList();
   private static List<MetadataObject.Type> expectTypes = Lists.newArrayList();
   private static List<String> expectObjectNames = Lists.newArrayList();

diff --git a/authorizations/authorization-jdbc/build.gradle.kts b/authorizations/authorization-jdbc/build.gradle.kts
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -57,7 +57,7 @@ if (gradle.startParameter.projectProperties["enableFuse"]?.toBoolean() == true)
 }
 include("iceberg:iceberg-common")
 include("iceberg:iceberg-rest-server")
-include("authorizations:authorization-ranger", "authorizations:authorization-jdbc", "authorizations:authorization-common", "authorizations:authorization-chain")
+include("authorizations:authorization-ranger", "authorizations:authorization-common", "authorizations:authorization-chain")
 include("trino-connector:trino-connector", "trino-connector:integration-test")
 include("spark-connector:spark-common")
 // kyuubi hive connector doesn't support 2.13 for Spark3.3