Changeset 3463

Timestamp:

08/23/13 15:20:13 (11 years ago)

Author:

olhsha

Message:

making URI's in JAXB-generated classes fro resources <serviceURI>_<external_id>. Earlier it was just external Id.

Location:

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

Files:

• main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified) (18 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDao.java (modified) (5 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDao.java (modified) (6 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcSourceDao.java (modified) (11 diffs)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDao.java (modified) (6 diffs)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified) (4 diffs)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDaoTest.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDaoTest.java (modified) (9 diffs)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcSourceDaoTest.java (modified) (5 diffs)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDaoTest.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/rest/NotebookResourceTest.java (modified) (3 diffs)

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

@@ -57 +57 @@
     @Override
     public List<Number> retrieveSourceIDs(Number annotationID) {
-        String sql = "SELECT " + source_id + " FROM " + annotationsSourcesTableName + " WHERE " + annotation_id + "= ?";
-        List<Number> result = getSimpleJdbcTemplate().query(sql, sourceIDRowMapper, annotationID);
-        return result;
+        StringBuilder sql = new StringBuilder("SELECT DISTINCT ");
+        sql.append(source_id).append(" FROM ").append(annotationsSourcesTableName).append(" WHERE ").append(annotation_id).append("= ?");
+        return getSimpleJdbcTemplate().query(sql.toString(), sourceIDRowMapper, annotationID);
     }
     
@@ -102 +102 @@
         }
 
-        List<Number> result = getSimpleJdbcTemplate().query(sql.toString(), internalIDRowMapper, params);
-        return result;
+        return getSimpleJdbcTemplate().query(sql.toString(), internalIDRowMapper, params);
     }
 
@@ -119 +118 @@
         query.append(annotation_id).append(" FROM ").append(annotationsSourcesTableName).append(" WHERE ").append(source_id).append(" IN ");
         query.append(values);
-        List<Number> result = getSimpleJdbcTemplate().query(query.toString(), internalIDRowMapper);
-        return result;
+        return getSimpleJdbcTemplate().query(query.toString(), internalIDRowMapper);
     }
     
@@ -137 +135 @@
 
         String values = makeListOfValues(annotationIDs);
