Address Alex feedback

Author: singhpk234

bom/build.gradle.kts

@@ -46,8 +46,8 @@ dependencies {
     api(project(":polaris-jpa-model"))
 
     api(project(":polaris-quarkus-admin"))
-    api(project(":polaris-quarkus-commons"))
-    api(project(":polaris-quarkus-test-commons"))
+    api(project(":polaris-quarkus-common"))
+    api(project(":polaris-quarkus-test-common"))
     api(project(":polaris-quarkus-defaults"))
     api(project(":polaris-quarkus-server"))
     api(project(":polaris-quarkus-service"))

gradle/projects.main.properties

@@ -30,8 +30,8 @@ polaris-quarkus-service=quarkus/service
 polaris-quarkus-server=quarkus/server
 polaris-quarkus-spark-tests=quarkus/spark-tests
 polaris-quarkus-admin=quarkus/admin
-polaris-quarkus-commons=quarkus/commons
-polaris-quarkus-test-commons=quarkus/test-commons
+polaris-quarkus-common=quarkus/common
+polaris-quarkus-test-common=quarkus/test-common
 polaris-quarkus-run-script=quarkus/run-script
 polaris-eclipselink=extension/persistence/eclipselink
 polaris-jpa-model=extension/persistence/jpa-model

quarkus/admin/build.gradle.kts

@@ -53,8 +53,8 @@ dependencies {
 
   implementation("org.jboss.slf4j:slf4j-jboss-logmanager")
 
-  implementation(project(":polaris-quarkus-commons"))
-  testImplementation(project(":polaris-quarkus-test-commons"))
+  implementation(project(":polaris-quarkus-common"))
+  testImplementation(project(":polaris-quarkus-test-common"))
   testFixturesApi(project(":polaris-core"))
 
   testFixturesApi(enforcedPlatform(libs.quarkus.bom))

quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcAdminProfile.java

@@ -22,8 +22,8 @@
 
 import java.util.List;
 import java.util.Map;
-import org.apache.polaris.test.commons.PostgresRelationalJdbcLifeCycleManagement;
-import org.apache.polaris.test.commons.RelationalJdbcProfile;
+import org.apache.polaris.test.common.PostgresRelationalJdbcLifeCycleManagement;
+import org.apache.polaris.test.common.RelationalJdbcProfile;
 
 public class RelationalJdbcAdminProfile extends RelationalJdbcProfile {
   @Override

quarkus/commons/build.gradle.kts renamed to quarkus/common/build.gradle.kts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.commons;
+package org.apache.polaris.common;
 
 import io.quarkus.arc.All;
 import io.quarkus.arc.InstanceHandle;

quarkus/commons/src/main/java/org/apache/polaris/commons/QuarkusDatasourceSupplier.java renamed to quarkus/common/src/main/java/org/apache/polaris/common/QuarkusDatasourceSupplier.java

@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.commons;
+package org.apache.polaris.common;
 
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithParentName;
 
 import java.util.Map;
 import java.util.Optional;
 
-@ConfigMapping(prefix = "polaris.relation.jdbc.datasource")
+@ConfigMapping(prefix = "polaris.relational.jdbc.datasource")
 public interface RelationalJdbcConfiguration {
   /** realmId to configured Datasource name mapping. */
   @WithParentName

quarkus/commons/src/main/java/org/apache/polaris/commons/RelationalJdbcConfiguration.java renamed to quarkus/common/src/main/java/org/apache/polaris/common/RelationalJdbcConfiguration.java

@@ -123,8 +123,8 @@ dependencies {
   testImplementation(libs.threeten.extra)
   testImplementation(libs.hawkular.agent.prometheus.scraper)
 
-  implementation(project(":polaris-quarkus-commons"))
-  testImplementation(project(":polaris-quarkus-test-commons"))
+  implementation(project(":polaris-quarkus-common"))
+  testImplementation(project(":polaris-quarkus-test-common"))
   testImplementation("io.quarkus:quarkus-junit5")
   testImplementation(platform(libs.testcontainers.bom))
   testImplementation("org.testcontainers:testcontainers")

quarkus/service/build.gradle.kts

@@ -21,7 +21,7 @@
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 import org.apache.polaris.service.it.test.PolarisApplicationIntegrationTest;
-import org.apache.polaris.test.commons.RelationalJdbcProfile;
+import org.apache.polaris.test.common.RelationalJdbcProfile;
 
 @TestProfile(RelationalJdbcProfile.class)
 @QuarkusIntegrationTest

quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusApplicationIT.java

@@ -21,7 +21,7 @@
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 import org.apache.polaris.service.it.test.PolarisManagementServiceIntegrationTest;
-import org.apache.polaris.test.commons.RelationalJdbcProfile;
+import org.apache.polaris.test.common.RelationalJdbcProfile;
 
 @TestProfile(RelationalJdbcProfile.class)
 @QuarkusIntegrationTest

quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusManagementServiceIT.java

@@ -21,7 +21,7 @@
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 import org.apache.polaris.service.it.test.PolarisPolicyServiceIntegrationTest;
-import org.apache.polaris.test.commons.RelationalJdbcProfile;
+import org.apache.polaris.test.common.RelationalJdbcProfile;
 
 @TestProfile(RelationalJdbcProfile.class)
 @QuarkusIntegrationTest

quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusPolicyServiceIT.java

@@ -21,7 +21,7 @@
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 import org.apache.polaris.service.it.test.PolarisRestCatalogViewFileIntegrationTest;
-import org.apache.polaris.test.commons.RelationalJdbcProfile;
+import org.apache.polaris.test.common.RelationalJdbcProfile;
 
 @TestProfile(RelationalJdbcProfile.class)
 @QuarkusIntegrationTest

quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcQuarkusViewFileIT.java

@@ -21,7 +21,7 @@
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 import org.apache.polaris.service.it.test.PolarisRestCatalogIntegrationTest;
-import org.apache.polaris.test.commons.RelationalJdbcProfile;
+import org.apache.polaris.test.common.RelationalJdbcProfile;
 
 @TestProfile(RelationalJdbcProfile.class)
 @QuarkusIntegrationTest

quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/relational/jdbc/JdbcRestCatalogIT.java

@@ -41,10 +41,7 @@
 import org.apache.polaris.core.config.PolarisConfigurationStore;
 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.MetaStoreManagerFactory;
-import org.apache.polaris.core.persistence.PolarisEntityManager;
-import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
+import org.apache.polaris.core.persistence.*;
 import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
 import org.apache.polaris.core.secrets.UserSecretsManager;
 import org.apache.polaris.core.secrets.UserSecretsManagerFactory;
@@ -258,12 +255,12 @@ public ActiveRolesProvider activeRolesProvider(
     return activeRolesProviders.select(Identifier.Literal.of(persistenceType)).get();
   }
 
-  //  @Produces
-  //  public DatasourceSupplier datasourceSupplier(
-  //      @Any RelationalJdbcConfiguration relationalJdbcConfiguration,
-  //      @All List<InstanceHandle<DataSource>> datasources) {
-  //    return new QuarkusDatasourceSupplier(relationalJdbcConfiguration, datasources);
-  //  }
+  //    @Produces
+  //    public DatasourceSupplier datasourceSupplier(
+  //        @Any RelationalJdbcConfiguration relationalJdbcConfiguration,
+  //        @All List<InstanceHandle<DataSource>> datasources) {
+  //      return new QuarkusDatasourceSupplier(relationalJdbcConfiguration, datasources);
+  //    }
 
   public void closeTaskExecutor(@Disposes @Identifier("task-executor") ManagedExecutor executor) {
     executor.close();

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

@@ -18,25 +18,25 @@
  */
 
 plugins {
-    alias(libs.plugins.jandex)
-    id("java-test-fixtures")
+  alias(libs.plugins.jandex)
+  id("java-test-fixtures")
 }
 
 configurations.all {
-    exclude(group = "org.antlr", module = "antlr4-runtime")
-    exclude(group = "org.scala-lang", module = "scala-library")
-    exclude(group = "org.scala-lang", module = "scala-reflect")
+  exclude(group = "org.antlr", module = "antlr4-runtime")
+  exclude(group = "org.scala-lang", module = "scala-library")
+  exclude(group = "org.scala-lang", module = "scala-reflect")
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+  sourceCompatibility = JavaVersion.VERSION_21
+  targetCompatibility = JavaVersion.VERSION_21
 }
 
 dependencies {
-    implementation(enforcedPlatform(libs.quarkus.bom))
-    implementation("io.quarkus:quarkus-junit5")
-    implementation(platform(libs.testcontainers.bom))
-    implementation("org.testcontainers:testcontainers")
-    implementation("org.testcontainers:postgresql")
-}
+  implementation(enforcedPlatform(libs.quarkus.bom))
+  implementation("io.quarkus:quarkus-junit5")
+  implementation(platform(libs.testcontainers.bom))
+  implementation("org.testcontainers:testcontainers")
+  implementation("org.testcontainers:postgresql")
+}

quarkus/test-commons/build.gradle.kts renamed to quarkus/test-common/build.gradle.kts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.test.commons;
+package org.apache.polaris.test.common;
 
 import io.quarkus.test.common.DevServicesContext;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
@@ -64,7 +64,7 @@ public Map<String, String> start() {
     if (databases.isEmpty()) {
       Map<String, String> props = generateDataSourceProps(List.of("realm1"));
       // make realm1_ds as the default ds
-      props.put("polaris.relation.jdbc.datasource.default-datasource", "realm1_ds");
+      props.put("polaris.relational.jdbc.datasource.default-datasource", "realm1_ds");
       return props;
     } else {
       Map<String, String> allProps = new HashMap<>();
@@ -97,7 +97,7 @@ private Map<String, String> generateDataSourceMappingProps(List<String> realms)
     Map<String, String> props = new HashMap<>();
     // polaris.relation.jdbc.datasource.realm=realm_ds
     for (String database : realms) {
-      props.put(String.format("polaris.relation.jdbc.datasource.%s", database), database + "_ds");
+      props.put(String.format("polaris.relational.jdbc.datasource.%s", database), database + "_ds");
     }
     return props;
   }

quarkus/test-commons/src/main/java/org/apache/polaris/test/commons/PostgresRelationalJdbcLifeCycleManagement.java renamed to quarkus/test-common/src/main/java/org/apache/polaris/test/common/PostgresRelationalJdbcLifeCycleManagement.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.test.commons;
+package org.apache.polaris.test.common;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 import java.util.List;