code-refactor

Author: singhpk234

bom/build.gradle.kts

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

gradle/projects.main.properties

@@ -30,7 +30,7 @@ polaris-quarkus-service=quarkus/service
 polaris-quarkus-server=quarkus/server
 polaris-quarkus-spark-tests=quarkus/spark-tests
 polaris-quarkus-admin=quarkus/admin
-polaris-quarkus-test-commons=quarkus/test-commons
+polaris-quarkus-commons=quarkus/commons
 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,7 +53,7 @@ dependencies {
 
   implementation("org.jboss.slf4j:slf4j-jboss-logmanager")
 
-  testImplementation(project(":polaris-quarkus-test-commons"))
+  implementation(project(":polaris-quarkus-commons"))
   testFixturesApi(project(":polaris-core"))
 
   testFixturesApi(enforcedPlatform(libs.quarkus.bom))

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

@@ -29,6 +29,7 @@
 import java.time.Clock;
 import java.util.List;
 import javax.sql.DataSource;
+import org.apache.polaris.commons.QuarkusDatasourceSupplier;
 import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
 import org.apache.polaris.core.PolarisDiagnostics;
 import org.apache.polaris.core.config.PolarisConfigurationStore;
@@ -84,9 +85,9 @@ public PolarisConfigurationStore configurationStore() {
   }
 
   @Produces
-  public DatasourceSupplier jdbcDatasource(
-      RelationalJdbcConfiguration relationalJdbcConfiguration,
-      @All List<InstanceHandle<DataSource>> dataSources) {
-    return new QuarkusDatasourceSupplier(relationalJdbcConfiguration, dataSources);
+  public DatasourceSupplier datasourceSupplier(
+      @Any RelationalJdbcConfiguration relationalJdbcConfiguration,
+      @All List<InstanceHandle<DataSource>> datasources) {
+    return new QuarkusDatasourceSupplier(relationalJdbcConfiguration, datasources);
   }
 }

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.commons.PostgresRelationalJdbcLifeCycleManagement;
+import org.apache.polaris.commons.RelationalJdbcProfile;
 
 public class RelationalJdbcAdminProfile extends RelationalJdbcProfile {
   @Override

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

@@ -35,6 +35,8 @@ java {
 
 dependencies {
   implementation(enforcedPlatform(libs.quarkus.bom))
+  implementation("io.quarkus:quarkus-arc")
+  implementation(project(":polaris-relational-jdbc"))
   implementation("io.quarkus:quarkus-junit5")
   implementation(platform(libs.testcontainers.bom))
   implementation("org.testcontainers:testcontainers")

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

@@ -16,18 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-package org.apache.polaris.test.commons;
+package org.apache.polaris.commons;
 
 import io.quarkus.test.common.DevServicesContext;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
-
+import java.util.List;
+import java.util.Map;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -52,7 +49,7 @@ public void init(Map<String, String> initArgs) {
   @SuppressWarnings("resource")
   public Map<String, String> start() {
     postgres =
-        new PostgreSQLContainer<>(DockerImageName.parse("postgres:17"))
+        new PostgreSQLContainer<>(DockerImageName.parse("postgres:17-alpine"))
             .withDatabaseName("realm1")
             .withUsername("polaris")
             .withPassword("polaris");
@@ -72,24 +69,30 @@ public Map<String, String> start() {
         props.put(String.format("polaris.relation.jdbc.datasource.%s", database), database + "_ds");
         props.put(String.format("quarkus.datasource.%s.db-kind", database + "_ds"), "pgsql");
         props.put(String.format("quarkus.datasource.%s.active", database + "_ds"), "true");
-        props.put(String.format("quarkus.datasource.%s.jdbc.url", database + "_ds"), postgres.getJdbcUrl().replace("realm1", database));
-        props.put(String.format("quarkus.datasource.%s.username", database + "_ds"), postgres.getUsername());
-        props.put(String.format("quarkus.datasource.%s.password", database + "_ds"), postgres.getPassword());
+        props.put(
+            String.format("quarkus.datasource.%s.jdbc.url", database + "_ds"),
+            postgres.getJdbcUrl().replace("realm1", database));
+        props.put(
+            String.format("quarkus.datasource.%s.username", database + "_ds"),
+            postgres.getUsername());
+        props.put(
+            String.format("quarkus.datasource.%s.password", database + "_ds"),
+            postgres.getPassword());
       }
     } else {
       return Map.of(
-              "polaris.persistence.type",
-              "relational-jdbc",
-              "quarkus.datasource.db-kind",
-              "pgsql",
-              "quarkus.datasource.jdbc.url",
-              postgres.getJdbcUrl(),
-              "quarkus.datasource.username",
-              postgres.getUsername(),
-              "quarkus.datasource.password",
-              postgres.getPassword(),
-              "quarkus.datasource.jdbc.initial-size",
-              "10");
+          "polaris.persistence.type",
+          "relational-jdbc",
+          "quarkus.datasource.db-kind",
+          "pgsql",
+          "quarkus.datasource.jdbc.url",
+          postgres.getJdbcUrl(),
+          "quarkus.datasource.username",
+          postgres.getUsername(),
+          "quarkus.datasource.password",
+          postgres.getPassword(),
+          "quarkus.datasource.jdbc.initial-size",
+          "10");
     }
 
     return props;

quarkus/admin/src/main/java/org/apache/polaris/admintool/config/QuarkusDatasourceSupplier.java renamed to quarkus/commons/src/main/java/org/apache/polaris/commons/QuarkusDatasourceSupplier.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.admintool.config;
+package org.apache.polaris.commons;
 
 import io.quarkus.arc.InstanceHandle;
 import java.util.List;
@@ -25,8 +25,8 @@
 import org.apache.polaris.extension.persistence.relational.jdbc.RelationalJdbcConfiguration;
 
 public class QuarkusDatasourceSupplier implements DatasourceSupplier {
-  private final List<InstanceHandle<DataSource>> dataSources;
-  private final RelationalJdbcConfiguration relationalJdbcConfiguration;
+  private List<InstanceHandle<DataSource>> dataSources;
+  private RelationalJdbcConfiguration relationalJdbcConfiguration;
 
   public static final String DEFAULT_DATA_SOURCE_NAME = "<default>";
 

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

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

quarkus/service/build.gradle.kts

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

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

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

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

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

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

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

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

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

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

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

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

@@ -36,6 +36,7 @@
 import java.time.Clock;
 import java.util.List;
 import javax.sql.DataSource;
+import org.apache.polaris.commons.QuarkusDatasourceSupplier;
 import org.apache.polaris.core.PolarisCallContext;
 import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
 import org.apache.polaris.core.PolarisDiagnostics;
@@ -266,9 +267,9 @@ public ActiveRolesProvider activeRolesProvider(
 
   @Produces
   public DatasourceSupplier datasourceSupplier(
-      RelationalJdbcConfiguration relationalJdbcConfiguration,
-      @All List<InstanceHandle<DataSource>> datasourceSuppliers) {
-    return new QuarkusDatasourceSupplier(relationalJdbcConfiguration, datasourceSuppliers);
+      @Any RelationalJdbcConfiguration relationalJdbcConfiguration,
+      @All List<InstanceHandle<DataSource>> datasources) {
+    return new QuarkusDatasourceSupplier(relationalJdbcConfiguration, datasources);
   }
 
   public void closeTaskExecutor(@Disposes @Identifier("task-executor") ManagedExecutor executor) {