Changeset 5684 for DASISH

Timestamp:

09/26/14 14:04:57 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Refixing the previous bug, because update public access mode id not work properly.

Location:

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

Files:

• AnnotationResource.java (modified) (3 diffs)
• PrincipalResource.java (modified) (4 diffs)
• RequestWrappers.java (modified) (3 diffs)

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

@@ -247 +247 @@
         Map params = new HashMap();
         params.put("annotation", annotation);
-        ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new AddAnnotation());
-        if (result != null) {
-            return (new ObjectFactory()).createResponseBody(result);
-        } else {
+        try {
+            ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new AddAnnotation());
+            if (result != null) {
+                return (new ObjectFactory()).createResponseBody(result);
+            } else {
+                return (new ObjectFactory()).createResponseBody(new ResponseBody());
+            }
+        } catch (NotInDataBaseException e) {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.getMessage());
             return (new ObjectFactory()).createResponseBody(new ResponseBody());
         }
@@ -399 +404 @@
         }
 
-        Access accessTyped = Access.fromValue(access);
-        int updatedAnnotations = 0;
-
-        if (annotationDatabaseId == null || annotationDatabaseId.trim().equals("")) {
-            List<Number> annotationIDs = dbDispatcher.getAnnotationInternalIDsFromHeadline(annotationHeadline);
-            if (annotationIDs == null || annotationIDs.isEmpty()) {
-                return "No annotations with this headline have been found";
-            };
-            int count = 0;
-            for (Number annotationID : annotationIDs) {
-                count = dbDispatcher.updatePublicAttribute(annotationID, accessTyped);;
-                updatedAnnotations = updatedAnnotations + count;
-            }
-            return (updatedAnnotations + " row(s) are updated");
-        } else {
-            try {
-                Number annotationID = dbDispatcher.getResourceInternalIdentifier(UUID.fromString(annotationDatabaseId), Resource.ANNOTATION);
-                updatedAnnotations = dbDispatcher.updatePublicAttribute(annotationID, accessTyped);
-            } catch (NotInDataBaseException e) {
-                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.toString());
-            }
-        }
-        return (updatedAnnotations + " annotation(s) are updated.");
+        try {
+
+            Access accessTyped = Access.fromValue(access);
+            if (annotationDatabaseId == null || annotationDatabaseId.trim().equals("")) {
+                List<UUID> annotationIds = dbDispatcher.getAnnotationExternalIdsFromHeadline(annotationHeadline);
+                if (annotationIds == null || annotationIds.isEmpty()) {
+                    httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "No annotations with this headline have been found");
+                    return "No annotations with this headline have been found";
+                };
+                int updatedAnnotations = 0;            
+                for (UUID annotationId : annotationIds) {
+                    Map params = new HashMap();
+                    params.put("access", accessTyped);
+                    Integer result = (Integer) (new RequestWrappers(this)).wrapRequestResource(params, new UpdatePublicAccess(), Resource.ANNOTATION, ResourceAction.WRITE_W_METAINFO, annotationId.toString());
+                    updatedAnnotations = (result != null) ? updatedAnnotations + result.intValue() : updatedAnnotations;
+                }
+                return (updatedAnnotations + " row(s) are updated");
+            } else {
+                Map params = new HashMap();
+                params.put("access", accessTyped);
+                Integer result = (Integer) (new RequestWrappers(this)).wrapRequestResource(params, new UpdatePublicAccess(), Resource.ANNOTATION, ResourceAction.WRITE_W_METAINFO, annotationDatabaseId);
+                if (result != null) {
+                    return result + " row(s) is(are) updated.";
+                } else {
+                    return "0 rows are updated.";
+                }
+            }
+        } catch (NotInDataBaseException e1) {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e1.toString());
+            return "0 rows are updated.";
+        } catch (ForbiddenException e2) {
+            httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN, e2.toString());
+            return "0 rows are updated.";
+        }
+    }
+
+    private class UpdatePublicAccess implements ILambda<Map, Integer> {
+
+        @Override
+        public Integer apply(Map params) throws NotInDataBaseException {
+            Number annotationID = (Number) params.get("internalID");
+            Access access = (Access) params.get("access");
+            return dbDispatcher.updatePublicAttribute(annotationID, access);
+        }
     }
 
@@ -512 +538 @@
             return "0 rows are updated.";
         }
-
-
     }
 

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

@@ -77 +77 @@
         Map params = new HashMap<String, String>();
         params.put("externalId", externalIdentifier);
