From: Roland Häder <roland@mxchange.org>
Date: Tue, 14 Apr 2020 08:03:54 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a0013c4c342a74b4a7b2d6e5964aeebbc86e1d00;p=jfinancials-ejb.git
Please cherry-pick:
- updated jphone-core.jar requires now some new getter/setter names like
getMobileEntryUpdated(), setContactEntry<Created|Updated>() and many more
Signed-off-by: Roland Häder <roland@mxchange.org>
---
diff --git a/src/java/org/mxchange/jcontacts/model/contact/FinancialsAdminContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/FinancialsAdminContactSessionBean.java
index 02d0216..043f585 100644
--- a/src/java/org/mxchange/jcontacts/model/contact/FinancialsAdminContactSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/model/contact/FinancialsAdminContactSessionBean.java
@@ -70,7 +70,7 @@ public class FinancialsAdminContactSessionBean extends BaseFinancialsEnterpriseB
}
// Set created timestamp
- contact.setContactCreated(new Date());
+ contact.setContactEntryCreated(new Date());
// Set all created timestamps, if instance is there
this.setAllPhoneEntriesCreated(contact);
diff --git a/src/java/org/mxchange/jcontacts/model/phone/FinancialsAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/FinancialsAdminContactPhoneSessionBean.java
index 88f227c..7c46cbc 100644
--- a/src/java/org/mxchange/jcontacts/model/phone/FinancialsAdminContactPhoneSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/model/phone/FinancialsAdminContactPhoneSessionBean.java
@@ -192,12 +192,12 @@ public class FinancialsAdminContactPhoneSessionBean extends BaseFinancialsEnterp
} else if (null == mobileNumber) {
// Throw NPE
throw new NullPointerException("mobileNumber is null"); //NOI18N
- } else if (mobileNumber.getPhoneId() == null) {
+ } else if (mobileNumber.getMobileId() == null) {
// Throw it again
throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N
- } else if (mobileNumber.getPhoneId() < 1) {
+ } else if (mobileNumber.getMobileId() < 1) {
// Invalid id
- throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N
+ throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getMobileId())); //NOI18N
} else if (mobileNumber.getMobileProvider() == null) {
// Throw NPE again
throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N
@@ -357,9 +357,9 @@ public class FinancialsAdminContactPhoneSessionBean extends BaseFinancialsEnterp
} else if (null == mobileNumber) {
// Throw NPE
throw new NullPointerException("mobileNumber is null"); //NOI18N
- } else if (mobileNumber.getPhoneId() instanceof Long) {
+ } else if (mobileNumber.getMobileId() instanceof Long) {
// Throw it again
- throw new IllegalStateException(MessageFormat.format("mobileNumber.phoneId={0} is not null", mobileNumber.getPhoneId())); //NOI18N
+ throw new IllegalStateException(MessageFormat.format("mobileNumber.phoneId={0} is not null", mobileNumber.getMobileId())); //NOI18N
} else if (mobileNumber.getMobileProvider() == null) {
// Throw NPE again
throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N
@@ -372,7 +372,7 @@ public class FinancialsAdminContactPhoneSessionBean extends BaseFinancialsEnterp
}
// Set created instance
- mobileNumber.setPhoneEntryCreated(new Date());
+ mobileNumber.setMobileEntryCreated(new Date());
// Set mobile number in contact
contact.setContactMobileNumber(mobileNumber);
@@ -489,15 +489,15 @@ public class FinancialsAdminContactPhoneSessionBean extends BaseFinancialsEnterp
} else if (contact.getContactMobileNumber() == null) {
// Not set cell phone instance
throw new PhoneNumberNotLinkedException(mobileNumber);
- } else if (contact.getContactMobileNumber().getPhoneId() == null) {
+ } else if (contact.getContactMobileNumber().getMobileId() == null) {
// Throw NPE again
throw new NullPointerException("contact.contactMobileNumber.phoneId is null"); //NOI18N
- } else if (contact.getContactMobileNumber().getPhoneId() < 1) {
+ } else if (contact.getContactMobileNumber().getMobileId() < 1) {
// Invalid id number
- throw new IllegalArgumentException(MessageFormat.format("contact.contactMobileNumber.phoneId={0} is invalid.", contact.getContactMobileNumber().getPhoneId())); //NOI18N
- } else if (!Objects.equals(mobileNumber.getPhoneId(), contact.getContactMobileNumber().getPhoneId())) {
+ throw new IllegalArgumentException(MessageFormat.format("contact.contactMobileNumber.phoneId={0} is invalid.", contact.getContactMobileNumber().getMobileId())); //NOI18N
+ } else if (!Objects.equals(mobileNumber.getMobileId(), contact.getContactMobileNumber().getMobileId())) {
// Not same object
- throw new IllegalArgumentException(MessageFormat.format("contact.contactMobileNumber.phoneId={0} and mobileNumber.phoneId={1} are not the same.", contact.getContactMobileNumber().getPhoneId(), mobileNumber.getPhoneId())); //NOI18N
+ throw new IllegalArgumentException(MessageFormat.format("contact.contactMobileNumber.phoneId={0} and mobileNumber.phoneId={1} are not the same.", contact.getContactMobileNumber().getMobileId(), mobileNumber.getMobileId())); //NOI18N
}
// Remove it from contact
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java
index eed7bb0..d9c2634 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java
@@ -18,7 +18,6 @@ package org.mxchange.jcontactsbusiness.model.basicdata;
import java.text.MessageFormat;
import java.util.Date;
-import java.util.List;
import java.util.Objects;
import javax.ejb.EJB;
import javax.ejb.Stateless;
@@ -85,7 +84,7 @@ public class FinancialsAdminBusinessDataSessionBean extends BaseFinancialsEnterp
}
// Now add current date
- basicData.setCompanyCreated(new Date());
+ basicData.setCompanyEntryCreated(new Date());
// Is there a owner set?
if (basicData.getCompanyUserOwner() instanceof User) {
@@ -144,16 +143,13 @@ public class FinancialsAdminBusinessDataSessionBean extends BaseFinancialsEnterp
* @return Whether same company name has been used
*/
private boolean isSameCompanyNameAdded (final BasicData basicData) {
- // Get all available entries
- final List<BasicData> list = this.businessDataBean.allBusinessBasicData();
-
// Default is not found
boolean isFound = false;
// Then check each entry
- for (final BasicData entry : list) {
+ for (final BasicData currentBasicData : this.businessDataBean.allBusinessBasicData()) {
// Is the company name matching?
- if (Objects.equals(entry.getCompanyName(), basicData.getCompanyName())) {
+ if (Objects.equals(currentBasicData.getCompanyName(), basicData.getCompanyName())) {
// Found match
isFound = true;
}
@@ -171,16 +167,13 @@ public class FinancialsAdminBusinessDataSessionBean extends BaseFinancialsEnterp
* @return Whether same company short name has been used
*/
private boolean isSameCompanyShortNameAdded (final BasicData basicData) {
- // Get all available entries
- final List<BasicData> list = this.businessDataBean.allBusinessBasicData();
-
// Default is not found
boolean isFound = false;
// Then check each entry
- for (final BasicData entry : list) {
+ for (final BasicData currentBasicData : this.businessDataBean.allBusinessBasicData()) {
// Is the company name matching?
- if (Objects.equals(entry.getCompanyShortName(), basicData.getCompanyShortName())) {
+ if (Objects.equals(currentBasicData.getCompanyShortName(), basicData.getCompanyShortName())) {
// Found match
isFound = true;
}
diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminEmployeeSessionBean.java
index db60aab..480ebf0 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminEmployeeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminEmployeeSessionBean.java
@@ -111,9 +111,9 @@ public class FinancialsAdminEmployeeSessionBean extends BaseFinancialsEnterprise
} else if ((employee.getEmployeeNumber() != null) && (employee.getEmployeeNumber().isEmpty())) {
// Throw it again
throw new IllegalArgumentException("employee.employeeNumber is empty"); //NOI18N
- } else if ((employee.getEmployeeMobileNumber() != null) && (employee.getEmployeeMobileNumber().getPhoneId() != null)) {
+ } else if ((employee.getEmployeeMobileNumber() != null) && (employee.getEmployeeMobileNumber().getMobileId() != null)) {
// Throw once more
- throw new IllegalArgumentException(MessageFormat.format("employee.employeeMobileNumber.phoneId={0} is unexpected.", employee.getEmployeeMobileNumber().getPhoneId())); //NOI18N
+ throw new IllegalArgumentException(MessageFormat.format("employee.employeeMobileNumber.phoneId={0} is unexpected.", employee.getEmployeeMobileNumber().getMobileId())); //NOI18N
} else if ((employee.getEmployeePersonalData() != null) && (employee.getEmployeePersonalData().getContactId() == null)) {
// Throw NPE
throw new NullPointerException("employee.employeePersonalData.contactId is null"); //NOI18N
@@ -197,7 +197,7 @@ public class FinancialsAdminEmployeeSessionBean extends BaseFinancialsEnterprise
// Is mobile number set?
if (employee.getEmployeeMobileNumber() instanceof DialableMobileNumber) {
// Yes, then set created there as well
- employee.getEmployeeMobileNumber().setPhoneEntryCreated(new Date());
+ employee.getEmployeeMobileNumber().setMobileEntryCreated(new Date());
// Make mobile provider managed
final MobileProvider mobileProvider = this.createManaged(employee.getEmployeeMobileNumber().getMobileProvider());
diff --git a/src/java/org/mxchange/jfinancials/enterprise/BaseFinancialsEnterpriseBean.java b/src/java/org/mxchange/jfinancials/enterprise/BaseFinancialsEnterpriseBean.java
index bcf244e..7e67a3d 100644
--- a/src/java/org/mxchange/jfinancials/enterprise/BaseFinancialsEnterpriseBean.java
+++ b/src/java/org/mxchange/jfinancials/enterprise/BaseFinancialsEnterpriseBean.java
@@ -48,7 +48,6 @@ import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumbers;
import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumbers;
import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider;
-import org.mxchange.jphone.utils.PhoneUtils;
import org.mxchange.jusercore.model.user.User;
import org.mxchange.jusercore.model.user.Users;
@@ -574,12 +573,12 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
}
// Is a mobile number instance set?
- if ((mobileNumber instanceof DialableMobileNumber) && (mobileNumber.getPhoneId() == null)) {
+ if ((mobileNumber instanceof DialableMobileNumber) && (mobileNumber.getMobileId() == null)) {
// Debug message
this.getLoggerBeanLocal().logDebug("setAllPhoneEntriesCreated: Setting created timestamp for mobile number ..."); //NOI18N
// Set updated timestamp
- mobileNumber.setPhoneEntryCreated(new Date());
+ mobileNumber.setMobileEntryCreated(new Date());
}
// Trace message
@@ -749,16 +748,16 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
if (null == mobileNumber) {
// Throw NPE
throw new NullPointerException("mobileNumber is null"); //NOI18N
- } else if (fetchedNumber.getPhoneId() == null) {
+ } else if (fetchedNumber.getMobileId() == null) {
// ..and again
throw new NullPointerException("fetchedNumber.phoneId is null"); //NOI18N
}
// Debug message
- this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: fetchedNumber.phoneId={0}", fetchedNumber.getPhoneId())); //NOI18N
+ this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: fetchedNumber.phoneId={0}", fetchedNumber.getMobileId())); //NOI18N
// Init query instance
- final DialableMobileNumber foundNumber = this.getEntityManager().find(fetchedNumber.getClass(), fetchedNumber.getPhoneId());
+ final DialableMobileNumber foundNumber = this.getEntityManager().find(fetchedNumber.getClass(), fetchedNumber.getMobileId());
// Debug message
this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: foundNumber={0}", foundNumber)); //NOI18N
@@ -767,7 +766,7 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
DialableMobileNumber detachedNumber = null;
// Is there a difference?
- if (!PhoneUtils.isSameMobileNumber(mobileNumber, fetchedNumber)) {
+ if (!MobileNumbers.isSameMobileNumber(mobileNumber, fetchedNumber)) {
// @TODO Copy all to foundNumber, then merge
// Merge this entry
@@ -815,7 +814,7 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
DialableLandLineNumber detachedNumber = null;
// Is there a difference?
- if (!PhoneUtils.isSameLandLineNumber(landLineNumber, fetchedNumber)) {
+ if (!LandLineNumbers.isSameLandLineNumber(landLineNumber, fetchedNumber)) {
// @TODO Copy all to foundNumber, then merge
// Merge this entry
@@ -863,7 +862,7 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
DialableFaxNumber detachedNumber = null;
// Is there a difference?
- if (!PhoneUtils.isSameFaxNumber(faxNumber, fetchedNumber)) {
+ if (!FaxNumbers.isSameFaxNumber(faxNumber, fetchedNumber)) {
// @TODO Copy all to foundNumber, then merge
// Merge this entry
@@ -901,7 +900,7 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
}
// Set updated timestamp
- detachedContact.setContactUpdated(new Date());
+ detachedContact.setContactEntryUpdated(new Date());
// Get contact from it and find it
final Contact foundContact = this.getEntityManager().find(detachedContact.getClass(), detachedContact.getContactId());
@@ -947,47 +946,47 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
}
// Get all instances
- final DialableMobileNumber mobile = detachedContact.getContactMobileNumber();
- final DialableLandLineNumber landLine = detachedContact.getContactLandLineNumber();
- final DialableFaxNumber fax = detachedContact.getContactFaxNumber();
+ final DialableMobileNumber mobileNumber = detachedContact.getContactMobileNumber();
+ final DialableLandLineNumber landLineNumber = detachedContact.getContactLandLineNumber();
+ final DialableFaxNumber faxNumber = detachedContact.getContactFaxNumber();
// Is there a mobile instance set?
- if (mobile instanceof DialableMobileNumber) {
+ if (mobileNumber instanceof DialableMobileNumber) {
// Debug message
- this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: mobile.phoneId={0} is being updated ...", mobile.getPhoneId())); //NOI18N
+ this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: mobile.phoneId={0} is being updated ...", mobileNumber.getMobileId())); //NOI18N
// Then find it, too
- final DialableMobileNumber foundMobile = this.getEntityManager().find(mobile.getClass(), mobile.getPhoneId());
+ final DialableMobileNumber foundMobile = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getMobileId());
// Should be there
- assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getPhoneId()); //NOI18N
+ assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getMobileId()); //NOI18N
// Copy all
- MobileNumbers.copyAll(detachedContact.getContactMobileNumber(), foundMobile);
+ MobileNumbers.copyMobileNumber(detachedContact.getContactMobileNumber(), foundMobile);
// Then merge it, too
final 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
+ assert (managedMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", managedMobile.getMobileId()); //NOI18N
// Set it back
detachedContact.setContactMobileNumber(managedMobile);
}
// Is there a fax instance set?
- if (fax instanceof DialableFaxNumber) {
+ if (faxNumber instanceof DialableFaxNumber) {
// Debug message
- this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: fax.phoneId={0} is being updated ...", fax.getPhoneId())); //NOI18N
+ this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: fax.phoneId={0} is being updated ...", faxNumber.getPhoneId())); //NOI18N
// Then find it, too
- final DialableFaxNumber foundFax = this.getEntityManager().find(fax.getClass(), fax.getPhoneId());
+ final DialableFaxNumber foundFax = this.getEntityManager().find(faxNumber.getClass(), faxNumber.getPhoneId());
// Should be there
assert (foundFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", foundFax.getPhoneId()); //NOI18N
// Copy all
- FaxNumbers.copyAll(detachedContact.getContactFaxNumber(), foundFax);
+ FaxNumbers.copyFaxNumber(detachedContact.getContactFaxNumber(), foundFax);
// Then merge it, too
final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
@@ -1000,18 +999,18 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
}
// Is there a fax instance set?
- if (landLine instanceof DialableLandLineNumber) {
+ if (landLineNumber instanceof DialableLandLineNumber) {
// Debug message
- this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: landLine.phoneId={0} is being updated ...", landLine.getPhoneId())); //NOI18N
+ this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: landLine.phoneId={0} is being updated ...", landLineNumber.getPhoneId())); //NOI18N
// Then find it, too
- final DialableLandLineNumber foundLandLine = this.getEntityManager().find(landLine.getClass(), landLine.getPhoneId());
+ final DialableLandLineNumber foundLandLine = this.getEntityManager().find(landLineNumber.getClass(), landLineNumber.getPhoneId());
// Should be there
assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N
// Copy all
- LandLineNumbers.copyAll(detachedContact.getContactLandLineNumber(), foundLandLine);
+ LandLineNumbers.copyLandLineNumber(detachedContact.getContactLandLineNumber(), foundLandLine);
// Then merge it, too
final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);
@@ -1163,7 +1162,7 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
this.getLoggerBeanLocal().logDebug(MessageFormat.format("setAllContactPhoneEntries: other.contactMobileNumber={0}", other.getContactMobileNumber())); //NOI18N
// Is other mobile not set?
- if ((other.getContactMobileNumber() == null) || (PhoneUtils.isSameMobileNumber(contact.getContactMobileNumber(), other.getContactMobileNumber()))) {
+ if ((other.getContactMobileNumber() == null) || (MobileNumbers.isSameMobileNumber(contact.getContactMobileNumber(), other.getContactMobileNumber()))) {
// Debug message
this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntries: Copying mobile entry ..."); //NOI18N
@@ -1181,7 +1180,7 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
this.getLoggerBeanLocal().logDebug(MessageFormat.format("setAllContactPhoneEntries: other.contactLandLineNumber={0}", other.getContactLandLineNumber())); //NOI18N
// Is other mobile not set?
- if ((other.getContactLandLineNumber() == null) || (PhoneUtils.isSameLandLineNumber(contact.getContactLandLineNumber(), other.getContactLandLineNumber()))) {
+ if ((other.getContactLandLineNumber() == null) || (LandLineNumbers.isSameLandLineNumber(contact.getContactLandLineNumber(), other.getContactLandLineNumber()))) {
// Debug message
this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntries: Copying land-line entry ..."); //NOI18N
@@ -1199,7 +1198,7 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
this.getLoggerBeanLocal().logDebug(MessageFormat.format("setAllContactPhoneEntries: other.contactFaxNumber={0}", other.getContactFaxNumber())); //NOI18N
// Is other mobile not set?
- if ((other.getContactFaxNumber() == null) || (PhoneUtils.isSameFaxNumber(contact.getContactFaxNumber(), other.getContactFaxNumber()))) {
+ if ((other.getContactFaxNumber() == null) || (FaxNumbers.isSameFaxNumber(contact.getContactFaxNumber(), other.getContactFaxNumber()))) {
// Debug message
this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntries: Copying fax entry ..."); //NOI18N
@@ -1280,12 +1279,12 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean {
}
// Is a mobile number instance set?
- if ((mobileNumber instanceof DialableMobileNumber) && (mobileNumber.getPhoneId() instanceof Long) && (mobileNumber.getPhoneId() > 0)) {
+ if ((mobileNumber instanceof DialableMobileNumber) && (mobileNumber.getMobileId() instanceof Long) && (mobileNumber.getMobileId() > 0)) {
// Debug message
this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntriesUpdated: Setting updated timestamp for mobile number ..."); //NOI18N
// Set updated timestamp
- mobileNumber.setPhoneEntryUpdated(new Date());
+ mobileNumber.setMobileEntryUpdated(new Date());
}
// Trace message
diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java
index 6cc3e11..45a5438 100644
--- a/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java
@@ -153,12 +153,12 @@ public class FinancialsAdminPhoneSessionBean extends BaseFinancialsEnterpriseBea
if (null == mobileNumber) {
// Not set, throw NPE
throw new NullPointerException("mobileNumber is null"); //NOI18N
- } else if (mobileNumber.getPhoneId() == null) {
+ } else if (mobileNumber.getMobileId() == null) {
// Throw NPE again
throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N
- } else if (mobileNumber.getPhoneId() < 1) {
+ } else if (mobileNumber.getMobileId() < 1) {
// Invalid number
- throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N
+ throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getMobileId())); //NOI18N
} else if (mobileNumber.getMobileProvider() == null) {
// Throw NPE
throw new NullPointerException("mobileNumber.cellphoneProvider is null"); //NOI18N
@@ -168,16 +168,16 @@ public class FinancialsAdminPhoneSessionBean extends BaseFinancialsEnterpriseBea
} else if (mobileNumber.getMobileProvider().getProviderId() < 1) {
// Id not valid
throw new IllegalArgumentException(MessageFormat.format("mobileNumber.cellphoneProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N
- } else if (mobileNumber.getPhoneNumber() == null) {
+ } else if (mobileNumber.getMobileNumber() == null) {
// Throw NPE again
- throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N
- } else if (mobileNumber.getPhoneNumber() < 1) {
+ throw new NullPointerException("mobileNumber.mobileNumber is null"); //NOI18N
+ } else if (mobileNumber.getMobileNumber() < 1) {
// Throw NPE again
- throw new NullPointerException(MessageFormat.format("mobileNumber.phoneNumber={0} is not valid.", mobileNumber.getPhoneNumber())); //NOI18N
+ throw new NullPointerException(MessageFormat.format("mobileNumber.mobileNumber={0} is not valid.", mobileNumber.getMobileNumber())); //NOI18N
}
// Get a managed instance
- final DialableMobileNumber managedNumber = this.getEntityManager().getReference(mobileNumber.getClass(), mobileNumber.getPhoneId());
+ final DialableMobileNumber managedNumber = this.getEntityManager().getReference(mobileNumber.getClass(), mobileNumber.getMobileId());
// Remove it from database
this.getEntityManager().remove(managedNumber);
@@ -234,7 +234,7 @@ public class FinancialsAdminPhoneSessionBean extends BaseFinancialsEnterpriseBea
this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateFaxData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
// Set updated timestamp
- FaxNumbers.copyAll(faxNumber, managedNumber);
+ FaxNumbers.copyFaxNumber(faxNumber, managedNumber);
managedNumber.setPhoneEntryUpdated(new Date());
// Trace message
@@ -292,7 +292,7 @@ public class FinancialsAdminPhoneSessionBean extends BaseFinancialsEnterpriseBea
this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateLandLineData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
// Set updated timestamp
- LandLineNumbers.copyAll(landLineNumber, managedNumber);
+ LandLineNumbers.copyLandLineNumber(landLineNumber, managedNumber);
managedNumber.setPhoneEntryUpdated(new Date());
// Trace message
@@ -311,12 +311,12 @@ public class FinancialsAdminPhoneSessionBean extends BaseFinancialsEnterpriseBea
if (null == mobileNumber) {
// Not set, throw NPE
throw new NullPointerException("mobileNumber is null"); //NOI18N
- } else if (mobileNumber.getPhoneId() == null) {
+ } else if (mobileNumber.getMobileId() == null) {
// Throw NPE again
throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N
- } else if (mobileNumber.getPhoneId() < 1) {
+ } else if (mobileNumber.getMobileId() < 1) {
// Invalid number
- throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N
+ throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getMobileId())); //NOI18N
} else if (mobileNumber.getMobileProvider() == null) {
// Throw NPE
throw new NullPointerException("mobileNumber.cellphoneProvider is null"); //NOI18N
@@ -326,26 +326,26 @@ public class FinancialsAdminPhoneSessionBean extends BaseFinancialsEnterpriseBea
} else if (mobileNumber.getMobileProvider().getProviderId() < 1) {
// Id not valid
throw new IllegalArgumentException(MessageFormat.format("mobileNumber.cellphoneProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N
- } else if (mobileNumber.getPhoneNumber() == null) {
+ } else if (mobileNumber.getMobileNumber() == null) {
// Throw NPE again
- throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N
- } else if (mobileNumber.getPhoneNumber() < 1) {
+ throw new NullPointerException("mobileNumber.mobileNumber is null"); //NOI18N
+ } else if (mobileNumber.getMobileNumber() < 1) {
// Throw NPE again
- throw new NullPointerException(MessageFormat.format("mobileNumber.phoneNumber={0} is not valid.", mobileNumber.getPhoneNumber())); //NOI18N
+ throw new NullPointerException(MessageFormat.format("mobileNumber.mobileNumber={0} is not valid.", mobileNumber.getMobileNumber())); //NOI18N
}
// Get contact from it and find it
- final DialableMobileNumber managedNumber = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId());
+ final DialableMobileNumber managedNumber = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getMobileId());
// Should be found
- assert (managedNumber instanceof DialableMobileNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", mobileNumber.getPhoneId()); //NOI18N
+ assert (managedNumber instanceof DialableMobileNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", mobileNumber.getMobileId()); //NOI18N
// Debug message
- this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateMobileData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
+ this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateMobileData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getMobileId())); //NOI18N
// Set updated timestamp
- MobileNumbers.copyAll(mobileNumber, managedNumber);
- managedNumber.setPhoneEntryUpdated(new Date());
+ MobileNumbers.copyMobileNumber(mobileNumber, managedNumber);
+ managedNumber.setMobileEntryUpdated(new Date());
// Trace message
this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateMobileData: managedNumber={1} - EXIT!", this.getClass().getSimpleName(), managedNumber)); //NOI18N
diff --git a/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java
index 5e607af..431b19e 100644
--- a/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java
@@ -82,7 +82,7 @@ public class FinancialsAdminUserSessionBean extends BaseFinancialsEnterpriseBean
// Set created timestamp
user.setUserCreated(new Date());
- user.getUserContact().setContactCreated(new Date());
+ user.getUserContact().setContactEntryCreated(new Date());
// Update mobile, land-line and fax instance
this.setAllPhoneEntriesCreated(user.getUserContact());
diff --git a/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java
index 3d2bc06..eab8e52 100644
--- a/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java
@@ -26,7 +26,6 @@ import javax.persistence.NoResultException;
import javax.persistence.PersistenceException;
import javax.persistence.Query;
import org.mxchange.jcontacts.model.contact.Contact;
-import org.mxchange.jcontacts.model.contact.Contacts;
import org.mxchange.jfinancials.enterprise.BaseFinancialsEnterpriseBean;
import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
import org.mxchange.jphone.model.phonenumbers.fax.FaxNumbers;
@@ -586,22 +585,22 @@ public class FinancialsUserSessionBean extends BaseFinancialsEnterpriseBean impl
// Is there a mobile instance set?
if (mobileNumber instanceof DialableMobileNumber) {
// Debug message
- this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: mobile.phoneId={0} is being updated ...", mobileNumber.getPhoneId())); //NOI18N
+ this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: mobile.phoneId={0} is being updated ...", mobileNumber.getMobileId())); //NOI18N
// Then find it, too
- final DialableMobileNumber foundMobile = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId());
+ final DialableMobileNumber foundMobile = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getMobileId());
// Should be there
- assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getPhoneId()); //NOI18N
+ assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getMobileId()); //NOI18N
// Copy all
- MobileNumbers.copyAll(managedUser.getUserContact().getContactMobileNumber(), foundMobile);
+ MobileNumbers.copyMobileNumber(managedUser.getUserContact().getContactMobileNumber(), foundMobile);
// Then merge it, too
final 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
+ assert (managedMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", managedMobile.getMobileId()); //NOI18N
// Set it back
managedContact.setContactMobileNumber(managedMobile);
@@ -622,7 +621,7 @@ public class FinancialsUserSessionBean extends BaseFinancialsEnterpriseBean impl
assert (foundFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", foundFax.getPhoneId()); //NOI18N
// Copy all
- FaxNumbers.copyAll(managedUser.getUserContact().getContactFaxNumber(), foundFax);
+ FaxNumbers.copyFaxNumber(managedUser.getUserContact().getContactFaxNumber(), foundFax);
// Then merge it, too
final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
@@ -649,7 +648,7 @@ public class FinancialsUserSessionBean extends BaseFinancialsEnterpriseBean impl
assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N
// Copy all
- LandLineNumbers.copyAll(managedUser.getUserContact().getContactLandLineNumber(), foundLandLine);
+ LandLineNumbers.copyLandLineNumber(managedUser.getUserContact().getContactLandLineNumber(), foundLandLine);
// Then merge it, too
final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);