-        String sql = "SELECT DISTINCT " + annotationStar + " FROM " + annotationTableName + " WHERE " + annotationAnnotation_id + "  IN " + values;
-        return getSimpleJdbcTemplate().query(sql, annotationInfoRowMapper);
+        StringBuilder sql = new StringBuilder("SELECT DISTINCT ");
+        sql.append(annotationStar).append(" FROM ").append(annotationTableName ).append(" WHERE ").append(annotationAnnotation_id).append("  IN ").append(values);
+        return getSimpleJdbcTemplate().query(sql.toString(), annotationInfoRowMapper);
     }
     private final RowMapper<AnnotationInfo> annotationInfoRowMapper = new RowMapper<AnnotationInfo>() {
@@ -144 +143 @@
         public AnnotationInfo mapRow(ResultSet rs, int rowNumber) throws SQLException {
             AnnotationInfo annotationInfo = new AnnotationInfo();
+            annotationInfo.setRef(externalIDtoURI(_serviceURI, rs.getString(external_id)));
             annotationInfo.setOwner(getResourceREF(Integer.toString(rs.getInt(owner_id))));
             annotationInfo.setHeadline(rs.getString(headline));
@@ -161 +161 @@
     @Override
     public List<ResourceREF> getAnnotationREFs(List<Number> annotationIDs) {
-
         if (annotationIDs == null) {
             return null;
         }
-
         if (annotationIDs.isEmpty()) {
             return (new ArrayList<ResourceREF>());
@@ -171 +169 @@
 
         String values = makeListOfValues(annotationIDs);
-        String sql = "SELECT DISTINCT " + annotationAnnotation_id + " FROM " + annotationTableName + " WHERE " + annotationAnnotation_id + "  IN " + values;
-        return getSimpleJdbcTemplate().query(sql, annotationREFRowMapper);
+        StringBuilder sql = new StringBuilder("SELECT DISTINCT ");
+        sql.append(external_id).append(" FROM ").append(annotationTableName).append(" WHERE ").append(annotationAnnotation_id).append("  IN ").append(values);
+        return getSimpleJdbcTemplate().query(sql.toString(), annotationREFRowMapper);
     }
     private final RowMapper<ResourceREF> annotationREFRowMapper = new RowMapper<ResourceREF>() {
@@ -178 +177 @@
         public ResourceREF mapRow(ResultSet rs, int rowNumber) throws SQLException {
             ResourceREF annotationREF = new ResourceREF();
-            annotationREF.setRef(Integer.toString(rs.getInt(annotation_id)));
+            annotationREF.setRef(externalIDtoURI(_serviceURI, rs.getString(external_id)));
             return annotationREF;
         }
@@ -188 +187 @@
         if (annotationID == null) {
             return null;        }
-        String sql = "SELECT " + annotationStar + " FROM " + annotationTableName + " WHERE " + annotationAnnotation_id + "= ? LIMIT  1";
-        List<Annotation> respond = getSimpleJdbcTemplate().query(sql, annotationRowMapper, annotationID);
-
-        if (respond == null) {
-            return null;
-        }
-      
-        Annotation result = respond.get(0);
-        String externalId = result.getURI();
-        result.setURI(extrnalIDtoURI(_serviceURI, externalId));
-        
-        return result;
+        StringBuilder sql = new StringBuilder("SELECT ");
+        sql.append(annotationStar).append(" FROM ").append(annotationTableName).append(" WHERE ").append(annotationAnnotation_id).append("= ? LIMIT  1");
+        List<Annotation> respond = getSimpleJdbcTemplate().query(sql.toString(), annotationRowMapper, annotationID);
+        return (respond.isEmpty() ? null : respond.get(0));
     }
     
@@ -215 +206 @@
             annotation.setBody(Helpers.deserializeBody(rs.getString(body_xml)));
             annotation.setTargetSources(null);
-            // TODO: fix: rpelace URI in the schema with external id, or make here the conversion:
-            // from external ID in the DB to the URI for the class
-            annotation.setURI(rs.getString(external_id));
+            annotation.setURI(externalIDtoURI(_serviceURI, rs.getString(external_id)));
 
             try {
@@ -232 +221 @@
     
     private boolean annotationIsInUse(Number sourceID) {
-        String sqlNotebooks = "SELECT " + notebook_id + " FROM " + notebooksAnnotationsTableName + " WHERE " + annotation_id + "= ? LIMIT 1";
-        List<Number> resultNotebooks = getSimpleJdbcTemplate().query(sqlNotebooks, notebookIDRowMapper, sourceID);
+        StringBuilder sqlNotebooks = new StringBuilder("SELECT ");
+        sqlNotebooks.append(notebook_id).append(" FROM ").append(notebooksAnnotationsTableName).append(" WHERE ").append(annotation_id).append("= ? LIMIT 1");
+        List<Number> resultNotebooks = getSimpleJdbcTemplate().query(sqlNotebooks.toString(), notebookIDRowMapper, sourceID);
         if (resultNotebooks.size() > 0) {
             return true;
         }
-        String sqlSources = "SELECT " + source_id + " FROM " + annotationsSourcesTableName + " WHERE " + annotation_id + "= ? LIMIT 1";
-        List<Number> resultSources = getSimpleJdbcTemplate().query(sqlSources, sourceIDRowMapper, sourceID);
+        
+        StringBuilder sqlSources = new StringBuilder("SELECT ");
+        sqlSources.append(source_id).append(" FROM ").append(annotationsSourcesTableName).append(" WHERE ").append(annotation_id).append("= ? LIMIT 1");
+        List<Number> resultSources = getSimpleJdbcTemplate().query(sqlSources.toString(), sourceIDRowMapper, sourceID);
         if (resultSources.size() > 0) {
             return true;
         }
-        String sqlPermissions = "SELECT " + principal_id + " FROM " + permissionsTableName + " WHERE " + annotation_id + "= ? LIMIT 1";
-        List<Number> resultPermissions = getSimpleJdbcTemplate().query(sqlPermissions, principalIDRowMapper, sourceID);
-        if (resultPermissions.size() > 0) {
-            return true;
-        }
         
-        return false;
+        StringBuilder sqlPermissions = new StringBuilder("SELECT ");
+        sqlPermissions.append(principal_id).append(" FROM ").append(permissionsTableName).append(" WHERE ").append(annotation_id).append("= ? LIMIT 1");
+        List<Number> resultPermissions = getSimpleJdbcTemplate().query(sqlPermissions.toString(), principalIDRowMapper, sourceID);
+        return (resultPermissions.size() > 0);
     }
     
@@ -282 +272 @@
         sql.append(",").append(headline).append(",").append(body_xml).append(" ) VALUES (:externalId, :ownerId, :headline, :bodyXml)");
         int affectedRows = getSimpleJdbcTemplate().update(sql.toString(), params);
-        if (affectedRows == 1) {
-            return getInternalID(externalID);
-        } else {
-            return null;
-        }
-
+        return ((affectedRows > 0) ? getInternalID(externalID) : null);
     }
     
@@ -296 +281 @@
         paramsAnnotationsSources.put("annotationId", annotationID);
         paramsAnnotationsSources.put("sourceId", sourceID);
-        String sqlAnnotationsSources = "INSERT INTO " + annotationsSourcesTableName + "(" + annotation_id + "," + source_id + " ) VALUES (:annotationId, :sourceId)";
-        int affectedRows = getSimpleJdbcTemplate().update(sqlAnnotationsSources, paramsAnnotationsSources);
-        return (affectedRows);
+        StringBuilder  sqlAnnotationsSources = new StringBuilder("INSERT INTO ");
+        sqlAnnotationsSources.append(annotationsSourcesTableName ).append("(").append(annotation_id).append(",").append(source_id).append(" ) VALUES (:annotationId, :sourceId)");
+        return getSimpleJdbcTemplate().update(sqlAnnotationsSources.toString(), paramsAnnotationsSources);
     }
     //////////////////////////////////////////////////////////////////////////////////
 
    
-    //////////////////////////////////////////////////////
+    /////////////////// DELETERS //////////////////////////
     @Override
     public int deleteAnnotation(Number annotationID) throws SQLException {
@@ -309 +294 @@
             return 0;
         }
-        
-        String sqlAnnotation = "DELETE FROM " + annotationTableName + " where " + annotation_id + " = ?";
-        return (getSimpleJdbcTemplate().update(sqlAnnotation, annotationID)); 
+        StringBuilder sqlAnnotation = new StringBuilder("DELETE FROM ");
+        sqlAnnotation.append(annotationTableName).append(" where ").append(annotation_id).append(" = ?");
+        return (getSimpleJdbcTemplate().update(sqlAnnotation.toString(), annotationID)); 
     }
     
@@ -317 +302 @@
     @Override
     public int deleteAllAnnotationSource(Number annotationID) throws SQLException {
-        String sqlTargetSources = "DELETE FROM " + annotationsSourcesTableName + " where " + annotation_id + " = ?";
-        return getSimpleJdbcTemplate().update(sqlTargetSources, annotationID); // removed "annotations_target_sources" rows
+        StringBuilder sqlTargetSources = new StringBuilder("DELETE FROM ");
+        sqlTargetSources.append(annotationsSourcesTableName).append(" WHERE ").append(annotation_id).append(" = ?");
+        return getSimpleJdbcTemplate().update(sqlTargetSources.toString(), annotationID); // # removed "annotations_target_sources" rows
        
     }
@@ -338 +324 @@
     @Override
     public int deleteAnnotationPrincipalPermissions(Number annotationID) throws SQLException {
-        String sqlPermissions = "DELETE FROM " + permissionsTableName + " where " + annotation_id + " = ?";
-        return getSimpleJdbcTemplate().update(sqlPermissions, annotationID); // removed "permission" rows 
+        StringBuilder sqlPermissions = new StringBuilder("DELETE FROM ");
+        sqlPermissions.append(permissionsTableName).append(" WHERE ").append(annotation_id).append(" = ?");
+        return getSimpleJdbcTemplate().update(sqlPermissions.toString(), annotationID); // removed "permission" rows 
         
     }
@@ -350 +337 @@
         paramsPermissions.put("principalId", userID);
         paramsPermissions.put("status", permission.value());
-        String sqlUpdatePermissionTable = "INSERT INTO " + permissionsTableName + " (" + annotation_id + "," + principal_id + "," + this.permission + ") VALUES (:annotationId, :principalId, :status)";
-        final int affectedPermissions = getSimpleJdbcTemplate().update(sqlUpdatePermissionTable, paramsPermissions);
+        StringBuilder sqlUpdatePermissionTable = new StringBuilder("INSERT INTO ");
+        sqlUpdatePermissionTable.append(permissionsTableName).append(" (").append(annotation_id).append(",").append(principal_id).append(",").append(this.permission ).append(") VALUES (:annotationId, :principalId, :status)");
+        final int affectedPermissions = getSimpleJdbcTemplate().update(sqlUpdatePermissionTable.toString(), paramsPermissions);
         return affectedPermissions;
     }
