]> git.mxchange.org Git - jjobs-ejb.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sat, 9 Sep 2017 11:35:31 +0000 (13:35 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 9 Sep 2017 11:58:36 +0000 (13:58 +0200)
- removed explicit flush() on entity manager as this hurts performance + may
  cause trouble when other entities (concurrently) are not "ready to be flushed)
- implemented addBranchOffice() + added missing public constructor
- added private method isBranchOfficeFound() which uses the general EJB for
  retrieving whole branch office list
- added protected getManaged() for Contact and Country instances
- renamed companyDataId -> basicDataId

Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/jcontacts/contact/JobsAdminContactSessionBean.java
src/java/org/mxchange/jcontactsbusiness/basicdata/JobsAdminBusinessDataSessionBean.java
src/java/org/mxchange/jcontactsbusiness/basicdata/JobsBusinessDataSessionBean.java
src/java/org/mxchange/jcontactsbusiness/branchoffice/JobsAdminBranchOfficeSessionBean.java
src/java/org/mxchange/jcountry/data/JobsCountrySingletonBean.java
src/java/org/mxchange/jjobs/database/BaseJobsDatabaseBean.java
src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java
src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java
src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java
src/java/org/mxchange/jusercore/model/user/activity/JobsUserActivityLogMessageBean.java
src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java

index 1166c7eb29c86968b4d514170ab5ce45aceb90cc..0c6e7449e088142ccd6484096b3a36aebb000425 100644 (file)
@@ -72,9 +72,6 @@ public class JobsAdminContactSessionBean extends BaseJobsDatabaseBean implements
                // Persist it
                this.getEntityManager().persist(contact);
 
-               // Flush it to get contactId set
-               this.getEntityManager().flush();
-
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addContact: contact.contactId={1} after persisting - EXIT!", this.getClass().getSimpleName(), contact.getContactId())); //NOI18N
 
index 2d5922d8b9eb656eea541d8a39a9f837a04ad9ff..a8d18a6142b385c059916ebd0554c7244e06b03b 100644 (file)
@@ -61,9 +61,9 @@ public class JobsAdminBusinessDataSessionBean extends BaseJobsDatabaseBean imple
                if (null == basicData) {
                        // Throw NPE
                        throw new NullPointerException("basicData is null"); //NOI18N
-               } else if (basicData.getCompanyDataId() != null) {
+               } else if (basicData.getBasicDataId() != null) {
                        // Should be null
-                       throw new IllegalArgumentException(MessageFormat.format("basicData.companyDataId={0} - is not null", basicData.getCompanyDataId())); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("basicData.basicDataId={0} - is not null", basicData.getBasicDataId())); //NOI18N
                }
 
                // Get all available entries
@@ -87,11 +87,8 @@ public class JobsAdminBusinessDataSessionBean extends BaseJobsDatabaseBean imple
                // Persist it
                this.getEntityManager().persist(basicData);
 
-               // Flush it (bad performance!)
-               this.getEntityManager().flush();
-
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addBusinessBasicData: basicData.companyDataId={1} - EXIT!", this.getClass().getSimpleName(), basicData.getCompanyDataId())); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addBusinessBasicData: basicData.basicDataId={1} - EXIT!", this.getClass().getSimpleName(), basicData.getBasicDataId())); //NOI18N
 
                // Return updated instance
                return basicData;
index 97f80e93ef425a360aec957cf20b79b59011ecee..bec3cc5d12cff630cba456e86630d6ad3e3402be 100644 (file)
@@ -66,7 +66,7 @@ public class JobsBusinessDataSessionBean extends BaseJobsDatabaseBean implements
        }
 
        @Override
-       public BusinessBasicData findBasicDataById (final Long companyDataId) throws BusinessDataNotFoundException {
+       public BusinessBasicData findBasicDataById (final Long basicDataId) throws BusinessDataNotFoundException {
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findBasicDataById: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
@@ -74,28 +74,28 @@ public class JobsBusinessDataSessionBean extends BaseJobsDatabaseBean implements
                final Query query = this.getEntityManager().createNamedQuery("SearchBusinessDataById", CompanyBasicData.class); //NOI18N
 
                // Set parameter
-               query.setParameter("companyDataId", companyDataId); //NOI18N
+               query.setParameter("basicDataId", basicDataId); //NOI18N
 
                // Get single instance
-               final BusinessBasicData businessData;
+               final BusinessBasicData basicData;
 
                // Try to find a result
                try {
                        // Find a single result
-                       businessData = (BusinessBasicData) query.getSingleResult();
+                       basicData = (BusinessBasicData) query.getSingleResult();
 
                        // Log trace message
-                       this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findBasicDataById: Found contact={1}", this.getClass().getSimpleName(), businessData)); //NOI18N
+                       this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findBasicDataById: Found basicData={1}", this.getClass().getSimpleName(), basicData)); //NOI18N
                } catch (final NoResultException ex) {
                        // No result found
-                       throw new BusinessDataNotFoundException(companyDataId, ex);
+                       throw new BusinessDataNotFoundException(basicDataId, ex);
                }
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findBasicDataById: businessData={1} - EXIT!", this.getClass().getSimpleName(), businessData)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findBasicDataById: basicData={1} - EXIT!", this.getClass().getSimpleName(), basicData)); //NOI18N
 
                // Return it
