(polaris) branch mcollado-realm-config created (now 7066e682)

[co...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

collado pushed a change to branch mcollado-realm-config
in repository https://gitbox.apache.org/repos/asf/polaris.git


      at 7066e682 Updates for pr comments

This branch includes the following new commits:

     new 7066e682 Updates for pr comments

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

(polaris) 01/01: Updates for pr comments

[co...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

collado pushed a commit to branch mcollado-realm-config
in repository https://gitbox.apache.org/repos/asf/polaris.git

commit 7066e682de43f524462b38fe8a5ae2be21dc19c2
Author: Michael Collado <co...@gmail.com>
AuthorDate: Mon Oct 28 16:02:20 2024 -0700

    Updates for pr comments
---
 .../org/apache/polaris/service/config/PolarisApplicationConfig.java | 6 +++---
 .../polaris/service/config/DefaultConfigurationStoreTest.java       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/polaris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java b/polaris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java
index 9cab7576..7d5fd8fd 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java
@@ -56,7 +56,7 @@ public class PolarisApplicationConfig extends Configuration {
   private DiscoverableAuthenticator<String, AuthenticatedPolarisPrincipal> polarisAuthenticator;
   private CorsConfiguration corsConfiguration = new CorsConfiguration();
   private TaskHandlerConfiguration taskHandler = new TaskHandlerConfiguration();
-  private Map<String, Object> featureConfiguration = Map.of();
+  private Map<String, Object> globalFeatureConfiguration = Map.of();
   private Map<String, Map<String, Object>> realmConfiguration = Map.of();
   private List<String> defaultRealms;
   private String awsAccessKey;
@@ -169,7 +169,7 @@ public class PolarisApplicationConfig extends Configuration {
 
   @JsonProperty("featureConfiguration")
   public void setFeatureConfiguration(Map<String, Object> featureConfiguration) {
-    this.featureConfiguration = featureConfiguration;
+    this.globalFeatureConfiguration = featureConfiguration;
   }
 
   @JsonProperty("realmFeatureConfiguration")
@@ -194,7 +194,7 @@ public class PolarisApplicationConfig extends Configuration {
   }
 
   public PolarisConfigurationStore getConfigurationStore() {
-    return new DefaultConfigurationStore(featureConfiguration, realmConfiguration);
+    return new DefaultConfigurationStore(globalFeatureConfiguration, realmConfiguration);
   }
 
   public List<String> getDefaultRealms() {
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/config/DefaultConfigurationStoreTest.java b/polaris-service/src/test/java/org/apache/polaris/service/config/DefaultConfigurationStoreTest.java
index e095969b..7c981ab9 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/config/DefaultConfigurationStoreTest.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/config/DefaultConfigurationStoreTest.java
@@ -26,7 +26,7 @@ import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
 import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory;
 import org.junit.jupiter.api.Test;
 
-class DefaultConfigurationStoreTest {
+public class DefaultConfigurationStoreTest {
 
   @Test
   public void testGetConfiguration() {