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

Timestamp:

08/14/13 16:34:29 (11 years ago)

Author:

olhsha

Message:

"put updated body" is implemented and tested. Big refactring: simplifying DAO's and pushing their composition to rest methods. add-methods in DAO return now not the classes but internalID-s of the added resources. Still 2 test errors and 2 test failures.

File:

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

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

@@ -70 +70 @@
             result.setTool(rs.getString(tool));
             result.setType(rs.getString(type_));
-            // TODO add where is the file when the schem is updated!!!!s
+            // TODO add "where is the file when the schema" is updated!!!!s
             return result;
         }
@@ -93 +93 @@
      
       ////////////////////////////////////////////////////////////////////////////
-      @Override
-    public CachedRepresentationInfo addCachedRepresentationInfo(CachedRepresentationInfo cached) {
+    @Override
+    public Number addCachedRepresentationInfo(CachedRepresentationInfo cached) {
 
         CachedRepresentationIdentifier externalIdentifier = new CachedRepresentationIdentifier();
@@ -105 +105 @@
         String sql = "INSERT INTO " + cachedRepresentationTableName + "(" + external_id + "," + mime_type + "," + tool + "," + type_ + " ) VALUES (:externalId, :mime_type,  :tool, :type)";
         final int affectedRows = getSimpleJdbcTemplate().update(sql, params);
-
-        if (affectedRows == 1) {
-            CachedRepresentationInfo cachedNew = makeFreshCopy(cached);
-            cachedNew.setRef(externalIdentifier.toString());
-            return cachedNew;
-        } else {
-            return null;
-        }
+        return getInternalID(externalIdentifier);
     }
 
@@ -139 +132 @@
     };
 
-    ////////// Helpers ///////////////////
-    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;
-    }
-    
 }