[Minor] use root cause in ResponseUtil.toResponse()

strolch-li · Jul 4, 2024 · fd12410 · fd12410
1 parent 6385317
commit fd12410
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/web-rest/src/main/java/li/strolch/rest/helper/ResponseUtil.java b/web-rest/src/main/java/li/strolch/rest/helper/ResponseUtil.java
@@ -19,6 +19,7 @@
 import li.strolch.service.api.ServiceResult;
 import li.strolch.utils.I18nMessage;
 import li.strolch.utils.collections.Paging;
+import li.strolch.utils.helper.ExceptionHelper;
 import li.strolch.utils.helper.StringHelper;
 
 import java.util.List;
@@ -140,7 +141,8 @@ public static Response toResponse(ServiceResult svcResult) {
 		if (svcResult.isOk())
 			return Response.ok().entity(json).type(MediaType.APPLICATION_JSON).build();
 
-		Status status = switch (t) {
+		Throwable rootCause = getRootCause(t);
+		Status status = switch (rootCause) {
 			case AccessDeniedException ignored -> Status.FORBIDDEN;
 			case PrivilegeException ignored -> Status.UNAUTHORIZED;
 			case StrolchElementNotFoundException ignored -> Status.NOT_FOUND;
@@ -151,12 +153,13 @@ public static Response toResponse(ServiceResult svcResult) {
 	}
 
 	public static Response toResponse(Throwable t) {
-		return switch (t) {
-			case StrolchNotAuthenticatedException ignored -> toResponse(Status.UNAUTHORIZED, t);
-			case AccessDeniedException ignored -> toResponse(Status.FORBIDDEN, t);
-			case StrolchElementNotFoundException ignored -> toResponse(Status.NOT_FOUND, t);
-			case PrivilegeException ignored -> toResponse(Status.FORBIDDEN, t);
-			case null, default -> toResponse(Status.INTERNAL_SERVER_ERROR, t);
+		Throwable rootCause = getRootCause(t);
+		return switch (rootCause) {
+			case StrolchNotAuthenticatedException ignored -> toResponse(Status.UNAUTHORIZED, rootCause);
+			case AccessDeniedException ignored -> toResponse(Status.FORBIDDEN, rootCause);
+			case StrolchElementNotFoundException ignored -> toResponse(Status.NOT_FOUND, rootCause);
+			case PrivilegeException ignored -> toResponse(Status.FORBIDDEN, rootCause);
+			case null, default -> toResponse(Status.INTERNAL_SERVER_ERROR, rootCause);
 		};
 	}