Skip to content

Commit dc0fbbb

Browse files
committed
Address Alex feedback
1 parent 6432732 commit dc0fbbb

File tree

4 files changed

+15
-22
lines changed

4 files changed

+15
-22
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.Map;
2525
import java.util.Optional;
2626

27-
@ConfigMapping(prefix = "polaris.relation.jdbc.datasource")
27+
@ConfigMapping(prefix = "polaris.relational.jdbc.datasource")
2828
public interface RelationalJdbcConfiguration {
2929
/** realmId to configured Datasource name mapping. */
3030
@WithParentName

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,6 @@ public ActiveRolesProvider activeRolesProvider(
258258
return activeRolesProviders.select(Identifier.Literal.of(persistenceType)).get();
259259
}
260260

261-
// @Produces
262-
// public DatasourceSupplier datasourceSupplier(
263-
// @Any RelationalJdbcConfiguration relationalJdbcConfiguration,
264-
// @All List<InstanceHandle<DataSource>> datasources) {
265-
// return new QuarkusDatasourceSupplier(relationalJdbcConfiguration, datasources);
266-
// }
267-
268261
public void closeTaskExecutor(@Disposes @Identifier("task-executor") ManagedExecutor executor) {
269262
executor.close();
270263
}

quarkus/test-commons/build.gradle.kts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@
1818
*/
1919

2020
plugins {
21-
alias(libs.plugins.jandex)
22-
id("java-test-fixtures")
21+
alias(libs.plugins.jandex)
22+
id("java-test-fixtures")
2323
}
2424

2525
configurations.all {
26-
exclude(group = "org.antlr", module = "antlr4-runtime")
27-
exclude(group = "org.scala-lang", module = "scala-library")
28-
exclude(group = "org.scala-lang", module = "scala-reflect")
26+
exclude(group = "org.antlr", module = "antlr4-runtime")
27+
exclude(group = "org.scala-lang", module = "scala-library")
28+
exclude(group = "org.scala-lang", module = "scala-reflect")
2929
}
3030

3131
java {
32-
sourceCompatibility = JavaVersion.VERSION_21
33-
targetCompatibility = JavaVersion.VERSION_21
32+
sourceCompatibility = JavaVersion.VERSION_21
33+
targetCompatibility = JavaVersion.VERSION_21
3434
}
3535

3636
dependencies {
37-
implementation(enforcedPlatform(libs.quarkus.bom))
38-
implementation("io.quarkus:quarkus-junit5")
39-
implementation(platform(libs.testcontainers.bom))
40-
implementation("org.testcontainers:testcontainers")
41-
implementation("org.testcontainers:postgresql")
42-
}
37+
implementation(enforcedPlatform(libs.quarkus.bom))
38+
implementation("io.quarkus:quarkus-junit5")
39+
implementation(platform(libs.testcontainers.bom))
40+
implementation("org.testcontainers:testcontainers")
41+
implementation("org.testcontainers:postgresql")
42+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private Map<String, String> generateDataSourceMappingProps(List<String> realms)
9797
Map<String, String> props = new HashMap<>();
9898
// polaris.relation.jdbc.datasource.realm=realm_ds
9999
for (String database : realms) {
100-
props.put(String.format("polaris.relation.jdbc.datasource.%s", database), database + "_ds");
100+
props.put(String.format("polaris.relational.jdbc.datasource.%s", database), database + "_ds");
101101
}
102102
return props;
103103
}

0 commit comments

Comments
 (0)