FINERACT-2081: Support read-only transactions via Batch API

apache · Dec 16, 2024 · 13373ab · 13373ab
1 parent 51433ff
commit 13373ab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/fineract-core/src/main/java/org/apache/fineract/batch/service/BatchApiServiceImpl.java b/fineract-core/src/main/java/org/apache/fineract/batch/service/BatchApiServiceImpl.java
@@ -56,6 +56,7 @@
 import org.apache.fineract.infrastructure.core.filters.BatchCallHandler;
 import org.apache.fineract.infrastructure.core.filters.BatchFilter;
 import org.apache.fineract.infrastructure.core.filters.BatchRequestPreprocessor;
+import org.apache.fineract.infrastructure.core.persistence.ExtendedJpaTransactionManager;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.dao.NonTransientDataAccessException;
@@ -141,6 +142,9 @@ private List<BatchResponse> callInTransaction(Consumer<TransactionTemplate> tran
         List<BatchResponse> responseList = new ArrayList<>();
         try {
             TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager);
+            if (transactionManager instanceof ExtendedJpaTransactionManager extendedJpaTransactionManager) {
+                transactionTemplate.setReadOnly(extendedJpaTransactionManager.isReadOnlyConnection());
+            }
             transactionConfigurator.accept(transactionTemplate);
             return transactionTemplate.execute(status -> {
                 BatchRequestContextHolder.setEnclosingTransaction(status);
@@ -240,7 +244,8 @@ private BatchResponse executeRequest(BatchRequest request, UriInfo uriInfo) {
             BatchRequestContextHolder.setRequestAttributes(new HashMap<>(Optional.ofNullable(request.getHeaders())
                     .map(list -> list.stream().collect(Collectors.toMap(Header::getName, Header::getValue)))
                     .orElse(Collections.emptyMap())));
-            if (BatchRequestContextHolder.isEnclosingTransaction()) {
+            if (BatchRequestContextHolder.isEnclosingTransaction()
+                    && BatchRequestContextHolder.getEnclosingTransaction().stream().anyMatch(ts -> !ts.isReadOnly())) {
                 entityManager.flush();
             }
             BatchCallHandler callHandler = new BatchCallHandler(this.batchFilters, commandStrategy::execute);

diff --git a/...electingPersistenceUnitPostProcessor.java → ...electingPersistenceUnitPostProcessor.java b/...electingPersistenceUnitPostProcessor.java → ...electingPersistenceUnitPostProcessor.java
diff --git a/...stence/ExtendedJpaTransactionManager.java → ...stence/ExtendedJpaTransactionManager.java b/...stence/ExtendedJpaTransactionManager.java → ...stence/ExtendedJpaTransactionManager.java
@@ -64,7 +64,7 @@ protected void doCommit(DefaultTransactionStatus status) {
         invokeLifecycleCallbacks(TransactionLifecycleCallback::afterCommit);
     }
 
-    private boolean isReadOnlyConnection() {
+    public boolean isReadOnlyConnection() {
         try (Connection connection = getDataSource().getConnection()) {
             return connection.isReadOnly();
         } catch (SQLException e) {

diff --git a/...istence/TransactionLifecycleCallback.java → ...istence/TransactionLifecycleCallback.java b/...istence/TransactionLifecycleCallback.java → ...istence/TransactionLifecycleCallback.java