-               return businessData;
+               return basicData;
        }
 
        @Override
index cbaa38a4f36d540e1459b16cd33dfe283d37a039..8eb53bbb654d2b03d6f8bc90ab84dab276f16edb 100644 (file)
  */
 package org.mxchange.jcontactsbusiness.branchoffice;
 
+import java.text.MessageFormat;
+import java.util.GregorianCalendar;
+import java.util.List;
+import javax.ejb.EJB;
 import javax.ejb.Stateless;
+import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
+import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeAlreadyAddedException;
+import org.mxchange.jcountry.data.Country;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
+import org.mxchange.jusercore.model.user.User;
 
 /**
  * A stateless session bean for administrative branch office purposes
@@ -32,4 +40,105 @@ public class JobsAdminBranchOfficeSessionBean extends BaseJobsDatabaseBean imple
         */
        private static final long serialVersionUID = 58_467_386_571_701L;
 
+       /**
+        * General branch office bean
+        */
+       @EJB
+       private BranchOfficeSessionBeanRemote branchOfficeBean;
+
+       /**
+        * Default constructor
+        */
+       public JobsAdminBranchOfficeSessionBean () {
+               // Call super constructor
+               super();
+       }
+
+       @Override
+       public BranchOffice addBranchOffice (final BranchOffice branchOffice) throws BranchOfficeAlreadyAddedException {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addBranchOffice(): branchOffice={1} - CALLED!", this.getClass().getSimpleName(), branchOffice)); //NOI18N
+
+               // Validate parameter
+               if (null == branchOffice) {
+                       // Throw NPE
+                       throw new NullPointerException("branchOffice is null"); //NOI18N
+               } else if (branchOffice.getBranchId() instanceof Long) {
+                       // Should not happen
+                       throw new IllegalArgumentException("branchOffice.branchId should not be set."); //NOI18N
+               } else if (this.isBranchOfficeFound(branchOffice)) {
+                       // Already added, abort here
+                       throw new BranchOfficeAlreadyAddedException(branchOffice);
+               }
+
+               // Add created timestamp
+               branchOffice.setBranchCreated(new GregorianCalendar());
+
+               // Is user instance set?
+               if (branchOffice.getBranchCompany() instanceof BusinessBasicData) {
+                       // Get managed instance back
+                       final BusinessBasicData managedBasicData = this.getManaged(branchOffice.getBranchCompany());
+
+                       // Set it back in branch office
+                       branchOffice.setBranchCompany(managedBasicData);
+               }
+
+               // Is user instance set?
+               if (branchOffice.getBranchUserOwner() instanceof User) {
+                       // Get managed instance back
+                       final User managedUser = this.getManaged(branchOffice.getBranchUserOwner());
+
+                       // Set it back in branch office
+                       branchOffice.setBranchUserOwner(managedUser);
+               }
+
+               // Is user instance set?
+               if (branchOffice.getBranchCountry() instanceof Country) {
+                       // Get managed instance back
+                       final Country managedCountry = this.getManaged(branchOffice.getBranchCountry());
+
+                       // Set it back in branch office
+                       branchOffice.setBranchCountry(managedCountry);
+               }
+
+               // Persist it
+               this.getEntityManager().persist(branchOffice);
+
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addBranchOffice(): branchOffice.branchId={1} - EXIT!", this.getClass().getSimpleName(), branchOffice.getBranchId())); //NOI18N
+
+               // Return updated instance
+               return branchOffice;
+       }
+
+       /**
+        * Checks if given branch office's address is already persisted. The whole
+        * (persisted) list is being loaded and each address is being matched
+        * against the given branch office's address.
+        * <p>
+        * @param branchOffice Branch office being checked
+        * <p>
+        * @return Whether it has been found
+        */
+       private boolean isBranchOfficeFound (final BranchOffice branchOffice) {
+               // Get whole list
+               final List<BranchOffice> branchOffices = this.branchOfficeBean.allBranchOffices();
+
+               // Default is not found
+               boolean isFound = false;
+
+               // Check all single addresses
+               for (final BranchOffice bo : branchOffices) {
+                       // Is the same address found?
+                       if (BranchOfficeUtils.isSameAddress(bo, branchOffice)) {
+                               // Found one
+                               isFound = true;
+                               break;
+                       }
+               }
+
+               // Return flag
+               return isFound;
+       }
+
 }
