From 3eab5e48346dc981d817dcc2406ee098d9e8ab98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 9 Sep 2017 14:18:10 +0200 Subject: [PATCH] Please cherry-pick: - introduced isSameCompanyNameAdded() which encapsulates checking for if a company name has already been used. This is, together with the thrown checked exception a last effort to prevent bad bad SqlException or any other "low-level" exception as they are more severage than this. - thumb of a rule: always pre-validate if all conditions are met (return "okay") prior doing risky things where uncontrolled exceptions may be thrown. - make company-owner (User), founder (Employee) and contact person (dito) managed before persisting the whole BasicData instance as this makes sure that no duplicates will end up in database MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../database/BaseAddressbookDatabaseBean.java | 68 +++++++++++++---- ...dressbookAdminBusinessDataSessionBean.java | 73 +++++++++++++++---- .../AddressbookBusinessDataSessionBean.java | 2 + ...ressbookAdminBranchOfficeSessionBean.java} | 22 +++--- ...> AddressbookBranchOfficeSessionBean.java} | 6 +- ...ssbookAdminCompanyEmployeeSessionBean.java | 1 + ...AddressbookCompanyEmployeeSessionBean.java | 2 + .../data/AddressbookCountrySingletonBean.java | 3 + ...essbookAdminMobileProviderSessionBean.java | 2 + ...ddressbookMobileProviderSingletonBean.java | 3 + .../AddressbookAdminPhoneSessionBean.java | 1 + .../phone/AddressbookPhoneSessionBean.java | 1 + .../user/AddressbookAdminUserSessionBean.java | 2 +- ...AddressbookUserActivityLogMessageBean.java | 2 +- 14 files changed, 146 insertions(+), 42 deletions(-) rename src/java/org/mxchange/jcontactsbusiness/branchoffice/{FinancialsAdminBranchOfficeSessionBean.java => AddressbookAdminBranchOfficeSessionBean.java} (80%) rename src/java/org/mxchange/jcontactsbusiness/branchoffice/{FinancialsBranchOfficeSessionBean.java => AddressbookBranchOfficeSessionBean.java} (84%) diff --git a/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java b/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java index cce383e..e19d63d 100644 --- a/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java +++ b/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java @@ -31,6 +31,8 @@ import org.mxchange.jcontacts.model.contact.ContactUtils; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; +import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee; +import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcoreee.database.BaseDatabaseBean; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jcountry.model.data.CountryData; @@ -292,9 +294,9 @@ public abstract class BaseAddressbookDatabaseBean extends BaseDatabaseBean { *

* @return Managed contact instance */ - protected Contact getManaged (final Contact contact) { + protected Contact createManaged (final Contact contact) { // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: contact={1} - CALLED!", this.getClass().getSimpleName(), contact)); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: contact={1} - CALLED!", this.getClass().getSimpleName(), contact)); //NOI18N // user should not be null if (null == contact) { @@ -315,7 +317,7 @@ public abstract class BaseAddressbookDatabaseBean extends BaseDatabaseBean { assert (managedContact instanceof Contact) : "managedContact is null"; //NOI18N // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N // Return it return managedContact; @@ -328,9 +330,9 @@ public abstract class BaseAddressbookDatabaseBean extends BaseDatabaseBean { *

* @return Managed country instance */ - protected Country getManaged (final Country country) { + protected Country createManaged (final Country country) { // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: country={1} - CALLED!", this.getClass().getSimpleName(), country)); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: country={1} - CALLED!", this.getClass().getSimpleName(), country)); //NOI18N // user should not be null if (null == country) { @@ -351,22 +353,22 @@ public abstract class BaseAddressbookDatabaseBean extends BaseDatabaseBean { assert (managedCountry instanceof Country) : "managedCountry is null"; //NOI18N // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: managedCountry={1} - EXIT!", this.getClass().getSimpleName(), managedCountry)); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: managedCountry={1} - EXIT!", this.getClass().getSimpleName(), managedCountry)); //NOI18N // Return it return managedCountry; } /** - * Get back a managed instance from given contact + * Get back a managed instance from given basic data *

- * @param basicData Unmanaged/detached contact instance + * @param basicData Unmanaged/detached basic data instance *

- * @return Managed contact instance + * @return Managed basic data instance */ - protected BusinessBasicData getManaged (final BusinessBasicData basicData) { + protected BusinessBasicData createManaged (final BusinessBasicData basicData) { // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: basicData={1} - CALLED!", this.getClass().getSimpleName(), basicData)); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: basicData={1} - CALLED!", this.getClass().getSimpleName(), basicData)); //NOI18N // user should not be null if (null == basicData) { @@ -387,12 +389,48 @@ public abstract class BaseAddressbookDatabaseBean extends BaseDatabaseBean { assert (managedBasicData instanceof BusinessBasicData) : "managedBasicData is null"; //NOI18N // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: managedBasicData={1} - EXIT!", this.getClass().getSimpleName(), managedBasicData)); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: managedBasicData={1} - EXIT!", this.getClass().getSimpleName(), managedBasicData)); //NOI18N // Return it return managedBasicData; } + /** + * Get back a managed instance from given employee + *

+ * @param employee Unmanaged/detached employee instance + *

+ * @return Managed employee instance + */ + protected Employee createManaged (final Employee employee) { + // Trace message + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: employee={1} - CALLED!", this.getClass().getSimpleName(), employee)); //NOI18N + + // user should not be null + if (null == employee) { + // Abort here + throw new NullPointerException("employee is null"); //NOI18N + } else if (employee.getEmployeeId() == null) { + // Id is set + throw new NullPointerException("employee.employeeId is null"); //NOI18N + } else if (employee.getEmployeeId() < 1) { + // Id is set + throw new IllegalArgumentException(MessageFormat.format("employee.employeeId={0} is null", employee.getEmployeeId())); //NOI18N + } + + // Try to find it (should be there) + final Employee managedEmployee = this.getEntityManager().find(CompanyEmployee.class, employee.getEmployeeId()); + + // Should be there + assert (managedEmployee instanceof Employee) : "managedEmployee is null"; //NOI18N + + // Trace message + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: managedEmployee={1} - EXIT!", this.getClass().getSimpleName(), managedEmployee)); //NOI18N + + // Return it + return managedEmployee; + } + /** * Get back a managed instance from given user *

@@ -400,9 +438,9 @@ public abstract class BaseAddressbookDatabaseBean extends BaseDatabaseBean { *

* @return Managed user instance */ - protected User getManaged (final User user) { + protected User createManaged (final User user) { // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: user={1} - CALLED!", this.getClass().getSimpleName(), user)); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: user={1} - CALLED!", this.getClass().getSimpleName(), user)); //NOI18N // user should not be null if (null == user) { @@ -432,7 +470,7 @@ public abstract class BaseAddressbookDatabaseBean extends BaseDatabaseBean { assert (managedUser instanceof User) : "managedUser is null"; //NOI18N // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getManaged: managedUser={1} - EXIT!", this.getClass().getSimpleName(), managedUser)); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: managedUser={1} - EXIT!", this.getClass().getSimpleName(), managedUser)); //NOI18N // Return it return managedUser; diff --git a/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookAdminBusinessDataSessionBean.java index 592003b..cf8d545 100644 --- a/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookAdminBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookAdminBusinessDataSessionBean.java @@ -24,8 +24,11 @@ import javax.ejb.EJB; import javax.ejb.Stateless; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException; +import org.mxchange.jcontactsbusiness.model.basicdata.AdminBusinessDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.employee.Employee; +import org.mxchange.jusercore.model.user.User; /** * An administrative stateless session bean for business data @@ -66,25 +69,40 @@ public class AddressbookAdminBusinessDataSessionBean extends BaseAddressbookData } else if (basicData.getBasicDataId() != null) { // Should be null throw new IllegalArgumentException(MessageFormat.format("basicData.basicDataId={0} - is not null", basicData.getBasicDataId())); //NOI18N + } else if (this.isSameCompanyNameAdded(basicData)) { + // Throw exception + throw new BusinessDataAlreadyAddedException(basicData); } - // Get all available entries - final List list = this.businessDataBean.allCompanyBasicData(); + // Now add current date + basicData.setCompanyCreated(new GregorianCalendar()); - // Is the list filled? - if (!list.isEmpty()) { - // Then check each entry - for (final BusinessBasicData entry : list) { - // Is the company name matching? - if (Objects.equals(entry.getCompanyName(), basicData.getCompanyName())) { - // Found match - throw new BusinessDataAlreadyAddedException(basicData); - } - } + // Is there a owner set? + if (basicData.getCompanyUserOwner() instanceof User) { + // Get managed instance + final User managedUser = this.createManaged(basicData.getCompanyUserOwner()); + + // Set it back + basicData.setCompanyUserOwner(managedUser); } - // Now add current date - basicData.setCompanyCreated(new GregorianCalendar()); + // Is a founder set? + if (basicData.getCompanyFounder() instanceof Employee) { + // Get managed instance + final Employee managedEmployee = this.createManaged(basicData.getCompanyFounder()); + + // Set it back + basicData.setCompanyFounder(managedEmployee); + } + + // Is a contact person set? + if (basicData.getCompanyContactEmployee() instanceof Employee) { + // Get managed instance + final Employee managedEmployee = this.createManaged(basicData.getCompanyContactEmployee()); + + // Set it back + basicData.setCompanyContactEmployee(managedEmployee); + } // Persist it this.getEntityManager().persist(basicData); @@ -96,4 +114,31 @@ public class AddressbookAdminBusinessDataSessionBean extends BaseAddressbookData return basicData; } + /** + * Checks if given basic data is already added by it's company name + *

+ * @param basicData Basic data to be checked + * + * @return Whether same company name has been used + */ + private boolean isSameCompanyNameAdded (final BusinessBasicData basicData) { + // Get all available entries + final List list = this.businessDataBean.allCompanyBasicData(); + + // Default is not found + boolean isFound = false; + + // Then check each entry + for (final BusinessBasicData entry : list) { + // Is the company name matching? + if (Objects.equals(entry.getCompanyName(), basicData.getCompanyName())) { + // Found match + isFound = true; + } + } + + // Return flag + return isFound; + } + } diff --git a/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookBusinessDataSessionBean.java index fcd2af9..33d84f6 100644 --- a/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookBusinessDataSessionBean.java @@ -25,6 +25,8 @@ import javax.persistence.Query; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; /** * A stateless session bean for business data diff --git a/src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookAdminBranchOfficeSessionBean.java similarity index 80% rename from src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsAdminBranchOfficeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookAdminBranchOfficeSessionBean.java index c15a831..020d0ba 100644 --- a/src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsAdminBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookAdminBranchOfficeSessionBean.java @@ -21,10 +21,14 @@ import java.util.GregorianCalendar; import java.util.List; import javax.ejb.EJB; import javax.ejb.Stateless; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; +import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeAlreadyAddedException; -import org.mxchange.jcountry.data.Country; -import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.branchoffice.AdminBranchOfficeSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffices; +import org.mxchange.jcountry.model.data.Country; import org.mxchange.jusercore.model.user.User; /** @@ -33,7 +37,7 @@ import org.mxchange.jusercore.model.user.User; * @author Roland Häder */ @Stateless (name = "adminBranchOffice", description = "An administrative statless bean for handling branch office data (all)") -public class FinancialsAdminBranchOfficeSessionBean extends BaseFinancialsDatabaseBean implements AdminBranchOfficeSessionBeanRemote { +public class AddressbookAdminBranchOfficeSessionBean extends BaseAddressbookDatabaseBean implements AdminBranchOfficeSessionBeanRemote { /** * Serial number @@ -49,7 +53,7 @@ public class FinancialsAdminBranchOfficeSessionBean extends BaseFinancialsDataba /** * Default constructor */ - public FinancialsAdminBranchOfficeSessionBean () { + public AddressbookAdminBranchOfficeSessionBean () { // Call super constructor super(); } @@ -77,7 +81,7 @@ public class FinancialsAdminBranchOfficeSessionBean extends BaseFinancialsDataba // Is user instance set? if (branchOffice.getBranchCompany() instanceof BusinessBasicData) { // Get managed instance back - final BusinessBasicData managedBasicData = this.getManaged(branchOffice.getBranchCompany()); + final BusinessBasicData managedBasicData = this.createManaged(branchOffice.getBranchCompany()); // Set it back in branch office branchOffice.setBranchCompany(managedBasicData); @@ -86,7 +90,7 @@ public class FinancialsAdminBranchOfficeSessionBean extends BaseFinancialsDataba // Is user instance set? if (branchOffice.getBranchUserOwner() instanceof User) { // Get managed instance back - final User managedUser = this.getManaged(branchOffice.getBranchUserOwner()); + final User managedUser = this.createManaged(branchOffice.getBranchUserOwner()); // Set it back in branch office branchOffice.setBranchUserOwner(managedUser); @@ -95,7 +99,7 @@ public class FinancialsAdminBranchOfficeSessionBean extends BaseFinancialsDataba // Is user instance set? if (branchOffice.getBranchCountry() instanceof Country) { // Get managed instance back - final Country managedCountry = this.getManaged(branchOffice.getBranchCountry()); + final Country managedCountry = this.createManaged(branchOffice.getBranchCountry()); // Set it back in branch office branchOffice.setBranchCountry(managedCountry); @@ -130,7 +134,7 @@ public class FinancialsAdminBranchOfficeSessionBean extends BaseFinancialsDataba // Check all single addresses for (final BranchOffice bo : branchOffices) { // Is the same address found? - if (BranchOfficeUtils.isSameAddress(bo, branchOffice)) { + if (BranchOffices.isSameAddress(bo, branchOffice)) { // Found one isFound = true; break; diff --git a/src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookBranchOfficeSessionBean.java similarity index 84% rename from src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsBranchOfficeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookBranchOfficeSessionBean.java index 0d720c7..3fe167a 100644 --- a/src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookBranchOfficeSessionBean.java @@ -20,7 +20,9 @@ import java.text.MessageFormat; import java.util.List; import javax.ejb.Stateless; import javax.persistence.Query; -import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; +import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote; /** * A stateless session bean for general branch office purposes @@ -28,7 +30,7 @@ import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; * @author Roland Häder */ @Stateless (name = "branchOffice", description = "A general statless bean for handling branch office data (all)") -public class FinancialsBranchOfficeSessionBean extends BaseFinancialsDatabaseBean implements BranchOfficeSessionBeanRemote { +public class AddressbookBranchOfficeSessionBean extends BaseAddressbookDatabaseBean implements BranchOfficeSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookAdminCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookAdminCompanyEmployeeSessionBean.java index 391fa33..27bd364 100644 --- a/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookAdminCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookAdminCompanyEmployeeSessionBean.java @@ -18,6 +18,7 @@ package org.mxchange.jcontactsbusiness.employee; import javax.ejb.Stateless; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; +import org.mxchange.jcontactsbusiness.model.employee.AdminCompanyEmployeeSessionBeanRemote; /** * A stateless bean for administrative purposes for company employees. diff --git a/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookCompanyEmployeeSessionBean.java index 18aa929..5c19171 100644 --- a/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookCompanyEmployeeSessionBean.java @@ -23,6 +23,8 @@ import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcontactsbusiness.exceptions.employee.CompanyEmployeeNotFoundException; +import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.employee.Employee; /** * A stateless bean for general purposes for company employees. diff --git a/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java b/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java index 08dc838..0aad3fd 100644 --- a/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java +++ b/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java @@ -25,6 +25,9 @@ import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jcountry.model.data.CountryData; +import org.mxchange.jcountry.model.data.CountrySingletonBeanRemote; /** * A singleton EJB for country informations diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java index 4f04b1e..e36dc5d 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java @@ -21,6 +21,8 @@ import java.util.GregorianCalendar; import javax.ejb.Stateless; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; /** * An administrative singleton EJB for mobile provider informations diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java index 1877f08..5877721 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java @@ -22,6 +22,9 @@ import javax.ejb.Singleton; import javax.ejb.Startup; import javax.persistence.Query; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.CellphoneProvider; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote; /** * A singleton EJB for mobile provider informations diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java index 3b5a5d4..bee9e5b 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java @@ -26,6 +26,7 @@ import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; 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.phone.AdminPhoneSessionBeanRemote; /** * An EJB for administrative phone purposes diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookPhoneSessionBean.java index 4bae357..54259d7 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookPhoneSessionBean.java @@ -29,6 +29,7 @@ import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; +import org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote; /** * A general phone EJB diff --git a/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java index 8c1b386..f8969af 100644 --- a/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java @@ -137,7 +137,7 @@ public class AddressbookAdminUserSessionBean extends BaseAddressbookDatabaseBean } // Get a managed instance - final User managedUser = this.getManaged(user); + final User managedUser = this.createManaged(user); // Should be found! assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N diff --git a/src/java/org/mxchange/jusercore/model/user/activity/AddressbookUserActivityLogMessageBean.java b/src/java/org/mxchange/jusercore/model/user/activity/AddressbookUserActivityLogMessageBean.java index 31a9eca..8387f1d 100644 --- a/src/java/org/mxchange/jusercore/model/user/activity/AddressbookUserActivityLogMessageBean.java +++ b/src/java/org/mxchange/jusercore/model/user/activity/AddressbookUserActivityLogMessageBean.java @@ -136,7 +136,7 @@ public class AddressbookUserActivityLogMessageBean extends BaseAddressbookDataba } // Make user instance managed - final User managedUser = this.getManaged(userActivity.getActivityUser()); + final User managedUser = this.createManaged(userActivity.getActivityUser()); // Set it back userActivity.setActivityUser(managedUser); -- 2.39.5