Changeset 1320

Timestamp:

05/16/11 13:37:34 (13 years ago)

Author:

twagoo

Message:

UserId? also stored and retrieved

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/impl/database/UserDao.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/model/UserMapping.java (modified) (2 diffs)
• test/java/clarin/cmdi/componentregistry/impl/database/UserDaoTest.java (modified) (1 diff)

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

@@ -16 +16 @@
 public class UserDao extends ComponentRegistryDao<User> {
 
-    private final static String SELECT_BASE = "SELECT name, principal_name FROM " + TABLE_REGISTRY_USER;
+    private final static String SELECT_BASE = "SELECT " + COLUMN_ID + ", name, principal_name FROM " + TABLE_REGISTRY_USER;
 
     public List<User> getAllUsers() {
@@ -42 +42 @@
         public User mapRow(ResultSet rs, int rowNumber) throws SQLException {
             User user = new User();
+            user.setId(rs.getInt(COLUMN_ID));
             user.setName(rs.getString("name"));
             user.setPrincipalName(rs.getString("principal_name"));

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/UserMapping.java

@@ -21 +21 @@
         private String userDir;
         private String principalName;
+        private Number id;
 
         public void setName(String name) {
@@ -45 +46 @@
             return principalName;
         }
+
+        public Number getId() {
+            return id;
+        }
+
+        public void setId(Number id) {
+            this.id = id;
+        }
 
     }

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

@@ -46 +46 @@
 
         assertEquals(0, userDao.getAllUsers().size());
-        userDao.insertUser(testUser);
+        Number newId =  userDao.insertUser(testUser);
+        assertNotNull(newId);
+
         List<User> users = userDao.getAllUsers();
         assertEquals(1, users.size());
+
         assertEquals("Aap", users.get(0).getName());
         assertEquals("aap@clarin.eu", users.get(0).getPrincipalName());