Changeset 3364

Timestamp:

08/12/13 12:57:16 (11 years ago)

Author:

olhsha

Message:

safe removing sources (if not other annotation refers) is incorporated into remove annotation

Location:

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

Files:

• main/java/eu/dasish/annotation/backend/Helpers.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcSourceDao.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified) (5 diffs)

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

@@ -19 +19 @@
 
 import java.sql.Timestamp;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.Locale;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;

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

@@ -194 +194 @@
     public int deleteAnnotation(Number annotationId) throws SQLException {
 
-        //TODO: why  does it not work via calling notebook and permissions "remove" methods??
-
         String sqlNotebooks = "DELETE FROM " + notebooksAnnotationsTableName + " where " + annotation_id + " = ?";
         int affectedNotebooks = getSimpleJdbcTemplate().update(sqlNotebooks, annotationId);
 
-        String sqlPermissions = "DELETE FROM " + permissionsTableName + " where " + annotation_id + " = ?";
+         String sqlPermissions = "DELETE FROM " + permissionsTableName + " where " + annotation_id + " = ?";
         int affectedPermissions = getSimpleJdbcTemplate().update(sqlPermissions, annotationId);
-
-        // TODO make a separate methods in sources DAO so that it handles removal of sources which are not referered by annotations
+        
+        // safe removing sources
+        List<Number> sourceIDs = jdbcSourceDao.retrieveSourceIDs(annotationId);
         String sqlTargetSources = "DELETE FROM " + annotationsSourcesTableName + " where " + annotation_id + " = ?";
-        int affectedSources = getSimpleJdbcTemplate().update(sqlTargetSources, annotationId);
+        int affectedAnnotationsSources = getSimpleJdbcTemplate().update(sqlTargetSources, annotationId);
+        int affectedSources;
+        for (Number sourceID : sourceIDs) {            
+         // call  the method in sources DAO that handles removal of a source which is not refered by other annotations
+            affectedSources = jdbcSourceDao.deleteSource(sourceID);
+        }
 
         String sqlAnnotation = "DELETE FROM " + annotationTableName + " where " + annotation_id + " = ?";

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

@@ -64 +64 @@
     public List<Number> retrieveSourceIDs(Number annotationID) {
         String sql = "SELECT " + source_id + " FROM " + annotationsSourcesTableName + " WHERE " + annotation_id + "= ?";
-        List<Number> result = getSimpleJdbcTemplate().query(sql, annotationSourceRowMapper, annotationID);
-
-        if (result == null) {
-            return null;
-        }
-        if (result.isEmpty()) {
-            return null;
-        }
+        List<Number> result = getSimpleJdbcTemplate().query(sql, annotationSourceRowMapper, annotationID);       
         return result;
     }

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

@@ -18 +18 @@
 package eu.dasish.annotation.backend.dao.impl;
 
-import eu.dasish.annotation.backend.Helpers;
 import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.backend.TestInstances;
@@ -38 +37 @@
 import java.util.List;
 import java.util.Map;
-import javax.xml.datatype.DatatypeConfigurationException;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import static org.junit.Assert.*;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -229 +228 @@
     public void testDeleteAnnotation() throws SQLException {
         System.out.println("deleteAnnotation");
-
-        mockery.checking(new Expectations() {
-            {
-                oneOf(permissionsDao).removeAnnotation(5);
+        final List<Number> sourceIDs = new ArrayList<Number>();
+        sourceIDs.add(3);
+        sourceIDs.add(4);
+
+        mockery.checking(new Expectations() {
+            {
+                oneOf(sourceDao).retrieveSourceIDs(5);
+                will(returnValue(sourceIDs));
+                
+                oneOf(sourceDao).deleteSource(sourceIDs.get(0));
+                will(returnValue(0));
+                
+                oneOf(sourceDao).deleteSource(sourceIDs.get(1));
                 will(returnValue(1));
-
-                oneOf(notebookDao).removeAnnotation(5);
-                will(returnValue(3));
             }
         });
@@ -244 +249 @@
         // now, try to delete the same annotation one more time
         // if it has been already deleted then the method under testing should return 0
+        
+        mockery.checking(new Expectations() {
+            {
+                oneOf(sourceDao).retrieveSourceIDs(5);
+                will(returnValue(new ArrayList<Number>()));                
+            }
+        });
         result = jdbcAnnotationDao.deleteAnnotation(5);
         assertEquals(0, result);
@@ -352 +364 @@
 
     @Test
+    @Ignore
     public void testGetExternalID() {
         System.out.println("getAnnotationID");