feat: added improved exception handler (#15)

onecx · Apr 23, 2024 · 95ebf81 · 95ebf81
1 parent 1bc61f4
commit 95ebf81
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/src/main/java/org/tkit/onecx/tenant/bff/rs/controllers/TenantRestController.java b/src/main/java/org/tkit/onecx/tenant/bff/rs/controllers/TenantRestController.java
@@ -8,6 +8,7 @@
 import jakarta.ws.rs.core.Response;
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.jboss.resteasy.reactive.ClientWebApplicationException;
 import org.jboss.resteasy.reactive.RestResponse;
 import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
 import org.tkit.onecx.tenant.bff.rs.mappers.ExceptionMapper;
@@ -85,7 +86,7 @@ public RestResponse<ProblemDetailResponseDTO> constraint(ConstraintViolationExce
     }
 
     @ServerExceptionMapper
-    public Response restException(WebApplicationException ex) {
-        return Response.status(ex.getResponse().getStatus()).build();
+    public Response restException(ClientWebApplicationException ex) {
+        return exceptionMapper.clientException(ex);
     }
 }
diff --git a/src/main/java/org/tkit/onecx/tenant/bff/rs/mappers/ExceptionMapper.java b/src/main/java/org/tkit/onecx/tenant/bff/rs/mappers/ExceptionMapper.java
@@ -1,20 +1,26 @@
 package org.tkit.onecx.tenant.bff.rs.mappers;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.validation.Path;
 import jakarta.ws.rs.core.Response;
 
+import org.jboss.resteasy.reactive.ClientWebApplicationException;
 import org.jboss.resteasy.reactive.RestResponse;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper;
 
 import gen.org.tkit.onecx.tenant.bff.rs.internal.model.ProblemDetailInvalidParamDTO;
+import gen.org.tkit.onecx.tenant.bff.rs.internal.model.ProblemDetailParamDTO;
 import gen.org.tkit.onecx.tenant.bff.rs.internal.model.ProblemDetailResponseDTO;
+import gen.org.tkit.onecx.tenant.client.model.ProblemDetailResponse;
 
 @Mapper(uses = { OffsetDateTimeMapper.class })
 public interface ExceptionMapper {
@@ -25,12 +31,44 @@ default RestResponse<ProblemDetailResponseDTO> constraint(ConstraintViolationExc
         return RestResponse.status(Response.Status.BAD_REQUEST, dto);
     }
 
+    default Response clientException(ClientWebApplicationException ex) {
+        if (ex.getResponse().getStatus() == 500) {
+            return Response.status(400).build();
+        } else {
+            if (ex.getResponse().getMediaType() != null
+                    && ex.getResponse().getMediaType().toString().equals(APPLICATION_JSON)) {
+                return Response.status(ex.getResponse().getStatus())
+                        .entity(map(ex.getResponse().readEntity(ProblemDetailResponse.class))).build();
+            } else {
+                return Response.status(ex.getResponse().getStatus()).build();
+            }
+        }
+    }
+
+    @Mapping(target = "removeParamsItem", ignore = true)
+    @Mapping(target = "removeInvalidParamsItem", ignore = true)
+    ProblemDetailResponseDTO map(ProblemDetailResponse problemDetailResponse);
+
     @Mapping(target = "removeParamsItem", ignore = true)
     @Mapping(target = "params", ignore = true)
     @Mapping(target = "invalidParams", ignore = true)
     @Mapping(target = "removeInvalidParamsItem", ignore = true)
     ProblemDetailResponseDTO exception(String errorCode, String detail);
 
+    default List<ProblemDetailParamDTO> map(Map<String, Object> params) {
+        if (params == null) {
+            return List.of();
+        }
+        return params.entrySet().stream().map(e -> {
+            var item = new ProblemDetailParamDTO();
+            item.setKey(e.getKey());
+            if (e.getValue() != null) {
+                item.setValue(e.getValue().toString());
+            }
+            return item;
+        }).toList();
+    }
+
     List<ProblemDetailInvalidParamDTO> createErrorValidationResponse(
             Set<ConstraintViolation<?>> constraintViolation);