index 9234f18cfb633a6bb315206e32f00298ef84b567..2fc68b8b91cd8f1a1a86623a62c71115f9873479 100644 (file)
@@ -77,9 +77,6 @@ public class JobsCountrySingletonBean extends BaseJobsDatabaseBean implements Co
                // It is not added, so persist it
                this.getEntityManager().persist(country);
 
-               // Flush it to get id number back, maybe it is directly needed?
-               this.getEntityManager().flush();
-
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addCountry: country={1} - EXIT!", this.getClass().getSimpleName(), country)); //NOI18N
 
index 602d3276e321a9d678e40f823ea66846c050471f..12b0647c341d3472895866946ade0257f1834525 100644 (file)
@@ -28,7 +28,12 @@ import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.ContactUtils;
+import org.mxchange.jcontacts.contact.UserContact;
+import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
+import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData;
 import org.mxchange.jcoreee.database.BaseDatabaseBean;
+import org.mxchange.jcountry.data.Country;
+import org.mxchange.jcountry.data.CountryData;
 import org.mxchange.jmailee.model.delivery.wrapper.EmailDeliveryWrapper;
 import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery;
 import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
@@ -280,6 +285,114 @@ public abstract class BaseJobsDatabaseBean extends BaseDatabaseBean {
                return detachedNumber;
        }
 
+       /**
+        * Get back a managed instance from given contact
+        * <p>
+        * @param contact Unmanaged/detached contact instance
+        * <p>
+        * @return Managed contact instance
+        */
+       protected Contact getManaged (final Contact contact) {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: contact={1} - CALLED!", this.getClass().getSimpleName(), contact)); //NOI18N
+
+               // user should not be null
+               if (null == contact) {
+                       // Abort here
+                       throw new NullPointerException("contact is null"); //NOI18N
+               } else if (contact.getContactId() == null) {
+                       // Id is set
+                       throw new NullPointerException("contact.contactId is null"); //NOI18N
+               } else if (contact.getContactId() < 1) {
+                       // Id is set
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is null", contact.getContactId())); //NOI18N
+               }
+
+               // Try to find it (should be there)
+               final Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
+
+               // Should be there
+               assert (managedContact instanceof Contact) : "managedContact is null"; //NOI18N
+
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
+
+               // Return it
+               return managedContact;
+       }
+
+       /**
+        * Get back a managed instance from given country
+        * <p>
+        * @param country Unmanaged/detached country instance
+        * <p>
+        * @return Managed country instance
+        */
+       protected Country getManaged (final Country country) {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: country={1} - CALLED!", this.getClass().getSimpleName(), country)); //NOI18N
+
+               // user should not be null
+               if (null == country) {
+                       // Abort here
+                       throw new NullPointerException("country is null"); //NOI18N
+               } else if (country.getCountryId() == null) {
+                       // Id is set
+                       throw new NullPointerException("country.countryId is null"); //NOI18N
+               } else if (country.getCountryId() < 1) {
+                       // Id is set
+                       throw new IllegalArgumentException(MessageFormat.format("country.countryId={0} is null", country.getCountryId())); //NOI18N
+               }
+
+               // Try to find it (should be there)
+               final Country managedCountry = this.getEntityManager().find(CountryData.class, country.getCountryId());
+
+               // Should be there
+               assert (managedCountry instanceof Country) : "managedCountry is null"; //NOI18N
+
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: managedCountry={1} - EXIT!", this.getClass().getSimpleName(), managedCountry)); //NOI18N
+
+               // Return it
+               return managedCountry;
+       }
+
+       /**
+        * Get back a managed instance from given contact
+        * <p>
+        * @param basicData Unmanaged/detached contact instance
+        * <p>
+        * @return Managed contact instance
+        */
+       protected BusinessBasicData getManaged (final BusinessBasicData basicData) {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: basicData={1} - CALLED!", this.getClass().getSimpleName(), basicData)); //NOI18N
+
+               // user should not be null
+               if (null == basicData) {
+                       // Abort here
+                       throw new NullPointerException("basicData is null"); //NOI18N
+               } else if (basicData.getBasicDataId() == null) {
+                       // Id is set
+                       throw new NullPointerException("basicData.basicDataId is null"); //NOI18N
+               } else if (basicData.getBasicDataId() < 1) {
+                       // Id is set
+                       throw new IllegalArgumentException(MessageFormat.format("basicData.basicDataId={0} is null", basicData.getBasicDataId())); //NOI18N
+               }
+
+               // Try to find it (should be there)
+               final BusinessBasicData managedBasicData = this.getEntityManager().find(CompanyBasicData.class, basicData.getBasicDataId());
+
+               // Should be there
+               assert (managedBasicData instanceof BusinessBasicData) : "managedBasicData is null"; //NOI18N
+
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: managedBasicData={1} - EXIT!", this.getClass().getSimpleName(), managedBasicData)); //NOI18N
+
+               // Return it
+               return managedBasicData;
+       }
+
        /**
         * Get back a managed instance from given user
         * <p>
@@ -287,7 +400,7 @@ public abstract class BaseJobsDatabaseBean extends BaseDatabaseBean {
         * <p>
         * @return Managed user instance
         */
