Changeset 3380 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDao.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/JdbcVersionDao.java (modified) (4 diffs)

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

@@ -51 +51 @@
         return new VersionIdentifier(super.getExternalIdentifier(internalID));
     }
+    
+      //////////////////////////////////////////////////////////////////////////////////////////////////////    
+    @Override
+    public Number getInternalID(VersionIdentifier externalID) {
+        return (super.getInternalID(externalID));
+    }
+    
     ///////////////////////////////////////////////////////////////
 
@@ -158 +165 @@
     /////////////////////////////////////////////////
     @Override
-    public Version addVersion(Version freshVersion) {
+    public Number addVersion(Version freshVersion) {
         VersionIdentifier externalIdentifier = new VersionIdentifier();
         String newExternalIdentifier = externalIdentifier.toString();
@@ -168 +175 @@
         String sql = "INSERT INTO " + versionTableName + "(" + external_id + "," + version + " ) VALUES (:externalId, :version)";
         final int affectedRows = getSimpleJdbcTemplate().update(sql, params);
-
-        if (affectedRows == 1) {
-            Version versionAdded = makeFreshCopy(freshVersion);
-            // TODO change for external identifier when the schema is fixed
-            versionAdded.setVersion(newExternalIdentifier);
-            return versionAdded;
-        } else {
-            return null;
-        }
-
-        // adding the corresponding cached representation is initiated from the separate service POST api/sources/<sid>/cached
-        // so it is not implemented here
+        return getInternalID(externalIdentifier);
     }
 
@@ -213 +209 @@
     }
 
-    ////////////////////// HELPERS ///////////////////////////////
-    private Version makeFreshCopy(Version version) {
-        Version result = new Version();
-        // TOD: add external ID when the schema is corrected
-        result.setVersion(version.getVersion());
-        return result;
-    }
+   
 }