This is an automated email from the ASF dual-hosted git repository. emaynard pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push: new 923a2e1d2 Remove readInternalProperties helpers (#2506) 923a2e1d2 is described below commit 923a2e1d21b0e145024786f568734f33b9bcb57f Author: Christopher Lambert <xn...@gmx.de> AuthorDate: Thu Sep 4 20:07:07 2025 +0200 Remove readInternalProperties helpers (#2506) the functionality is already provided by the `PrincipalEntity` --- .../service/test/PolarisIntegrationTestFixture.java | 14 +------------- .../polaris/service/test/PolarisIntegrationTestHelper.java | 2 -- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/runtime/service/src/test/java/org/apache/polaris/service/test/PolarisIntegrationTestFixture.java b/runtime/service/src/test/java/org/apache/polaris/service/test/PolarisIntegrationTestFixture.java index b9e719122..f8df9a101 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/test/PolarisIntegrationTestFixture.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/test/PolarisIntegrationTestFixture.java @@ -21,8 +21,6 @@ package org.apache.polaris.service.test; import static org.apache.polaris.service.context.TestRealmContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.Entity; @@ -113,9 +111,8 @@ public class PolarisIntegrationTestFixture { PolarisMetaStoreManager metaStoreManager = helper.metaStoreManagerFactory.getOrCreateMetaStoreManager(realmContext); PrincipalEntity principal = metaStoreManager.findRootPrincipal(polarisContext).orElseThrow(); - Map<String, String> propertiesMap = readInternalProperties(principal); return metaStoreManager - .loadPrincipalSecrets(polarisContext, propertiesMap.get("client_id")) + .loadPrincipalSecrets(polarisContext, principal.getClientId()) .getPrincipalSecrets(); } @@ -213,15 +210,6 @@ public class PolarisIntegrationTestFixture { } } - private Map<String, String> readInternalProperties(PrincipalEntity principal) { - try { - return helper.objectMapper.readValue( - principal.getInternalProperties(), new TypeReference<>() {}); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - } - private static SnowmanIdentifier getSnowmanIdentifier(TestEnvironment testEnv) { return new SnowmanIdentifier("snowman" + testEnv.testId(), "catalog-admin" + testEnv.testId()); } diff --git a/runtime/service/src/test/java/org/apache/polaris/service/test/PolarisIntegrationTestHelper.java b/runtime/service/src/test/java/org/apache/polaris/service/test/PolarisIntegrationTestHelper.java index 6fdff1d7c..281b15b5f 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/test/PolarisIntegrationTestHelper.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/test/PolarisIntegrationTestHelper.java @@ -18,7 +18,6 @@ */ package org.apache.polaris.service.test; -import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.inject.Inject; import jakarta.inject.Singleton; import org.apache.polaris.core.PolarisDiagnostics; @@ -32,7 +31,6 @@ public class PolarisIntegrationTestHelper { @Inject MetaStoreManagerFactory metaStoreManagerFactory; @Inject RealmContextResolver realmContextResolver; - @Inject ObjectMapper objectMapper; @Inject PolarisDiagnostics diagServices; @Inject PolarisConfigurationStore configurationStore;