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

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

@@ -63 +63 @@
         }
 
-        @Transactional
         @Override
         public Vendor createVendor(String name) {
+                Vendor vendor = createVendorInternal(name);
+                return vendor;
+        }
+
+        @Transactional
+        private Vendor createVendorInternal(String name) {
                 EntityManager em = entityManagerService.getEntityManager();
                 Vendor vendor = new Vendor();
@@ -77 +82 @@
         }
 
-        @Transactional
-        @Override
-        public void updateVendor(String guid, String name) {
+        @Override
+        public Vendor updateVendor(String guid, String name) {
+                Vendor vendor = updateVendorInternal(guid, name);
+                return vendor;
+        }
+
+        @Transactional
+        private Vendor updateVendorInternal(String guid, String name) {
                 EntityManager em = entityManagerService.getEntityManager();
 
@@ -90 +100 @@
 
                 em.merge(vendor);
-        }
-
-        @Transactional
-        @Override
-        public void removeVendor(String guid) {
+
+                return vendor;
+        }
+
+        @Override
+        public Vendor removeVendor(String guid) {
+                Vendor vendor = removeVendorInternal(guid);
+                return vendor;
+        }
+
+        @Transactional
+        private Vendor removeVendorInternal(String guid) {
                 EntityManager em = entityManagerService.getEntityManager();
                 Vendor vendor = em.find(Vendor.class, guid);
@@ -102 +119 @@
 
                 em.remove(vendor);
+
+                return vendor;
         }
 
@@ -157 +176 @@
         }
 
-        @Transactional
         @Override
         public Application createApplication(String vendorGuid, String name, String platform, Map<String, String> props) {
+                Application app = createApplicationInternal(vendorGuid, name, platform, props);
+                fireEntityAdded(app);
+                return app;
+        }
+
+        @Transactional
+        private Application createApplicationInternal(String vendorGuid, String name, String platform,
+                        Map<String, String> props) {
                 EntityManager em = entityManagerService.getEntityManager();
 
@@ -181 +207 @@
         }
 
-        @Transactional
-        @Override
-        public void updateApplication(String guid, String name, Map<String, String> props) {
+        @Override
+        public Application updateApplication(String guid, String name, Map<String, String> props) {
+                Application app = updateApplicationInternal(guid, name, props);
+                fireEntityUpdated(app);
+                return app;
+        }
+
+        @Transactional
+        private Application updateApplicationInternal(String guid, String name, Map<String, String> props) {
                 EntityManager em = entityManagerService.getEntityManager();
                 Application app = em.find(Application.class, guid);
@@ -197 +229 @@
                         em.remove(d);
                 }
-                
+
                 app.getMetadatas().clear();
                 setAppMetadatas(em, app, props);
 
                 em.merge(app);
+
+                return app;
         }
 
@@ -217 +251 @@
         }
 
-        @Transactional
-        @Override
-        public void removeApplication(String guid) {
+        @Override
+        public Application removeApplication(String guid) {
+                Application app = removeApplicationInternal(guid);
+                fireEntityRemoved(app);
+                return app;
+        }
+
+        @Transactional
+        private Application removeApplicationInternal(String guid) {
                 EntityManager em = entityManagerService.getEntityManager();
                 Application app = em.find(Application.class, guid);
@@ -226 +266 @@
 
                 em.remove(app);
+
+                return app;
         }
 
@@ -241 +283 @@
         }
 
-        @Transactional
         @Override
         public ApplicationVersion createApplicationVersion(String vendorName, String appName, String version) {
+                ApplicationVersion appVersion = createApplicationVersionIntenal(vendorName, appName, version);
+                return appVersion;
+        }
+
+        @Transactional
+        private ApplicationVersion createApplicationVersionIntenal(String vendorName, String appName, String version) {
                 EntityManager em = entityManagerService.getEntityManager();
                 Vendor vendor = getVendor(vendorName);
@@ -264 +311 @@
         }
 
-        @Transactional
-        @Override
-        public void updateApplicationVersion(String guid, String version) {
+        @Override
+        public ApplicationVersion updateApplicationVersion(String guid, String version) {
+                ApplicationVersion appVersion = updateApplicationVersionInternal(guid, version);
+                return appVersion;
+        }
+
+        @Transactional
+        private ApplicationVersion updateApplicationVersionInternal(String guid, String version) {
                 EntityManager em = entityManagerService.getEntityManager();
                 ApplicationVersion appVersion = em.find(ApplicationVersion.class, guid);
@@ -276 +328 @@
 
                 em.merge(appVersion);
-        }
-
-        @Transactional
-        @Override
-        public void removeApplicationVersion(String guid) {
+
+                return appVersion;
+        }
+
+        @Override
+        public ApplicationVersion removeApplicationVersion(String guid) {
+                ApplicationVersion appVersion = removeApplicationVersionInternal(guid);
+                return appVersion;
+        }
+
+        @Transactional
+        private ApplicationVersion removeApplicationVersionInternal(String guid) {
                 EntityManager em = entityManagerService.getEntityManager();
                 ApplicationVersion version = em.find(ApplicationVersion.class, guid);
                 if (version == null)
-                        return;
+                        return null;
 
                 em.remove(version);
+
+                return version;
         }
 }