Skip to content

Commit 4e2ef4f

Browse files
committed
refactor(database): simplify data connector
1 parent 5474a4b commit 4e2ef4f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

playtime-core/src/main/java/com/github/imdmk/playtime/core/database/DataSourceConnector.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.imdmk.playtime.core.database;
22

33
import com.github.imdmk.playtime.core.database.configurer.DataSourceConfigurer;
4+
import com.github.imdmk.playtime.core.database.configurer.DataSourceConfigurerFactory;
45
import com.github.imdmk.playtime.core.platform.logger.PluginLogger;
56
import com.j256.ormlite.jdbc.DataSourceConnectionSource;
67
import com.j256.ormlite.support.ConnectionSource;
@@ -23,11 +24,11 @@ final class DataSourceConnector {
2324
DataSourceConnector(
2425
PluginLogger logger,
2526
DataSourceFactory dataSourceFactory,
26-
DataSourceConfigurer dataSourceConfigurer
27+
DatabaseConfig config
2728
) {
2829
this.logger = logger;
2930
this.dataSourceFactory = dataSourceFactory;
30-
this.dataSourceConfigurer = dataSourceConfigurer;
31+
this.dataSourceConfigurer = DataSourceConfigurerFactory.getFor(config.databaseMode);
3132
}
3233

3334
synchronized void connect(DatabaseConfig config, File dataFolder) throws SQLException {

playtime-core/src/main/java/com/github/imdmk/playtime/core/database/DatabaseManagerImpl.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
@Database
1717
public final class DatabaseManagerImpl implements DatabaseManager {
1818

19+
private static final DataSourceFactory FACTORY = new DataSourceFactory();
20+
1921
private final File dataFolder;
2022
private final DatabaseConfig config;
2123

@@ -29,10 +31,7 @@ public DatabaseManagerImpl(
2931
) {
3032
this.dataFolder = dataFolder;
3133
this.config = config;
32-
33-
DataSourceConfigurer configurer = DataSourceConfigurerFactory.getFor(config.databaseMode);
34-
DataSourceFactory factory = new DataSourceFactory();
35-
this.dataConnector = new DataSourceConnector(logger, factory, configurer);
34+
this.dataConnector = new DataSourceConnector(logger, FACTORY, config);
3635
}
3736

3837
@Override

0 commit comments

Comments
 (0)