Code refactoring.

paulissoft · May 15, 2024 · 3e6e470 · 3e6e470
1 parent 40c320d
commit 3e6e470
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/...rt-pool-data-source/src/main/java/com/paulissoft/pato/jdbc/CombiPoolDataSourceHikari.java b/...rt-pool-data-source/src/main/java/com/paulissoft/pato/jdbc/CombiPoolDataSourceHikari.java
@@ -318,12 +318,8 @@ private void updatePoolDescription(@NonNull final PoolDataSourceConfigurationHik
                 poolDataSource.setPoolName(String.join("-", items));
             }
 
-            if (isParentPoolDataSource) {
-                // keep poolDataSource.getPoolName() and poolDataSourceConfiguration.getPoolName() in sync
-                poolDataSourceConfiguration.setPoolName(poolDataSource.getPoolName());
-            } else {
-                poolDataSourceConfiguration.setPoolName(getPoolNamePrefix() + "-" + schema); // own prefix
-            }
+            // keep poolDataSource.getPoolName() and poolDataSourceConfiguration.getPoolName() in sync
+            poolDataSourceConfiguration.setPoolName(getPoolNamePrefix() + "-" + schema); // own prefix
         } finally {
             log.debug("config pool data source; name: {}; address: {}",
                       poolDataSourceConfiguration.getPoolName(),

diff --git a/...rt-pool-data-source/src/main/java/com/paulissoft/pato/jdbc/CombiPoolDataSourceOracle.java b/...rt-pool-data-source/src/main/java/com/paulissoft/pato/jdbc/CombiPoolDataSourceOracle.java
@@ -247,12 +247,8 @@ protected void updatePoolDescription(@NonNull final PoolDataSourceConfigurationO
                 }
             }
 
-            if (isParentPoolDataSource) {
-                // keep poolDataSource.getPoolDescription() and poolDataSourceConfiguration.getConnectionPoolName() in sync
-                poolDataSourceConfiguration.setConnectionPoolName(getPoolDescription(poolDataSource));
-            } else {
-                poolDataSourceConfiguration.setConnectionPoolName(getPoolNamePrefix() + "-" + schema); // own prefix
-            }
+            // keep poolDataSource.getPoolDescription() and poolDataSourceConfiguration.getConnectionPoolName() in sync
+            poolDataSourceConfiguration.setConnectionPoolName(getPoolNamePrefix() + "-" + schema); // own prefix
         } catch (SQLException ex) {
             throw new RuntimeException(SimplePoolDataSource.exceptionToString(ex));
         } finally {