Please cherry-pick:

- had moved copyAll() to new utility classes which is a much better place for
  them. Per EJB standards, no "complex" methods in POJOs/entity classes which
  makes sense. :-)

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java b/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java
index 232eff744739db63adb989cc645d3f1ae1fc6db8..6820a083b07241f0d12413374cf4a47a5b1ea7df 100644 (file)
--- a/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java
+++ b/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java
@@ -30,8 +30,11 @@ import org.mxchange.jcoreee.database.BaseDatabaseBean;
 import org.mxchange.jmailee.model.delivery.wrapper.EmailDeliveryWrapper;
 import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery;
 import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.fax.FaxNumbers;
 import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.phonenumbers.landline.LandLineNumbers;
 import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
+import org.mxchange.jphone.phonenumbers.mobile.MobileNumbers;
 import org.mxchange.jphone.utils.PhoneUtils;
 import org.mxchange.jusercore.model.user.LoginUser;
 import org.mxchange.jusercore.model.user.User;
@@ -385,11 +388,17 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                        // Should be there
                        assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getPhoneId()); //NOI18N
 
+                       // Then merge it, too
+                       DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
+
+                       // Should be there
+                       assert (managedMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", managedMobile.getPhoneId()); //NOI18N
+
                        // Copy all
-                       foundMobile.copyAll(detachedContact.getContactMobileNumber());
+                       MobileNumbers.copyAll(detachedContact.getContactMobileNumber(), managedMobile);
 
                        // Set it back
-                       detachedContact.setContactMobileNumber(foundMobile);
+                       detachedContact.setContactMobileNumber(managedMobile);
                }
 
                // Is there a  fax instance set?
@@ -400,11 +409,20 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                        // Then find it, too
                        DialableFaxNumber foundFax = this.getEntityManager().find(fax.getClass(), fax.getPhoneId());
 
+                       // Should be there
+                       assert (foundFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", foundFax.getPhoneId()); //NOI18N
+
+                       // Then merge it, too
+                       DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
+
+                       // Should be there
+                       assert (managedFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", managedFax.getPhoneId()); //NOI18N
+
                        // Copy all
-                       foundFax.copyAll(detachedContact.getContactFaxNumber());
+                       FaxNumbers.copyAll(detachedContact.getContactFaxNumber(), managedFax);
 
                        // Set it back
-                       detachedContact.setContactFaxNumber(foundFax);
+                       detachedContact.setContactFaxNumber(managedFax);
                }
 
                // Is there a  fax instance set?
@@ -418,11 +436,17 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                        // Should be there
                        assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N
 
+                       // Then merge it, too
+                       DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);
+
+                       // Should be there
+                       assert (managedLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", managedLandLine.getPhoneId()); //NOI18N
+
                        // Copy all
-                       foundLandLine.copyAll(detachedContact.getContactLandLineNumber());
+                       LandLineNumbers.copyAll(detachedContact.getContactLandLineNumber(), managedLandLine);
 
                        // Set it back
-                       detachedContact.setContactLandLineNumber(foundLandLine);
+                       detachedContact.setContactLandLineNumber(managedLandLine);
                }
 
                // Trace message