github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump ebean-datasource to 8.8 with DataSourceBuilder

Browse Source 
First step in migrating the ebean-datasource API to use builder pattern.
DataSourceConfig (concrete type) migrating to DataSourceBuilder (interface).

A followup step will deprecate the use of DataSourceConfig.
This commit is contained in:
Rob Bygrave
2023-11-03 18:31:11 +13:00
parent 70eb557929
commit 41185eeb5c
10 changed files with 88 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
+6 -6
View File
@@ -3,7 +3,7 @@ package io.ebean.test.config;
import io.avaje.applog.AppLog;
import io.ebean.config.AutoConfigure;
import io.ebean.config.DatabaseConfig;
import io.ebean.datasource.DataSourceConfig;
import io.ebean.datasource.DataSourceBuilder;
import io.ebean.test.config.platform.PlatformAutoConfig;
import io.ebean.test.config.provider.ProviderAutoConfig;
import io.ebean.test.containers.DockerHost;
@@ -69,11 +69,11 @@ public class AutoConfigureForTesting implements AutoConfigure {
}
}
private void makeV1Compatible(DataSourceConfig ds) {
private void makeV1Compatible(DataSourceBuilder ds) {
if (ds == null) {
return;
}
String url = ds.getUrl();
String url = ds.settings().getUrl();
if (url == null || !url.startsWith("jdbc:h2:")) {
return;
}
@@ -81,7 +81,7 @@ public class AutoConfigureForTesting implements AutoConfigure {
url = url.replace(";MODE=LEGACY", "");
url = url.replace(";NON_KEYWORDS=KEY,VALUE", "");
url = url.replace(";NON_KEYWORDS=KEY", "");
ds.setUrl(url);
ds.url(url);
}
/**
@@ -100,8 +100,8 @@ public class AutoConfigureForTesting implements AutoConfigure {
* Setup the DataSource on the extra database if necessary.
*/
private void setupExtraDataSourceIfNecessary(DatabaseConfig config) {
DataSourceConfig dataSourceConfig = config.getDataSourceConfig();
if (dataSourceConfig == null || dataSourceConfig.getUsername() == null) {
DataSourceBuilder dataSourceConfig = config.getDataSourceConfig();
if (dataSourceConfig == null || dataSourceConfig.settings().getUsername() == null) {
new PlatformAutoConfig(environmentDb, config)
.configExtraDataSource();
}
ebean-test/src/main/java/io/ebean/test/config/platform/PlatformAutoConfig.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class PlatformAutoConfig {
Config config = new Config(db, platform, databaseName, this.config);
platformSetup.setupExtraDbDataSource(config);
log.log(DEBUG, "configured dataSource for extraDb name:{0} url:{1}", db, this.config.getDataSourceConfig().getUrl());
log.log(DEBUG, "configured dataSource for extraDb name:{0} url:{1}", db, this.config.getDataSourceConfig().settings().getUrl());
}
}