Changeset 4406

Timestamp:

01/30/14 16:47:11 (10 years ago)

Author:

olhsha

Message:

Getting filtered annotation lists is debugged and tested. REST service DELETE annotation-principal is added

Location:

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

Files:

• main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified) (2 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified) (2 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified) (2 diffs)
• main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceTest.java (modified) (2 diffs)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified) (2 diffs)

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

@@ -66 +66 @@
      * 
      */
-    public List<Number> getFilteredAnnotationIDs(List<Number> annotationIDs, String text, String namespace, Timestamp after, Timestamp before);
+    public List<Number> getFilteredAnnotationIDs(List<Number> annotationIDs, String text, String namespace, String after, String before);
      
     public List<Number> getAllAnnotationIDs();

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

@@ -87 +87 @@
     * -- created after time-samp "after and before time-stamp "before".
     */
-    List<Number> getFilteredAnnotationIDs(String link, String text, Number inloggedUserID, String[] accessModes, String namespace, Timestamp after, Timestamp before);
+    List<Number> getFilteredAnnotationIDs(String link, String text, Number inloggedUserID, String[] accessModes, String namespace, String after, String before);
     
     AnnotationInfoList getAllAnnotationInfos();
@@ -109 +109 @@
      */
     AnnotationInfoList getFilteredAnnotationInfos(String word, String text, Number inloggedUserID, String[] accessModes, String namespace, UUID
-            ownerID, Timestamp after, Timestamp before);
+            ownerID, String after, String before);
 
     /**

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

@@ -186 +186 @@
     ////////////////////////////////////////////////////////////////////////
     @Override
-    public List<Number> getFilteredAnnotationIDs(String link, String text, Number inloggedUserID, String[] accessModes, String namespace, Timestamp after, Timestamp before) {
+    public List<Number> getFilteredAnnotationIDs(String link, String text, Number inloggedUserID, String[] accessModes, String namespace, String after, String before) {
 
         if (accessModes == null) {
@@ -255 +255 @@
 
     @Override
-    public AnnotationInfoList getFilteredAnnotationInfos(String word, String text, Number inloggedUserID, String[] accessModes, String namespace, UUID owner, Timestamp after, Timestamp before) {
+    public AnnotationInfoList getFilteredAnnotationInfos(String word, String text, Number inloggedUserID, String[] accessModes, String namespace, UUID owner, String after, String before) {
         List<Number> annotationIDs = getFilteredAnnotationIDs(word, text, inloggedUserID, accessModes, namespace, after, before);
         Number givenOwnerID = (owner != null) ? userDao.getInternalID(owner) : null;

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

@@ -166 +166 @@
     ////////////////////////////////////////////////////////////////////////
     @Override
-    public List<Number> getFilteredAnnotationIDs(List<Number> annotationIDs, String text, String namespace, Timestamp after, Timestamp before) {
+    public List<Number> getFilteredAnnotationIDs(List<Number> annotationIDs, String text, String namespace, String after, String before) {
 
         StringBuilder sql = new StringBuilder("SELECT DISTINCT ");
@@ -186 +186 @@
 
         if (after != null) {
-            sql.append(" AND ").append(last_modified).append("  > :after");
-            params.put("after", after);
+            sql.append(" AND ").append(last_modified).append("  > :afterTimestamp");
+            params.put("afterTimestamp", Timestamp.valueOf(after));
         }
 
         if (before != null) {
-            sql.append(" AND ").append(last_modified).append("  < :before");
-            params.put("before", before);
+            sql.append(" AND ").append(last_modified).append("  < :beforeTimestamp");
+            params.put("beforeTimestamp", Timestamp.valueOf(before));
         }
 

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

@@ -200 +200 @@
             @QueryParam("namespace") String namespace,
             @QueryParam("owner") String ownerExternalId,
-            @QueryParam("after") Timestamp after,
-            @QueryParam("before") Timestamp before) throws IOException {
+            @QueryParam("after") String after,
+            @QueryParam("before") String before) throws IOException {
 
         dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());

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

@@ -296 +296 @@
         mockAnnotationIDs2.add(3);
         
-        final Timestamp after = new Timestamp(0);
-        final Timestamp before = new Timestamp(System.currentTimeMillis());
+        final String after = (new Timestamp(0)).toString();
+        final String before = (new Timestamp(System.currentTimeMillis())).toString();
 
         final List<Number> mockRetval = new ArrayList<Number>();
@@ -393 +393 @@
         final String text = "some html";
         final UUID ownerUUID = UUID.fromString(TestBackendConstants._TEST_USER_4_EXT_ID);
-        final Timestamp after = new Timestamp(0);
-        final Timestamp before = new Timestamp(System.currentTimeMillis());
+        final String after = (new Timestamp(0)).toString();
+        final String before = (new Timestamp(System.currentTimeMillis())).toString();
 
         final List<Number> mockAnnotIDs = new ArrayList<Number>();

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

@@ -348 +348 @@
         
              
-        Timestamp after = new Timestamp(0); 
-        Timestamp before = new Timestamp(System.currentTimeMillis());  
+        final String after = (new Timestamp(0)).toString();
+        final String before = (new Timestamp(System.currentTimeMillis())).toString();
+ 
         List<Number> result_4 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, after, before);        
         assertEquals(2, result_4.size());
@@ -355 +356 @@
         assertEquals(3, result_2.get(1));
         
-        Timestamp after_1 = new Timestamp(System.currentTimeMillis()); // no annotations added after "now"       
+        final String after_1 = (new Timestamp(System.currentTimeMillis())).toString();// no annotations added after "now"       
         List<Number> result_5 = jdbcAnnotationDao.getFilteredAnnotationIDs(annotationIDs, "some html", null, after_1, null);        
         assertEquals(0, result_5.size());