-        Principal result = (Principal) (new RequestWrappers(this)).wrapRequestResource(params, new GetPrincipal());
-        return (result != null) ? (new ObjectFactory().createPrincipal(result)) : (new ObjectFactory().createPrincipal(new Principal()));
+        try {
+            Principal result = (Principal) (new RequestWrappers(this)).wrapRequestResource(params, new GetPrincipal());
+            return (result != null) ? (new ObjectFactory().createPrincipal(result)) : (new ObjectFactory().createPrincipal(new Principal()));
+        } catch (NotInDataBaseException e) {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.getMessage());
+            return new ObjectFactory().createPrincipal(new Principal());
+        }
     }
 
@@ -111 +116 @@
         Map params = new HashMap<String, String>();
         params.put("email", email);
-        Principal result = (Principal) (new RequestWrappers(this)).wrapRequestResource(params, new GetPrincipalByInfo());
-        return (result != null) ? (new ObjectFactory().createPrincipal(result)) : (new ObjectFactory().createPrincipal(new Principal()));
+        try {
+            Principal result = (Principal) (new RequestWrappers(this)).wrapRequestResource(params, new GetPrincipalByInfo());
+            return (result != null) ? (new ObjectFactory().createPrincipal(result)) : (new ObjectFactory().createPrincipal(new Principal()));
+        } catch (NotInDataBaseException e) {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.getMessage());
+            return new ObjectFactory().createPrincipal(new Principal());
+        }
     }
 
@@ -131 +141 @@
         Map params = new HashMap<String, String>();
         params.put("externalId", externalIdentifier);
-        CurrentPrincipalInfo result = (CurrentPrincipalInfo) (new RequestWrappers(this)).wrapRequestResource(params, new GetCurrentPrincipalInfo());
-        return (result != null) ? (new ObjectFactory().createCurrentPrincipalInfo(result)) : (new ObjectFactory().createCurrentPrincipalInfo(new CurrentPrincipalInfo()));
+        try {
+            CurrentPrincipalInfo result = (CurrentPrincipalInfo) (new RequestWrappers(this)).wrapRequestResource(params, new GetCurrentPrincipalInfo());
+            return (result != null) ? (new ObjectFactory().createCurrentPrincipalInfo(result)) : (new ObjectFactory().createCurrentPrincipalInfo(new CurrentPrincipalInfo()));
+        } catch (NotInDataBaseException e) {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.getMessage());
+            return new ObjectFactory().createCurrentPrincipalInfo(new CurrentPrincipalInfo());
+        }
     }
 
@@ -309 +324 @@
             Map params = new HashMap<String, Object>();
             params.put("newPrincipal", principal);
-            Principal result = (Principal) (new RequestWrappers(this)).wrapRequestResource(params, new UpdatePrincipal());
-            return (result != null) ? (new ObjectFactory().createPrincipal(result)) : (new ObjectFactory().createPrincipal(new Principal()));
-
+            try {
+                Principal result = (Principal) (new RequestWrappers(this)).wrapRequestResource(params, new UpdatePrincipal());
+                return (result != null) ? (new ObjectFactory().createPrincipal(result)) : (new ObjectFactory().createPrincipal(new Principal()));
+            } catch (NotInDataBaseException e) {
+                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.getMessage());
+                return new ObjectFactory().createPrincipal(new Principal());
+            }
         } else {
             this.ADMIN_RIGHTS_EXPECTED();

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

@@ -53 +53 @@
     }
 
-    public T wrapRequestResource(Map params, ILambda<Map, T> dbRequestor) throws IOException {
+    public T wrapRequestResource(Map params, ILambda<Map, T> dbRequestor) throws IOException, NotInDataBaseException {
         Number remotePrincipalID = resourceResource.getPrincipalID();
         if (remotePrincipalID == null) {
@@ -59 +59 @@
         }
         params.put(_principalID, remotePrincipalID);
-        try {
-            return dbRequestor.apply(params);
-        } catch (NotInDataBaseException e1) {
-            resourceResource.loggerServer.debug(e1.toString());
-            resourceResource.httpServletResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e1.toString());
-            return null;
-        }
+        return dbRequestor.apply(params);
     }
 
@@ -85 +79 @@
 
     }
+    
+    
 
     public JAXBElement<Principal> wrapAddPrincipalRequest(Map params, ILambdaPrincipal<Map, Principal> dbRequestor) throws IOException, NotInDataBaseException, PrincipalExists {