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

Timestamp:

02/21/14 18:24:38 (10 years ago)

Author:

olhsha

Message:

refactored.Redundar row mappers are some other methods are thrown away

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified) (15 diffs)

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

@@ -80 +80 @@
     NotebookDao notebookDao;
     final static protected String admin = "admin";
-    private static final Logger logger = LoggerFactory.getLogger(AnnotationResource.class);
+    private static final Logger logger = LoggerFactory.getLogger(DBIntegrityServiceImlp.class);
 
     //////////////////////////////////
@@ -135 +135 @@
             Annotation result = annotationDao.getAnnotationWithoutTargetsAndPermissions(annotationID);
             result.setOwnerRef(userDao.getURIFromInternalID(annotationDao.getOwner(annotationID)));
-            List<Number> targetIDs = annotationDao.retrieveTargetIDs(annotationID);
+            List<Number> targetIDs = targetDao.retrieveTargetIDs(annotationID);
             TargetInfoList sis = new TargetInfoList();
             for (Number targetID : targetIDs) {
@@ -235 +235 @@
     public ReferenceList getAnnotationTargets(Number annotationID) {
         ReferenceList result = new ReferenceList();
-        List<Number> targetIDs = annotationDao.retrieveTargetIDs(annotationID);
+        List<Number> targetIDs = targetDao.retrieveTargetIDs(annotationID);
         for (Number targetID : targetIDs) {
             result.getRef().add(targetDao.getURIFromInternalID(targetID));
@@ -248 +248 @@
         }
         List<String> result = new ArrayList<String>();
-        List<Number> targetIDs = annotationDao.retrieveTargetIDs(annotationID);
+        List<Number> targetIDs = targetDao.retrieveTargetIDs(annotationID);
         for (Number targetID : targetIDs) {
-            List<Number> versions = targetDao.getCachedRepresentations(targetID);
+            List<Number> versions = cachedRepresentationDao.getCachedRepresentationsForTarget(targetID);
             if (versions == null) {
                 result.add(targetDao.getURIFromInternalID(targetID));
@@ -293 +293 @@
                 annotationInfo.setOwnerRef(userDao.getURIFromInternalID(annotationDao.getOwner(annotationID)));
                 result.getAnnotationInfo().add(annotationInfo);
-
             }
 
@@ -421 +420 @@
         }
     }
+    
+    ////// noetbooks ///////
 
     @Override
@@ -472 +473 @@
     public ReferenceList getPrincipals(Number notebookID, String permission) {
         ReferenceList result = new ReferenceList();
-        List<Number> principalIDs = notebookDao.getPrincipalIDsWithPermission(notebookID, Permission.fromValue(permission));
+        List<Number> principalIDs = userDao.getPrincipalIDsWithPermissionForNotebook(notebookID, Permission.fromValue(permission));
         for (Number principalID : principalIDs) {
             String reference = userDao.getURIFromInternalID(principalID);
@@ -487 +488 @@
 
         ReferenceList annotations = new ReferenceList();
-        List<Number> annotationIDs = notebookDao.getAnnotations(notebookID);
+        List<Number> annotationIDs = annotationDao.getAnnotations(notebookID);
         for (Number annotationID : annotationIDs) {
             annotations.getRef().add(annotationDao.getURIFromInternalID(annotationID));
@@ -498 +499 @@
         permissions.add(Permission.WRITER);
         for (Permission permission : permissions) {
-            List<Number> users = notebookDao.getPrincipalIDsWithPermission(notebookID, permission);
+            List<Number> users = userDao.getPrincipalIDsWithPermissionForNotebook(notebookID, permission);
             if (users != null) {
                 for (Number user : users) {
@@ -520 +521 @@
     @Override
     public ReferenceList getAnnotationsForNotebook(Number notebookID, int startAnnotation, int maximumAnnotations, String orderedBy, boolean desc) {
-        List<Number> annotationIDs = notebookDao.getAnnotations(notebookID);
+        List<Number> annotationIDs = annotationDao.getAnnotations(notebookID);
 
         if (startAnnotation < -1) {
@@ -697 +698 @@
 
     ////////////// DELETERS //////////////////
+    
+   
+    
+    
     @Override
     public int deleteUser(Number userID) {
@@ -702 +707 @@
     }
 
-    ////////////// DELETERS //////////////////
+    
     @Override
     public int deleteUserSafe(Number userID) {
@@ -708 +713 @@
     }
 
+    @Override
+    public int deleteCachedRepresentation(Number internalID) {
+        
+        if (internalID == null) {
+            logger.debug("Cached's internalID is null");
+            return 0;
+        }
+        
+        if (targetDao.cachedIsInUse(internalID)) {
+            logger.debug("Cached Repr. is in use, and cannot be deleted.");
+            return 0;
+        }
+
+        return cachedRepresentationDao.deleteCachedRepresentation(internalID);
+    };
+    
+    
     @Override
     public int[] deleteCachedRepresentationOfTarget(Number versionID, Number cachedID) {
@@ -722 +744 @@
 
     @Override
-    public int[] deleteAllCachedRepresentationsOfTarget(Number TargetID) {
+    public int[] deleteAllCachedRepresentationsOfTarget(Number targetID) {
         int[] result = new int[2];
         result[0] = 0;
         result[1] = 0;
-        List<Number> cachedIDs = targetDao.getCachedRepresentations(TargetID);
+        List<Number> cachedIDs = cachedRepresentationDao.getCachedRepresentationsForTarget(targetID);
         for (Number cachedID : cachedIDs) {
-            int[] currentResult = this.deleteCachedRepresentationOfTarget(TargetID, cachedID);
+            int[] currentResult = this.deleteCachedRepresentationOfTarget(targetID, cachedID);
             result[0] = result[0] + currentResult[0];
             result[1] = result[1] + currentResult[1];
@@ -737 +759 @@
     @Override
     public int[] deleteAnnotation(Number annotationID) {
-        int[] result = new int[4];
+        int[] result = new int[5];
         result[1] = annotationDao.deleteAnnotationPrincipalPermissions(annotationID);
-        List<Number> targetIDs = annotationDao.retrieveTargetIDs(annotationID);
+        List<Number> targetIDs = targetDao.retrieveTargetIDs(annotationID);
         result[2] = annotationDao.deleteAllAnnotationTarget(annotationID);
-        result[0] = annotationDao.deleteAnnotation(annotationID);
         result[3] = 0;
         if (targetIDs != null) {
             for (Number targetID : targetIDs) {
                 this.deleteAllCachedRepresentationsOfTarget(targetID);
-                result[3] = result[3] + targetDao.deleteTarget(targetID);
-
-            }
-        }
-        return result;
+                result[3] = result[3] + this.deleteTarget(targetID);
+
+            }
+        }
+        
+        result[4] = annotationDao.deleteAnnotationFromAllNotebooks(annotationID);
+        
+        result[0] = annotationDao.deleteAnnotation(annotationID);
+        return result;
+    }
+    
+    ////////////////////// DELETERS ////////////////////////
+    @Override
+    public int deleteTarget(Number internalID) {
+        if (internalID == null) {
+            logger.debug("internalID of the target is null.");
+            return 0;
+        }
+        
+        if (annotationDao.targetIsInUse(internalID)) {
+            logger.debug("The target is in use, and cannot be deleted.");
+            return 0;
+        }
+        
+        return targetDao.deleteTarget(internalID);
+
     }