@@ -362 +350 @@
             return null;
         }
-        String sql = "SELECT " + principal_id + "," + permission + " FROM " + permissionsTableName + " WHERE " + annotation_id + "  = ?";
-        List<Map<Number, String>> result = getSimpleJdbcTemplate().query(sql, principalsPermissionsRowMapper, annotationId.toString());
-        return result;
+        StringBuilder sql = new StringBuilder("SELECT ");
+        sql.append(principal_id).append(",").append(permission).append(" FROM ").append(permissionsTableName).append(" WHERE ").append(annotation_id).append("  = ?");
+        return getSimpleJdbcTemplate().query(sql.toString(), principalsPermissionsRowMapper, annotationId.toString());
     }
     private final RowMapper<Map<Number, String>> principalsPermissionsRowMapper = new RowMapper<Map<Number, String>>() {

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

@@ -49 +49 @@
     public CachedRepresentationInfo getCachedRepresentationInfo(Number internalID) {
 
-        String sql = "SELECT " + cachedRepresentationStar + " FROM " + cachedRepresentationTableName + " WHERE " + cached_representation_id + "= ?";
+        String sql = "SELECT " + cachedRepresentationStar + " FROM " + cachedRepresentationTableName + " WHERE " + cached_representation_id + "= ? LIMIT 1";
         List<CachedRepresentationInfo> result = getSimpleJdbcTemplate().query(sql, cachedRepresentationRowMapper, internalID);
 
-        if (result == null) {
-            return null;
-        }
         if (result.isEmpty()) {
             return null;
@@ -65 +62 @@
             CachedRepresentationInfo result = new CachedRepresentationInfo();
             result.setMimeType(rs.getString(mime_type));
-            result.setRef(rs.getString(external_id));
+            result.setRef(externalIDtoURI(_serviceURI, rs.getString(external_id)));
             result.setTool(rs.getString(tool));
             result.setType(rs.getString(type_));
@@ -78 +75 @@
         String sql = "SELECT " + version_id + " FROM " + versionsCachedRepresentationsTableName + " WHERE " + cached_representation_id + "= ? LIMIT 1";
         List<Number> result = getSimpleJdbcTemplate().query(sql, versionIDRowMapper, cachedID);
-        if (result.size() > 0) {
-            return true;
-        }
-        return false;
+        return (!result.isEmpty());
     }
     
@@ -89 +83 @@
     @Override
     public Number addCachedRepresentationInfo(CachedRepresentationInfo cached) {
-
         UUID externalIdentifier = UUID.randomUUID();
         Map<String, Object> params = new HashMap<String, Object>();
@@ -98 +91 @@
         String sql = "INSERT INTO " + cachedRepresentationTableName + "(" + external_id + "," + mime_type + "," + tool + "," + type_ + " ) VALUES (:externalId, :mime_type,  :tool, :type)";
         final int affectedRows = getSimpleJdbcTemplate().update(sql, params);
-        return getInternalID(externalIdentifier);
+        return (affectedRows > 0 ? getInternalID(externalIdentifier) : null);
     }
 

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

@@ -24 +24 @@
 import eu.dasish.annotation.schema.NotebookInfo;
 import eu.dasish.annotation.schema.ResourceREF;
+import eu.dasish.annotation.schema.Version;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -57 +58 @@
     }
 
+    ////////////////////////////////////////////////
     @Override
     public List<NotebookInfo> getNotebookInfos(UUID  userID) {
@@ -62 +64 @@
         return getSimpleJdbcTemplate().query(sql, notebookInfoRowMapper, userID.toString());
     }
-
-    @Override
-    public List<Notebook> getUsersNotebooks(UUID userID) {
-        String sql = "SELECT " + notebookStar + " FROM " + notebookTableName + ", " + principalTableName + " where " + principal_id + " = " + owner_id + " and " + principalExternal_id + " = ?";
-        return getSimpleJdbcTemplate().query(sql, notebookRowMapper, userID.toString());
-    }
-
-    @Override
-    public UUID addNotebook(UUID userID, String title) {
-        try {
-            final UUID externalIdentifier = UUID.randomUUID();
-            String sql = "INSERT INTO " + notebookTableName + " (" + external_id + ", " + this.title + "," + owner_id + ") VALUES (:notebookId, :title, (SELECT " + principal_id + " FROM " + principalTableName + " WHERE " + principalExternal_id + " = :userID))";
-            Map<String, Object> params = new HashMap<String, Object>();
-            params.put("notebookId", externalIdentifier.toString());
-            params.put("userID", userID.toString());
-            params.put("title", title);
-            final int updatedRowCount = getSimpleJdbcTemplate().update(sql, params);
-            return externalIdentifier;
-        } catch (DataAccessException exception) {
-            throw exception;
-        }
-    }
+    
     private final RowMapper<NotebookInfo> notebookInfoRowMapper = new RowMapper<NotebookInfo>() {
         @Override
         public NotebookInfo mapRow(ResultSet rs, int rowNumber) throws SQLException {
             NotebookInfo notebookInfo = new NotebookInfo();
-            notebookInfo.setRef(rs.getString(external_id)); // todo: what is ref? should it be the external id? Olha: "yes"
+            notebookInfo.setRef(externalIDtoURI(_serviceURI, rs.getString(external_id))); 
             notebookInfo.setTitle(rs.getString(title));
-//            notebookInfo.setRef(rs.getString("URI"));
             return notebookInfo;
         }
     };
-    private final RowMapper<Notebook> notebookRowMapper = new RowMapper<Notebook>() {
+    
+    ////////////////////////////////////////////////
+
+    @Override
+    public List<Notebook> getUsersNotebooks(UUID userID) {
+        String sql = "SELECT " + notebookStar + " FROM " + notebookTableName + ", " + principalTableName + " where " + principal_id + " = " + owner_id + " and " + principalExternal_id + " = ?";
+        return getSimpleJdbcTemplate().query(sql, notebookRowMapper, userID.toString());
+    }
+    
+       private final RowMapper<Notebook> notebookRowMapper = new RowMapper<Notebook>() {
         @Override
         public Notebook mapRow(ResultSet rs, int rowNumber) throws SQLException {
@@ -108 +97 @@
                 throw new SQLException(exception);
             }
-//            notebook.setURI(rs.getString("URI_ID"));
+            notebook.setURI(externalIDtoURI(_serviceURI,rs.getString("external_id")));
             notebook.setAnnotations(getAnnotations(rs.getInt(notebook_id)));
             return notebook;
         }
     };
+
+    @Override
+    public UUID addNotebook(UUID userID, String title) {
+        try {
+            final UUID externalIdentifier = UUID.randomUUID();
+            String sql = "INSERT INTO " + notebookTableName + " (" + external_id + ", " + this.title + "," + owner_id + ") VALUES (:notebookId, :title, (SELECT " + principal_id + " FROM " + principalTableName + " WHERE " + principalExternal_id + " = :userID))";
+            Map<String, Object> params = new HashMap<String, Object>();
+            params.put("notebookId", externalIdentifier.toString());
+            params.put("userID", userID.toString());
+            params.put("title", title);
+            final int updatedRowCount = getSimpleJdbcTemplate().update(sql, params);
+            return externalIdentifier;
+        } catch (DataAccessException exception) {
+            throw exception;
+        }
+    }
+    
+ 
 
     // returns the number of affected annotations
@@ -152 +159 @@
         return getSimpleJdbcTemplate().query(sql.toString(), annotationIDRowMapper, notebookID);
     }
