Address review feedback

Author: singhpk234

extension/persistence/relational-jdbc/build.gradle.kts

@@ -32,7 +32,6 @@ dependencies {
   compileOnly(libs.jakarta.inject.api)
 
   implementation(libs.smallrye.common.annotation) // @Identifier
-  compileOnly(libs.smallrye.config.core)
 
   testImplementation(libs.mockito.junit.jupiter)
 

extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java

@@ -38,11 +38,7 @@
 import org.apache.polaris.core.entity.PolarisEntitySubType;
 import org.apache.polaris.core.entity.PolarisEntityType;
 import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
-import org.apache.polaris.core.persistence.AtomicOperationMetaStoreManager;
-import org.apache.polaris.core.persistence.BasePersistence;
-import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
-import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
-import org.apache.polaris.core.persistence.PrincipalSecretsGenerator;
+import org.apache.polaris.core.persistence.*;
 import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
 import org.apache.polaris.core.persistence.cache.EntityCache;
 import org.apache.polaris.core.persistence.cache.InMemoryEntityCache;

polaris-core/build.gradle.kts

@@ -70,6 +70,7 @@ dependencies {
   implementation(libs.jakarta.validation.api)
   implementation(libs.jakarta.ws.rs.api)
   implementation(libs.smallrye.common.annotation)
+  compileOnly(libs.smallrye.config.core) // @ConfigMap
 
   implementation("org.apache.iceberg:iceberg-aws")
   implementation(platform(libs.awssdk.bom))

extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/RelationalJdbcConfiguration.java renamed to polaris-core/src/main/java/org/apache/polaris/core/config/RelationalJdbcConfiguration.java

@@ -16,15 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.extension.persistence.relational.jdbc;
+package org.apache.polaris.core.config;
 
 import io.smallrye.config.ConfigMapping;
 import java.util.Map;
 import java.util.Optional;
 
 @ConfigMapping(prefix = "polaris.relation.jdbc.datasource")
 public interface RelationalJdbcConfiguration {
+  /** realmId to configured Datasource name mapping. */
   Map<String, String> realm();
 
+  /**
+   * Default datasource name to be used for a realmId when there is no mapping of realmId to
+   * Datasource name present.
+   */
   Optional<String> defaultDatasource();
 }

extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/DatasourceSupplier.java renamed to polaris-core/src/main/java/org/apache/polaris/core/persistence/DatasourceSupplier.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.extension.persistence.relational.jdbc;
+package org.apache.polaris.core.persistence;
 
 import javax.sql.DataSource;
 

quarkus/admin/build.gradle.kts

@@ -44,7 +44,7 @@ dependencies {
   implementation(project(":polaris-api-iceberg-service"))
 
   runtimeOnly(project(":polaris-eclipselink"))
-  implementation(project(":polaris-relational-jdbc"))
+  runtimeOnly(project(":polaris-relational-jdbc"))
   runtimeOnly("org.postgresql:postgresql")
   implementation("io.quarkus:quarkus-jdbc-postgresql")
   implementation(enforcedPlatform(libs.quarkus.bom))

quarkus/admin/src/main/java/org/apache/polaris/admintool/config/QuarkusProducers.java

@@ -33,12 +33,12 @@
 import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
 import org.apache.polaris.core.PolarisDiagnostics;
 import org.apache.polaris.core.config.PolarisConfigurationStore;
+import org.apache.polaris.core.config.RelationalJdbcConfiguration;
+import org.apache.polaris.core.persistence.DatasourceSupplier;
 import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
 import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
 import org.apache.polaris.core.storage.PolarisStorageIntegration;
 import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
-import org.apache.polaris.extension.persistence.relational.jdbc.DatasourceSupplier;
-import org.apache.polaris.extension.persistence.relational.jdbc.RelationalJdbcConfiguration;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 public class QuarkusProducers {

quarkus/commons/build.gradle.kts

@@ -34,6 +34,8 @@ java {
 }
 
 dependencies {
+  implementation(project(":polaris-core"))
+  implementation(enforcedPlatform(libs.quarkus.bom))
   implementation(enforcedPlatform(libs.quarkus.bom))
   implementation("io.quarkus:quarkus-arc")
   implementation(project(":polaris-relational-jdbc"))

quarkus/commons/src/main/java/org/apache/polaris/commons/QuarkusDatasourceSupplier.java

@@ -22,8 +22,8 @@
 import java.util.List;
 import javax.sql.DataSource;
 
-import org.apache.polaris.extension.persistence.relational.jdbc.DatasourceSupplier;
-import org.apache.polaris.extension.persistence.relational.jdbc.RelationalJdbcConfiguration;
+import org.apache.polaris.core.persistence.DatasourceSupplier;
+import org.apache.polaris.core.config.RelationalJdbcConfiguration;
 
 public class QuarkusDatasourceSupplier implements DatasourceSupplier {
   private final List<InstanceHandle<DataSource>> dataSources;

quarkus/service/build.gradle.kts

@@ -51,6 +51,11 @@ dependencies {
   implementation("io.quarkus:quarkus-security")
   implementation("io.quarkus:quarkus-smallrye-context-propagation")
   implementation("io.quarkus:quarkus-smallrye-fault-tolerance")
+  runtimeOnly("io.quarkus:quarkus-jdbc-postgresql") {
+    exclude(group = "org.antlr", module = "antlr4-runtime")
+    exclude(group = "org.scala-lang", module = "scala-library")
+    exclude(group = "org.scala-lang", module = "scala-reflect")
+  }
 
   implementation(libs.jakarta.enterprise.cdi.api)
   implementation(libs.jakarta.inject.api)
@@ -107,13 +112,7 @@ dependencies {
   testImplementation("software.amazon.awssdk:glue")
   testImplementation("software.amazon.awssdk:kms")
   testImplementation("software.amazon.awssdk:dynamodb")
-
-  implementation(project(":polaris-relational-jdbc"))
-  runtimeOnly("io.quarkus:quarkus-jdbc-postgresql") {
-    exclude(group = "org.antlr", module = "antlr4-runtime")
-    exclude(group = "org.scala-lang", module = "scala-library")
-    exclude(group = "org.scala-lang", module = "scala-reflect")
-  }
+  testImplementation(project(":polaris-relational-jdbc"))
   testImplementation(platform(libs.quarkus.bom))
   testImplementation("io.quarkus:quarkus-junit5")
   testImplementation("io.quarkus:quarkus-junit5-mockito")

quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java

@@ -44,18 +44,18 @@
 import org.apache.polaris.core.auth.PolarisAuthorizer;
 import org.apache.polaris.core.auth.PolarisAuthorizerImpl;
 import org.apache.polaris.core.config.PolarisConfigurationStore;
+import org.apache.polaris.core.config.RelationalJdbcConfiguration;
 import org.apache.polaris.core.context.CallContext;
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.core.persistence.BasePersistence;
+import org.apache.polaris.core.persistence.DatasourceSupplier;
 import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
 import org.apache.polaris.core.persistence.PolarisEntityManager;
 import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
 import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
 import org.apache.polaris.core.secrets.UserSecretsManager;
 import org.apache.polaris.core.secrets.UserSecretsManagerFactory;
 import org.apache.polaris.core.storage.cache.StorageCredentialCache;
-import org.apache.polaris.extension.persistence.relational.jdbc.DatasourceSupplier;
-import org.apache.polaris.extension.persistence.relational.jdbc.RelationalJdbcConfiguration;
 import org.apache.polaris.service.auth.ActiveRolesProvider;
 import org.apache.polaris.service.auth.Authenticator;
 import org.apache.polaris.service.auth.TokenBrokerFactory;