Changeset 1895

Timestamp:

04/20/12 12:59:56 (12 years ago)

Author:

twagoo

Message:

CommentsDao?.getById takes Id as Number. Added test for this method

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/impl/database/CommentsDao.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (2 diffs)
• test/java/clarin/cmdi/componentregistry/impl/database/CommentsDaoTest.java (modified) (1 diff)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/CommentsDao.java

@@ -59 +59 @@
      * @throws DataAccessException
      */
-    public Comment getById(String id) throws DataAccessException {
+    public Comment getById(Number id) throws DataAccessException {
         return getFirstOrNull(SELECT_BASE + " WHERE " + COLUMN_ID + " = ?", id);
     }
@@ -202 +202 @@
     }
 
-    /**
-     * Retrieve comment Id From a comment
-     * @param cmdId
-     * @return query for database access to id
-     */
-    public Number getDbId(String cmdId) {
-        StringBuilder query = new StringBuilder("SELECT " + COLUMN_ID + " FROM ").append(getTableName());
-        query.append(" WHERE ").append(COLUMN_ID).append(" = ?");
-        return getSimpleJdbcTemplate().queryForInt(query.toString(), cmdId);
-    }
-
     private Timestamp extractTimestamp(Comment comment) {
         if (comment.getCommentDate() != null) {

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

@@ -653 +653 @@
             ComponentRegistryException, UserUnauthorizedException, DeleteFailedException {
         try {
-            Comment comment = commentsDao.getById(commentId);
+            Comment comment = commentsDao.getById(Integer.parseInt(commentId));
             if (comment != null
                     // Comment must have an existing (in this registry) componentId or profileId
@@ -666 +666 @@
         } catch (DataAccessException ex) {
             throw new DeleteFailedException("Database access error while trying to delete component", ex);
+        } catch (NumberFormatException ex) {
+            throw new DeleteFailedException("Illegal comment ID, cannot parse integer", ex);
         }
     }

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/CommentsDaoTest.java

@@ -78 +78 @@
         assertEquals(TEST_COMMENT_USER_NAME, comments.get(0).getUserName());
         assertEquals(Integer.toString(TEST_COMMENT_USER_ID), comments.get(0).getUserId());
+    }
+
+    @Test
+    public void testGetById() {
+        Comment comment1 = createTestComment();
+        comment1.setProfileDescriptionId(TEST_COMMENT_PROFILE_ID);
+        Number commentId = commentsDao.insertComment(comment1, TEST_COMMENT_USER_ID);
+        Comment commentById = commentsDao.getById(commentId);
+        assertEquals(TEST_COMMENT_PROFILE_ID, commentById.getProfileDescriptionId());
+        assertEquals(TEST_COMMENT_NAME, commentById.getComment());
     }