change the config store access

apache · Mar 3, 2025 · 8d3c29d · 8d3c29d
1 parent 8e65bb1
commit 8d3c29d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/PolarisConfigurationStore.java b/polaris-core/src/main/java/org/apache/polaris/core/PolarisConfigurationStore.java
@@ -23,6 +23,8 @@
 import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
+
+import org.apache.polaris.core.context.CallContext;
 import org.apache.polaris.core.entity.CatalogEntity;
 
 /**
@@ -117,4 +119,18 @@ public interface PolarisConfigurationStore {
       return getConfiguration(ctx, config);
     }
   }
+
+  public static <T> @Nonnull T getConfiguration(PolarisConfiguration<T> configuration) {
+    CallContext callContext = CallContext.getCurrentContext();
+    if (callContext == null) {
+      return configuration.defaultValue;
+    } else {
+      return callContext
+          .getPolarisCallContext()
+          .getConfigurationStore()
+          .getConfiguration(
+              callContext.getPolarisCallContext(),
+              configuration);
+    }
+  }
 }
diff --git a/...s-core/src/main/java/org/apache/polaris/core/storage/aws/AwsStorageConfigurationInfo.java b/...s-core/src/main/java/org/apache/polaris/core/storage/aws/AwsStorageConfigurationInfo.java
@@ -28,6 +28,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.polaris.core.PolarisConfiguration;
+import org.apache.polaris.core.PolarisConfigurationStore;
 import org.apache.polaris.core.context.CallContext;
 import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
 
@@ -73,14 +74,8 @@ public AwsStorageConfigurationInfo(
     this.roleARN = roleARN;
     this.externalId = externalId;
     this.region = region;
-    CallContext callContext = CallContext.getCurrentContext();
     validateMaxAllowedLocations(
-        callContext
-            .getPolarisCallContext()
-            .getConfigurationStore()
-            .getConfiguration(
-                callContext.getPolarisCallContext(),
-                PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
+        PolarisConfigurationStore.getConfiguration(PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
   }
 
   @Override

diff --git a/...re/src/main/java/org/apache/polaris/core/storage/azure/AzureStorageConfigurationInfo.java b/...re/src/main/java/org/apache/polaris/core/storage/azure/AzureStorageConfigurationInfo.java
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Objects;
 import org.apache.polaris.core.PolarisConfiguration;
+import org.apache.polaris.core.PolarisConfigurationStore;
 import org.apache.polaris.core.context.CallContext;
 import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
 
@@ -50,14 +51,8 @@ public AzureStorageConfigurationInfo(
       @JsonProperty(value = "tenantId", required = true) @Nonnull String tenantId) {
     super(StorageType.AZURE, allowedLocations);
     this.tenantId = tenantId;
-    CallContext callContext = CallContext.getCurrentContext();
     validateMaxAllowedLocations(
-        callContext
-            .getPolarisCallContext()
-            .getConfigurationStore()
-            .getConfiguration(
-                callContext.getPolarisCallContext(),
-                PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
+        PolarisConfigurationStore.getConfiguration(PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
   }
 
   @Override

diff --git a/...s-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java b/...s-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java
@@ -25,6 +25,7 @@
 import jakarta.annotation.Nullable;
 import java.util.List;
 import org.apache.polaris.core.PolarisConfiguration;
+import org.apache.polaris.core.PolarisConfigurationStore;
 import org.apache.polaris.core.context.CallContext;
 import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
 
@@ -40,14 +41,8 @@ public GcpStorageConfigurationInfo(
       @JsonProperty(value = "allowedLocations", required = true) @Nonnull
           List<String> allowedLocations) {
     super(StorageType.GCS, allowedLocations);
-    CallContext callContext = CallContext.getCurrentContext();
     validateMaxAllowedLocations(
-        callContext
-            .getPolarisCallContext()
-            .getConfigurationStore()
-            .getConfiguration(
-                callContext.getPolarisCallContext(),
-                PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
+        PolarisConfigurationStore.getConfiguration(PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
   }
 
   @Override