Changeset 348:d91f6bd7d381 for kraken-dom/src/main/java/org/krakenapps/dom/api/impl/AdminApiImpl.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/AdminApiImpl.java (modified) (8 diffs)

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

@@ -49 +49 @@
 import org.krakenapps.dom.model.Organization;
 import org.krakenapps.dom.model.Admin;
-import org.krakenapps.dom.model.OrganizationParameter;
 import org.krakenapps.dom.model.Role;
 import org.krakenapps.jpa.ThreadLocalEntityManagerService;
@@ -92 +91 @@
 
                 if (hash.equals(Sha1.hash(password + session.getString("nonce")))) {
-                        OrganizationParameter param = orgParamApi.getOrganizationParameter(admin.getUser().getOrganization().getId(),
+                        String maxSession = orgParamApi.getOrganizationParameter(admin.getUser().getOrganization().getId(),
                                         "max_sessions");
-                        if (param != null) {
+                        if (maxSession != null) {
                                 try {
-                                        int maxSessions = Integer.parseInt(param.getValue());
+                                        int maxSessions = Integer.parseInt(maxSession);
                                         if (maxSessions > 0) {
                                                 if (force) {
@@ -116 +115 @@
                         for (LoginCallback callback : callbacks)
                                 callback.onLoginSuccess(admin, session);
-                        loggedIn.add(new LoggedInAdmin(admin.getRole().getLevel(), new Date(), session, admin.getUser().getLoginName()));
+                        loggedIn.add(new LoggedInAdmin(admin.getRole().getLevel(), new Date(), session, admin.getUser()
+                                        .getLoginName()));
                         return admin;
                 } else {
@@ -269 +269 @@
 
         @Override
-        public void createAdmin(int organizationId, Integer requestAdminId, Admin admin) {
-                createAdminInternal(organizationId, requestAdminId, admin);
-                fireEntityAdded(admin);
-        }
-
-        @Transactional
-        private void createAdminInternal(int organizationId, Integer requestAdminId, Admin admin) {
+        public Admin createAdmin(int organizationId, Integer requestAdminId, Admin admin) {
+                Admin a = createAdminInternal(organizationId, requestAdminId, admin);
+                fireEntityAdded(a);
+                return a;
+        }
+
+        @Transactional
+        private Admin createAdminInternal(int organizationId, Integer requestAdminId, Admin admin) {
                 EntityManager em = entityManagerService.getEntityManager();
                 Organization organization = em.find(Organization.class, organizationId);
@@ -300 +301 @@
                         em.persist(host);
                 }
+
+                return admin;
         }
 
@@ -323 +326 @@
                 Admin admin = (Admin) em.createQuery("SELECT a FROM Admin a LEFT JOIN a.user u WHERE u.loginName = ?")
                                 .setParameter(1, loginName).getSingleResult();
-                
+
                 admin.getRole().getPermissions().size();
                 admin.getTrustHosts().size();
-                
+
                 return admin;
         }
@@ -379 +382 @@
 
         @Override
-        public void removeAdmin(int organizationId, Integer requestAdminId, int adminId) {
-                Admin admin = removeAdminInternal(organizationId, requestAdminId, adminId);
-                fireEntityRemoved(admin);
-        }
-
-        @Transactional
-        private Admin removeAdminInternal(int organizationId, Integer requestAdminId, int adminId) {
-                EntityManager em = entityManagerService.getEntityManager();
-
-                Admin admin = (Admin) em.find(Admin.class, adminId);
-                if (admin.getUser().getOrganization().getId() != organizationId)
-                        throw new AdminNotFoundException(adminId);
-
-                if (requestAdminId != null) {
-                        Admin requestAdmin = em.find(Admin.class, requestAdminId);
-                        if (requestAdmin == null)
-                                throw new AdminNotFoundException(requestAdminId);
-
-                        if (requestAdmin.getRole().getLevel() < admin.getRole().getLevel())
-                                throw new SecurityException("remove admin");
-
-                        if (requestAdminId == adminId) {
-                                throw new CannotRemoveRequestingAdminException(requestAdminId);
-                        }
-                }
-
-                em.remove(admin);
-
-                return admin;
-        }
-
-        @Override
-        public void updateAdmin(int organizationId, Integer requestAdminId, Admin targetAdmin) {
+        public Admin updateAdmin(int organizationId, Integer requestAdminId, Admin targetAdmin) {
                 Admin admin = updateAdminInternal(organizationId, requestAdminId, targetAdmin);
                 fireEntityUpdated(admin);
+                return admin;
         }
 
@@ -477 +449 @@
         }
 
+        @Override
+        public Admin removeAdmin(int organizationId, Integer requestAdminId, int adminId) {
+                Admin admin = removeAdminInternal(organizationId, requestAdminId, adminId);
+                fireEntityRemoved(admin);
+                return admin;
+        }
+
+        @Transactional
+        private Admin removeAdminInternal(int organizationId, Integer requestAdminId, int adminId) {
+                EntityManager em = entityManagerService.getEntityManager();
+
+                Admin admin = (Admin) em.find(Admin.class, adminId);
+                if (admin.getUser().getOrganization().getId() != organizationId)
+                        throw new AdminNotFoundException(adminId);
+
+                if (requestAdminId != null) {
+                        Admin requestAdmin = em.find(Admin.class, requestAdminId);
+                        if (requestAdmin == null)
+                                throw new AdminNotFoundException(requestAdminId);
+
+                        if (requestAdmin.getRole().getLevel() < admin.getRole().getLevel())
+                                throw new SecurityException("remove admin");
+
+                        if (requestAdminId == adminId) {
+                                throw new CannotRemoveRequestingAdminException(requestAdminId);
+                        }
+                }
+
+                em.remove(admin);
+
+                return admin;
+        }
+
         private static final char[] chars = new char[62];
         static {