Skip to content

Commit

Permalink
Use the source of truth to publish JdbcDataSourceBuildItem
Browse files Browse the repository at this point in the history
Until now, we were using some transformed data, which wasn't very
practical when we needed more information.
  • Loading branch information
gsmet committed Jul 28, 2023
1 parent fd02a43 commit 6e44d77
Showing 1 changed file with 6 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,9 @@ void generateDataSourceBeans(AgroalRecorder recorder,
return;
}

for (Map.Entry<String, DataSourceSupport.Entry> entry : getDataSourceSupport(aggregatedBuildTimeConfigBuildItems,
sslNativeConfig,
capabilities).entries.entrySet()) {
for (AggregatedDataSourceBuildTimeConfigBuildItem aggregatedBuildTimeConfigBuildItem : aggregatedBuildTimeConfigBuildItems) {

String dataSourceName = entry.getKey();
String dataSourceName = aggregatedBuildTimeConfigBuildItem.getName();

SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
.configure(AgroalDataSource.class)
Expand All @@ -284,7 +282,7 @@ void generateDataSourceBeans(AgroalRecorder recorder,
// are created after runtime configuration has been set up
.createWith(recorder.agroalDataSourceSupplier(dataSourceName, dataSourcesRuntimeConfig));

if (entry.getValue().isDefault) {
if (aggregatedBuildTimeConfigBuildItem.isDefault()) {
configurator.addQualifier(Default.class);
} else {
// this definitely not ideal, but 'elytron-jdbc-security' uses it (although it could be easily changed)
Expand All @@ -298,9 +296,9 @@ void generateDataSourceBeans(AgroalRecorder recorder,
syntheticBeanBuildItemBuildProducer.produce(configurator.done());

jdbcDataSource.produce(new JdbcDataSourceBuildItem(dataSourceName,
entry.getValue().resolvedDbKind,
entry.getValue().dbVersion,
entry.getValue().isDefault));
aggregatedBuildTimeConfigBuildItem.getDbKind(),
aggregatedBuildTimeConfigBuildItem.getDataSourceConfig().dbVersion,
aggregatedBuildTimeConfigBuildItem.isDefault()));
}
}

Expand Down

0 comments on commit 6e44d77

Please sign in to comment.