Changeset 4262

Timestamp:

01/14/14 17:52:21 (10 years ago)

Author:

olhsha

Message:

Refactoring:duplication of info in the Db is removed (owner_id in the annotations, and annotation_principal_permission). GET works. PUT needs debugging, POSt needs testing.

Location:

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

Files:

• main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified) (5 diffs)
• main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified) (4 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified) (8 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified) (17 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDao.java (modified) (2 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified) (4 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcUserDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified) (12 diffs)
• main/java/eu/dasish/annotation/backend/rest/UserResource.java (modified) (1 diff)
• main/sql/DashishAnnotatorCreate.sql (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceTest.java (modified) (10 diffs)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified) (5 diffs)
• test/resources/test-data/InsertTestData.sql (modified) (2 diffs)

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

@@ -49 +49 @@
      * 
      */
-    public Map<Annotation, Number> getAnnotationWithoutTargetsAndPermissions(Number annotationID);
+    public Annotation getAnnotationWithoutTargetsAndPermissions(Number annotationID);
     
     
@@ -66 +66 @@
      * 
      */
-    public List<Number> getFilteredAnnotationIDs(List<Number> annotationIDs, String text, String namespace, Number ownerID, Timestamp after, Timestamp before);
+    public List<Number> getFilteredAnnotationIDs(List<Number> annotationIDs, String text, String namespace, Timestamp after, Timestamp before);
      
        /**
      * unit test is missing
      * @param annotationIDs
-     * @return pair <annotationInfo, owner_id>  for the annotation with the internal annotationID.
-     * 
-     */
-    public Map<AnnotationInfo, Number> getAnnotationInfoWithoutTargets(Number annotationID);    
+     * @return annotationInfo  for the annotation with the internal annotationID.
+     * 
+     */
+    public AnnotationInfo getAnnotationInfoWithoutTargets(Number annotationID);    
    
     /**
@@ -105 +105 @@
      */
     public List<Map<Number, String>>  getPermissions(Number annotationID);
+    
+    public Number  getOwner(Number annotationID);
     
     /**
@@ -159 +161 @@
      **/
     
-    public Number addAnnotation(Annotation annotation, Number ownerID);
+    public Number addAnnotation(Annotation annotation);
  
      
@@ -172 +174 @@
      * 
      * @param annotation
-     * @param ownerID
      * @return # of updated rows in "annotation" table after updating the annotation. Should return 1 if update  happens
      * @throws SQLException 
      */
-    public int updateAnnotation(Annotation annotation, Number ownerID);
+    public int updateAnnotation(Annotation annotation);
     
     

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

@@ -77 +77 @@
     * @param access
     * @param namespace
-    * @param owner
     * @param after
     * @param before
@@ -88 +87 @@
     * -- created after time-samp "after and before time-stamp "before".
     */
-    List<Number> getFilteredAnnotationIDs(String link, String text, Number inloggedUserID, String[] accessModes, String namespace, UUID
-            owner, Timestamp after, Timestamp before);
+    List<Number> getFilteredAnnotationIDs(String link, String text, Number inloggedUserID, String[] accessModes, String namespace, Timestamp after, Timestamp before);
     
     
@@ -145 +143 @@
     String getTargetURI(Number targetID);
    
-     UUID getTargetExternalIdentifier(Number targetID);
+    UUID getTargetExternalIdentifier(Number targetID);
      
     String getUserURI(Number userID); 
@@ -340 +338 @@
     public int deleteUser(Number userID);
     
+     /**
+     * 
+     * @param userID
+     * @return # of affected rows in the table "principal". 
+     * It is 1 if the userId is found and deleted; 
+     * it is 0 if it is not found or not deleted, e.g. because it is in use in the table "annotationsPreincipalsPermissions"
+     */
+    public int deleteUserSafe(Number userID);
+    
     /**
      * 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java

@@ -141 +141 @@
     public Annotation getAnnotation(Number annotationID) {
         if (annotationID != null) {
-            Map<Annotation, Number> annotationOwner = annotationDao.getAnnotationWithoutTargetsAndPermissions(annotationID);
-
-            Annotation[] annotations = new Annotation[1];
-            annotationOwner.keySet().toArray(annotations);
-            Annotation result = annotations[0];
-            result.setOwnerRef(userDao.getURIFromInternalID(annotationOwner.get(result)));
-
+            Annotation result = annotationDao.getAnnotationWithoutTargetsAndPermissions(annotationID);
+            result.setOwnerRef(userDao.getURIFromInternalID(annotationDao.getOwner(annotationID)));
             List<Number> targetIDs = annotationDao.retrieveTargetIDs(annotationID);
             TargetInfoList sis = new TargetInfoList();
@@ -191 +186 @@
     ////////////////////////////////////////////////////////////////////////
     @Override
-    public List<Number> getFilteredAnnotationIDs(String link, String text, Number inloggedUserID, String[] accessModes, String namespace, UUID owner, Timestamp after, Timestamp before) {
+    public List<Number> getFilteredAnnotationIDs(String link, String text, Number inloggedUserID, String[] accessModes, String namespace, Timestamp after, Timestamp before) {
 
         if (accessModes == null) {
@@ -205 +200 @@
         }
 
-        return annotationDao.getFilteredAnnotationIDs(annotationIDs, text, namespace, userDao.getInternalID(owner), after, before);
+        return annotationDao.getFilteredAnnotationIDs(annotationIDs, text, namespace, after, before);
     }
 
@@ -261 +256 @@
     @Override
     public AnnotationInfoList getFilteredAnnotationInfos(String word, String text, Number inloggedUserID, String[] accessModes, String namespace, UUID owner, Timestamp after, Timestamp before) {
-        List<Number> annotationIDs = getFilteredAnnotationIDs(word, text, inloggedUserID, accessModes, namespace, owner, after, before);
+        List<Number> annotationIDs = getFilteredAnnotationIDs(word, text, inloggedUserID, accessModes, namespace, after, before);
+        Number givenOwnerID = userDao.getInternalID(owner);
         if (annotationIDs != null) {
             AnnotationInfoList result = new AnnotationInfoList();
             for (Number annotationID : annotationIDs) {
-                Map<AnnotationInfo, Number> annotationInfoOwnerId = annotationDao.getAnnotationInfoWithoutTargets(annotationID);
-                ReferenceList targets = getAnnotationTargets(annotationID);
-                AnnotationInfo[] annotationInfos = new AnnotationInfo[1];
-                annotationInfoOwnerId.keySet().toArray(annotationInfos);
-                AnnotationInfo annotationInfo = annotationInfos[0];
-                annotationInfo.setTargets(targets);
-                annotationInfo.setOwnerRef(userDao.getURIFromInternalID(annotationInfoOwnerId.get(annotationInfo)));
-                result.getAnnotationInfo().add(annotationInfo);
+                Number ownerID = annotationDao.getOwner(annotationID);
+                if ((owner == null) || ownerID.equals(givenOwnerID)) {
+                    ReferenceList targets = getAnnotationTargets(annotationID);
+                    AnnotationInfo annotationInfo = annotationDao.getAnnotationInfoWithoutTargets(annotationID);
+                    annotationInfo.setTargets(targets);
+                    annotationInfo.setOwnerRef(userDao.getURIFromInternalID(ownerID));
+                    result.getAnnotationInfo().add(annotationInfo);
+                }
             }
 
@@ -384 +380 @@
     @Override
     public int updateUsersAnnotation(Number userID, Annotation annotation) {
-        int updatedAnnotations = annotationDao.updateAnnotation(annotation, userID);
+        int updatedAnnotations = annotationDao.updateAnnotation(annotation);
         Number annotationID = annotationDao.getInternalIDFromURI(annotation.getURI());
         int deletedTargets = annotationDao.deleteAllAnnotationTarget(annotationID);
         int deletedPrinsipalsPermissions = annotationDao.deleteAnnotationPrincipalPermissions(annotationID);
         int addedTargets = addTargets(annotation, annotationID);
-        int addedPrincipalsPermissions = addPrincipalsPermissions(annotation, annotationID);
+        int addedPrincipalsPermissions = addPrincipalsPermissions(annotation.getPermissions().getUserWithPermission(), annotationID);
+        int addedOwner = annotationDao.addAnnotationPrincipalPermission(annotationID, userID, Permission.OWNER);
         return updatedAnnotations;
     }
@@ -435 +432 @@
     @Override
     public Number addUsersAnnotation(Number userID, Annotation annotation) {
-        Number annotationID = annotationDao.addAnnotation(annotation, userID);
+        Number annotationID = annotationDao.addAnnotation(annotation);
         int affectedAnnotRows = addTargets(annotation, annotationID);
         int affectedPermissions = annotationDao.addAnnotationPrincipalPermission(annotationID, userID, Permission.OWNER);
@@ -464 +461 @@
     public int deleteUser(Number userID) {
         return userDao.deleteUser(userID);
+    }
+
+    ////////////// DELETERS //////////////////
+    @Override
+    public int deleteUserSafe(Number userID) {
+        return userDao.deleteUserSafe(userID);
     }
 
@@ -542 +545 @@
     }
 
-    private int addPrincipalsPermissions(Annotation annotation, Number annotationID) {
-        List<UserWithPermission> permissions = annotation.getPermissions().getUserWithPermission();
+    private int addPrincipalsPermissions(List<UserWithPermission> permissions, Number annotationID) {
         int addedPermissions = 0;
         for (UserWithPermission permission : permissions) {

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java

@@ -26 +26 @@
 import eu.dasish.annotation.schema.AnnotationInfo;
 import eu.dasish.annotation.schema.Permission;
-import java.io.IOException;
 import java.lang.String;
 import java.sql.ResultSet;
@@ -37 +36 @@
 import java.util.UUID;
 import javax.sql.DataSource;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.parsers.ParserConfigurationException;
 import org.springframework.jdbc.core.RowMapper;
-import org.xml.sax.SAXException;
 
 /**
@@ -143 +139 @@
         String result = "(";
         for (int i = 0; i < length - 1; i++) {
-            result = result + "'"+strings[i] + "', ";
-        }
-        result = result + "'"+strings[length - 1] + "')";
+            result = result + "'" + strings[i] + "', ";
+        }
+        result = result + "'" + strings[length - 1] + "')";
         return result;
     }
@@ -151 +147 @@
     ////////////////////////////////////////////////////////////////////////
     @Override
-    public List<Number> getFilteredAnnotationIDs(List<Number> annotationIDs, String text, String namespace, Number ownerID, Timestamp after, Timestamp before) {
+    public List<Number> getFilteredAnnotationIDs(List<Number> annotationIDs, String text, String namespace, Timestamp after, Timestamp before) {
 
         StringBuilder sql = new StringBuilder("SELECT DISTINCT ");
@@ -168 +164 @@
         sql.append(" AND ").append(annotation_id).append(" IN ").append(values);
 
-
-        if (ownerID != null) {
-            sql.append(" AND ").append(owner_id).append(" = :owner ");
-            params.put("owner", ownerID);
-        }
-
+ 
         if (after != null) {
             sql.append(" AND ").append(last_modified).append("  > :after");
@@ -208 +199 @@
 
     @Override
-    public Map<AnnotationInfo, Number> getAnnotationInfoWithoutTargets(Number annotationID) {
+    public AnnotationInfo getAnnotationInfoWithoutTargets(Number annotationID) {
         if (annotationID == null) {
             return null;
@@ -214 +205 @@
         StringBuilder sql = new StringBuilder("SELECT  ");
         sql.append(annotationStar).append(" FROM ").append(annotationTableName).append(" WHERE ").append(annotation_id).append("  = ? ");
-        List<Map<AnnotationInfo, Number>> result = getSimpleJdbcTemplate().query(sql.toString(), annotationInfoRowMapper, annotationID);
+        List<AnnotationInfo> result = getSimpleJdbcTemplate().query(sql.toString(), annotationInfoRowMapper, annotationID);
         if (result == null) {
             return null;
@@ -224 +215 @@
         return result.get(0);
     }
-    private final RowMapper<Map<AnnotationInfo, Number>> annotationInfoRowMapper = new RowMapper<Map<AnnotationInfo, Number>>() {
+    private final RowMapper<AnnotationInfo> annotationInfoRowMapper = new RowMapper<AnnotationInfo>() {
         @Override
-        public Map<AnnotationInfo, Number> mapRow(ResultSet rs, int rowNumber) throws SQLException {
-            Map<AnnotationInfo, Number> result = new HashMap<AnnotationInfo, Number>();
+        public AnnotationInfo mapRow(ResultSet rs, int rowNumber) throws SQLException {
             AnnotationInfo annotationInfo = new AnnotationInfo();
             annotationInfo.setRef(externalIDtoURI(rs.getString(external_id)));
             annotationInfo.setHeadline(rs.getString(headline));
             annotationInfo.setLastModified(timeStampToXMLGregorianCalendar(rs));
-            result.put(annotationInfo, rs.getInt(owner_id));
-            return result;
+            return annotationInfo;
         }
     };
@@ -269 +258 @@
     //////////////////////////////////////////////////////////////////////////
     @Override
-    public Map<Annotation, Number> getAnnotationWithoutTargetsAndPermissions(Number annotationID) {
+    public Annotation getAnnotationWithoutTargetsAndPermissions(Number annotationID) {
         if (annotationID == null) {
             return null;
@@ -275 +264 @@
         StringBuilder sql = new StringBuilder("SELECT ");
         sql.append(annotationStar).append(" FROM ").append(annotationTableName).append(" WHERE ").append(annotationAnnotation_id).append("= ? LIMIT  1");
-        List<Map<Annotation, Number>> respond = getSimpleJdbcTemplate().query(sql.toString(), annotationRowMapper, annotationID);
+        List<Annotation> respond = getSimpleJdbcTemplate().query(sql.toString(), annotationRowMapper, annotationID);
         return (respond.isEmpty() ? null : respond.get(0));
     }
-    private final RowMapper<Map<Annotation, Number>> annotationRowMapper = new RowMapper<Map<Annotation, Number>>() {
+    private final RowMapper<Annotation> annotationRowMapper = new RowMapper<Annotation>() {
         @Override
-        public Map<Annotation, Number> mapRow(ResultSet rs, int rowNumber) throws SQLException {
-            Map<Annotation, Number> result = new HashMap<Annotation, Number>();
-
+        public Annotation mapRow(ResultSet rs, int rowNumber) throws SQLException {
             Annotation annotation = new Annotation();
-            result.put(annotation, rs.getInt(owner_id));
-
             annotation.setHeadline(rs.getString(headline));
-
             AnnotationBody body = new AnnotationBody();
             if (rs.getBoolean(is_xml)) {
@@ -307 +291 @@
             annotation.setURI(externalIDtoURI(rs.getString(external_id)));
             annotation.setLastModified(timeStampToXMLGregorianCalendar(rs));
-            return result;
+            return annotation;
         }
     };
-
+    
+    @Override
+    public Number  getOwner(Number annotationID){
+        if (annotationID == null) {
+            return null;
+        }
+        StringBuilder sql = new StringBuilder("SELECT ");
+        sql.append(principal_id).append(" FROM ").append(permissionsTableName).append(" WHERE ").
+                append(permission).append("= 'owner' AND ").
+                append(annotation_id).append("= ? LIMIT  1");
+        List<Number> respond = getSimpleJdbcTemplate().query(sql.toString(), principalIDRowMapper, annotationID);
+        return (respond.isEmpty() ? null : respond.get(0));
+    }
+       
     /////////////////////////////
     @Override
@@ -335 +332 @@
 
     //////////// UPDATERS /////////////
-   
-
     @Override
     public int updateAnnotationBody(Number annotationID, String text, String mimeType, Boolean isXml) {
@@ -358 +353 @@
     // TODO Unit test
     @Override
-    public int updateAnnotation(Annotation annotation, Number ownerID) {
+    public int updateAnnotation(Annotation annotation) {
 
         String[] body = retrieveBodyComponents(annotation.getBody());
@@ -386 +381 @@
 
         Map<String, Object> params = new HashMap<String, Object>();
-        params.put("permission", permission.value());
+
         params.put("annotationID", annotationID);
         params.put("principalID", userID);
 
-        StringBuilder sql = new StringBuilder("UPDATE ");
-        sql.append(permissionsTableName).append(" SET ").
-                append(this.permission).append("= :permission").
-                append(" WHERE ").append(annotation_id).append("= :annotationID").
-                append(" AND ").append(principal_id).append("= :principalID");
-        return getSimpleJdbcTemplate().update(sql.toString(), params);
+        if (permission != null) {
+            params.put("permission", permission.value());
+            StringBuilder sql = new StringBuilder("UPDATE ");
+            sql.append(permissionsTableName).append(" SET ").
+                    append(this.permission).append("= :permission").
+                    append(" WHERE ").append(annotation_id).append("= :annotationID").
+                    append(" AND ").append(principal_id).append("= :principalID");
+            return getSimpleJdbcTemplate().update(sql.toString(), params);
+        } else {
+           StringBuilder sql = new StringBuilder("DELETE FROM "); 
+           sql.append(permissionsTableName).append(" WHERE ").append(annotation_id).append("= :annotationID").
+                    append(" AND ").append(principal_id).append("= :principalID");
+           return (getSimpleJdbcTemplate().update(sql.toString(), params));
+        }
+
     }
 
     //////////// ADDERS ////////////////////////
     @Override
-    public Number addAnnotation(Annotation annotation, Number ownerID) {
+    public Number addAnnotation(Annotation annotation) {
 
         String[] body = retrieveBodyComponents(annotation.getBody());
@@ -408 +412 @@
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("externalId", externalID.toString());
-        params.put("ownerId", ownerID);
         params.put("headline", annotation.getHeadline());
         params.put("bodyText", body[0]);
@@ -415 +418 @@
 
         StringBuilder sql = new StringBuilder("INSERT INTO ");
-        sql.append(annotationTableName).append("(").append(external_id).append(",").append(owner_id);
+        sql.append(annotationTableName).append("(").append(external_id);
         sql.append(",").append(headline).append(",").append(body_text).append(",").append(body_mimetype).append(",").append(is_xml).
-                append(" ) VALUES (:externalId, :ownerId, :headline, :bodyText, :bodyMimeType, :isXml)");
+                append(" ) VALUES (:externalId, :headline, :bodyText, :bodyMimeType, :isXml)");
         int affectedRows = getSimpleJdbcTemplate().update(sql.toString(), params);
         return ((affectedRows > 0) ? getInternalID(externalID) : null);
@@ -487 +490 @@
 
     /////////////// helpers //////////////////
+    @Override
     public String[] retrieveBodyComponents(AnnotationBody annotationBody) {
         boolean body_is_xml = annotationBody.getXmlBody() != null;

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDao.java

@@ -78 +78 @@
     @Override
     public List<Notebook> getUsersNotebooks(UUID userID) {
-        String sql = "SELECT " + notebookStar + " FROM " + notebookTableName + ", " + principalTableName + " where " + principal_id + " = " + owner_id + " and " + principalExternal_id + " = ?";
+        String sql = "SELECT " + notebookStar + " FROM " + notebookTableName + ", " + principalTableName + " where " + principal_id + " = " + notebookOwner_id + " and " + principalExternal_id + " = ?";
         return getSimpleJdbcTemplate().query(sql, notebookRowMapper, userID.toString());
     }
@@ -106 +106 @@
         try {
             final UUID externalIdentifier = UUID.randomUUID();
-            String sql = "INSERT INTO " + notebookTableName + " (" + external_id + ", " + this.title + "," + owner_id + ") VALUES (:notebookId, :title, (SELECT " + principal_id + " FROM " + principalTableName + " WHERE " + principalExternal_id + " = :userID))";
+            String sql = "INSERT INTO " + notebookTableName + " (" + external_id + ", " + this.title + "," + notebookOwner_id + ") VALUES (:notebookId, :title, (SELECT " + principal_id + " FROM " + principalTableName + " WHERE " + principalExternal_id + " = :userID))";
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("notebookId", externalIdentifier.toString());

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java

@@ -55 +55 @@
     final static protected String target_id = "target_id";
     final static protected String external_id = "external_id";
-    final static protected String owner_id = "owner_id";
     final static protected String headline = "headline";
     final static protected String body_text = "body_text";
@@ -61 +60 @@
     final static protected String title = "title";
     final static protected String principal_id = "principal_id";
+    final static protected String notebookOwner_id = "owner_id";
     final static protected String last_modified = "last_modified";
     final static protected String version = "version";
@@ -85 +85 @@
     final static protected String notebookTitle = notebookTableName + "." + title;
     final static protected String notebookExternal_id = notebookTableName + "." + external_id;
-    final static protected String notebookOwner_id = notebookTableName + "." + owner_id;
     final static protected String notebooksAnnotationsTableNameAnnotation_id = notebooksAnnotationsTableName + "." + annotation_id;
     final static protected String principalPrincipal_id = principalTableName + "." + principal_id;
@@ -200 +199 @@
         }
     };
-    protected final RowMapper<Number> ownerIDRowMapper = new RowMapper<Number>() {
-        @Override
-        public Number mapRow(ResultSet rs, int rowNumber) throws SQLException {
-            return rs.getInt(owner_id);
+   
+    protected final RowMapper<Number> notebookOwnerIDRowMapper = new RowMapper<Number>() {
+        @Override
+        public Number mapRow(ResultSet rs, int rowNumber) throws SQLException {
+            return rs.getInt(notebookOwner_id);
         }
     };

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcUserDao.java

@@ -86 +86 @@
         
         StringBuilder sqlNotebooks  = new StringBuilder("SELECT ");
-        sqlNotebooks.append(owner_id).append(" FROM ").append(notebookTableName).append(" WHERE ").append(owner_id).append("= ? LIMIT 1");
-        List<Number> resultNotebooks = getSimpleJdbcTemplate().query(sqlNotebooks.toString(), ownerIDRowMapper, userID);
+        sqlNotebooks.append(notebookOwner_id).append(" FROM ").append(notebookTableName).append(" WHERE ").append(notebookOwner_id).append("= ? LIMIT 1");
+        List<Number> resultNotebooks = getSimpleJdbcTemplate().query(sqlNotebooks.toString(), notebookOwnerIDRowMapper, userID);
         if (resultNotebooks.size() > 0) {
             return true;

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

@@ -32 +32 @@
 import eu.dasish.annotation.schema.ReferenceList;
 import eu.dasish.annotation.schema.ResponseBody;
+import eu.dasish.annotation.schema.UserWithPermission;
 import java.io.IOException;
 import java.net.URI;
@@ -100 +101 @@
     public AnnotationResource() {
     }
+    
+    
 
     @GET
@@ -164 +167 @@
 // TODO Unit test 
 
+   
+    
+    
     @GET
     @Produces(MediaType.TEXT_XML)
@@ -249 +255 @@
         }
     }
+    
+    // TODO: how to return the status code? 
+
+    
 ///////////////////////////////////////////////////////
 
@@ -278 +288 @@
         dbIntegrityService.setServiceURI(path);
         String annotationURI = annotation.getURI();
+        
         if (!(path + "annotations/" + externalIdentifier).equals(annotationURI)) {
-            logger.error("Wrong request: the external annotation ID and the annotation ID from the request body do not match.");
-            logger.error("Will do nothing.");
-            return null;
-        }
+            httpServletResponse.sendError(HttpServletResponse.SC_CONFLICT, "Wrong request: the external annotation ID and the annotation ID from the request body do not match. Correct the request and resend.");
+            return null;
+        }
+        
+        List<UserWithPermission> permissions = annotation.getPermissions().getUserWithPermission();
+        
+        
         final Number annotationID = dbIntegrityService.getAnnotationInternalIdentifier(UUID.fromString(externalIdentifier));
         if (annotationID != null) {
             final Number userID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
             if (userID != null) {
-                if (canWrite(userID, annotationID)) {
+                if (isOwner(userID, annotationID)) {
                     int updatedRows = dbIntegrityService.updateUsersAnnotation(userID, annotation);
                     logger.info("updateAnnotation method: OK");
@@ -293 +307 @@
 
                 } else {
-                    httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+                    httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Only owner can update the annotation fully (incl. permissions). Only writer can update the annotation's body.");
                     return null;
                 }
@@ -449 +463 @@
         final Permission permission = dbIntegrityService.getPermission(annotationID, userID);
         if (permission != null) {
-            return (permission.value() == Permission.OWNER.value() || permission.value() == Permission.WRITER.value() || permission.value() == Permission.READER.value());
+            return (permission.value().equals(Permission.OWNER.value()) || permission.value().equals(Permission.WRITER.value()) || permission.value().equals(Permission.READER.value()));
         } else {
             return false;
@@ -458 +472 @@
         final Permission permission = dbIntegrityService.getPermission(annotationID, userID);
         if (permission != null) {
-            return (permission.value() == Permission.OWNER.value() || permission.value() == Permission.WRITER.value());
+            return (permission.value().equals(Permission.OWNER.value()) || permission.value().equals(Permission.WRITER.value()));
         } else {
             return false;
@@ -467 +481 @@
         final Permission permission = dbIntegrityService.getPermission(annotationID, userID);
         if (permission != null) {
-            return (permission.value() == Permission.OWNER.value());
+            return (permission.value().equals(Permission.OWNER.value()));
         } else {
             return false;
@@ -475 +489 @@
     private String[] makeAccessModeChain(String accessMode) {
         if (accessMode != null) {
-            if (accessMode == Permission.OWNER.value()) {
+            if (accessMode.contains(Permission.OWNER.value())) {
                 String[] result = new String[1];
                 result[0] = accessMode;
                 return result;
             } else {
-                if (accessMode == Permission.WRITER.value()) {
+                if (accessMode.equals(Permission.WRITER.value())) {
                     String[] result = new String[2];
                     result[0] = Permission.WRITER.value();
@@ -486 +500 @@
                     return result;
                 } else {
-                    if (accessMode == Permission.READER.value()) {
+                    if (accessMode.equals(Permission.READER.value())) {
                         String[] result = new String[3];
                         result[0] = Permission.READER.value();
@@ -504 +518 @@
         }
     }
+    
+    
 }

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

@@ -216 +216 @@
         }
     }
+    
+    
+    @DELETE
+    @Path("{userId}/safe")
+    public String deleteUserSafe(@PathParam("userId") String externalIdentifier) throws IOException {
+        final Number remoteUserID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
+        if (remoteUserID != null) {
+            if (dbIntegrityService.userHasAdminRights(remoteUserID)) {
+                dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
+                final Number userID = dbIntegrityService.getUserInternalIdentifier(UUID.fromString(externalIdentifier));
+                if (userID != null) {
+                    final Integer result = dbIntegrityService.deleteUserSafe(userID);
+                    return "There is " + result.toString() + " row deleted";
+                } else {
+                    httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The user with the given id is not found in the database");
+                    return null;
+                }
+            } else {
+                httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The logged in user does not have admin rights to update a user info in the database");
+                return null;
+            }
+        } else {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database");
+            return null;
+        }
+    }
 
     private boolean ifLoggedIn(Number userID) {

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

@@ -60 +60 @@
     external_id text UNIQUE NOT NULL,
     last_modified timestamp default current_timestamp AT TIME ZONE 'UTC',
-    owner_id integer REFERENCES principal(principal_id), 
     headline text,
     body_text text,

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceTest.java

@@ -210 +210 @@
         listMap.add(map5);
 
-        final UUID externalID3 = UUID.fromString(TestBackendConstants._TEST_USER_3_EXT_ID);
-        final UUID externalID4 = UUID.fromString(TestBackendConstants._TEST_USER_4_EXT_ID);
-        final UUID externalID5 = UUID.fromString(TestBackendConstants._TEST_USER_5_EXT_ID);
-
         final String uri3 = TestBackendConstants._TEST_SERVLET_URI_users +TestBackendConstants._TEST_USER_3_EXT_ID;
         final String uri4 = TestBackendConstants._TEST_SERVLET_URI_users +TestBackendConstants._TEST_USER_4_EXT_ID;
         final String uri5 = TestBackendConstants._TEST_SERVLET_URI_users +TestBackendConstants._TEST_USER_5_EXT_ID;
 
-        final Map<Annotation, Number> mockAnnotationOwnerID = new HashMap<Annotation, Number>();
-        mockAnnotationOwnerID.put(mockAnnotation, 3);
         
         mockeryDao.checking(new Expectations() {
             {
                 oneOf(annotationDao).getAnnotationWithoutTargetsAndPermissions(2);
-                will(returnValue(mockAnnotationOwnerID));
+                will(returnValue(mockAnnotation));
+                
+                 oneOf(annotationDao).getOwner(2);
+                will(returnValue(3));
 
                 oneOf(userDao).getURIFromInternalID(3);
@@ -300 +297 @@
         mockAnnotationIDs2.add(2);
         mockAnnotationIDs2.add(3);
-
-        
-        final UUID owner = UUID.fromString(TestBackendConstants._TEST_USER_4_EXT_ID);
+        
         final Timestamp after = new Timestamp(0);
         final Timestamp before = new Timestamp(System.currentTimeMillis());
@@ -325 +320 @@
                 will(returnValue(mockAnnotationIDs2));
 
-                oneOf(userDao).getInternalID(owner);
-                will(returnValue(4));
-                
                
-                oneOf(annotationDao).getFilteredAnnotationIDs(mockAnnotationIDs1, "some html", null, 4, after, before);
+                oneOf(annotationDao).getFilteredAnnotationIDs(mockAnnotationIDs1, "some html", null, after, before);
                 will(returnValue(mockRetval));
 
@@ -336 +328 @@
 
 
-        List result = dbIntegrityService.getFilteredAnnotationIDs(word, "some html", 3, accessModes, null, owner, after, before);
+        List result = dbIntegrityService.getFilteredAnnotationIDs(word, "some html", 3, accessModes, null, after, before);
         assertEquals(1, result.size());
         assertEquals(3, result.get(0));
@@ -417 +409 @@
         TargetIDs.add(2);
         
-        final Map<AnnotationInfo,Number> mockPair = new HashMap<AnnotationInfo, Number>(); // annotationInfo-ownerID
-        mockPair.put(mockAnnotInfo, 4);
         
         final String[] accessModes = new String[2];
@@ -426 +416 @@
         mockeryDao.checking(new Expectations() {
             {
+                oneOf(userDao).getInternalID(ownerUUID);
+                will(returnValue(4));
+                
                 oneOf(annotationDao).getAnnotationIDsForUserWithPermission(3, accessModes);
                 will(returnValue(mockAnnotationIDs1));
 
                 
+              
                 // getFilteredAnnotationIds
                 oneOf(targetDao).getTargetsReferringTo(word);
@@ -437 +431 @@
                 will(returnValue(mockAnnotationIDs2));
                
-                oneOf(userDao).getInternalID(ownerUUID);
-                will(returnValue(4));
-              
-                oneOf(annotationDao).getFilteredAnnotationIDs(mockAnnotationIDs1, text, null, 4, after, before);
+               
+                oneOf(annotationDao).getFilteredAnnotationIDs(mockAnnotationIDs1, text, null, after, before);
                 will(returnValue(mockAnnotIDs));
                 
@@ -447 +439 @@
 //                
                 oneOf(annotationDao).getAnnotationInfoWithoutTargets(3);
-                will(returnValue(mockPair));
+                will(returnValue(mockAnnotInfo));
+                
+                oneOf(annotationDao).getOwner(3);
+                will(returnValue(4));
+                
+                oneOf(userDao).getURIFromInternalID(4);
+                will(returnValue(TestBackendConstants._TEST_SERVLET_URI_users+"00000000-0000-0000-0000-000000000112"));
                 
                 ////
@@ -456 +454 @@
                 oneOf(targetDao).getURIFromInternalID(2);
                 will(returnValue(TestBackendConstants._TEST_SERVLET_URI_Targets +TestBackendConstants._TEST_Target_2_EXT_ID));
-                ////
-                
-                oneOf(userDao).getURIFromInternalID(4);
-                will(returnValue(TestBackendConstants._TEST_SERVLET_URI_users +TestBackendConstants._TEST_USER_4_EXT_ID)); 
-             
+              
                
             }
@@ -682 +676 @@
         mockeryDao.checking(new Expectations() {
             {
-                oneOf(annotationDao).addAnnotation(testAnnotation, 5);
+                oneOf(annotationDao).addAnnotation(testAnnotation);
                 will(returnValue(6)); // the next free number is 6
 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java

@@ -232 +232 @@
         System.out.println("test getAnnotationWithoutTargets");
         jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI_annotations);
-        final Map<Annotation, Number> result= jdbcAnnotationDao.getAnnotationWithoutTargetsAndPermissions(2);
-        Annotation[] annotations = new Annotation[1];
-        result.keySet().toArray(annotations);
-        
-        assertEquals(TestBackendConstants._TEST_ANNOT_2_HEADLINE, annotations[0].getHeadline());
-        assertEquals(3, result.get(annotations[0]));
-        assertEquals(TestBackendConstants._TEST_ANNOT_2_BODY, annotations[0].getBody().getTextBody().getValue()); 
-        assertEquals(TestBackendConstants._TEST_BODY_MIMETYPE_HTML, annotations[0].getBody().getTextBody().getMimeType()); 
+        final Annotation result= jdbcAnnotationDao.getAnnotationWithoutTargetsAndPermissions(2);
+        
+        assertEquals(TestBackendConstants._TEST_ANNOT_2_HEADLINE, result.getHeadline());
+        assertEquals(TestBackendConstants._TEST_ANNOT_2_BODY, result.getBody().getTextBody().getValue()); 
+        assertEquals(TestBackendConstants._TEST_BODY_MIMETYPE_HTML, result.getBody().getTextBody().getMimeType()); 
         assertEquals(TestBackendConstants._TEST_SERVLET_URI_annotations+
-                TestBackendConstants._TEST_ANNOT_2_EXT, annotations[0].getURI());
-        assertEquals(DatatypeFactory.newInstance().newXMLGregorianCalendar(TestBackendConstants._TEST_ANNOT_2_TIME_STAMP), annotations[0].getLastModified());
+                TestBackendConstants._TEST_ANNOT_2_EXT, result.getURI());
+        assertEquals(DatatypeFactory.newInstance().newXMLGregorianCalendar(TestBackendConstants._TEST_ANNOT_2_TIME_STAMP), result.getLastModified());
     }
 
@@ -276 +273 @@
         assertEquals(null, annotationToAdd.getLastModified());
         
-        Number newAnnotationID = jdbcAnnotationDao.addAnnotation(annotationToAdd, 5);
+        Number newAnnotationID = jdbcAnnotationDao.addAnnotation(annotationToAdd);
         assertEquals(6, newAnnotationID);
         
         // checking
-        Map<Annotation, Number> getResult= jdbcAnnotationDao.getAnnotationWithoutTargetsAndPermissions(6);
-        Annotation[] annotations = new Annotation[1];
-        getResult.keySet().toArray(annotations);
-        Annotation addedAnnotation = annotations[0];
+        Annotation addedAnnotation= jdbcAnnotationDao.getAnnotationWithoutTargetsAndPermissions(6);
         assertFalse(null == addedAnnotation.getURI());
         assertFalse(null == addedAnnotation.getLastModified());
-        assertEquals(5, getResult.get(addedAnnotation));
         assertEquals(annotationToAdd.getBody().getTextBody().getMimeType(), addedAnnotation.getBody().getTextBody().getMimeType());
         assertEquals(annotationToAdd.getBody().getTextBody().getValue(), addedAnnotation.getBody().getTextBody().getValue()); 
@@ -343 +336 @@
         annotationIDs.add(3);
         
-        List<Number> result_1 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, null, null, null, null, null);        
+        List<Number> result_1 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, null, null, null, null);        
         assertEquals(2, result_1.size());
         assertEquals(2, result_1.get(0));
@@ -349 +342 @@
         
        
-        List<Number> result_2 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, null, null);        
+        List<Number> result_2 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, null, null);        
         assertEquals(2, result_2.size());
         assertEquals(2, result_2.get(0));
@@ -355 +348 @@
         
         
-       
-        List<Number> result_3 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, 3, null, null);        
-        assertEquals(1, result_3.size());
-        assertEquals(2, result_3.get(0));
-        
-       
+             
         Timestamp after = new Timestamp(0); 
         Timestamp before = new Timestamp(System.currentTimeMillis());  
-        List<Number> result_4 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, 3, after, before);        
-        assertEquals(1, result_4.size());
+        List<Number> result_4 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, after, before);        
+        assertEquals(2, result_4.size());
         assertEquals(2, result_4.get(0));
-        
+        assertEquals(3, result_2.get(1));
         
         Timestamp after_1 = new Timestamp(System.currentTimeMillis()); // no annotations added after "now"       
-        List<Number> result_5 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, 3, after_1, null);        
+        List<Number> result_5 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, after_1, null);        
         assertEquals(0, result_5.size());
         

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/test-data/InsertTestData.sql

@@ -27 +27 @@
 -- INSERT INTO notebook (title, owner_id, external_id) VALUES ('a notebook', 1, 1);
 
-INSERT INTO annotation (owner_id,headline, body_text, body_mimetype, external_id, is_xml) VALUES (1, 'a headline', '<html><body>some html</body></html>', 'text/html' , '00000000-0000-0000-0000-000000000005', false); --1 
+INSERT INTO annotation (headline, body_text, body_mimetype, external_id, is_xml) VALUES ('a headline', '<html><body>some html</body></html>', 'text/html' , '00000000-0000-0000-0000-000000000005', false); --1 
 
 INSERT INTO notebook (title, owner_id, external_id) VALUES ('a second notebook', 2, '00000000-0000-0000-0000-000000000002'); --2
@@ -48 +48 @@
 INSERT INTO notebook (title, owner_id, external_id) VALUES ('Notebook 6', 5, '00000000-0000-0000-0000-000000000014'); --6
 
-INSERT INTO annotation (owner_id,headline,body_text, body_mimetype, external_id, last_modified, is_xml) VALUES (3, 'Sagrada Famiglia','<html><body>some html 1</body></html>', 'text/html' , '00000000-0000-0000-0000-000000000021', '2013-08-12 09:25:00.383', false); --2
-INSERT INTO annotation (owner_id,headline,body_text, body_mimetype, external_id, is_xml) VALUES (4, 'Gaudi','<html><body>some html 2</body></html>', 'text/html' , '00000000-0000-0000-0000-000000000022',false); --3
-INSERT INTO annotation (owner_id,headline,body_text, body_mimetype, external_id, is_xml) VALUES (5, 'Art Nuveau','some plain text', 'text/plain' , '00000000-0000-0000-0000-000000000023', false); --4
-INSERT INTO annotation (owner_id,headline,body_text, body_mimetype, external_id, is_xml) VALUES (3, 'Annotation to delete','<html><body>some html 4</body></html>', 'text/html' , '00000000-0000-0000-0000-000000000024',false); --5
+INSERT INTO annotation (headline,body_text, body_mimetype, external_id, last_modified, is_xml) VALUES ('Sagrada Famiglia','<html><body>some html 1</body></html>', 'text/html' , '00000000-0000-0000-0000-000000000021', '2013-08-12 09:25:00.383', false); --2
+INSERT INTO annotation (headline,body_text, body_mimetype, external_id, is_xml) VALUES ('Gaudi','<html><body>some html 2</body></html>', 'text/html' , '00000000-0000-0000-0000-000000000022',false); --3
+INSERT INTO annotation (headline,body_text, body_mimetype, external_id, is_xml) VALUES ('Art Nuveau','some plain text', 'text/plain' , '00000000-0000-0000-0000-000000000023', false); --4
+INSERT INTO annotation (headline,body_text, body_mimetype, external_id, is_xml) VALUES ('Annotation to delete','<html><body>some html 4</body></html>', 'text/html' , '00000000-0000-0000-0000-000000000024',false); --5