Please cherry-pick:

- updated JARs have new copyFooData() method names

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

diff --git a/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java b/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java
index e98e89718e2b6aecbcbc656b039d57c5f7a90a48..e3f601053d7200cb2ab3d1f83a0bd923f6b63e2d 100644 (file)
--- a/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java
+++ b/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java
@@ -903,7 +903,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("mergeContactData: foundContact.contactId={0}", foundContact.getContactId())); //NOI18N
 
                // Copy all
-               Contacts.copyAll(detachedContact, foundContact);
+               Contacts.copyContactData(detachedContact, foundContact);
 
                // Merge contact instance
                final Contact managedContact = this.getEntityManager().merge(foundContact);
@@ -953,7 +953,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                        assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getMobileId()); //NOI18N
 
                        // Copy all
-                       MobileNumbers.copyMobileNumber(detachedContact.getContactMobileNumber(), foundMobile);
+                       MobileNumbers.copyMobileNumberData(detachedContact.getContactMobileNumber(), foundMobile);
 
                        // Then merge it, too
                        final DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
@@ -977,7 +977,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                        assert (foundFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", foundFax.getPhoneId()); //NOI18N
 
                        // Copy all
-                       FaxNumbers.copyFaxNumber(detachedContact.getContactFaxNumber(), foundFax);
+                       FaxNumbers.copyFaxNumberData(detachedContact.getContactFaxNumber(), foundFax);
 
                        // Then merge it, too
                        final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
@@ -1001,7 +1001,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                        assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N
 
                        // Copy all
-                       LandLineNumbers.copyLandLineNumber(detachedContact.getContactLandLineNumber(), foundLandLine);
+                       LandLineNumbers.copyLandLineNumberData(detachedContact.getContactLandLineNumber(), foundLandLine);
 
                        // Then merge it, too
                        final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);

diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/mobile/JobsAdminMobileSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobile/JobsAdminMobileSessionBean.java
index b618154d2e798b9a78a313a4536a6d5b19a1417b..e4170ae340a253ab76d1f1e9286360621b34bc18 100644 (file)
--- a/src/java/org/mxchange/jphone/model/phonenumbers/mobile/JobsAdminMobileSessionBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobile/JobsAdminMobileSessionBean.java
@@ -126,7 +126,7 @@ public class JobsAdminMobileSessionBean extends BaseJobsEnterpriseBean implement
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateMobileData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getMobileId())); //NOI18N
 
                // Set updated timestamp
-               MobileNumbers.copyMobileNumber(mobileNumber, managedNumber);
+               MobileNumbers.copyMobileNumberData(mobileNumber, managedNumber);
                managedNumber.setMobileEntryUpdated(new Date());
 
                // Trace message

diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java
index 4dee83f5b4bad0132138eb3b462097878c68c0f3..41e7b4de63eaa804d99db7e5f9af0fd9034aeb7c 100644 (file)
--- a/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java
@@ -190,7 +190,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsEnterpriseBean implements
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateFaxData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
 
                // Set updated timestamp
-               FaxNumbers.copyFaxNumber(faxNumber, managedNumber);
+               FaxNumbers.copyFaxNumberData(faxNumber, managedNumber);
                managedNumber.setPhoneEntryUpdated(new Date());
 
                // Trace message
@@ -248,7 +248,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsEnterpriseBean implements
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateLandLineData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
 
                // Set updated timestamp
-               LandLineNumbers.copyLandLineNumber(landLineNumber, managedNumber);
+               LandLineNumbers.copyLandLineNumberData(landLineNumber, managedNumber);
                managedNumber.setPhoneEntryUpdated(new Date());
 
                // Trace message

diff --git a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java
index c018b26a44d62e114e6aef482f4891281337a8fa..40ae85cc719f6593131de6a05b36e9f8c0735995 100644 (file)
--- a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java
@@ -287,7 +287,10 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS
                final User foundUser = this.getEntityManager().find(user.getClass(), user.getUserId());
 
                // Should be found!
-               assert (foundUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
+               assert (foundUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", detachedUser.getUserId()); //NOI18N
+
+               // Copy all data
+               Users.copyUserData(detachedUser, foundUser);
 
                // Merge user
                final User managedUser = this.getEntityManager().merge(foundUser);
@@ -295,9 +298,6 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS
                // Should be found!
                assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
 
-               // Copy all data
-               Users.copyAll(managedUser, managedUser);
-
                // Set as updated
                managedUser.setUserUpdated(new Date());
 
@@ -414,7 +414,7 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS
                assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
 
                // Copy all data
-               Users.copyAll(user, managedUser);
+               Users.copyUserData(user, managedUser);
 
                // Set as updated
                managedUser.setUserUpdated(new Date());
@@ -443,7 +443,7 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS
                        assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getMobileId()); //NOI18N
 
                        // Copy all
-                       MobileNumbers.copyMobileNumber(managedUser.getUserContact().getContactMobileNumber(), foundMobile);
+                       MobileNumbers.copyMobileNumberData(managedUser.getUserContact().getContactMobileNumber(), foundMobile);
 
                        // Then merge it, too
                        final DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
@@ -470,7 +470,7 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS
                        assert (foundFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", foundFax.getPhoneId()); //NOI18N
 
                        // Copy all
-                       FaxNumbers.copyFaxNumber(managedUser.getUserContact().getContactFaxNumber(), foundFax);
+                       FaxNumbers.copyFaxNumberData(managedUser.getUserContact().getContactFaxNumber(), foundFax);
 
                        // Then merge it, too
                        final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
@@ -497,7 +497,7 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS
                        assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N
 
                        // Copy all
-                       LandLineNumbers.copyLandLineNumber(managedUser.getUserContact().getContactLandLineNumber(), foundLandLine);
+                       LandLineNumbers.copyLandLineNumberData(managedUser.getUserContact().getContactLandLineNumber(), foundLandLine);
 
                        // Then merge it, too
                        final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);