(fineract) branch develop updated: FINERACT-2081: Consider read-only all the transactions when the connection is read-only

[adamsaghy]

This is an automated email from the ASF dual-hosted git repository.

adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5667bc89b FINERACT-2081: Consider read-only all the transactions when 
the connection is read-only
5667bc89b is described below

commit 5667bc89be50ce4d985526db63059a1cf067f7fe
Author: Adam Saghy <adamsa...@gmail.com>
AuthorDate: Thu Dec 12 15:50:09 2024 +0100

    FINERACT-2081: Consider read-only all the transactions when the connection 
is read-only
---
 .../database/TomcatJdbcDataSourcePerTenantService.java     |  6 ++----
 .../core/persistence/ExtendedJpaTransactionManager.java    | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git 
a/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/database/TomcatJdbcDataSourcePerTenantService.java
 
b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/database/TomcatJdbcDataSourcePerTenantService.java
index fb829d664..9e11be36c 100644
--- 
a/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/database/TomcatJdbcDataSourcePerTenantService.java
+++ 
b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/database/TomcatJdbcDataSourcePerTenantService.java
@@ -70,10 +70,8 @@ public class TomcatJdbcDataSourcePerTenantService implements 
RoutingDataSourceSe
             Long tenantConnectionKey = tenantConnection.getConnectionId();
             // if tenantConnection information available switch to the
             // appropriate datasource for that tenant.
-            actualDataSource = 
TENANT_TO_DATA_SOURCE_MAP.computeIfAbsent(tenantConnectionKey, (key) -> {
-                DataSource tenantSpecificDataSource = 
dataSourcePerTenantServiceFactory.createNewDataSourceFor(tenantConnection);
-                return tenantSpecificDataSource;
-            });
+            actualDataSource = 
TENANT_TO_DATA_SOURCE_MAP.computeIfAbsent(tenantConnectionKey,
+                    (key) -> 
dataSourcePerTenantServiceFactory.createNewDataSourceFor(tenantConnection));
 
         }
 
diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/persistence/ExtendedJpaTransactionManager.java
 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/persistence/ExtendedJpaTransactionManager.java
index 667186fee..5d85df640 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/persistence/ExtendedJpaTransactionManager.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/persistence/ExtendedJpaTransactionManager.java
@@ -20,6 +20,8 @@ package org.apache.fineract.infrastructure.core.persistence;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.FlushModeType;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Consumer;
@@ -41,7 +43,7 @@ public class ExtendedJpaTransactionManager extends 
JpaTransactionManager {
     @Override
     protected void doBegin(Object transaction, TransactionDefinition 
definition) {
         super.doBegin(transaction, definition);
-        if (isReadOnlyTx(transaction)) {
+        if (isReadOnlyConnection() || isReadOnlyTx(transaction)) {
             EntityManager entityManager = getCurrentEntityManager();
             if (entityManager != null) {
                 entityManager.setFlushMode(FlushModeType.COMMIT);
@@ -52,7 +54,7 @@ public class ExtendedJpaTransactionManager extends 
JpaTransactionManager {
 
     @Override
     protected void doCommit(DefaultTransactionStatus status) {
-        if (isReadOnlyTx(status.getTransaction())) {
+        if (isReadOnlyConnection() || isReadOnlyTx(status.getTransaction())) {
             EntityManager entityManager = getCurrentEntityManager();
             if (entityManager != null) {
                 entityManager.clear();
@@ -62,6 +64,14 @@ public class ExtendedJpaTransactionManager extends 
JpaTransactionManager {
         invokeLifecycleCallbacks(TransactionLifecycleCallback::afterCommit);
     }
 
+    private boolean isReadOnlyConnection() {
+        try (Connection connection = getDataSource().getConnection()) {
+            return connection.isReadOnly();
+        } catch (SQLException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
     @Override
     protected void doCleanupAfterCompletion(Object transaction) {
         super.doCleanupAfterCompletion(transaction);