xx

apache · Dec 25, 2024 · e6fb39c · e6fb39c
1 parent 7df3df6
commit e6fb39c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/core/src/main/java/org/apache/gravitino/connector/BaseCatalog.java b/core/src/main/java/org/apache/gravitino/connector/BaseCatalog.java
@@ -37,7 +37,7 @@
 import org.apache.gravitino.connector.authorization.AuthorizationProvider;
 import org.apache.gravitino.connector.authorization.BaseAuthorization;
 import org.apache.gravitino.connector.capability.Capability;
-import org.apache.gravitino.credential.CatalogCredentialProvider;
+import org.apache.gravitino.credential.CatalogCredentialOperationDispatcher;
 import org.apache.gravitino.meta.CatalogEntity;
 import org.apache.gravitino.utils.IsolatedClassLoader;
 import org.slf4j.Logger;
@@ -80,7 +80,7 @@ public abstract class BaseCatalog<T extends BaseCatalog>
 
   private volatile Map<String, String> properties;
 
-  private volatile CatalogCredentialProvider catalogCredentialProvider;
+  private volatile CatalogCredentialOperationDispatcher catalogCredentialOperationDispatcher;
 
   private static String ENTITY_IS_NOT_SET = "entity is not set";
 
@@ -262,9 +262,9 @@ public void close() throws IOException {
       authorizationPlugin.close();
       authorizationPlugin = null;
     }
-    if (catalogCredentialProvider != null) {
-      catalogCredentialProvider.close();
-      catalogCredentialProvider = null;
+    if (catalogCredentialOperationDispatcher != null) {
+      catalogCredentialOperationDispatcher.close();
+      catalogCredentialOperationDispatcher = null;
     }
   }
 
@@ -280,15 +280,16 @@ public Capability capability() {
     return capability;
   }
 
-  public CatalogCredentialProvider getCatalogCredentialManager() {
-    if (catalogCredentialProvider == null) {
+  public CatalogCredentialOperationDispatcher catalogCredentialOperationDispatcher() {
+    if (catalogCredentialOperationDispatcher == null) {
       synchronized (this) {
-        if (catalogCredentialProvider == null) {
-          this.catalogCredentialProvider = new CatalogCredentialProvider(name(), properties());
+        if (catalogCredentialOperationDispatcher == null) {
+          this.catalogCredentialOperationDispatcher =
+              new CatalogCredentialOperationDispatcher(name(), properties());
         }
       }
     }
-    return catalogCredentialProvider;
+    return catalogCredentialOperationDispatcher;
   }
 
   private CatalogOperations createOps(Map<String, String> conf) {

diff --git a/...credential/CatalogCredentialProvider.java → ...CatalogCredentialOperationDispatcher.java b/...credential/CatalogCredentialProvider.java → ...CatalogCredentialOperationDispatcher.java
@@ -26,15 +26,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/** Generate credentials for the objects in the same catalog. */
-public class CatalogCredentialProvider implements Closeable {
+/**
+ * Manage lifetime of the credential provider in one catalog, dispatch credential request to the
+ * corresponding credential provider.
+ */
+public class CatalogCredentialOperationDispatcher implements Closeable {
 
-  private static final Logger LOG = LoggerFactory.getLogger(CatalogCredentialProvider.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(CatalogCredentialOperationDispatcher.class);
 
   private final String catalogName;
   private final Map<String, CredentialProvider> credentialProviders;
 
-  public CatalogCredentialProvider(String catalogName, Map<String, String> catalogProperties) {
+  public CatalogCredentialOperationDispatcher(
+      String catalogName, Map<String, String> catalogProperties) {
     this.catalogName = catalogName;
     this.credentialProviders = CredentialUtils.loadCredentialProviders(catalogProperties);
   }

diff --git a/core/src/main/java/org/apache/gravitino/credential/CredentialOperationDispatcher.java b/core/src/main/java/org/apache/gravitino/credential/CredentialOperationDispatcher.java
@@ -65,7 +65,7 @@ private List<Credential> getCredentials(
         .map(
             entry ->
                 baseCatalog
-                    .getCatalogCredentialManager()
+                    .catalogCredentialOperationDispatcher()
                     .getCredential(entry.getKey(), entry.getValue()))
         .filter(Objects::nonNull)
         .collect(Collectors.toList());