From f9c324cc6bfe6fae7a53173e45ea4c4b7219eff8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 19 Aug 2016 17:49:20 +0200 Subject: [PATCH] Please cherry-pick: - change find() to getReference() as this causes no additional SELECT on database backend --- .../phone/JobsAdminPhoneSessionBean.java | 2 +- .../model/user/JobsAdminUserSessionBean.java | 2 +- .../jusercore/model/user/JobsUserSessionBean.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java index 5bd557b..b3df91a 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java @@ -113,7 +113,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A mobileNumber.setPhoneEntryUpdated(new GregorianCalendar()); // Get contact from it and find it - DialableMobileNumber foundNumber = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId()); + DialableMobileNumber foundNumber = this.getEntityManager().getReference(mobileNumber.getClass(), mobileNumber.getPhoneId()); // Should be found assert (foundNumber instanceof DialableMobileNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", mobileNumber.getPhoneId()); //NOI18N diff --git a/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java index 7e71dc6..6267760 100644 --- a/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java @@ -139,7 +139,7 @@ public class JobsAdminUserSessionBean extends BaseJobsDatabaseBean implements Ad } // Try to find the contact - Contact foundContact = this.getEntityManager().find(user.getUserContact().getClass(), user.getUserContact().getContactId()); + Contact foundContact = this.getEntityManager().getReference(user.getUserContact().getClass(), user.getUserContact().getContactId()); // Set detached object in rexcruiter instance user.setUserContact(foundContact); diff --git a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java index e0af749..5f231ed 100644 --- a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java @@ -573,7 +573,7 @@ public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSes user.setUserContact(null); // Find the instance - User foundUser = this.getEntityManager().find(user.getClass(), user.getUserId()); + User foundUser = this.getEntityManager().getReference(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 @@ -666,7 +666,7 @@ public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSes } // Find the instance - User foundUser = this.getEntityManager().find(user.getClass(), user.getUserId()); + User foundUser = this.getEntityManager().getReference(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 @@ -685,7 +685,7 @@ public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSes detachedUser.getUserContact().setContactUpdated(new GregorianCalendar()); // Get contact from it and find it - Contact foundContact = this.getEntityManager().find(user.getUserContact().getClass(), user.getUserContact().getContactId()); + Contact foundContact = this.getEntityManager().getReference(user.getUserContact().getClass(), user.getUserContact().getContactId()); // Should be found assert (foundContact instanceof Contact) : MessageFormat.format("Contact with id {0} not found, but should be.", user.getUserContact().getContactId()); //NOI18N @@ -714,7 +714,7 @@ public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSes this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: mobile.phoneId={0} is being updated ...", mobileNumber.getPhoneId())); //NOI18N // Then find it, too - DialableMobileNumber foundMobile = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId()); + DialableMobileNumber foundMobile = this.getEntityManager().getReference(mobileNumber.getClass(), mobileNumber.getPhoneId()); // Should be there assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getPhoneId()); //NOI18N @@ -741,7 +741,7 @@ public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSes this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: fax.phoneId={0} is being updated ...", fax.getPhoneId())); //NOI18N // Then find it, too - DialableFaxNumber foundFax = this.getEntityManager().find(fax.getClass(), fax.getPhoneId()); + DialableFaxNumber foundFax = this.getEntityManager().getReference(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 @@ -768,7 +768,7 @@ public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSes this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: landLine.phoneId={0} is being updated ...", landLine.getPhoneId())); //NOI18N // Then find it, too - DialableLandLineNumber foundLandLine = this.getEntityManager().find(landLine.getClass(), landLine.getPhoneId()); + DialableLandLineNumber foundLandLine = this.getEntityManager().getReference(landLine.getClass(), landLine.getPhoneId()); // Should be there assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N -- 2.39.5