Changeset 3236

Timestamp:

08/05/13 13:32:17 (11 years ago)

Author:

olhsha

Message:

get, retrieve list for versions, add and delete cached representations DAO are implemented and tested

Location:

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

Files:

• main/java/eu/dasish/annotation/backend/dao/CachedRepresentationDao.java (modified) (3 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDao.java (modified) (4 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDao.java (modified) (1 diff)
• main/resources/spring-config/cachedRepresentationDao.xml (added)
• main/resources/spring-config/versionDao.xml (added)
• test/java/eu/dasish/annotation/backend/TestBackendConstants.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/TestInstances.java (modified) (2 diffs)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDaoTest.java (added)
• 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/CachedRepresentationDao.java

@@ -41 +41 @@
      * @return internal identifier of the resource with externalID
      */
-    public  Number getExternalId(CachedRepresentationIdentifier externalID);
+    public  Number getInternalId(CachedRepresentationIdentifier externalID);
     
     /**
      * 
      * @param internalID
-     * @return the object which fields have the corresponding column values of the row internalID
+     * @return the object "cached representation info"  with the internal id "internalID"
      */
     public CachedRepresentationInfo getCachedRepresentationInfo(Number internalID);
@@ -53 +53 @@
      * 
      * @param versionID
-     * @return List of cached_representation_id-s of all the cached representations of the version with versionID
+     * @return The list list of cached representation internal id-s of all the cached representations of the version with versionID
      */
     public List<Number> retrieveCachedRepresentationList(Number versionID);
@@ -59 +59 @@
     /**
      * 
-     * @param versionID
-     * @return List of cached_representation_id-s of all the cached representations of the version with versionID
+     * @param internalID
+     * @return the amount of rows affected by removing from the DB the cached representation with the id "intenalID"
+     * should be "1" (or 0 with  a non-existing id on the input)
      */
-    public CachedRepresentations retrieveCachedRepresentations(Number versionID);
+    public int deleteCachedRepresentationInfo(Number internalID);
     
+    /**
+     * 
+     * @param cached
+     * @return copy of "cached" after "cached" is added to the DB; the internal id is set in the return copy
+     */
+    public CachedRepresentationInfo addCachedRepresentationInfo(CachedRepresentationInfo cached);
    
 }

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

@@ -333 +333 @@
    
     
-   
-   
-    //TODO: update when target sources and permissions are added
+ //////////////////////////////////////////  
+   
     private  Annotation makeFreshCopy(Annotation annotation){
         

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

@@ -21 +21 @@
 import eu.dasish.annotation.backend.identifiers.CachedRepresentationIdentifier;
 import eu.dasish.annotation.schema.CachedRepresentationInfo;
-import eu.dasish.annotation.schema.CachedRepresentations;
-import eu.dasish.annotation.schema.ResourceREF;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.sql.DataSource;
 import org.springframework.jdbc.core.RowMapper;
@@ -69 +68 @@
       //////////////////////////////////////////////////////////////////////////////////////////////////////
      @Override
-     public Number getExternalId(CachedRepresentationIdentifier externalID){
+     public Number getInternalId(CachedRepresentationIdentifier externalID){
        if (externalID == null) {
             return null;
         }
        String sql = "SELECT "+cached_representation_id+" FROM "+cachedRepresentationTableName+" WHERE "+external_id  +"= ?";
-       List<Number> sqlResult= getSimpleJdbcTemplate().query(sql, internalIDRowMapper, externalID); 
+       List<Number> sqlResult= getSimpleJdbcTemplate().query(sql, internalIDRowMapper, externalID.toString()); 
        
        if (sqlResult == null) {
@@ -90 +89 @@
         @Override
         public Number mapRow(ResultSet rs, int rowNumber) throws SQLException {
-            return(rs.getInt(cached_representation_id));
+            int result = rs.getInt(cached_representation_id); 
+            Number resultNumber =  result;
+            return resultNumber;
         }
      }; 
@@ -140 +141 @@
       };
       
+      ////////////////////////////////////////////////////////////////////////////
+      @Override
+      public int deleteCachedRepresentationInfo(Number internalID){
+        String sql = "DELETE FROM " + cachedRepresentationTableName + " where "+cached_representation_id + " = ?";
+        String sqlVersionsCachedRepresentations = "DELETE FROM " + versionsCachedRepresentationsTableName + " where "+cached_representation_id + " = ?";        
+        getSimpleJdbcTemplate().update(sqlVersionsCachedRepresentations, internalID);
+        return (getSimpleJdbcTemplate().update(sql, internalID));
+      };
+     
+      ////////////////////////////////////////////////////////////////////////////
+      @Override
+      public CachedRepresentationInfo addCachedRepresentationInfo(CachedRepresentationInfo cached){
+          
+          CachedRepresentationIdentifier externalIdentifier = new CachedRepresentationIdentifier();
+          
+          Map<String, Object> params = new HashMap<String, Object>();
+          params.put("externalId", externalIdentifier.toString());
+          params.put("mime_type", cached.getMimeType());
+          params.put("tool", cached.getTool());
+          params.put("type", cached.getType());
+          String sql = "INSERT INTO "+cachedRepresentationTableName + "("+external_id+","+ mime_type+"," + tool+","+type_+" ) VALUES (:externalId, :mime_type,  :tool, :type)";
+          final int affectedRows = getSimpleJdbcTemplate().update(sql, params);
+          CachedRepresentationInfo cachedNew = makeFreshCopy(cached);          
+          return cachedNew;
+      }
       
-      /////////////////////////////////////////////////////
+      ////////// Helpers ///////////////////
       
-      @Override
-      public CachedRepresentations retrieveCachedRepresentations(Number versionID){
-       CachedRepresentations result = new CachedRepresentations();
-       
-       List<Number> cachedRepresenationIDs = retrieveCachedRepresentationList(versionID);
-       List<ResourceREF> cachedRepresenationIdentifierList = new ArrayList<ResourceREF>();
-       
-       for (Number cachedRepresentationID :  cachedRepresenationIDs){
-           ResourceREF resourceREF = new ResourceREF();
-           resourceREF.setRef(getExternalId(cachedRepresentationID).toString());
-           cachedRepresenationIdentifierList.add(resourceREF);
-       }
-       
-       result.getCachedRepresentation().addAll(cachedRepresenationIdentifierList);
-       return result;
-      };
-      
+      private CachedRepresentationInfo makeFreshCopy(CachedRepresentationInfo cached){
+          CachedRepresentationInfo result = new CachedRepresentationInfo();
+          result.setMimeType(cached.getMimeType());
+          result.setRef(cached.getRef());
+          result.setTool(cached.getTool());
+          result.setType(cached.getType());
+          return result;
+      }
 }

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

@@ -45 +45 @@
     final static protected String permissionsTableName = "annotations_principals_permissions";
     final static protected String annotationsSourcesTableName = "annotations_target_sources";
-    final static protected String versionsCachedRepresentationsTableName = "versions+cached_representations";
+    final static protected String versionsCachedRepresentationsTableName = "versions_cached_representations";
     
     

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

@@ -113 +113 @@
         public Version mapRow(ResultSet rs, int rowNumber) throws SQLException {
             Version result = new Version();
-            //external_id, mime_type, tool, type_, where_is_the_file
-           // result.setCachedRepresentations((rs.get)
-          //  result.setRef(rs.getString(external_id));
-          //  result.setTool(rs.getString(tool));
-           // result.setType(rs.getString(type_));
-            // TODO add where is the file when the schem is updated!!!!s
+            // TODO: clarify situation with the attribute cached representation
+            //result.setCachedRepresentations!!! The same situation as with permissions lists: we cannot refer from a filed to a list of smth, we have a separate joint table
+            // TODO: attribute URI (external-id is missing)
+            result.setVersion(rs.getString("external_id"));
             return result;
         }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestBackendConstants.java

@@ -81 +81 @@
     public static final int _TEST_SOURCE_1_VERSION_ID = 1;
     public static final int _TEST_SOURCE_2_VERSION_ID = 3;
+    
+    public static final String _TEST_CACHED_REPRESENTATION_1_EXT_ID_ = "00000000-0000-0000-0000-000000000051";
+    // INSERT INTO cached_representation_info (external_id, mime_type, tool, type_, where_is_the_file) VALUES ('00000000-0000-0000-0000-000000000051', 'text/html', 'latex', 'text', 'corpus1'); --1
+    public static final String _TEST_CACHED_REPRESENTATION_1_MIME_TYPE_ =  "text/html";
+    public static final String _TEST_CACHED_REPRESENTATION_1_TOOL_ =  "latex";
+    public static final String _TEST_CACHED_REPRESENTATION_1_TYPE_ =  "text";
+    
+    
 }
 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestInstances.java

@@ -66 +66 @@
     
     // so far tests only adding annot with existing sources!!!
-    // TOD: add non-existing sources
+    // TODO: add non-existing sources
     private Annotation makeAnnotation(String bodyTxt, String headline, int ownerId){
         Annotation result = new Annotation();
@@ -91 +91 @@
         return _annotationToAdd;
     }
+    
+   
 }

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

@@ -123 +123 @@
 INSERT INTO cached_representation_info (external_id, mime_type, tool, type_, where_is_the_file) VALUES ('00000000-0000-0000-0000-000000000053', 'image/png', 'screenshooter', 'image', 'corpus1'); -- 3
 INSERT INTO cached_representation_info (external_id, mime_type, tool, type_, where_is_the_file) VALUES ('00000000-0000-0000-0000-000000000054', 'text/html', 'oxygen', 'text', 'corpus1'); --4 
+INSERT INTO cached_representation_info (external_id, mime_type, tool, type_, where_is_the_file) VALUES ('00000000-0000-0000-0000-000000000055', 'image/jpg', 'photomaster', 'image', 'TLAscratch'); --5 
 
 --------------------------------------------------------------
@@ -138 +139 @@
 INSERT INTO versions_cached_representations (version_id, cached_representation_id) VALUES (3, 2);
 INSERT INTO versions_cached_representations (version_id, cached_representation_id) VALUES (4, 4);
-
+INSERT INTO versions_cached_representations (version_id, cached_representation_id) VALUES (1, 5);
 
 ---- PERMISSIONS --------------------------------------------------------------------------------------------