Please cherry-pick:

- rewrote to new copyAll() methods as having them in POJOs is no good idea
  anyway as you should keep those objects as simple as possible.

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

diff --git a/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java b/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java
index 9ec689dc8d36720c48e3f5338b2540bbf0d69cf0..b2c75b1d223335f4ceadef2f9014f2a4d13b43f6 100644 (file)
--- a/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java
@@ -23,7 +23,6 @@ import java.util.Objects;
 import javax.ejb.Stateless;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
-import org.mxchange.jcontacts.contact.utils.ContactUtils;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean;
 /**

diff --git a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java
index 8bee996435a6fcbba7c271f69e558678136c9b71..5bcd50a3da6427b34fe0828f0b4c58f712a6e817 100644 (file)
--- a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java
@@ -29,6 +29,7 @@ import javax.persistence.NoResultException;
 import javax.persistence.PersistenceException;
 import javax.persistence.Query;
 import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jcontacts.contact.ContactUtils;
 import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
@@ -584,7 +585,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                assert (updatedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
 
                // Copy all data
-               updatedUser.copyAll(user);
+               UserUtils.copyAll(user, updatedUser);
 
                // Set as updated
                updatedUser.setUserUpdated(new GregorianCalendar());
@@ -713,7 +714,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                assert (updatedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
 
                // Copy all data
-               updatedUser.copyAll(user);
+               UserUtils.copyAll(user, updatedUser);
 
                // Set as updated
                updatedUser.setUserUpdated(new GregorianCalendar());
@@ -729,7 +730,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: managedContact.contactId={0}", managedContact.getContactId())); //NOI18N
 
                // Copy all
-               managedContact.copyAll(user.getUserContact());
+               ContactUtils.copyAll(user.getUserContact(), managedContact);
 
                // Set it back in user
                user.setUserContact(managedContact);