#263: Removed unnecessary exception throw

cristal-ise · Aug 14, 2019 · 589bd40 · 589bd40
1 parent 914993d
commit 589bd40
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/restapi/src/main/java/org/cristalise/restapi/ItemRoot.java b/restapi/src/main/java/org/cristalise/restapi/ItemRoot.java
@@ -174,7 +174,7 @@ else if ((script = getAggregateScript(type, scriptVersion)) != null) {
             else if (item.checkViewpoint(type, view)) {
                 try {
                     return getViewpointOutcome(uuid, type, view, true).cookie(checkAndCreateNewCookie(authData)).build();
-                } catch ( Exception e ) {
+                } catch ( InvalidItemPathException | ObjectNotFoundException | PersistencyException e ) {
                     throw new WebAppExceptionBuilder().exception(e).newCookie(checkAndCreateNewCookie(authData)).build();
                 }
             }

diff --git a/restapi/src/main/java/org/cristalise/restapi/ItemUtils.java b/restapi/src/main/java/org/cristalise/restapi/ItemUtils.java
@@ -147,7 +147,7 @@ protected static ItemProxy getProxy(String uuid) throws InvalidItemPathException
     }
 
     public Response.ResponseBuilder getViewpointOutcome(String uuid, String schema, String viewName, boolean json)
-            throws InvalidItemPathException, ObjectNotFoundException, Exception
+            throws InvalidItemPathException, ObjectNotFoundException, PersistencyException
     {
         ItemProxy item = ItemRoot.getProxy(uuid);
         try {

diff --git a/restapi/src/main/java/org/cristalise/restapi/ItemViewpoint.java b/restapi/src/main/java/org/cristalise/restapi/ItemViewpoint.java
@@ -109,7 +109,7 @@ public Response queryJSONData(@PathParam("uuid") String uuid,
 
         try {
             return getViewpointOutcome(uuid, schema, viewName, true).cookie(checkAndCreateNewCookie( authData )).build();
-        } catch ( Exception e ) {
+        } catch ( PersistencyException | InvalidItemPathException | ObjectNotFoundException e ) {
             throw new WebAppExceptionBuilder().exception(e).newCookie(checkAndCreateNewCookie( authData )).build();
         }
     }