From 9ed9153cba83144c33c61c3024267eb264a1451e Mon Sep 17 00:00:00 2001
From: Michael Vorburger <mike@vorburger.ch>
Date: Tue, 30 Jun 2020 00:35:42 +0200
Subject: [PATCH] use AbstractPlatformException's defaultUserMessage as
 RuntimeException's message [FINERACT-1062]

---
 ...esWritePlatformServiceJpaRepositoryImpl.java |  2 +-
 .../exception/AbstractPlatformException.java    | 17 +++++++++--------
 .../exception/UserNotFoundException.java        |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java
index 2ddbf4a58..d1e7f3fc5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java
@@ -167,7 +167,7 @@ public class ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl implements
             }
             createProvsioningEntry(currentDate, addJournalEntries);
         } catch (ProvisioningEntryAlreadyCreatedException peace) {
-            LOG.error("{}", peace.getDefaultUserMessage());
+            LOG.error("Provisioning Entry already created", peace);
         } catch (DataIntegrityViolationException dive) {
             LOG.error("Problem occurred in generateLoanLossProvisioningAmount function", dive);
         }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformException.java
index 9f0420348..1439e5b1b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformException.java
@@ -32,26 +32,27 @@ public abstract class AbstractPlatformException extends RuntimeException {
     private final String defaultUserMessage;
     private final Object[] defaultUserMessageArgs;
 
-    protected AbstractPlatformException(String globalisationMessageCode, String defaultUserMessage, Object[] defaultUserMessageArgs) {
-        super(findThrowableCause(defaultUserMessageArgs));
-        this.globalisationMessageCode = globalisationMessageCode;
-        this.defaultUserMessage = defaultUserMessage;
-        this.defaultUserMessageArgs = AbstractPlatformException.filterThrowableCause(defaultUserMessageArgs);
-    }
-
     protected AbstractPlatformException(String globalisationMessageCode, String defaultUserMessage) {
+        super(defaultUserMessage);
         this.globalisationMessageCode = globalisationMessageCode;
         this.defaultUserMessage = defaultUserMessage;
         this.defaultUserMessageArgs = NO_ARGS;
     }
 
     protected AbstractPlatformException(String globalisationMessageCode, String defaultUserMessage, Throwable cause) {
-        super(cause);
+        super(defaultUserMessage, cause);
         this.globalisationMessageCode = globalisationMessageCode;
         this.defaultUserMessage = defaultUserMessage;
         this.defaultUserMessageArgs = NO_ARGS;
     }
 
+    protected AbstractPlatformException(String globalisationMessageCode, String defaultUserMessage, Object[] defaultUserMessageArgs) {
+        super(defaultUserMessage, findThrowableCause(defaultUserMessageArgs));
+        this.globalisationMessageCode = globalisationMessageCode;
+        this.defaultUserMessage = defaultUserMessage;
+        this.defaultUserMessageArgs = AbstractPlatformException.filterThrowableCause(defaultUserMessageArgs);
+    }
+
     private static Throwable findThrowableCause(Object[] defaultUserMessageArgs) {
         for (Object defaultUserMessageArg : defaultUserMessageArgs) {
             if (defaultUserMessageArg instanceof Throwable) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/exception/UserNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/exception/UserNotFoundException.java
index 926f7a904..12ba82f11 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/exception/UserNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/exception/UserNotFoundException.java
@@ -26,10 +26,10 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourc
 public class UserNotFoundException extends AbstractPlatformResourceNotFoundException {
 
     public UserNotFoundException(final Long id) {
-        super("error.msg.user.id.invalid", "User with identifier " + id + " does not exist", id);
+        super("error.msg.user.id.invalid", "User with ID " + id + " does not exist", id);
     }
 
     public UserNotFoundException(final String userName) {
-        super("error.msg.user.name.not.found", "User with identifier " + userName + " does not exist");
+        super("error.msg.user.name.not.found", "User with name '" + userName + "' does not exist");
     }
 }