refactor JdbcProperties.java

apache · Dec 24, 2024 · b52e9e0 · b52e9e0
1 parent f5a7933
commit b52e9e0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/...ion/jdbc/JdbcAuthorizationProperties.java → ...rization/JdbcAuthorizationProperties.java b/...ion/jdbc/JdbcAuthorizationProperties.java → ...rization/JdbcAuthorizationProperties.java
@@ -16,29 +16,39 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.authorization.jdbc;
+package org.apache.gravitino.authorization;
 
 import java.util.Map;
 
 /** The properties for JDBC authorization plugin. */
-public class JdbcAuthorizationProperties {
+public class JdbcAuthorizationProperties extends AuthorizationProperties {
   private static final String CONFIG_PREFIX = "authorization.jdbc.";
   public static final String JDBC_PASSWORD = CONFIG_PREFIX + "password";
   public static final String JDBC_USERNAME = CONFIG_PREFIX + "username";
   public static final String JDBC_URL = CONFIG_PREFIX + "url";
   public static final String JDBC_DRIVER = CONFIG_PREFIX + "driver";
 
-  public static void validate(Map<String, String> properties) {
-    String errorMsg = "%s is required";
-    check(properties, JDBC_URL, errorMsg);
-    check(properties, JDBC_USERNAME, errorMsg);
-    check(properties, JDBC_PASSWORD, errorMsg);
-    check(properties, JDBC_DRIVER, errorMsg);
+  public JdbcAuthorizationProperties(Map<String, String> properties) {
+    super(properties);
   }
 
-  private static void check(Map<String, String> properties, String key, String errorMsg) {
+  private void check(String key, String errorMsg) {
     if (!properties.containsKey(key) && properties.get(key) != null) {
       throw new IllegalArgumentException(String.format(errorMsg, key));
     }
   }
+
+  @Override
+  String getPropertiesPrefix() {
+    return CONFIG_PREFIX;
+  }
+
+  @Override
+  public void validate() {
+    String errorMsg = "%s is required";
+    check(JDBC_URL, errorMsg);
+    check(JDBC_USERNAME, errorMsg);
+    check(JDBC_PASSWORD, errorMsg);
+    check(JDBC_DRIVER, errorMsg);
+  }
 }
diff --git a/authorizations/authorization-jdbc/build.gradle.kts b/authorizations/authorization-jdbc/build.gradle.kts
@@ -31,7 +31,9 @@ dependencies {
   implementation(project(":core")) {
     exclude(group = "*")
   }
-
+  implementation(project(":authorizations:authorization-common")) {
+    exclude(group = "*")
+  }
   implementation(libs.bundles.log4j)
   implementation(libs.commons.lang3)
   implementation(libs.guava)

diff --git a/...n-jdbc/src/main/java/org/apache/gravitino/authorization/jdbc/JdbcAuthorizationPlugin.java b/...n-jdbc/src/main/java/org/apache/gravitino/authorization/jdbc/JdbcAuthorizationPlugin.java
@@ -34,6 +34,7 @@
 import org.apache.gravitino.authorization.AuthorizationPrivilege;
 import org.apache.gravitino.authorization.AuthorizationSecurableObject;
 import org.apache.gravitino.authorization.Group;
+import org.apache.gravitino.authorization.JdbcAuthorizationProperties;
 import org.apache.gravitino.authorization.MetadataObjectChange;
 import org.apache.gravitino.authorization.Owner;
 import org.apache.gravitino.authorization.Role;
@@ -65,7 +66,8 @@ abstract class JdbcAuthorizationPlugin implements AuthorizationPlugin, JdbcAutho
   public JdbcAuthorizationPlugin(Map<String, String> config) {
     // Initialize the data source
     dataSource = new BasicDataSource();
-    JdbcAuthorizationProperties.validate(config);
+    JdbcAuthorizationProperties jdbcAuthProperties = new JdbcAuthorizationProperties(config);
+    jdbcAuthProperties.validate();
 
     String jdbcUrl = config.get(JdbcAuthorizationProperties.JDBC_URL);
     dataSource.setUrl(jdbcUrl);

diff --git a/...bc/src/test/java/org/apache/gravitino/authorization/jdbc/JdbcAuthorizationPluginTest.java b/...bc/src/test/java/org/apache/gravitino/authorization/jdbc/JdbcAuthorizationPluginTest.java
@@ -27,6 +27,7 @@
 import org.apache.gravitino.MetadataObject;
 import org.apache.gravitino.MetadataObjects;
 import org.apache.gravitino.authorization.Group;
+import org.apache.gravitino.authorization.JdbcAuthorizationProperties;
 import org.apache.gravitino.authorization.Owner;
 import org.apache.gravitino.authorization.Privileges;
 import org.apache.gravitino.authorization.Role;