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

Timestamp:

02/14/14 12:54:43 (10 years ago)

Author:

olhsha

Message:

Integrity-Service tests are done (mocking NotebookDao?).

File:

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

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

@@ -499 +499 @@
 
         int offset = (startAnnotation > 0) ? startAnnotation - 1 : 0;
-        String direction = desc ? " DESC " : " ASC ";
+        String direction = desc ? "DESC" : "ASC";
         List<Number> selectedAnnotIDs = annotationDao.sublistOrderedAnnotationIDs(annotationIDs, offset, maximumAnnotations, orderedBy, direction);
         List<UUID> annotationUUIDs = new ArrayList<UUID>();
@@ -641 +641 @@
         return annotationDao.addAnnotationPrincipalPermission(annotationID, userID, permission);
     }
-    
+
     //////////// notebooks //////
-
     @Override
     public Number createNotebook(Notebook notebook, Number ownerID) {
@@ -719 +718 @@
         return result;
     }
-    
+
     @Override
     public boolean deleteNotebook(Number notebookID) {
-        boolean deletePermissions = notebookDao.deleteAllPermissionsForNotebook(notebookID);
-        boolean deleteAnnotations = notebookDao.deleteAllAnnotationsFromNotebook(notebookID);
-        return notebookDao.deleteNotebook(notebookID);
-    }
-
-    ////////////// HELPERS ////////////////////
-    private Target createFreshTarget(TargetInfo targetInfo) {
+        if (notebookDao.deleteAllPermissionsForNotebook(notebookID) || notebookDao.deleteAllAnnotationsFromNotebook(notebookID)) {
+            return notebookDao.deleteNotebook(notebookID);
+        } else {
+            return false;
+        }
+    }
+
+////////////// HELPERS ////////////////////
+private Target createFreshTarget(TargetInfo targetInfo) {
         Target target = new Target();
         target.setLink(targetInfo.getLink());