Ripristinati lock e unlock

ems-core/src/main/java/it/integry/common/var/EmsDBConst.java

@@ -12,7 +12,7 @@ import java.util.concurrent.locks.ReentrantLock;
 @Service
 public class EmsDBConst {
 
-//    private final ReentrantLock datiAziendaLock = new ReentrantLock();
+    private final ReentrantLock datiAziendaLock = new ReentrantLock();
     private HashMap<String, Const> datiAziendaBindingTable = new HashMap<String, Const>() {{
     }};
 
@@ -28,24 +28,24 @@ public class EmsDBConst {
     public Const getConsts(String dbName) {
         String aziendaUp = dbName.toUpperCase();
 
-//        datiAziendaLock.lock();
+        datiAziendaLock.lock();
+        try {
             if (!datiAziendaBindingTable.containsKey(aziendaUp)) {
                 datiAziendaBindingTable.put(aziendaUp, new Const());
             }
 
-        final Const aConst = datiAziendaBindingTable.get(aziendaUp);
+            return datiAziendaBindingTable.get(aziendaUp);
-//        datiAziendaLock.unlock();
+        } finally {
-
+            datiAziendaLock.unlock();
-        return aConst;
+        }
     }
 
     public void destroyAll() {
-//        datiAziendaLock.lock();
+        datiAziendaLock.lock();
         datiAziendaBindingTable = new HashMap<>();
-//        datiAziendaLock.unlock();
+        datiAziendaLock.unlock();
     }
 
-
     public static class Const {
 
         private String applicationDbName;

ems-core/src/main/java/it/integry/ems/service/comuni/service/UnitaTerritorialiService.java

@@ -19,6 +19,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
 @Service
@@ -32,7 +33,7 @@ public class UnitaTerritorialiService {
     // Data di ultima modifica
     private Instant lastModifiedSource = Instant.MIN;
     // Locker per la sincronizzazione
-//    private final ReentrantLock updateLocker = new ReentrantLock();
+    private final ReentrantLock updateLocker = new ReentrantLock();
     // Dati transcodificati
     private List<IstatComuneDataRow> dataSource = new ArrayList<>();
     private List<Regione> regioni = new ArrayList<>();
@@ -77,13 +78,13 @@ public class UnitaTerritorialiService {
             return;
         }
 
-//        updateLocker.lock();
+        updateLocker.lock();
         try (InputStream streamIstat = connectionIstat.getInputStream()) {
             if (updateServiceData(streamIstat)) {
                 lastModifiedSource = Instant.now();  // Recupera la data di modifica dal server
             }
         } finally {
-//            updateLocker.unlock();
+            updateLocker.unlock();
         }
     }
 

ems-core/src/main/java/it/integry/ems/sync/MultiDBTransaction/BasicConnectionPool.java

@@ -15,6 +15,7 @@ import java.sql.SQLException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
 
 @Component
 public class BasicConnectionPool {
@@ -29,21 +30,21 @@ public class BasicConnectionPool {
     private final ConcurrentHashMap<String, AtomicInteger> extraConnectionCounters = new ConcurrentHashMap<>();
     private final ConcurrentHashMap<String, Set<String>> activeConnectionNames = new ConcurrentHashMap<>();
 
-//    private final ReentrantLock poolLock = new ReentrantLock();
+    private final ReentrantLock poolLock = new ReentrantLock();
 
     public void init() throws Exception {
-//        poolLock.lock();
+        poolLock.lock();
         try {
             closeAllConnections();
             int poolSize = calculatePoolSize();
             initializeConnections(poolSize);
         } finally {
-//            poolLock.unlock();
+            poolLock.unlock();
         }
     }
 
     private void closeAllConnections() {
-//        poolLock.lock();
+        poolLock.lock();
         try {
             // Chiude tutte le connessioni esistenti
             connectionPool.values().forEach(connections ->
@@ -57,7 +58,7 @@ public class BasicConnectionPool {
             extraConnectionCounters.clear();
             activeConnectionNames.clear();
         } finally {
-//            poolLock.unlock();
+            poolLock.unlock();
         }
     }
 
@@ -127,21 +128,16 @@ public class BasicConnectionPool {
             return null;
         }
 
-//        poolLock.lock();
+        poolLock.lock();
         try {
-            if (!connectionPool.containsKey(dbName)|| connectionPool.get(dbName).isEmpty()) {
+            if (!connectionPool.containsKey(dbName) || connectionPool.get(dbName).isEmpty()) {
                 return createExtraConnection(profileName);
             }
 
             List<DataSource> pool = connectionPool.get(dbName);
             List<DataSource> used = usedConnections.get(dbName);
 
-            DataSource ds;
+            DataSource ds = pool.remove(0);
-            try {
-                ds = pool.remove(0);    
-            } catch (IndexOutOfBoundsException ex) {
-                return createExtraConnection(profileName);
-            }            
 
             if (ds.isClosed()) {
                 String oldName = ds.getApplicationName();
@@ -157,7 +153,7 @@ public class BasicConnectionPool {
             logger.trace("Assigned connection: {} for database: {}", ds.getApplicationName(), dbName);
             return ds;
         } finally {
-//            poolLock.unlock();
+            poolLock.unlock();
         }
     }
 
@@ -167,7 +163,7 @@ public class BasicConnectionPool {
             return false;
         }
 
-//        poolLock.lock();
+        poolLock.lock();
         try {
             String currentCatalog = ds.getConnection().getCatalog();
             AvailableConnectionsModel model = findConnectionModel(profileName);
@@ -183,13 +179,13 @@ public class BasicConnectionPool {
 
             return handleConnectionRelease(ds);
         } finally {
-//            poolLock.unlock();
+            poolLock.unlock();
         }
     }
 
     private DataSource createExtraConnection(String profileName) throws Exception {
         String dbName = settingsModel.getDbNameFromProfileDb(profileName);
-//        poolLock.lock();
+        poolLock.lock();
         try {
             // Calcola il numero totale di connessioni esistenti
             int baseCount = connectionPool.get(dbName).size() + usedConnections.get(dbName).size();
@@ -201,7 +197,6 @@ public class BasicConnectionPool {
             // Verifica se la connessione esiste già
             if (activeConnectionNames.get(dbName).contains(connectionName)) {
                 logger.warn("Extra connection name collision detected: {}", connectionName);
-//                extraConnectionCounters.get(dbName).decrementAndGet();
                 return createExtraConnection(profileName); // Riprova con un nuovo nome
             }
 
@@ -212,7 +207,7 @@ public class BasicConnectionPool {
             logger.trace("Created extra connection: {} for database: {}", connectionName, dbName);
             return ds;
         } finally {
-//            poolLock.unlock();
+            poolLock.unlock();
         }
     }
 

ems-core/src/main/java/it/integry/ems/sync/MultiDBTransaction/MultiDBTransactionManager.java

@@ -23,6 +23,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
 @Service
@@ -35,7 +36,7 @@ public class MultiDBTransactionManager implements AutoCloseable {
     private List<AdvancedDataSource> dbDatasources = new ArrayList<>();
     private DataSource dataSource;
 
-//    private final ReentrantLock datasourcesLock = new ReentrantLock();
+    private final ReentrantLock datasourcesLock = new ReentrantLock();
 
     @Autowired
     private BasicConnectionPool connectionPool;
@@ -89,7 +90,6 @@ public class MultiDBTransactionManager implements AutoCloseable {
             this.setPrimaryDs(profileDb);
         } catch (Exception ex) {
             logger.error("Errore durante la connessione al DB.", ex);
-//            throw ex;
         }
     }
 
@@ -135,7 +135,8 @@ public class MultiDBTransactionManager implements AutoCloseable {
                 }
             }
 
-//            datasourcesLock.lock();
+            datasourcesLock.lock();
+            try {
                 dbDatasources.add(new AdvancedDataSource(profileName, dataSource, isDistributore, isInternalDb));
 
                 if (isDistributore) {
@@ -147,8 +148,9 @@ public class MultiDBTransactionManager implements AutoCloseable {
                             })
                             .collect(Collectors.toList());
                 }
-
+            } finally {
-//            datasourcesLock.unlock();
+                datasourcesLock.unlock();
+            }
         }
     }
 
@@ -243,7 +245,8 @@ public class MultiDBTransactionManager implements AutoCloseable {
     }
 
     public void closeAll() throws Exception {
-//        datasourcesLock.lock();
+        datasourcesLock.lock();
+        try {
             if (dbDatasources != null && !dbDatasources.isEmpty()) {
                 for (AdvancedDataSource advancedDataSource : dbDatasources) {
 
@@ -262,15 +265,16 @@ public class MultiDBTransactionManager implements AutoCloseable {
                         logger.error("UnexpectedConnectionSwitchException: " + advancedDataSource.getProfileName(), e);
                     }
 
-                if(dbPrimary != null && advancedDataSource.getDataSource() == dbPrimary.getDataSource())
+                    if (dbPrimary != null && advancedDataSource.getDataSource() == dbPrimary.getDataSource())
                         dbPrimary = null;
 
                 }
 
                 dbDatasources.clear();
             }
-
+        } finally {
-//        datasourcesLock.unlock();
+            datasourcesLock.unlock();
+        }
     }
 
 

ems-core/src/main/java/it/integry/ems/user/service/UserCacheService.java

@@ -38,13 +38,13 @@ public class UserCacheService {
 
     private final HashMap<String, List<UserDTO>> cachedUsers = new HashMap<>();
 
-    //private final ReentrantLock cacheLock = new ReentrantLock();
+    private final ReentrantLock cacheLock = new ReentrantLock();
 
     boolean canStart = false;
 
     @PostContextConstruct(priority = 10)
     private void init() {
-        if(UtilityDebug.isDebugExecution()) internalCacheUpdate(true);
+        if (UtilityDebug.isDebugExecution()) internalCacheUpdate(true);
         canStart = !UtilityDebug.isDebugExecution();
     }
 
@@ -54,7 +54,7 @@ public class UserCacheService {
     }
 
     private void internalCacheUpdate(boolean forceStart) {
-        if(!forceStart && !canStart) return;
+        if (!forceStart && !canStart) return;
 
         List<AvailableConnectionsModel> availableConnectionsModels =
                 settingsModel.getAvailableConnectionsWithoutDuplicatedProfiles(true);
@@ -103,7 +103,8 @@ public class UserCacheService {
     }
 
     public @Nullable UserDTO retrieveUser(String dbName, String md5User) {
-        //cacheLock.lock();
+        cacheLock.lock();
+        try {
             List<UserDTO> users = cachedUsers.getOrDefault(dbName, null);
 
             if (users == null || users.isEmpty())
@@ -119,12 +120,15 @@ public class UserCacheService {
                     })
                     .findFirst();
 
-        //cacheLock.unlock();
             return foundUser.orElse(null);
+        } finally {
+            cacheLock.unlock();
+        }
     }
 
     public @Nullable UserDTO retrieveUser(String dbName, String username, String password, IntegryApplicationEnum application) {
-        //cacheLock.lock();
+        cacheLock.lock();
+        try {
             List<UserDTO> users = cachedUsers.getOrDefault(dbName, null);
 
             if (users == null || users.isEmpty())
@@ -145,14 +149,17 @@ public class UserCacheService {
                                     (application == IntegryApplicationEnum.GESTIONALE_BASE && x.isInternal())))
                     .findFirst();
 
-        //cacheLock.unlock();
             return foundUser.orElse(null);
+        } finally {
+            cacheLock.unlock();
+        }
     }
 
     public @Nullable UserDTO retrieveUserData(String profileDb, String username, IntegryApplicationEnum application) {
+        cacheLock.lock();
+        try {
             String dbName = settingsModel.getDbNameFromProfileDb(profileDb);
 
-        //cacheLock.lock();
             List<UserDTO> users = cachedUsers.getOrDefault(dbName, null);
 
             if (users == null || users.isEmpty())
@@ -166,14 +173,17 @@ public class UserCacheService {
                                     (application == IntegryApplicationEnum.WMS && x.isWeb()) ||
                                     (application == IntegryApplicationEnum.GESTIONALE_BASE && x.isInternal())))
                     .findFirst();
-        //cacheLock.unlock();
 
             return foundUser.orElse(null);
+        } finally {
+            cacheLock.unlock();
+        }
     }
 
 
     public void discoverAllUsers(MultiDBTransactionManager multiDBTransactionManager) throws Exception {
-       //cacheLock.lock();
+        cacheLock.lock();
+        try {
             List<Callable<Void>> calls = new ArrayList<>();
 
             for (final AdvancedDataSource advancedDataSource : multiDBTransactionManager.getActiveConnections()) {
@@ -217,13 +227,15 @@ public class UserCacheService {
             }
 
             taskExecutorService.executeTasks(calls);
-        //cacheLock.unlock();
+        } finally {
+            cacheLock.unlock();
+        }
     }
 
     public void invalidateCache() {
-        //cacheLock.lock();
+        cacheLock.lock();
         this.cachedUsers.clear();
-        //cacheLock.unlock();
+        cacheLock.unlock();
 
         this.internalCacheUpdate();
     }