Changeset 4679

Timestamp:

03/12/14 20:27:50 (10 years ago)

Author:

olhsha

Message:

debugging and testing

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main

Files:

• java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified) (2 diffs)
• webapp/WEB-INF/web.xml (modified) (1 diff)

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

@@ -293 +293 @@
                         int updatedRows = dbIntegrityService.updateAnnotationBody(annotationID, annotationBody);
                         return new ObjectFactory().createResponseBody(dbIntegrityService.makeAnnotationResponseEnvelope(annotationID));
-                    } else { 
+                    } else {
                         verboseOutput.FORBIDDEN_ANNOTATION_WRITING(externalIdentifier, dbIntegrityService.getAnnotationOwner(annotationID).getDisplayName(), dbIntegrityService.getAnnotationOwner(annotationID).getEMail());
                     }
@@ -353 +353 @@
         Number remoteUserID = this.getUserID();
         if (remoteUserID != null) {
-            try {
-                final Number annotationID = dbIntegrityService.getResourceInternalIdentifier(UUID.fromString(annotationExternalId), Resource.ANNOTATION);
-                if (annotationID != null) {
-                    if (remoteUserID.equals(dbIntegrityService.getAnnotationOwnerID(annotationID)) || dbIntegrityService.getTypeOfUserAccount(remoteUserID).equals(admin)) {
-                        int updatedRows = dbIntegrityService.updatePermissions(annotationID, permissions);
-                        return new ObjectFactory().createResponseBody(dbIntegrityService.makePermissionResponseEnvelope(annotationID, Resource.ANNOTATION));
-                    } else {
-                        verboseOutput.FORBIDDEN_PERMISSION_CHANGING(annotationExternalId, dbIntegrityService.getAnnotationOwner(annotationID).getDisplayName(), dbIntegrityService.getAnnotationOwner(annotationID).getEMail());
-                    }
-                } else {
-                    verboseOutput.ANNOTATION_NOT_FOUND(annotationExternalId);
-                }
-
-
-            } catch (IllegalArgumentException e) {
-                verboseOutput.ILLEGAL_UUID(annotationExternalId);
-            }
+            final Number annotationID = dbIntegrityService.getResourceInternalIdentifier(UUID.fromString(annotationExternalId), Resource.ANNOTATION);
+            if (annotationID != null) {
+                if (remoteUserID.equals(dbIntegrityService.getAnnotationOwnerID(annotationID)) || dbIntegrityService.getTypeOfUserAccount(remoteUserID).equals(admin)) {
+                    int updatedRows = dbIntegrityService.updatePermissions(annotationID, permissions);
+                    return new ObjectFactory().createResponseBody(dbIntegrityService.makePermissionResponseEnvelope(annotationID, Resource.ANNOTATION));
+                } else {
+                    verboseOutput.FORBIDDEN_PERMISSION_CHANGING(annotationExternalId, dbIntegrityService.getAnnotationOwner(annotationID).getDisplayName(), dbIntegrityService.getAnnotationOwner(annotationID).getEMail());
+                }
+            } else {
+                verboseOutput.ANNOTATION_NOT_FOUND(annotationExternalId);
+            }
+
         }
         return new ObjectFactory().createResponseBody(new ResponseBody());

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml

@@ -105 +105 @@
     </security-role> 
     
-    <!--    <filter>
+<!--    <filter>
         <filter-name>AAIFilter</filter-name>
         <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class>