-       protected User getManagedUser (final User user) {
+       protected User getManaged (final User user) {
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: user={1} - CALLED!", this.getClass().getSimpleName(), user)); //NOI18N
 
index 7df3933c2c2fb5141860e7296357d7c233845c1d..6111b67290bacd93dc3e41669f39447550965cd1 100644 (file)
@@ -84,9 +84,6 @@ public class JobsAdminMobileProviderSessionBean extends BaseJobsDatabaseBean imp
                // Persist it
                this.getEntityManager().persist(mobileProvider);
 
-               // ... and flush it to get id back
-               this.getEntityManager().flush();
-
                // Log trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addMobileProvider: mobileProvider.providerId={1} - EXIT!", this.getClass().getSimpleName(), mobileProvider.getProviderId())); //NOI18N
 
index 768e233964822261163a803aac0035ed2d10e208..f8df323fdad3508a6b5a9329de5a3571309b2831 100644 (file)
@@ -97,9 +97,6 @@ public class JobsAdminUserSessionBean extends BaseJobsDatabaseBean implements Ad
                // Persist it
                this.getEntityManager().persist(user);
 
-               // Flush to get id back
-               this.getEntityManager().flush();
-
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addUser: user={1},user.userId={2} - EXIT!", this.getClass().getSimpleName(), user, user.getUserId())); //NOI18N
 
@@ -140,7 +137,7 @@ public class JobsAdminUserSessionBean extends BaseJobsDatabaseBean implements Ad
                }
 
                // Get a managed instance
-               final User managedUser = this.getManagedUser(user);
+               final User managedUser = this.getManaged(user);
 
                // Should be found!
                assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
@@ -193,9 +190,6 @@ public class JobsAdminUserSessionBean extends BaseJobsDatabaseBean implements Ad
                // Perist it
                this.getEntityManager().persist(user);
 
-               // Flush it to get updated instance back
-               this.getEntityManager().flush();
-
                // Log trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkUser: user={1} - EXIT!", this.getClass().getSimpleName(), user)); //NOI18N
 
index ef30cf373a38ead8f197ca21effd7728a12a741e..0b4513dde428db31e2a1dca63b30dbb975403187 100644 (file)
@@ -673,9 +673,6 @@ public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSes
                // Persist it
                this.getEntityManager().persist(entry);
 
-               // Flush it to get id number back
-               this.getEntityManager().flush();
-
                // Send email to user
                this.sendEmail("User password change", "user_password_change", managedUser, baseUrl, null); //NOI18N
 
index ea386588094e9dff7187d9aaeaa4a6f7bfe14b63..665f5d3378d27f730bec37680fd7dc9ee24f2d26 100644 (file)
@@ -136,7 +136,7 @@ public class JobsUserActivityLogMessageBean extends BaseJobsDatabaseBean impleme
                }
 
                // Make user instance managed
-               final User managedUser = this.getManagedUser(userActivity.getActivityUser());
+               final User managedUser = this.getManaged(userActivity.getActivityUser());
 
                // Set it back
                userActivity.setActivityUser(managedUser);
index 28152bcf55e3b20e412fac51ceefd32786100e7c..2f02a3b125b1d784a121b0052e56c9dcd23feb52 100644 (file)
@@ -110,7 +110,7 @@ public class JobsUserEmailChangeSessionBean extends BaseJobsDatabaseBean impleme
                this.generateSecureHash(emailChange);
 
                // Make user managed
-               emailChange.setEmailChangeUser(this.getManagedUser(emailChange.getEmailChangeUser()));
+               emailChange.setEmailChangeUser(this.getManaged(emailChange.getEmailChangeUser()));
 
                // Persist it
                //@TODO Fix email delivery then allow this: this.getEntityManager().persist(emailChange);