FINERACT-1909: Retry feature for commands - no wrap for retryable exc…

…eptions
apache · Nov 3, 2023 · a42f469 · a42f469
1 parent 224dbdc
commit a42f469
Show file tree

Hide file tree

Showing 78 changed files with 375 additions and 446 deletions.
diff --git a/...e/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java b/...e/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java
@@ -35,7 +35,7 @@
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
-import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
+import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
 import org.apache.fineract.organisation.office.domain.Office;
 import org.apache.fineract.organisation.office.domain.OfficeRepositoryWrapper;
@@ -143,7 +143,7 @@ private void handleGLClosureIntegrityIssues(final JsonCommand command, final Thr
         }
 
         log.error("Error occured.", dve);
-        throw new PlatformDataIntegrityException("error.msg.glClosure.unknown.data.integrity.issue",
+        throw ErrorHandler.getMappable(dve, "error.msg.glClosure.unknown.data.integrity.issue",
                 "Unknown data integrity issue with resource GL Closure: " + realCause.getMessage());
     }
 }
diff --git a/...ng/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java b/...ng/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java
@@ -36,9 +36,8 @@
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
-import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
+import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.dao.NonTransientDataAccessException;
 import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.stereotype.Service;
 
@@ -141,27 +140,15 @@ public CommandProcessingResult deleteGLAccountActivityMapping(Long financialActi
     }
 
     private void handleFinancialActivityAccountDataIntegrityIssues(final JsonCommand command, final Throwable realCause,
-            final NonTransientDataAccessException dve) {
+            final Exception dve) {
         if (realCause.getMessage().contains("financial_activity_type")) {
             final Integer financialActivityId = command
                     .integerValueSansLocaleOfParameterNamed(FinancialActivityAccountsJsonInputParams.FINANCIAL_ACTIVITY_ID.getValue());
             throw new DuplicateFinancialActivityAccountFoundException(financialActivityId);
         }
 
         log.error("Error occured.", dve);
-        throw new PlatformDataIntegrityException("error.msg.glAccount.unknown.data.integrity.issue",
-                "Unknown data integrity issue with resource GL Account: " + realCause.getMessage());
-    }
-
-    private void handleFinancialActivityAccountDataIntegrityIssues(JsonCommand command, Throwable realCause, PersistenceException dve) {
-        if (realCause.getMessage().contains("financial_activity_type")) {
-            final Integer financialActivityId = command
-                    .integerValueSansLocaleOfParameterNamed(FinancialActivityAccountsJsonInputParams.FINANCIAL_ACTIVITY_ID.getValue());
-            throw new DuplicateFinancialActivityAccountFoundException(financialActivityId);
-        }
-
-        log.error("Error occured.", dve);
-        throw new PlatformDataIntegrityException("error.msg.glAccount.unknown.data.integrity.issue",
+        throw ErrorHandler.getMappable(dve, "error.msg.glAccount.unknown.data.integrity.issue",
                 "Unknown data integrity issue with resource GL Account: " + realCause.getMessage());
     }
 

diff --git a/...fineract/accounting/glaccount/service/GLAccountWritePlatformServiceJpaRepositoryImpl.java b/...fineract/accounting/glaccount/service/GLAccountWritePlatformServiceJpaRepositoryImpl.java
@@ -42,7 +42,7 @@
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
-import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
+import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -230,7 +230,7 @@ private void handleGLAccountDataIntegrityIssues(final JsonCommand command, final
         }
 
         LOG.error("Error occured.", dve);
-        throw new PlatformDataIntegrityException("error.msg.glAccount.unknown.data.integrity.issue",
+        throw ErrorHandler.getMappable(dve, "error.msg.glAccount.unknown.data.integrity.issue",
                 "Unknown data integrity issue with resource GL Account: " + realCause.getMessage());
     }
 

diff --git a/fineract-core/src/main/java/org/apache/fineract/batch/exception/ErrorInfo.java b/fineract-core/src/main/java/org/apache/fineract/batch/exception/ErrorInfo.java
@@ -26,6 +26,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.apache.fineract.batch.domain.Header;
+import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
 
 /**
  * Provides members to hold the basic information about the exceptions raised in commandStrategy classes.

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
@@ -48,11 +48,11 @@
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.domain.Header;
 import org.apache.fineract.batch.exception.BatchReferenceInvalidException;
-import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.batch.service.ResolutionHelper.BatchRequestNode;
 import org.apache.fineract.infrastructure.core.domain.BatchRequestContextHolder;
 import org.apache.fineract.infrastructure.core.exception.AbstractIdempotentCommandException;
+import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
 import org.apache.fineract.infrastructure.core.filters.BatchCallHandler;
 import org.apache.fineract.infrastructure.core.filters.BatchFilter;
 import org.apache.fineract.infrastructure.core.filters.BatchRequestPreprocessor;

diff --git a/fineract-core/src/main/java/org/apache/fineract/commands/service/CommandSourceService.java b/fineract-core/src/main/java/org/apache/fineract/commands/service/CommandSourceService.java
@@ -21,13 +21,13 @@
 import static org.apache.fineract.commands.domain.CommandProcessingResultType.UNDER_PROCESSING;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.commands.domain.CommandSource;
 import org.apache.fineract.commands.domain.CommandSourceRepository;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.exception.CommandNotFoundException;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
 import org.apache.fineract.useradministration.domain.AppUser;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;

diff --git a/...c/main/java/org/apache/fineract/commands/service/SynchronousCommandProcessingService.java b/...c/main/java/org/apache/fineract/commands/service/SynchronousCommandProcessingService.java
@@ -20,7 +20,6 @@
 
 import static org.apache.fineract.commands.domain.CommandProcessingResultType.ERROR;
 import static org.apache.fineract.commands.domain.CommandProcessingResultType.PROCESSED;
-import static org.apache.fineract.commands.domain.CommandProcessingResultType.UNDER_PROCESSING;
 import static org.apache.http.HttpStatus.SC_OK;
 
 import com.google.gson.Gson;
@@ -32,7 +31,6 @@
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.fineract.batch.exception.ErrorHandler;
 import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.commands.domain.CommandProcessingResultType;
 import org.apache.fineract.commands.domain.CommandSource;
@@ -47,6 +45,7 @@
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
 import org.apache.fineract.infrastructure.core.domain.BatchRequestContextHolder;
 import org.apache.fineract.infrastructure.core.domain.FineractRequestContextHolder;
+import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
 import org.apache.fineract.infrastructure.core.exception.IdempotentCommandProcessFailedException;
 import org.apache.fineract.infrastructure.core.exception.IdempotentCommandProcessSucceedException;
 import org.apache.fineract.infrastructure.core.exception.IdempotentCommandProcessUnderProcessingException;

diff --git a/...ain/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformException.java b/...ain/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformException.java
@@ -54,6 +54,9 @@ protected AbstractPlatformException(String globalisationMessageCode, String defa
     }
 
     private static Throwable findThrowableCause(Object[] defaultUserMessageArgs) {
+        if (defaultUserMessageArgs == null) {
+            return null;
+        }
         for (Object defaultUserMessageArg : defaultUserMessageArgs) {
             if (defaultUserMessageArg instanceof Throwable) {
                 return (Throwable) defaultUserMessageArg;

diff --git a/...ineract/batch/exception/ErrorHandler.java → ...tructure/core/exception/ErrorHandler.java b/...ineract/batch/exception/ErrorHandler.java → ...tructure/core/exception/ErrorHandler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.fineract.batch.exception;
+package org.apache.fineract.infrastructure.core.exception;
 
 import static org.springframework.core.ResolvableType.forClassWithGenerics;
 
@@ -36,9 +36,8 @@
 import net.fortuna.ical4j.validate.ValidationException;
 import org.apache.commons.collections4.SetUtils;
 import org.apache.fineract.batch.domain.Header;
+import org.apache.fineract.batch.exception.ErrorInfo;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
-import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
-import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.apache.fineract.infrastructure.core.exceptionmapper.DefaultExceptionMapper;
 import org.apache.fineract.infrastructure.core.exceptionmapper.FineractExceptionMapper;
 import org.apache.fineract.infrastructure.core.serialization.GoogleGsonSerializerHelper;
@@ -108,40 +107,45 @@ public ErrorInfo handle(@NotNull RuntimeException exception) {
         return new ErrorInfo(response.getStatus(), errorCode, msg instanceof String ? (String) msg : JSON_HELPER.toJson(msg), batchHeaders);
     }
 
-    public RuntimeException getMappable(@NotNull Throwable thr) {
+    public static RuntimeException getMappable(@NotNull Throwable thr) {
         return getMappable(thr, null, null, null);
     }
 
-    public RuntimeException getMappable(@NotNull Throwable t, String msgCode, String defaultMsg, String param,
+    public static RuntimeException getMappable(@NotNull Throwable thr, String msgCode, String defaultMsg) {
+        return getMappable(thr, msgCode, defaultMsg, null);
+    }
+
+    public static RuntimeException getMappable(@NotNull Throwable t, String msgCode, String defaultMsg, String param,
             final Object... defaultMsgArgs) {
         String msg = defaultMsg == null ? t.getMessage() : defaultMsg;
-        param = param == null ? "unknown" : param;
+        String codePfx = "error.msg" + (param == null ? "" : ("." + param));
+        Object[] args = defaultMsgArgs == null ? new Object[] { t } : defaultMsgArgs;
         if (t instanceof NestedRuntimeException nre) {
             Throwable cause = nre.getMostSpecificCause();
-            msg = cause.getMessage();
+            msg = defaultMsg == null ? cause.getMessage() : defaultMsg;
             if (nre instanceof NonTransientDataAccessException) {
-                msgCode = msgCode == null ? "error.msg." + param + ".data.integrity.issue" : msgCode;
-                return new PlatformDataIntegrityException(msgCode, msg, param, defaultMsgArgs);
+                msgCode = msgCode == null ? codePfx + ".data.integrity.issue" : msgCode;
+                return new PlatformDataIntegrityException(msgCode, msg, param, args);
             }
         }
         if (t instanceof ValidationException) {
-            msgCode = msgCode == null ? "error.msg.validation." + param + ".error" : msgCode;
+            msgCode = msgCode == null ? codePfx + ".validation.error" : msgCode;
             return new PlatformApiDataValidationException(List.of(ApiParameterError.parameterError(msgCode, msg, param, defaultMsgArgs)));
         }
         if (t instanceof PersistenceException) {
-            msgCode = msgCode == null ? "error.msg.persistence." + param + ".error" : msgCode;
-            return new PlatformDataIntegrityException(msgCode, msg, param, defaultMsgArgs);
+            msgCode = msgCode == null ? codePfx + ".persistence.error" : msgCode;
+            return new PlatformDataIntegrityException(msgCode, msg, param, args);
         }
         if (t instanceof AuthenticationException) {
-            msgCode = msgCode == null ? "error.msg.authentication." + param + ".error" : msgCode;
-            return new PlatformDataIntegrityException(msgCode, msg, param, defaultMsgArgs);
+            msgCode = msgCode == null ? codePfx + ".authentication.error" : msgCode;
+            return new PlatformDataIntegrityException(msgCode, msg, param, args);
         }
         if (t instanceof RuntimeException re) {
             return re;
         }
         if (t instanceof ParseException) {
-            msgCode = msgCode == null ? "error.msg.parse." + param + ".error" : msgCode;
-            return new PlatformDataIntegrityException(msgCode, msg, param, defaultMsgArgs);
+            msgCode = msgCode == null ? codePfx + ".parse.error" : msgCode;
+            return new PlatformDataIntegrityException(msgCode, msg, param, args);
         }
         return new RuntimeException(msg, t);
     }

diff --git a/fineract-core/src/test/java/org/apache/fineract/batch/exception/ErrorHandlerTest.java b/fineract-core/src/test/java/org/apache/fineract/batch/exception/ErrorHandlerTest.java
@@ -25,6 +25,7 @@
 import java.util.InputMismatchException;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
 import org.apache.fineract.infrastructure.core.exceptionmapper.DefaultExceptionMapper;
 import org.apache.fineract.infrastructure.core.exceptionmapper.FineractExceptionMapper;
 import org.junit.jupiter.api.Assertions;

diff --git a/...ct/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java b/...ct/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java
@@ -67,6 +67,7 @@
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
 import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
+import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
 import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
 import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
 import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
@@ -618,7 +619,7 @@ private String generateTransactionId(final Long officeId) {
     private PlatformDataIntegrityException handleJournalEntryDataIntegrityIssues(final Throwable realCause,
             final NonTransientDataAccessException dve) {
         log.error("Error occurred.", dve);
-        return new PlatformDataIntegrityException("error.msg.glJournalEntry.unknown.data.integrity.issue",
+        throw ErrorHandler.getMappable(dve, "error.msg.glJournalEntry.unknown.data.integrity.issue",
                 "Unknown data integrity issue with resource Journal Entry: " + realCause.getMessage());
     }
 

diff --git a/...fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java b/...fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java
@@ -46,7 +46,7 @@
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
-import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
+import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
 import org.apache.fineract.organisation.office.domain.Office;
 import org.apache.fineract.organisation.office.domain.OfficeRepositoryWrapper;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -78,7 +78,7 @@ private void handleAccountingRuleIntegrityIssues(final JsonCommand command, fina
         }
 
         log.error("Error occured.", dve);
-        throw new PlatformDataIntegrityException("error.msg.accounting.rule.unknown.data.integrity.issue",
+        throw ErrorHandler.getMappable(dve, "error.msg.accounting.rule.unknown.data.integrity.issue",
                 "Unknown data integrity issue with resource Accounting Rule: " + realCause.getMessage());
     }
 

diff --git a/...va/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java b/...va/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java
@@ -27,6 +27,7 @@
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
+import org.apache.fineract.infrastructure.core.exception.ErrorHandler;
 import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -67,16 +68,13 @@ public CommandProcessingResult createAdHocQuery(final JsonCommand command) {
      */
     private void handleDataIntegrityIssues(final JsonCommand command, final Throwable realCause,
             final NonTransientDataAccessException dve) {
-
         if (realCause.getMessage().contains("unq_name")) {
-
             final String name = command.stringValueOfParameterNamed("name");
             throw new PlatformDataIntegrityException("error.msg.adhocquery.duplicate.name",
                     "AdHocQuery with name `" + name + "` already exists", "name", name);
         }
-
         log.error("Error occured.", dve);
-        throw new PlatformDataIntegrityException("error.msg.adhocquery.unknown.data.integrity.issue",
+        throw ErrorHandler.getMappable(dve, "error.msg.adhocquery.unknown.data.integrity.issue",
                 "Unknown data integrity issue with resource.");
     }
 
@@ -119,8 +117,8 @@ public CommandProcessingResult deleteAdHocQuery(Long adHocId) {
             this.adHocRepository.delete(adHoc);
             return new CommandProcessingResultBuilder().withEntityId(adHocId).build();
         } catch (final JpaSystemException | DataIntegrityViolationException e) {
-            throw new PlatformDataIntegrityException("error.msg.unknown.data.integrity.issue",
-                    "Unknown data integrity issue with resource: " + e.getMostSpecificCause(), e);
+            throw ErrorHandler.getMappable(e, "error.msg.unknown.data.integrity.issue",
+                    "Unknown data integrity issue with resource: " + e.getMostSpecificCause());
         }
     }
 
@@ -140,8 +138,8 @@ public CommandProcessingResult disableAdHocQuery(Long adHocId) {
             return new CommandProcessingResultBuilder().withEntityId(adHocId).build();
 
         } catch (final JpaSystemException | DataIntegrityViolationException e) {
-            throw new PlatformDataIntegrityException("error.msg.unknown.data.integrity.issue",
-                    "Unknown data integrity issue with resource: " + e.getMostSpecificCause(), e);
+            throw ErrorHandler.getMappable(e, "error.msg.unknown.data.integrity.issue",
+                    "Unknown data integrity issue with resource: " + e.getMostSpecificCause());
         }
     }
 
@@ -161,8 +159,8 @@ public CommandProcessingResult enableAdHocQuery(Long adHocId) {
             return new CommandProcessingResultBuilder().withEntityId(adHocId).build();
 
         } catch (final JpaSystemException | DataIntegrityViolationException e) {
-            throw new PlatformDataIntegrityException("error.msg.unknown.data.integrity.issue",
-                    "Unknown data integrity issue with resource: " + e.getMostSpecificCause(), e);
+            throw ErrorHandler.getMappable(e, "error.msg.unknown.data.integrity.issue",
+                    "Unknown data integrity issue with resource: " + e.getMostSpecificCause());
         }
     }
 }