This commit is contained in:
Looly
2024-07-13 12:04:43 +08:00
parent c4627a339d
commit b30bf90210
44 changed files with 361 additions and 301 deletions

View File

@@ -75,7 +75,7 @@ public class SettingConfigParser implements ConfigParser {
@Override
public DbConfig parse(final String group) {
final Setting setting = this.setting;
final Setting subSetting = setting.getSetting(StrUtil.emptyIfNull(group));
final Setting subSetting = setting.getSetting(StrUtil.toStringOrEmpty(group));
if (MapUtil.isEmpty(subSetting)) {
throw new DbException("No config for group: [{}]", group);
}

View File

@@ -167,7 +167,7 @@ public class DSPool implements Closeable {
* @return {@link DSWrapper} 数据源包装
*/
private DSWrapper createDSWrapper(final String group) {
final DbConfig dbConfig = this.configParser.parse(StrUtil.emptyIfNull(group));
final DbConfig dbConfig = this.configParser.parse(StrUtil.toStringOrEmpty(group));
return DSWrapper.wrap(factory.createDataSource(dbConfig), dbConfig);
}
}