From 006b2a8cdffc3526b26d87e7ca5523b9db4a9555 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 18 Apr 2020 15:50:44 +0200 Subject: [PATCH] Please cherry-pick: - updated JARs have new copyFooData() method names MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../jjobs/enterprise/BaseJobsEnterpriseBean.java | 8 ++++---- .../mobile/JobsAdminMobileSessionBean.java | 2 +- .../phone/JobsAdminPhoneSessionBean.java | 4 ++-- .../model/user/JobsUserSessionBean.java | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java b/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java index e98e897..e3f6010 100644 --- 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 b618154..e4170ae 100644 --- 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 4dee83f..41e7b4d 100644 --- 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 c018b26..40ae85c 100644 --- 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); -- 2.39.5