absent concept set exception is handled now (1897) (#1898)

ssuvorov-fls · web-flow · commit ce9419cce6a0 · 2021-06-15T13:16:39.000+03:00
Co-authored-by: Sergey Suvorov &lt;sergey.suvorov@odysseusinc.com&gt;
diff --git a/src/main/java/org/ohdsi/webapi/util/GenericExceptionMapper.java b/src/main/java/org/ohdsi/webapi/util/GenericExceptionMapper.java
@@ -32,6 +32,9 @@
 import javax.ws.rs.ext.Provider;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.Objects;
 
 /**
  *
@@ -66,6 +69,20 @@ public Response toResponse(Throwable ex) {
             ex = new RuntimeException(ex.getMessage());
         } else if (ex instanceof ConceptNotExistException) {
             responseStatus = Status.BAD_REQUEST;
+        } else if (ex instanceof UndeclaredThrowableException) {
+            Throwable throwable = getThrowable((UndeclaredThrowableException)ex);
+            if (Objects.nonNull(throwable)) {
+                if (throwable instanceof ConceptNotExistException) {
+                    responseStatus = Status.BAD_REQUEST;
+                    ex = throwable;
+                } else {
+                    responseStatus = Status.INTERNAL_SERVER_ERROR;
+                    ex = new RuntimeException("An exception occurred: " + ex.getClass().getName());
+                }
+            } else {
+                responseStatus = Status.INTERNAL_SERVER_ERROR;
+                ex = new RuntimeException("An exception occurred: " + ex.getClass().getName());
+            }
         } else {
             responseStatus = Status.INTERNAL_SERVER_ERROR;
             // Create new message to prevent sending error information to client
@@ -79,4 +96,12 @@ public Response toResponse(Throwable ex) {
                 .type(MediaType.APPLICATION_JSON)
                 .build();
     }
+
+    private Throwable getThrowable(UndeclaredThrowableException ex) {
+        if (Objects.nonNull(ex.getUndeclaredThrowable()) && ex.getUndeclaredThrowable() instanceof InvocationTargetException) {
+            InvocationTargetException ite = (InvocationTargetException) ex.getUndeclaredThrowable();
+            return ite.getTargetException();
+        }
+        return null;
+    }
 }
