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

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

@@ -59 +59 @@
                 EntityManager em = entityManagerService.getEntityManager();
                 try {
-                        return (HostExtension) em.createQuery("FROM HostExtension e WHERE e.className = ?").setParameter(1,
-                                        className).getSingleResult();
+                        return (HostExtension) em.createQuery("FROM HostExtension e WHERE e.className = ?")
+                                        .setParameter(1, className).getSingleResult();
                 } catch (NoResultException e) {
                         return null;
@@ -83 +83 @@
 
         @Override
-        public int createHost(int organizationId, int hostTypeId, int areaId, String name, String description) {
+        public Host createHost(int organizationId, int hostTypeId, int areaId, String name, String description) {
                 Host host = createHostInternal(organizationId, hostTypeId, areaId, name, description);
                 fireEntityAdded(host);
-                return host.getId();
+                return host;
         }
 
@@ -129 +129 @@
 
         @Override
-        public void updateHost(int organizationId, int hostId, String name, String description) {
+        public Host updateHost(int organizationId, int hostId, String name, String description) {
                 Host host = updateHostInternal(organizationId, hostId, name, description);
                 fireEntityUpdated(host);
+                return host;
         }
 
@@ -154 +155 @@
         }
 
-        @Transactional
-        @Override
-        public void updateHostGuid(int organizationId, int hostId, String guid) {
-                EntityManager em = entityManagerService.getEntityManager();
-
-                try {
-                        Host host = getHost(organizationId, hostId);
-                        if (host == null)
-                                throw new HostNotFoundException();
-
-                        host.setGuid(guid);
-                        em.merge(host);
-
-                        fireEntityUpdated(host);
-                } catch (NoResultException e) {
-                        throw new HostNotFoundException();
-                }
+        @Override
+        public Host updateHostGuid(int organizationId, int hostId, String guid) {
+                Host host = updateHostGuidInternal(organizationId, hostId, guid);
+                fireEntityUpdated(host);
+                return host;
+        }
+
+        @Transactional
+        private Host updateHostGuidInternal(int organizationId, int hostId, String guid) {
+                EntityManager em = entityManagerService.getEntityManager();
+                Host host = getHost(organizationId, hostId);
+                if (host == null)
+                        throw new HostNotFoundException();
+
+                host.setGuid(guid);
+                em.merge(host);
+                return host;
         }
 
@@ -206 +207 @@
                 EntityManager em = entityManagerService.getEntityManager();
                 try {
-                        Host host = (Host) em.createNamedQuery("Host.findById").setParameter(1, organizationId).setParameter(2,
-                                        hostId).getSingleResult();
+                        Host host = (Host) em.createNamedQuery("Host.findById").setParameter(1, organizationId)
+                                        .setParameter(2, hostId).getSingleResult();
 
                         host.getExtensions().size(); // force loading
@@ -225 +226 @@
         }
 
-        @Transactional
-        @Override
-        public void moveHost(int organizationId, int hostId, int areaId) {
+        @Override
+        public Host moveHost(int organizationId, int hostId, int areaId) {
+                Host host = moveHostInternal(organizationId, hostId, areaId);
+                fireEntityUpdated(host);
+                return host;
+        }
+
+        @Transactional
+        private Host moveHostInternal(int organizationId, int hostId, int areaId) {
                 EntityManager em = entityManagerService.getEntityManager();
 
@@ -238 +245 @@
 
                 em.merge(host);
-        }
-
-        @Override
-        public void removeHost(int organizationId, int hostId) {
-                Host host = getHost(organizationId, hostId);
-                if (host == null)
-                        throw new HostNotFoundException();
-
+                return host;
+        }
+
+        @Override
+        public Host removeHost(int organizationId, int hostId) {
+                Host host = getHost(organizationId, hostId);
+                if (host == null)
+                        throw new HostNotFoundException();
                 fireEntityRemoving(host);
                 removeHostInternal(organizationId, hostId);
                 fireEntityRemoved(host);
+                return host;
         }
 
@@ -255 +263 @@
                 EntityManager em = entityManagerService.getEntityManager();
                 Host host = getHost(organizationId, hostId);
-
                 host.getExtensions().clear();
-
                 em.remove(host);
         }
 
-        @Transactional
-        @Override
-        public void mapHostExtensions(int organizationId, int hostId, Set<String> hostExtensionNames) {
+        @Override
+        public Host mapHostExtensions(int organizationId, int hostId, Set<String> hostExtensionNames) {
+                Host host = mapHostExtensionsInternal(organizationId, hostId, hostExtensionNames);
+                fireEntityUpdated(host);
+                return host;
+        }
+
+        @Transactional
+        private Host mapHostExtensionsInternal(int organizationId, int hostId, Set<String> hostExtensionNames) {
                 EntityManager em = entityManagerService.getEntityManager();
                 Host host = getHost(organizationId, hostId);
@@ -280 +292 @@
                         em.merge(host);
                 }
+
+                return host;
         }
 
@@ -292 +306 @@
         }
 
-        @Transactional
-        @Override
-        public void unmapHostExtensions(int organizationId, int hostId, Set<String> hostExtensionNames) {
+        @Override
+        public Host unmapHostExtensions(int organizationId, int hostId, Set<String> hostExtensionNames) {
+                Host host = unmapHostExtensionsInternal(organizationId, hostId, hostExtensionNames);
+                fireEntityUpdated(host);
+                return host;
+        }
+
+        @Transactional
+        private Host unmapHostExtensionsInternal(int organizationId, int hostId, Set<String> hostExtensionNames) {
                 EntityManager em = entityManagerService.getEntityManager();
                 Host host = getHost(organizationId, hostId);
@@ -311 +331 @@
                         em.merge(host);
                 }
+
+                return host;
         }