Skip to content

Commit a250b58

Browse files
author
rezra3
committed
fixed build
1 parent 69deb93 commit a250b58

5 files changed

+22
-20
lines changed

src/common/codeine/db/mysql/DbUtils.java

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package codeine.db.mysql;
22

3+
import codeine.jsons.global.GlobalConfigurationJsonStore;
34
import codeine.jsons.global.MysqlConfigurationJson;
45
import codeine.utils.exceptions.ConnectToDatabaseException;
56
import codeine.utils.exceptions.DatabaseException;
@@ -36,12 +37,25 @@ public class DbUtils {
3637
@Inject
3738
private MysqlHostSelector hostSelector;
3839

40+
@Inject
41+
private GlobalConfigurationJsonStore globalConfigurationJsonStore;
3942

40-
public DbUtils(int maxTotal, int minTotal) {
43+
public DbUtils() {
4144
super();
42-
genericObjectPoolConfig.setMaxTotal(maxTotal);
43-
genericObjectPoolConfig.setMinIdle(minTotal);
44-
genericObjectPoolConfig.setMaxIdle(maxTotal);
45+
init();
46+
}
47+
48+
49+
public DbUtils(MysqlHostSelector hostSelector, GlobalConfigurationJsonStore globalConfigurationJsonStore) {
50+
this.hostSelector = hostSelector;
51+
this.globalConfigurationJsonStore = globalConfigurationJsonStore;
52+
init();
53+
}
54+
55+
private void init() {
56+
genericObjectPoolConfig.setMaxTotal(globalConfigurationJsonStore.get().max_db_pool_size());
57+
genericObjectPoolConfig.setMinIdle(globalConfigurationJsonStore.get().min_db_pool_size());
58+
genericObjectPoolConfig.setMaxIdle(globalConfigurationJsonStore.get().max_db_pool_size());
4559
try {
4660
Class.forName("com.mysql.jdbc.Driver");
4761
} catch (ClassNotFoundException e) {
@@ -50,10 +64,6 @@ public DbUtils(int maxTotal, int minTotal) {
5064
}
5165

5266

53-
public DbUtils(MysqlHostSelector hostSelector, int maxTotal, int minTotal) {
54-
this(maxTotal, minTotal);
55-
this.hostSelector = hostSelector;
56-
}
5767

5868

5969
private static void closeStatement(Statement stmt) {

src/common/codeine/db/mysql/connectors/AlertsMysqlConnectorDatabaseConnectorListProvider.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ public class AlertsMysqlConnectorDatabaseConnectorListProvider {
2222
public List<AlertsMysqlConnector> get() {
2323
List<AlertsMysqlConnector> $ = Lists.newArrayList();
2424
for (MysqlConfigurationJson m : globalConfigurationJsonStore.get().mysql()) {
25-
DbUtils dbUtils = new DbUtils(new StaticMysqlHostSelector(m),
26-
globalConfigurationJsonStore.get().max_db_pool_size(),
27-
globalConfigurationJsonStore.get().min_db_pool_size());
25+
DbUtils dbUtils = new DbUtils(new StaticMysqlHostSelector(m), globalConfigurationJsonStore);
2826
AlertsMysqlConnector c = new AlertsMysqlConnector(dbUtils, gson, webConfJsonStore);
2927
$.add(c);
3028
}

src/common/codeine/db/mysql/connectors/NotificationsMysqlConnectorDatabaseConnectorListProvider.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ public class NotificationsMysqlConnectorDatabaseConnectorListProvider {
2828
public List<NotificationsMysqlConnector> get() {
2929
List<NotificationsMysqlConnector> $ = Lists.newArrayList();
3030
for (MysqlConfigurationJson m : globalConfigurationJsonStore.get().mysql()) {
31-
DbUtils dbUtils = new DbUtils(new StaticMysqlHostSelector(m),
32-
globalConfigurationJsonStore.get().max_db_pool_size(),
33-
globalConfigurationJsonStore.get().min_db_pool_size());
31+
DbUtils dbUtils = new DbUtils(new StaticMysqlHostSelector(m), globalConfigurationJsonStore);
3432
NotificationsMysqlConnector c = new NotificationsMysqlConnector(dbUtils, gson,
3533
webConfJsonStore, featureFlags);
3634
$.add(c);

src/common/codeine/db/mysql/connectors/ProjectConfigurationDatabaseConnectorListProvider.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ public class ProjectConfigurationDatabaseConnectorListProvider {
2323
public List<ProjectsConfigurationConnector> get() {
2424
List<ProjectsConfigurationConnector> $ = Lists.newArrayList();
2525
for (MysqlConfigurationJson m : globalConfigurationJsonStore.get().mysql()) {
26-
DbUtils dbUtils = new DbUtils(new StaticMysqlHostSelector(m),
27-
globalConfigurationJsonStore.get().max_db_pool_size(),
28-
globalConfigurationJsonStore.get().min_db_pool_size());
26+
DbUtils dbUtils = new DbUtils(new StaticMysqlHostSelector(m), globalConfigurationJsonStore);
2927
ProjectsConfigurationConnector c = new ProjectsConfigurationMysqlConnector(dbUtils, gson, webConfJsonStore);
3028
$.add(c);
3129
}

src/common/codeine/db/mysql/connectors/StatusDatabaseConnectorListProvider.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ public class StatusDatabaseConnectorListProvider {
2323
public List<IStatusDatabaseConnector> get() {
2424
List<IStatusDatabaseConnector> $ = Lists.newArrayList();
2525
for (MysqlConfigurationJson m : globalConfigurationJsonStore.get().mysql()) {
26-
DbUtils dbUtils = new DbUtils(new StaticMysqlHostSelector(m),
27-
globalConfigurationJsonStore.get().max_db_pool_size(),
28-
globalConfigurationJsonStore.get().min_db_pool_size());
26+
DbUtils dbUtils = new DbUtils(new StaticMysqlHostSelector(m), globalConfigurationJsonStore);
2927
IStatusDatabaseConnector c = new StatusMysqlConnector(dbUtils, gson, webConfJsonStore);
3028
$.add(c);
3129
}

0 commit comments

Comments
 (0)