Merge pull request #878 from 9tigerio/feature/777_max_connections

#777 - introduce new parameter max pool size or maximum no of connect…
9tigerio · Mar 9, 2025 · 831f181 · 831f181
2 parents d63264b + 2cb6b08
commit 831f181
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/api-rest/src/main/java/com/homihq/db2rest/jdbc/config/DbServiceConfiguration.java b/api-rest/src/main/java/com/homihq/db2rest/jdbc/config/DbServiceConfiguration.java
@@ -97,6 +97,7 @@ private DataSource buildDataSource(DatabaseConnectionDetail connectionDetail) {
         config.setJdbcUrl(connectionDetail.url());
         config.setUsername(connectionDetail.username());
         config.setPassword(connectionDetail.password());
+        config.setMaximumPoolSize(connectionDetail.maxConnections());
 
         config.setAutoCommit(false);
         return new HikariDataSource(config);

diff --git a/api-rest/src/main/resources/application.yml b/api-rest/src/main/resources/application.yml
@@ -8,6 +8,7 @@ app:
       username: ${DB_USER}
       password: ${DB_PASSWORD}
       schemas: ${INCLUDED_SCHEMAS:}
+      maxConnections: ${MAX_POOL_SIZE:5}
 
 server:
   port: ${SERVER_PORT:8080}

diff --git a/rdbms-support/src/main/java/com/homihq/db2rest/jdbc/JdbcManager.java b/rdbms-support/src/main/java/com/homihq/db2rest/jdbc/JdbcManager.java
@@ -39,9 +39,10 @@ public final class JdbcManager {
     private final Map<String, DbDetailHolder> dbDetailHolderMap = new ConcurrentHashMap<>();
     private final Map<String, NamedParameterJdbcTemplate> namedParameterJdbcTemplateMap =
             new ConcurrentHashMap<>();
+    /*
     private final Map<String, JdbcTransactionManager> jdbcTransactionManagerMap =
             new ConcurrentHashMap<>();
-
+    */
     private final Map<String, TransactionTemplate> transactionTemplateMap =
             new ConcurrentHashMap<>();
 
@@ -101,7 +102,7 @@ private void loadAllMetaData() {
 
                 JdbcTransactionManager jdbcTransactionManager = new JdbcTransactionManager(ds);
 
-                this.jdbcTransactionManagerMap.put((String) dbId, jdbcTransactionManager);
+                //this.jdbcTransactionManagerMap.put((String) dbId, jdbcTransactionManager);
                 this.transactionTemplateMap.put((String) dbId, new TransactionTemplate(jdbcTransactionManager));
 
             }

diff --git a/rest-common/src/main/java/com/homihq/db2rest/multidb/DatabaseConnectionDetail.java b/rest-common/src/main/java/com/homihq/db2rest/multidb/DatabaseConnectionDetail.java
@@ -10,16 +10,13 @@ public record DatabaseConnectionDetail(String id, String type, String url, Strin
                                        String password, String database
         , List<String> catalog, List<String> schemas, List<String> tables,
                                        Map<String, String> connectionProperties,
-                                       EnvironmentProperties envProperties) {
+                                       EnvironmentProperties envProperties, int maxConnections) {
     public boolean isMongo() {
         return StringUtils.equalsIgnoreCase(type, "MONGO");
     }
 
     public boolean isJdbcPresent() {
-
         return StringUtils.isNotBlank(url);
-
-        // && !StringUtils.equalsIgnoreCase(url, "${DB_URL}");
     }
 
     public boolean includeAllSchemas() {