Changeset 5679 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java

Timestamp:

09/26/14 09:14:41 (10 years ago)

Author:

olhsha@mpi.nl

Message:

bug fixed with the little code restructuring. 403 was not thrown (but 500 for another reason was thrown) when a not-owner tries to update permissions of an annotation. Now it is fixed by removing catching exceptions and messaging errors from auxiliary request wrappers to REST methods directly.

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java (modified) (3 diffs)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/RequestWrappers.java

@@ -18 +18 @@
 package eu.dasish.annotation.backend.rest;
 
+import eu.dasish.annotation.backend.ForbiddenException;
 import eu.dasish.annotation.backend.NotInDataBaseException;
 import eu.dasish.annotation.backend.PrincipalExists;
@@ -67 +68 @@
     }
 
-    public T wrapRequestResource(Map params, ILambda<Map, T> dbRequestor, Resource resource, ResourceAction action, String externalId) throws IOException {
+    public T wrapRequestResource(Map params, ILambda<Map, T> dbRequestor, Resource resource, ResourceAction action, String externalId) throws IOException, ForbiddenException, NotInDataBaseException {
         Number principalID = resourceResource.getPrincipalID();
         if (principalID == null) {
@@ -73 +74 @@
         }
         params.put(_principalID, principalID);
-        try {
-            final Number resourceID = resourceResource.dbDispatcher.getResourceInternalIdentifier(UUID.fromString(externalId), resource);
-            if (resourceResource.dbDispatcher.canDo(action, principalID, resourceID, resource)) {
-                params.put(_externalId, externalId);            
-                params.put(_internalID, resourceID);
-                params.put(_resourceType, resource);
-                return dbRequestor.apply(params);
-            } else {
-                this.FORBIDDEN_RESOURCE_ACTION(externalId, resource.name(), action.name());
-                resourceResource.loggerServer.debug("Principal " + resourceResource.dbDispatcher.getResourceExternalIdentifier(principalID, Resource.PRINCIPAL) + " cannot " + action.name() + " " + resource.name() + " with the id " + externalId);
-                resourceResource.httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
-                return null;
-            }
-        } catch (NotInDataBaseException e2) {
-            resourceResource.loggerServer.debug(e2.toString());
-            resourceResource.httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e2.toString());
-            return null;
-        }
-    }
-
-    public JAXBElement<Principal> wrapAddPrincipalRequest(Map params, ILambdaPrincipal<Map, Principal> dbRequestor) throws IOException {
-
-        try {
-            try {
-                return new ObjectFactory().createPrincipal(dbRequestor.apply(params));
-            } catch (NotInDataBaseException e1) {
-                resourceResource.loggerServer.debug(e1.toString());
-                resourceResource.httpServletResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e1.toString());
-                return new ObjectFactory().createPrincipal(new Principal());
-            }
-        } catch (PrincipalExists e) {
-            resourceResource.loggerServer.debug(e.toString());
-            resourceResource.httpServletResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
-            return new ObjectFactory().createPrincipal(new Principal());
+        final Number resourceID = resourceResource.dbDispatcher.getResourceInternalIdentifier(UUID.fromString(externalId), resource);
+        if (resourceResource.dbDispatcher.canDo(action, principalID, resourceID, resource)) {
+            params.put(_externalId, externalId);
+            params.put(_internalID, resourceID);
+            params.put(_resourceType, resource);
+            return dbRequestor.apply(params);
+        } else {
+            throw new ForbiddenException(this.FORBIDDEN_RESOURCE_ACTION(externalId, resource.name(), action.name()));
         }
 
     }
+
+    public JAXBElement<Principal> wrapAddPrincipalRequest(Map params, ILambdaPrincipal<Map, Principal> dbRequestor) throws IOException, NotInDataBaseException, PrincipalExists {
+        return new ObjectFactory().createPrincipal(dbRequestor.apply(params));
+    }
 }