-    private final RowMapper<Number> annotationIDRowMapper = new RowMapper<Number>() {
-        @Override
-        public Integer mapRow(ResultSet rs, int rowNumber) throws SQLException {
-            Integer annotationId = rs.getInt("annotation_id");
-            return annotationId;
-        }
-    };
-
+  
     //////////////////////////////////////////////////
     /**
@@ -216 +216 @@
             return null;
         }
-        String sql = "SELECT  " + notebookExternal_id + "," + notebookTitle + " FROM " + notebookTableName + " where " + notebook_id + " = ?";
+        String sql = "SELECT  " + notebookExternal_id + "," + notebookTitle + " FROM " + notebookTableName + " where " + notebook_id + " = ? LIMIT 1";
         List<NotebookInfo> result = getSimpleJdbcTemplate().query(sql, notebookInfoRowMapper, notebookID.toString());
-        if (result == null) {
-            return null;
-        }
-        if (result.isEmpty()) {
-            return null;
-        }
-        return result.get(0);
+        return (!result.isEmpty() ? result.get(0) : null);
     }
 

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

@@ -203 +203 @@
     
      
-    protected String extrnalIDtoURI(String serviceURI, String externalID) {
+    protected String externalIDtoURI(String serviceURI, String externalID) {
         if (_serviceURI != null) {
             return _serviceURI + externalID;

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

@@ -53 +53 @@
         String sql = "SELECT " + sourceStar + "FROM " + sourceTableName + " WHERE " + source_id + " = ?";
         List<Source> result = getSimpleJdbcTemplate().query(sql, sourceRowMapper, internalID);
-        return result.get(0);
+        return (!result.isEmpty() ? result.get(0) : null);
     }
     private final RowMapper<Source> sourceRowMapper = new RowMapper<Source>() {
@@ -61 +61 @@
                 XMLGregorianCalendar xmlDate = Helpers.setXMLGregorianCalendar(rs.getTimestamp(time_stamp));
                 Source result = 
-                        constructSource(UUID.fromString(rs.getString(external_id)), rs.getString(link_uri), rs.getString(version), xmlDate);
+                        constructSource(rs.getString(external_id), rs.getString(link_uri), rs.getString(version), xmlDate);
                 return result;
             } catch (DatatypeConfigurationException e) {
@@ -75 +75 @@
     public List<Number> retrieveVersionList(Number sourceID) {
         String sql = "SELECT " + version_id + " FROM " + sourcesVersionsTableName + " WHERE " + source_id + " = ?";
-        List<Number> result = getSimpleJdbcTemplate().query(sql, versionIDRowMapper, sourceID);
-        return result;
+        return getSimpleJdbcTemplate().query(sql, versionIDRowMapper, sourceID);
     }
 
@@ -92 +91 @@
         String sourceIDs = makeListOfValues(sources);
         String sql = "SELECT " + external_id + "," + link_uri + "," + version + " FROM " + sourceTableName + " WHERE " + source_id + " IN " + sourceIDs;
-        List<SourceInfo> result = getSimpleJdbcTemplate().query(sql, SourceInfoRowMapper);
-        return result;
+        return getSimpleJdbcTemplate().query(sql, SourceInfoRowMapper);
     }
     private final RowMapper<SourceInfo> SourceInfoRowMapper = new RowMapper<SourceInfo>() {
         @Override
         public SourceInfo mapRow(ResultSet rs, int rowNumber) throws SQLException {
-            return constructSourceInfo(UUID.fromString(rs.getString(external_id)), rs.getString(link_uri), rs.getString(version));
+            return constructSourceInfo(rs.getString(external_id), rs.getString(link_uri), rs.getString(version));
         }
     };
@@ -108 +106 @@
         StringBuilder sql = new StringBuilder("SELECT ");
         sql.append(source_id).append(" FROM ").append(sourceTableName).append(" WHERE ").append(link_uri).append(" LIKE '%").append(link).append("%'");
-        List<Number> result = getSimpleJdbcTemplate().query(sql.toString(), internalIDRowMapper);
-        return result;
+        return getSimpleJdbcTemplate().query(sql.toString(), internalIDRowMapper);
     }
 
@@ -123 +120 @@
         String sqlVersions = "SELECT " + version_id + " FROM " + sourcesVersionsTableName + " WHERE " + source_id + "= ? LIMIT 1";
         List<Number> resultVersions = getSimpleJdbcTemplate().query(sqlVersions, versionIDRowMapper, sourceID);
-        if (resultVersions.size() > 0) {
-            return true;
-        }
-        return false;
+        return (resultVersions.size() > 0);
     }
     
@@ -135 +129 @@
     @Override
     public Number addSource(Source source) throws SQLException {        
-        String externalID = source.getURI();        
+        UUID externalID = UUID.randomUUID();      
         Map<String, Object> params = new HashMap<String, Object>();
-        params.put("externalId", externalID);
+        params.put("externalId", externalID.toString());
         params.put("linkUri", source.getLink());
         params.put("version", source.getVersion());
         String sql = "INSERT INTO " + sourceTableName + "(" + external_id + "," + link_uri + "," + version + " ) VALUES (:externalId, :linkUri,  :version)";
-        final int affectedRows = getSimpleJdbcTemplate().update(sql, params);        
-        Number internalID = getInternalID(UUID.fromString(externalID));
-        return internalID;
+        final int affectedRows = getSimpleJdbcTemplate().update(sql, params);  
+        return (affectedRows>0 ? getInternalID(UUID.fromString(externalID.toString())) : null);
     }
     
@@ -164 +157 @@
         }
         String sqlSourcesVersions = "DELETE FROM " + sourceTableName + " WHERE " + source_id + " = ? ";
-        int result = getSimpleJdbcTemplate().update(sqlSourcesVersions, internalID);
-        return result;
+        return getSimpleJdbcTemplate().update(sqlSourcesVersions, internalID);
 
     }
@@ -174 +166 @@
     public int deleteAllSourceVersion(Number internalID) {
         String sqlSourcesVersions = "DELETE FROM " + sourcesVersionsTableName + " WHERE " + source_id + " = ?";
-        int result = getSimpleJdbcTemplate().update(sqlSourcesVersions, internalID);
-        return result;
+        return getSimpleJdbcTemplate().update(sqlSourcesVersions, internalID);
 
     }
@@ -183 +174 @@
    
 
-    private SourceInfo constructSourceInfo(UUID UUID, String link, String version) {
+    private SourceInfo constructSourceInfo(String externalID, String link, String version) {
         SourceInfo sourceInfo = new SourceInfo();
-        sourceInfo.setRef(UUID.toString());
+        sourceInfo.setRef(externalIDtoURI(_serviceURI,externalID));
         sourceInfo.setLink(link);
         sourceInfo.setVersion(version);
@@ -191 +182 @@
     }
 
-    private Source constructSource(UUID UUID, String link, String version, XMLGregorianCalendar xmlTimeStamp) {
+    private Source constructSource(String externalID, String link, String version, XMLGregorianCalendar xmlTimeStamp) {
         Source source = new Source();
-        source.setURI(UUID.toString());
+        source.setURI(externalIDtoURI(_serviceURI, externalID));
         source.setTimeSatmp(xmlTimeStamp);
         source.setLink(link);

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

@@ -49 +49 @@
         String sql = "SELECT " + versionStar + " FROM " + versionTableName + " WHERE " + version_id + "= ? LIMIT 1";
         List<Version> result = getSimpleJdbcTemplate().query(sql, versionRowMapper, internalID);
-        if (result.isEmpty()) {
-            return null;
-        }
-        return result.get(0);
+        return (!result.isEmpty() ? result.get(0) : null);
     }
     private final RowMapper<Version> versionRowMapper = new RowMapper<Version>() {
@@ -61 +58 @@
             //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"));
+            result.setVersion(externalIDtoURI(_serviceURI, rs.getString(external_id)));
             return result;
         }
@@ -69 +66 @@
     @Override
     public List<Number> retrieveCachedRepresentationList(Number versionID) {
-        String sql = "SELECT " + cached_representation_id + " FROM " + versionsCachedRepresentationsTableName + " WHERE " + version_id + "= ?";
-        List<Number> result = getSimpleJdbcTemplate().query(sql, cachedIDRowMapper, versionID);
-        return result;
+        String sql = "SELECT DISTINCT " + cached_representation_id + " FROM " + versionsCachedRepresentationsTableName + " WHERE " + version_id + "= ?";
+        return getSimpleJdbcTemplate().query(sql, cachedIDRowMapper, versionID);
     }
 
@@ -87 +83 @@
         String sqlVersions = "SELECT " + cached_representation_id + " FROM " + versionsCachedRepresentationsTableName + " WHERE " + version_id + "= ? LIMIT 1";
         List<Number> resultCached = getSimpleJdbcTemplate().query(sqlVersions, cachedIDRowMapper, versionsID);
-        if (resultCached.size() > 0) {
-            return true;
-        }
-        return false;
+        return (resultCached.size() > 0) ;
     }
     
@@ -108 +101 @@
         String sql = "INSERT INTO " + versionTableName + "(" + external_id + "," + version + " ) VALUES (:externalId, :version)";
         final int affectedRows = getSimpleJdbcTemplate().update(sql, params);
-        return getInternalID(externalIdentifier);
+        return (affectedRows>0 ? getInternalID(externalIdentifier) : null);
     }
     
@@ -130 +123 @@
         }        
         String sql = "DELETE FROM " + versionTableName + " where " + version_id + " = ?";
-        int result = getSimpleJdbcTemplate().update(sql, internalID);      
-        return result;
+        return getSimpleJdbcTemplate().update(sql, internalID);
 
     }

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

@@ -106 +106 @@
         annotIds.add(4);
 
+        jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
         final List<AnnotationInfo> annotationInfos = jdbcAnnotationDao.getAnnotationInfos(annotIds);
         assertEquals(3, annotationInfos.size());
@@ -111 +112 @@
         assertEquals(TestBackendConstants._TEST_ANNOT_2_HEADLINE, annotationInfos.get(0).getHeadline());
         assertEquals(String.valueOf(TestBackendConstants._TEST_ANNOT_2_OWNER), annotationInfos.get(0).getOwner().getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI + TestBackendConstants._TEST_ANNOT_2_EXT,
+           annotationInfos.get(0).getRef());          
         //assertEquals(TestBackendConstants._TEST_ANNOT_1_TARGETS, annotationInfos.get(0).getTargetSources());
 
         assertEquals(TestBackendConstants._TEST_ANNOT_3_HEADLINE, annotationInfos.get(1).getHeadline());
         assertEquals(String.valueOf(TestBackendConstants._TEST_ANNOT_3_OWNER), annotationInfos.get(1).getOwner().getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI + TestBackendConstants._TEST_ANNOT_3_EXT,
+           annotationInfos.get(1).getRef()); 
         //assertEquals(TestBackendConstants._TEST_ANNOT_2_TARGETS, annotationInfos.get(1).getTargetSources());
 
         assertEquals(TestBackendConstants._TEST_ANNOT_4_HEADLINE, annotationInfos.get(2).getHeadline());
         assertEquals(String.valueOf(TestBackendConstants._TEST_ANNOT_4_OWNER), annotationInfos.get(2).getOwner().getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI + TestBackendConstants._TEST_ANNOT_4_EXT,
+           annotationInfos.get(2).getRef()); 
         //assertEquals(TestBackendConstants._TEST_ANNOT_3_TARGETS, annotationInfos.get(2).getTargetSources());
 
@@ -142 +149 @@
         annotIds.add(4);
 
+        jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
         final List<ResourceREF> testList = jdbcAnnotationDao.getAnnotationREFs(annotIds);
         assertEquals(3, testList.size());
-        assertEquals(String.valueOf(2), testList.get(0).getRef());
-        assertEquals(String.valueOf(3), testList.get(1).getRef());
-        assertEquals(String.valueOf(4), testList.get(2).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI +TestBackendConstants._TEST_ANNOT_2_EXT, testList.get(0).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI +TestBackendConstants._TEST_ANNOT_3_EXT, testList.get(1).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI + TestBackendConstants._TEST_ANNOT_4_EXT, testList.get(2).getRef());
 
         final List<ResourceREF> testListTwo = jdbcAnnotationDao.getAnnotationREFs(new ArrayList<Number>());
@@ -188 +196 @@
         assertEquals(null, annotaionNull);
         ////
-
+             
         final Number testAnnotationID = 2;
         jdbcAnnotationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);

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

@@ -81 +81 @@
         System.out.println("getCachedRepresentationInfo");
         
+        jdbcCachedRepresentationDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
         CachedRepresentationInfo result = jdbcCachedRepresentationDao.getCachedRepresentationInfo(1);        
-        assertEquals(TestBackendConstants._TEST_CACHED_REPRESENTATION_1_EXT_ID_, result.getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_CACHED_REPRESENTATION_1_EXT_ID_, result.getRef());
         assertEquals(TestBackendConstants._TEST_CACHED_REPRESENTATION_1_MIME_TYPE_, result.getMimeType());
         assertEquals(TestBackendConstants._TEST_CACHED_REPRESENTATION_1_TOOL_, result.getTool());
         assertEquals(TestBackendConstants._TEST_CACHED_REPRESENTATION_1_TYPE_, result.getType());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_CACHED_REPRESENTATION_1_EXT_ID_, result.getRef());
     }
 

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

@@ -83 +83 @@
         
         ResourceREF testRef = new ResourceREF();
-        testRef.setRef("1");
+        testRef.setRef(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_AID_1_);
         final List<ResourceREF> testResult = Arrays.asList(new ResourceREF[] {testRef});
         
         mockery.checking(new Expectations() {
             {
-                exactly(2).of(annotationDao).getAnnotationREFs(Arrays.asList(new Number[] {1}));// exactly 2 notebooks (their id-s 1 and 2) contains the annotation 1
+                exactly(2).of(annotationDao).getAnnotationREFs(Arrays.asList(new Number[] {1}));// exactly 2 notebooks (their id-s 1 and 2) contain the annotation 1
                 will(returnValue(testResult));
+                // necessary to set annotations reference lists in the notebook
             }
         });
         
+        jdbcNotebookDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
         final List<Notebook> notebooks = jdbcNotebookDao.getUsersNotebooks(UUID.fromString(TestBackendConstants._TEST_UID_2_));
 
@@ -98 +100 @@
         assertEquals(2, notebooks.size());
         assertEquals("a notebook", notebooks.get(0).getTitle());
-//        assertEquals("http://123456", notebooks.get(0).getURI());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_NOTEBOOK_1_EXT_ID, notebooks.get(0).getURI());
         assertNotNull(notebooks.get(0).getTimeStamp());
         assertEquals(year, notebooks.get(0).getTimeStamp().getYear());
@@ -176 +178 @@
         System.out.println("getAnnotationREFsOfNotebook");
         
+        jdbcNotebookDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
         // test One         
-        setMockeryNotebookOne();         
+        setMockeryNotebookOne(); 
         List<ResourceREF> testList = jdbcNotebookDao.getAnnotationREFsOfNotebook(3);
         assertEquals(2, testList.size());        
-        assertEquals(String.valueOf(2), testList.get(0).getRef());
-        assertEquals(String.valueOf(3), testList.get(1).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_ANNOT_2_EXT, testList.get(0).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_ANNOT_3_EXT, testList.get(1).getRef());
         
         // test Two
@@ -187 +190 @@
         List<ResourceREF> testListTwo = jdbcNotebookDao.getAnnotationREFsOfNotebook(4);
         assertEquals(1, testListTwo.size());        
-        assertEquals(String.valueOf(4), testListTwo.get(0).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_ANNOT_4_EXT, testListTwo.get(0).getRef());
         
         // test Three  "empty" 
@@ -208 +211 @@
         System.out.println("getAnnotations");
         
+        jdbcNotebookDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
+        
          // test One
         setMockeryNotebookOne(); 
         Annotations annotations = jdbcNotebookDao.getAnnotations(3);
         assertEquals(2, annotations.getAnnotation().size());        
-        assertEquals(String.valueOf(2), annotations.getAnnotation().get(0).getRef());
-        assertEquals(String.valueOf(3), annotations.getAnnotation().get(1).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_ANNOT_2_EXT, annotations.getAnnotation().get(0).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_ANNOT_3_EXT, annotations.getAnnotation().get(1).getRef());
         
         // test Two
@@ -219 +224 @@
         Annotations annotationsTwo = jdbcNotebookDao.getAnnotations(4);
         assertEquals(1, annotationsTwo.getAnnotation().size());        
-        assertEquals(String.valueOf(4), annotationsTwo.getAnnotation().get(0).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_ANNOT_4_EXT, annotationsTwo.getAnnotation().get(0).getRef());
         
         // test Three  "empty" list of annotations
@@ -242 +247 @@
         System.out.println("test getNotebookInfo");
         
+        jdbcNotebookDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
+        
          // test One        
         NotebookInfo info = jdbcNotebookDao.getNotebookInfo(3);
-        assertEquals(TestBackendConstants._TEST_NOTEBOOK_3_EXT, info.getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_NOTEBOOK_3_EXT, info.getRef());
         assertEquals(TestBackendConstants._TEST_NOTEBOOK_3_TITLE, info.getTitle());
         
@@ -305 +312 @@
     private void setMockeryNotebookOne(){        
         ResourceREF testRefOne = new ResourceREF();
-        testRefOne.setRef(String.valueOf(2));
+        testRefOne.setRef(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_ANNOT_2_EXT);
         ResourceREF testRefTwo = new ResourceREF();
-        testRefTwo.setRef(String.valueOf(3));
+        testRefTwo.setRef(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_ANNOT_3_EXT);
         final List<ResourceREF> testResult = Arrays.asList(new ResourceREF[] {testRefOne, testRefTwo});
         
@@ -320 +327 @@
      private void setMockeryNotebookTwo(){ 
         ResourceREF testRef = new ResourceREF();
-        testRef.setRef(String.valueOf(4));
+        testRef.setRef(String.valueOf(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_ANNOT_4_EXT));
         final List<ResourceREF> testResultTwo = Arrays.asList(new ResourceREF[] {testRef});
         

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

@@ -73 +73 @@
         System.out.println("getSource");
         Number internalID = 1;
+        jdbcSourceDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
         Source result = jdbcSourceDao.getSource(internalID);
-        assertEquals(TestBackendConstants._TEST_SOURCE_1_EXT_ID, result.getURI());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_SOURCE_1_EXT_ID, result.getURI());
         assertEquals(TestBackendConstants._TEST_SOURCE_1_LINK, result.getLink());
         assertEquals(TestBackendConstants._TEST_VERSION_1_EXT_ID, result.getVersion());
-        //TODO: time stamp is not checked: do not know with what to compare 
+        // TODO :add time stamp test
+        
     }
 
@@ -128 +130 @@
         freshSource.setLink(link);
         freshSource.setVersion(TestBackendConstants._TEST_VERSION_1_EXT_ID);
-        freshSource.setURI((UUID.randomUUID()).toString());
         freshSource.setTimeSatmp(null);
         
@@ -137 +138 @@
         assertEquals(link, addedSource.getLink());
         assertEquals(TestBackendConstants._TEST_VERSION_1_EXT_ID, addedSource.getVersion());
-        assertEquals(freshSource.getURI(), addedSource.getURI());
+        assertTrue(addedSource.getURI().startsWith(TestBackendConstants._TEST_SERVLET_URI));
     }
 
@@ -145 +146 @@
     @Test
     public void testGetSourceInfos() {
-        System.out.println("getSourceInfos");
+        System.out.println("getSourceInfos");        
+        jdbcSourceDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
         List<Number> test = new ArrayList<Number>();
         test.add(1);
@@ -151 +153 @@
         List<SourceInfo> result = jdbcSourceDao.getSourceInfos(test);
         assertEquals(2, result.size());
-        assertEquals(TestBackendConstants._TEST_SOURCE_1_EXT_ID, result.get(0).getRef());
-        assertEquals(TestBackendConstants._TEST_SOURCE_2_EXT_ID, result.get(1).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_SOURCE_1_EXT_ID, result.get(0).getRef());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_SOURCE_2_EXT_ID, result.get(1).getRef());
         assertEquals(TestBackendConstants._TEST_VERSION_1_EXT_ID, result.get(0).getVersion());
         assertEquals(TestBackendConstants._TEST_VERSION_3_EXT_ID, result.get(1).getVersion());

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

@@ -70 +70 @@
     @Test
     public void testGetVersion() {
-        System.out.println("getVersion");
+        System.out.println("getVersion");        
+        jdbcVersionDao.setServiceURI(TestBackendConstants._TEST_SERVLET_URI);
         Number internalID = 1;
+        
         Version result = jdbcVersionDao.getVersion(internalID);
-        assertEquals(TestBackendConstants._TEST_VERSION_1_EXT_ID, result.getVersion());
+        assertEquals(TestBackendConstants._TEST_SERVLET_URI+TestBackendConstants._TEST_VERSION_1_EXT_ID, result.getVersion());
         //TODO: once the schems is fixed, test "version" and "URI/external-id" separately
         // at the moment "version" corresponds "external_id"

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

@@ -64 +64 @@
         System.out.println("getNotebookInfo");
         final MockHttpServletRequest httpServletRequest = new MockHttpServletRequest();
-        httpServletRequest.setRemoteUser(TestBackendConstants._TEST_UID_1_);
+        httpServletRequest.setRemoteUser(TestBackendConstants._TEST_UID_1_);        
+        httpServletRequest.setServletPath(TestBackendConstants._TEST_SERVLET_URI);
+        
         
         mockery.checking(new Expectations() {
@@ -89 +91 @@
         });
         final MockHttpServletRequest httpServletRequest = new MockHttpServletRequest();
-        httpServletRequest.setRemoteUser(TestBackendConstants._TEST_UID_2_);
+        httpServletRequest.setRemoteUser(TestBackendConstants._TEST_UID_2_);               
+        httpServletRequest.setServletPath(TestBackendConstants._TEST_SERVLET_URI);
         List result = notebookResource.getUsersNotebooks(httpServletRequest);
         assertEquals(0, result.size());
@@ -101 +104 @@
         System.out.println("createNotebook");
         final MockHttpServletRequest httpServletRequest = new MockHttpServletRequest();
-        httpServletRequest.setRemoteUser(TestBackendConstants._TEST_UID_2_);
+        httpServletRequest.setRemoteUser(TestBackendConstants._TEST_UID_2_);               
+        httpServletRequest.setServletPath(TestBackendConstants._TEST_SERVLET_URI);
+        
         mockery.checking(new Expectations() {
             {