Skip to content

Commit b1abc4b

Browse files
singhpk234singhpk234
committed
code-refactor
1 parent 75a5952 commit b1abc4b

File tree

17 files changed

+51
-98
lines changed

17 files changed

+51
-98
lines changed

‎bom/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies {
4646
api(project(":polaris-jpa-model"))
4747

4848
api(project(":polaris-quarkus-admin"))
49-
api(project(":polaris-quarkus-test-commons"))
49+
api(project(":polaris-quarkus-commons"))
5050
api(project(":polaris-quarkus-defaults"))
5151
api(project(":polaris-quarkus-server"))
5252
api(project(":polaris-quarkus-service"))

‎gradle/projects.main.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ polaris-quarkus-service=quarkus/service
3030
polaris-quarkus-server=quarkus/server
3131
polaris-quarkus-spark-tests=quarkus/spark-tests
3232
polaris-quarkus-admin=quarkus/admin
33-
polaris-quarkus-test-commons=quarkus/test-commons
33+
polaris-quarkus-commons=quarkus/commons
3434
polaris-quarkus-run-script=quarkus/run-script
3535
polaris-eclipselink=extension/persistence/eclipselink
3636
polaris-jpa-model=extension/persistence/jpa-model

‎quarkus/admin/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ dependencies {
5353

5454
implementation("org.jboss.slf4j:slf4j-jboss-logmanager")
5555

56-
testImplementation(project(":polaris-quarkus-test-commons"))
56+
implementation(project(":polaris-quarkus-commons"))
5757
testFixturesApi(project(":polaris-core"))
5858

5959
testFixturesApi(enforcedPlatform(libs.quarkus.bom))

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.time.Clock;
3030
import java.util.List;
3131
import javax.sql.DataSource;
32+
import org.apache.polaris.commons.QuarkusDatasourceSupplier;
3233
import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
3334
import org.apache.polaris.core.PolarisDiagnostics;
3435
import org.apache.polaris.core.config.PolarisConfigurationStore;
@@ -84,9 +85,9 @@ public PolarisConfigurationStore configurationStore() {
8485
}
8586

8687
@Produces
87-
public DatasourceSupplier jdbcDatasource(
88-
RelationalJdbcConfiguration relationalJdbcConfiguration,
89-
@All List<InstanceHandle<DataSource>> dataSources) {
90-
return new QuarkusDatasourceSupplier(relationalJdbcConfiguration, dataSources);
88+
public DatasourceSupplier datasourceSupplier(
89+
@Any RelationalJdbcConfiguration relationalJdbcConfiguration,
90+
@All List<InstanceHandle<DataSource>> datasources) {
91+
return new QuarkusDatasourceSupplier(relationalJdbcConfiguration, datasources);
9192
}
9293
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
import java.util.List;
2424
import java.util.Map;
25-
import org.apache.polaris.test.commons.PostgresRelationalJdbcLifeCycleManagement;
26-
import org.apache.polaris.test.commons.RelationalJdbcProfile;
25+
import org.apache.polaris.commons.PostgresRelationalJdbcLifeCycleManagement;
26+
import org.apache.polaris.commons.RelationalJdbcProfile;
2727

2828
public class RelationalJdbcAdminProfile extends RelationalJdbcProfile {
2929
@Override

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

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ java {
3535

3636
dependencies {
3737
implementation(enforcedPlatform(libs.quarkus.bom))
38+
implementation("io.quarkus:quarkus-arc")
39+
implementation(project(":polaris-relational-jdbc"))
3840
implementation("io.quarkus:quarkus-junit5")
3941
implementation(platform(libs.testcontainers.bom))
4042
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

+25-22
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,15 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
20-
package org.apache.polaris.test.commons;
19+
package org.apache.polaris.commons;
2120

2221
import io.quarkus.test.common.DevServicesContext;
2322
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
24-
25-
import java.util.List;
26-
import java.util.Map;
27-
import java.util.Arrays;
2823
import java.util.ArrayList;
24+
import java.util.Arrays;
2925
import java.util.HashMap;
30-
26+
import java.util.List;
27+
import java.util.Map;
3128
import org.testcontainers.containers.PostgreSQLContainer;
3229
import org.testcontainers.utility.DockerImageName;
3330

@@ -72,24 +69,30 @@ public Map<String, String> start() {
7269
props.put(String.format("polaris.relation.jdbc.datasource.%s", database), database + "_ds");
7370
props.put(String.format("quarkus.datasource.%s.db-kind", database + "_ds"), "pgsql");
7471
props.put(String.format("quarkus.datasource.%s.active", database + "_ds"), "true");
75-
props.put(String.format("quarkus.datasource.%s.jdbc.url", database + "_ds"), postgres.getJdbcUrl().replace("realm1", database));
76-
props.put(String.format("quarkus.datasource.%s.username", database + "_ds"), postgres.getUsername());
77-
props.put(String.format("quarkus.datasource.%s.password", database + "_ds"), postgres.getPassword());
72+
props.put(
73+
String.format("quarkus.datasource.%s.jdbc.url", database + "_ds"),
74+
postgres.getJdbcUrl().replace("realm1", database));
75+
props.put(
76+
String.format("quarkus.datasource.%s.username", database + "_ds"),
77+
postgres.getUsername());
78+
props.put(
79+
String.format("quarkus.datasource.%s.password", database + "_ds"),
80+
postgres.getPassword());
7881
}
7982
} else {
8083
return Map.of(
81-
"polaris.persistence.type",
82-
"relational-jdbc",
83-
"quarkus.datasource.db-kind",
84-
"pgsql",
85-
"quarkus.datasource.jdbc.url",
86-
postgres.getJdbcUrl(),
87-
"quarkus.datasource.username",
88-
postgres.getUsername(),
89-
"quarkus.datasource.password",
90-
postgres.getPassword(),
91-
"quarkus.datasource.jdbc.initial-size",
92-
"10");
84+
"polaris.persistence.type",
85+
"relational-jdbc",
86+
"quarkus.datasource.db-kind",
87+
"pgsql",
88+
"quarkus.datasource.jdbc.url",
89+
postgres.getJdbcUrl(),
90+
"quarkus.datasource.username",
91+
postgres.getUsername(),
92+
"quarkus.datasource.password",
93+
postgres.getPassword(),
94+
"quarkus.datasource.jdbc.initial-size",
95+
"10");
9396
}
9497

9598
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.admintool.config;
19+
package org.apache.polaris.commons;
2020

2121
import io.quarkus.arc.InstanceHandle;
2222
import java.util.List;
@@ -25,8 +25,8 @@
2525
import org.apache.polaris.extension.persistence.relational.jdbc.RelationalJdbcConfiguration;
2626

2727
public class QuarkusDatasourceSupplier implements DatasourceSupplier {
28-
private final List<InstanceHandle<DataSource>> dataSources;
29-
private final RelationalJdbcConfiguration relationalJdbcConfiguration;
28+
private List<InstanceHandle<DataSource>> dataSources;
29+
private RelationalJdbcConfiguration relationalJdbcConfiguration;
3030

3131
public static final String DEFAULT_DATA_SOURCE_NAME = "<default>";
3232

‎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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.polaris.test.commons;
19+
package org.apache.polaris.commons;
2020

2121
import io.quarkus.test.junit.QuarkusTestProfile;
2222
import java.util.List;

‎quarkus/service/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ dependencies {
124124
testImplementation(libs.threeten.extra)
125125
testImplementation(libs.hawkular.agent.prometheus.scraper)
126126

127-
testImplementation(project(":polaris-quarkus-test-commons"))
127+
implementation(project(":polaris-quarkus-commons"))
128128
testImplementation("io.quarkus:quarkus-junit5")
129129
testImplementation(platform(libs.testcontainers.bom))
130130
testImplementation("org.testcontainers:testcontainers")

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import io.quarkus.test.junit.QuarkusIntegrationTest;
2222
import io.quarkus.test.junit.TestProfile;
23+
import org.apache.polaris.commons.RelationalJdbcProfile;
2324
import org.apache.polaris.service.it.test.PolarisApplicationIntegrationTest;
24-
import org.apache.polaris.test.commons.RelationalJdbcProfile;
2525

2626
@TestProfile(RelationalJdbcProfile.class)
2727
@QuarkusIntegrationTest

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import io.quarkus.test.junit.QuarkusIntegrationTest;
2222
import io.quarkus.test.junit.TestProfile;
23+
import org.apache.polaris.commons.RelationalJdbcProfile;
2324
import org.apache.polaris.service.it.test.PolarisManagementServiceIntegrationTest;
24-
import org.apache.polaris.test.commons.RelationalJdbcProfile;
2525

2626
@TestProfile(RelationalJdbcProfile.class)
2727
@QuarkusIntegrationTest

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import io.quarkus.test.junit.QuarkusIntegrationTest;
2222
import io.quarkus.test.junit.TestProfile;
23+
import org.apache.polaris.commons.RelationalJdbcProfile;
2324
import org.apache.polaris.service.it.test.PolarisPolicyServiceIntegrationTest;
24-
import org.apache.polaris.test.commons.RelationalJdbcProfile;
2525

2626
@TestProfile(RelationalJdbcProfile.class)
2727
@QuarkusIntegrationTest

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import io.quarkus.test.junit.QuarkusIntegrationTest;
2222
import io.quarkus.test.junit.TestProfile;
23+
import org.apache.polaris.commons.RelationalJdbcProfile;
2324
import org.apache.polaris.service.it.test.PolarisRestCatalogViewFileIntegrationTest;
24-
import org.apache.polaris.test.commons.RelationalJdbcProfile;
2525

2626
@TestProfile(RelationalJdbcProfile.class)
2727
@QuarkusIntegrationTest

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import io.quarkus.test.junit.QuarkusIntegrationTest;
2222
import io.quarkus.test.junit.TestProfile;
23+
import org.apache.polaris.commons.RelationalJdbcProfile;
2324
import org.apache.polaris.service.it.test.PolarisRestCatalogIntegrationTest;
24-
import org.apache.polaris.test.commons.RelationalJdbcProfile;
2525

2626
@TestProfile(RelationalJdbcProfile.class)
2727
@QuarkusIntegrationTest

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

-54
This file was deleted.

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import java.time.Clock;
3737
import java.util.List;
3838
import javax.sql.DataSource;
39+
import org.apache.polaris.commons.QuarkusDatasourceSupplier;
3940
import org.apache.polaris.core.PolarisCallContext;
4041
import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
4142
import org.apache.polaris.core.PolarisDiagnostics;
@@ -266,9 +267,9 @@ public ActiveRolesProvider activeRolesProvider(
266267

267268
@Produces
268269
public DatasourceSupplier datasourceSupplier(
269-
RelationalJdbcConfiguration relationalJdbcConfiguration,
270-
@All List<InstanceHandle<DataSource>> datasourceSuppliers) {
271-
return new QuarkusDatasourceSupplier(relationalJdbcConfiguration, datasourceSuppliers);
270+
@Any RelationalJdbcConfiguration relationalJdbcConfiguration,
271+
@All List<InstanceHandle<DataSource>> datasources) {
272+
return new QuarkusDatasourceSupplier(relationalJdbcConfiguration, datasources);
272273
}
273274

274275
public void closeTaskExecutor(@Disposes @Identifier("task-executor") ManagedExecutor executor) {

0 commit comments

Comments
 (0)