Changeset 348:d91f6bd7d381 for kraken-dom/src/main/java/org/krakenapps/dom/api/impl/UserApiImpl.java

Timestamp:

09/20/11 03:16:11 (8 months ago)

Author:

delmitz

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2782

Message:

modified API interfaces.

File:

• kraken-dom/src/main/java/org/krakenapps/dom/api/impl/UserApiImpl.java (modified) (4 diffs)

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/UserApiImpl.java

@@ -172 +172 @@
 
         @Override
-        public void createUser(User user) {
-                createUserInternal(user);
-                fireEntityAdded(user);
-        }
-
-        @Transactional
-        private void createUserInternal(User user) {
+        public User createUser(User user) {
+                User u = createUserInternal(user);
+                fireEntityAdded(u);
+                return u;
+        }
+
+        @Transactional
+        private User createUserInternal(User user) {
                 EntityManager em = entityManagerService.getEntityManager();
                 user.setPassword(hashPassword(user.getSalt(), user.getPassword()));
@@ -184 +185 @@
                 user.setUpdateDateTime(new Date());
                 em.persist(user);
-        }
-
-        @Override
-        public void updateUser(User user) {
-                updateUserInternal(user);
-                fireEntityUpdated(user);
-        }
-
-        @Transactional
-        private void updateUserInternal(User user) {
+                return user;
+        }
+
+        @Override
+        public User updateUser(User user) {
+                User u = updateUserInternal(user);
+                fireEntityUpdated(u);
+                return u;
+        }
+
+        @Transactional
+        private User updateUserInternal(User user) {
                 EntityManager em = entityManagerService.getEntityManager();
                 if (user.getId() == 0)
@@ -203 +206 @@
                 u.setName(user.getName());
                 u.setDescription(user.getDescription());
-                if (user.getPassword() != null)
+                if (user.getPassword() != null && !user.getPassword().isEmpty())
                         u.setPassword(hashPassword(user.getSalt(), user.getPassword()));
                 u.setTitle(user.getTitle());
@@ -212 +215 @@
                 u.setAdmin(user.getAdmin());
                 em.merge(u);
-        }
-
-        @Override
-        public void removeUser(int id) {
+                return u;
+        }
+
+        @Override
+        public User removeUser(int id) {
                 User user = removeUserInternal(id);
                 fireEntityRemoved(user);
+                return user;
         }