Merge pull request #682 from openmrs/RESTWS-1002

chibongho · web-flow · commit 6a90b75b5cd5 · 2025-10-28T17:14:12.000-04:00
RESTWS-1002 add translated exception message to 500 response if possible
diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RestUtil.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RestUtil.java
@@ -838,7 +838,7 @@ public static SimpleObject wrapErrorResponse(Exception ex, String reason) {
 			cause = cause.getCause();
 		}
 		
-		LinkedHashMap map = new LinkedHashMap();
+		LinkedHashMap<String, String> map = new LinkedHashMap<>();
 		if (reason != null && !reason.isEmpty()) {
 			map.put("message", reason + " [" + message + "]");
 		} else {
@@ -865,6 +865,10 @@ public static SimpleObject wrapErrorResponse(Exception ex, String reason) {
 			map.put("code", "");
 			map.put("detail", "");
 		}
+		map.put("rawMessage", ex.getMessage());
+		String translatedMessage = Context.getMessageSourceService().getMessage(ex.getMessage(), null, null, Context.getLocale());
+		map.put("translatedMessage", translatedMessage);
+		
 		return new SimpleObject().add("error", map);
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -838,7 +838,7 @@ public static SimpleObject wrapErrorResponse(Exception ex, String reason) {`
`838`	`838`	`cause = cause.getCause();`
`839`	`839`	`}`
`840`	`840`
`841`		`- LinkedHashMap map = new LinkedHashMap();`
	`841`	`+ LinkedHashMap<String, String> map = new LinkedHashMap<>();`
`842`	`842`	`if (reason != null && !reason.isEmpty()) {`
`843`	`843`	`map.put("message", reason + " [" + message + "]");`
`844`	`844`	`} else {`
`@@ -865,6 +865,10 @@ public static SimpleObject wrapErrorResponse(Exception ex, String reason) {`
`865`	`865`	`map.put("code", "");`
`866`	`866`	`map.put("detail", "");`
`867`	`867`	`}`
	`868`	`+ map.put("rawMessage", ex.getMessage());`
	`869`	`+ String translatedMessage = Context.getMessageSourceService().getMessage(ex.getMessage(), null, null, Context.getLocale());`
	`870`	`+ map.put("translatedMessage", translatedMessage);`
	`871`	`+`
`868`	`872`	`return new SimpleObject().add("error", map);`
`869`	`873`	`}`
`870`	`874`