From 806b95350122fa91f4f35c6b5c8f3a4a3cfaea30 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 15 Jul 2019 06:26:35 +0200 Subject: [PATCH] Don't cherry-pick: - renamed *DatabaseBean to *EnterpriseBean (see BaseEnterpriseBean) - renamed package database -> enterprise MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../contact/PizzaAdminContactSessionBean.java | 4 +- .../contact/PizzaContactSessionBean.java | 4 +- .../PizzaAdminContactPhoneSessionBean.java | 4 +- .../PizzaAdminBusinessDataSessionBean.java | 4 +- .../PizzaBusinessDataSessionBean.java | 4 +- .../PizzaAdminBranchOfficeSessionBean.java | 4 +- ...a => PizzaAdminDepartmentSessionBean.java} | 6 +- ...n.java => PizzaDepartmentSessionBean.java} | 4 +- ...=> PizzaAdminOpeningTimesSessionBean.java} | 6 +- ...java => PizzaOpeningTimesSessionBean.java} | 4 +- .../model/data/PizzaCountrySingletonBean.java | 4 +- .../PizzaAdminMobileProviderSessionBean.java | 4 +- .../phone/PizzaAdminPhoneSessionBean.java | 4 +- .../phone/PizzaPhoneSessionBean.java | 4 +- .../model/user/PizzaAdminUserSessionBean.java | 4 +- .../model/user/PizzaUserSessionBean.java | 4 +- .../PizzaUserActivityLogMessageBean.java | 4 +- .../PizzaUserActivitySessionBean.java | 6 +- .../PizzaUserEmailChangeSessionBean.java | 4 +- .../PizzaUserPasswordHistorySessionBean.java | 4 +- .../user/login/PizzaUserLoginSessionBean.java | 4 +- .../PizzaUserRegistrationSessionBean.java | 4 +- .../PizzaResendLinkSessionBean.java | 4 +- .../FinancialAdminReceiptSessionBean.java | 185 ------------------ .../enterprise}/BasePizzaEnterpriseBean.java | 6 +- .../model/basket/PizzaBasketSessionBean.java | 4 +- .../PizzaAdminCategorySessionBean.java | 4 +- .../category/PizzaCategorySessionBean.java | 4 +- .../PizzaAdminCustomerSessionBean.java | 4 +- .../customer/PizzaCustomerSessionBean.java | 4 +- .../product/PizzaAdminProductSessionBean.java | 4 +- .../product/PizzaProductSessionBean.java | 4 +- 32 files changed, 66 insertions(+), 251 deletions(-) rename src/java/org/mxchange/jcontactsbusiness/model/department/{FinancialsAdminDepartmentSessionBean.java => PizzaAdminDepartmentSessionBean.java} (96%) rename src/java/org/mxchange/jcontactsbusiness/model/department/{FinancialsDepartmentSessionBean.java => PizzaDepartmentSessionBean.java} (94%) rename src/java/org/mxchange/jcontactsbusiness/model/opening_time/{FinancialsAdminOpeningTimesSessionBean.java => PizzaAdminOpeningTimesSessionBean.java} (91%) rename src/java/org/mxchange/jcontactsbusiness/model/opening_time/{FinancialsOpeningTimesSessionBean.java => PizzaOpeningTimesSessionBean.java} (94%) delete mode 100644 src/java/org/mxchange/pizzaaplication/model/receipt/FinancialAdminReceiptSessionBean.java rename src/java/org/mxchange/{pizzaaplication/database => pizzaapplication/enterprise}/BasePizzaEnterpriseBean.java (99%) diff --git a/src/java/org/mxchange/jcontacts/model/contact/PizzaAdminContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/PizzaAdminContactSessionBean.java index 643d362..26cb8d3 100644 --- a/src/java/org/mxchange/jcontacts/model/contact/PizzaAdminContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/contact/PizzaAdminContactSessionBean.java @@ -23,7 +23,7 @@ import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * An administrative contact EJB @@ -31,7 +31,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "adminContact", description = "An administrative contact EJB") -public class PizzaAdminContactSessionBean extends BasePizzaDatabaseBean implements AdminContactSessionBeanRemote { +public class PizzaAdminContactSessionBean extends BasePizzaEnterpriseBean implements AdminContactSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jcontacts/model/contact/PizzaContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/PizzaContactSessionBean.java index c4170ae..0298a3d 100644 --- a/src/java/org/mxchange/jcontacts/model/contact/PizzaContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/contact/PizzaContactSessionBean.java @@ -24,14 +24,14 @@ import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A contact EJB *

* @author Roland Häder */ @Stateless (name = "contact", description = "A bean handling contact data") -public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements ContactSessionBeanRemote { +public class PizzaContactSessionBean extends BasePizzaEnterpriseBean implements ContactSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jcontacts/model/phone/PizzaAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/PizzaAdminContactPhoneSessionBean.java index b0bd0c5..173b509 100644 --- a/src/java/org/mxchange/jcontacts/model/phone/PizzaAdminContactPhoneSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/phone/PizzaAdminContactPhoneSessionBean.java @@ -28,7 +28,7 @@ import org.mxchange.jphone.exceptions.PhoneNumberNotLinkedException; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A session EJB for administrative contact's phone number purposes @@ -36,7 +36,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "adminContactPhone", description = "An administrative bean handling contact's phone (fax, land-line and mobile) data") -public class PizzaAdminContactPhoneSessionBean extends BasePizzaDatabaseBean implements AdminContactsPhoneSessionBeanRemote { +public class PizzaAdminContactPhoneSessionBean extends BasePizzaEnterpriseBean implements AdminContactsPhoneSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java index 6f9075e..90498c0 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java @@ -25,7 +25,7 @@ import javax.ejb.Stateless; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicCompanyDataAlreadyAddedException; import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jusercore.model.user.User; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * An administrative stateless session bean for business data @@ -33,7 +33,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "adminBasicCompanyData", description = "An administrative statless bean for handling business data (all)") -public class PizzaAdminBusinessDataSessionBean extends BasePizzaDatabaseBean implements AdminBasicCompanyDataSessionBeanRemote { +public class PizzaAdminBusinessDataSessionBean extends BasePizzaEnterpriseBean implements AdminBasicCompanyDataSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaBusinessDataSessionBean.java index 652fb38..6a6a9d6 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaBusinessDataSessionBean.java @@ -22,7 +22,7 @@ import java.util.Objects; import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicCompanyDataNotFoundException; /** @@ -31,7 +31,7 @@ import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicCompanyDataNotFo * @author Roland Häder */ @Stateless (name = "basicCompanyData", description = "A general statless bean for handling business data (all)") -public class PizzaBusinessDataSessionBean extends BasePizzaDatabaseBean implements BasicCompanyDataSessionBeanRemote { +public class PizzaBusinessDataSessionBean extends BasePizzaEnterpriseBean implements BasicCompanyDataSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaAdminBranchOfficeSessionBean.java index 5b811af..d924dbe 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaAdminBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaAdminBranchOfficeSessionBean.java @@ -26,7 +26,7 @@ import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jusercore.model.user.User; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A stateless session bean for administrative branch office purposes @@ -34,7 +34,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "adminBranchOffice", description = "An administrative statless bean for handling branch office data (all)") -public class PizzaAdminBranchOfficeSessionBean extends BasePizzaDatabaseBean implements AdminBranchOfficeSessionBeanRemote { +public class PizzaAdminBranchOfficeSessionBean extends BasePizzaEnterpriseBean implements AdminBranchOfficeSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jcontactsbusiness/model/department/FinancialsAdminDepartmentSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/department/PizzaAdminDepartmentSessionBean.java similarity index 96% rename from src/java/org/mxchange/jcontactsbusiness/model/department/FinancialsAdminDepartmentSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/department/PizzaAdminDepartmentSessionBean.java index 002e4da..6849c36 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/department/FinancialsAdminDepartmentSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/department/PizzaAdminDepartmentSessionBean.java @@ -26,7 +26,7 @@ import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; -import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; +import org.mxchange.jfinancials.database.BasePizzaEnterpriseBean; import org.mxchange.jusercore.model.user.User; /** @@ -35,7 +35,7 @@ import org.mxchange.jusercore.model.user.User; * @author Roland Häder */ @Stateless (name = "adminDepartment", description = "An administrative statless bean for handling department data (all)") -public class FinancialsAdminDepartmentSessionBean extends BaseFinancialsDatabaseBean implements AdminDepartmentSessionBeanRemote { +public class PizzaAdminDepartmentSessionBean extends BasePizzaEnterpriseBean implements AdminDepartmentSessionBeanRemote { /** * Serial number @@ -51,7 +51,7 @@ public class FinancialsAdminDepartmentSessionBean extends BaseFinancialsDatabase /** * Default constructor */ - public FinancialsAdminDepartmentSessionBean () { + public PizzaAdminDepartmentSessionBean () { // Call super constructor super(); } diff --git a/src/java/org/mxchange/jcontactsbusiness/model/department/FinancialsDepartmentSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/department/PizzaDepartmentSessionBean.java similarity index 94% rename from src/java/org/mxchange/jcontactsbusiness/model/department/FinancialsDepartmentSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/department/PizzaDepartmentSessionBean.java index f88605e..b75845b 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/department/FinancialsDepartmentSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/department/PizzaDepartmentSessionBean.java @@ -22,7 +22,7 @@ import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.jcontactsbusiness.exceptions.department.DepartmentNotFoundException; -import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; +import org.mxchange.jfinancials.database.BasePizzaEnterpriseBean; /** * A stateless session bean for general department purposes @@ -30,7 +30,7 @@ import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; * @author Roland Häder */ @Stateless (name = "department", description = "A general statless bean for handling branch office data (all)") -public class FinancialsDepartmentSessionBean extends BaseFinancialsDatabaseBean implements DepartmentSessionBeanRemote { +public class PizzaDepartmentSessionBean extends BasePizzaEnterpriseBean implements DepartmentSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jcontactsbusiness/model/opening_time/FinancialsAdminOpeningTimesSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/opening_time/PizzaAdminOpeningTimesSessionBean.java similarity index 91% rename from src/java/org/mxchange/jcontactsbusiness/model/opening_time/FinancialsAdminOpeningTimesSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/opening_time/PizzaAdminOpeningTimesSessionBean.java index 4f1468a..a916645 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/opening_time/FinancialsAdminOpeningTimesSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/opening_time/PizzaAdminOpeningTimesSessionBean.java @@ -19,7 +19,7 @@ package org.mxchange.jcontactsbusiness.model.opening_time; import java.text.MessageFormat; import java.util.Date; import javax.ejb.Stateless; -import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; +import org.mxchange.jfinancials.database.BasePizzaEnterpriseBean; /** * A stateless session bean for administrative opening times purposes @@ -27,7 +27,7 @@ import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; * @author Roland Häder */ @Stateless (name = "adminOpeningTimes", description = "An administrative statless bean for handling opening times") -public class FinancialsAdminOpeningTimesSessionBean extends BaseFinancialsDatabaseBean implements AdminOpeningTimeSessionBeanRemote { +public class PizzaAdminOpeningTimesSessionBean extends BasePizzaEnterpriseBean implements AdminOpeningTimeSessionBeanRemote { /** * Serial number @@ -37,7 +37,7 @@ public class FinancialsAdminOpeningTimesSessionBean extends BaseFinancialsDataba /** * Default constructor */ - public FinancialsAdminOpeningTimesSessionBean () { + public PizzaAdminOpeningTimesSessionBean () { // Call super constructor super(); } diff --git a/src/java/org/mxchange/jcontactsbusiness/model/opening_time/FinancialsOpeningTimesSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/opening_time/PizzaOpeningTimesSessionBean.java similarity index 94% rename from src/java/org/mxchange/jcontactsbusiness/model/opening_time/FinancialsOpeningTimesSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/opening_time/PizzaOpeningTimesSessionBean.java index 7e418b5..104ec79 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/opening_time/FinancialsOpeningTimesSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/opening_time/PizzaOpeningTimesSessionBean.java @@ -22,7 +22,7 @@ import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.jcontactsbusiness.exceptions.opening_time.OpeningTimeNotFoundException; -import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; +import org.mxchange.jfinancials.database.BasePizzaEnterpriseBean; /** * A stateless session bean for general opening times purposes @@ -30,7 +30,7 @@ import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; * @author Roland Häder */ @Stateless (name = "openingTimes", description = "A general statless bean for handling branch office data (all)") -public class FinancialsOpeningTimesSessionBean extends BaseFinancialsDatabaseBean implements OpeningTimeSessionBeanRemote { +public class PizzaOpeningTimesSessionBean extends BasePizzaEnterpriseBean implements OpeningTimeSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jcountry/model/data/PizzaCountrySingletonBean.java b/src/java/org/mxchange/jcountry/model/data/PizzaCountrySingletonBean.java index f938dd8..a8a8ea3 100644 --- a/src/java/org/mxchange/jcountry/model/data/PizzaCountrySingletonBean.java +++ b/src/java/org/mxchange/jcountry/model/data/PizzaCountrySingletonBean.java @@ -24,7 +24,7 @@ import javax.ejb.Startup; import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A singleton EJB for country informations @@ -33,7 +33,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; */ @Startup @Singleton (name = "country", description = "A singleton session-scoped bean for country informations") -public class PizzaCountrySingletonBean extends BasePizzaDatabaseBean implements CountrySingletonBeanRemote { +public class PizzaCountrySingletonBean extends BasePizzaEnterpriseBean implements CountrySingletonBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java index d0c6a14..722df90 100644 --- a/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java @@ -20,7 +20,7 @@ import java.text.MessageFormat; import java.util.Date; import javax.ejb.Stateless; import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * Administrative singleton EJB for mobile provider informations @@ -28,7 +28,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "adminMobileProvider", description = "A singleton session-scoped bean for mobile provider informations, admin-edition") -public class PizzaAdminMobileProviderSessionBean extends BasePizzaDatabaseBean implements AdminMobileProviderSessionBeanRemote { +public class PizzaAdminMobileProviderSessionBean extends BasePizzaEnterpriseBean implements AdminMobileProviderSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaAdminPhoneSessionBean.java index d023dfd..4e9d24f 100644 --- a/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaAdminPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaAdminPhoneSessionBean.java @@ -25,7 +25,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.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * An EJB for administrative phone purposes @@ -33,7 +33,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "adminPhone", description = "An administrative bean handling phone data") -public class PizzaAdminPhoneSessionBean extends BasePizzaDatabaseBean implements AdminPhoneSessionBeanRemote { +public class PizzaAdminPhoneSessionBean extends BasePizzaEnterpriseBean implements AdminPhoneSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaPhoneSessionBean.java index c3260d8..26b665b 100644 --- a/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaPhoneSessionBean.java @@ -28,7 +28,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.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A general phone EJB @@ -36,7 +36,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "phone", description = "A bean handling phone data") -public class PizzaPhoneSessionBean extends BasePizzaDatabaseBean implements PhoneSessionBeanRemote { +public class PizzaPhoneSessionBean extends BasePizzaEnterpriseBean implements PhoneSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/user/PizzaAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/PizzaAdminUserSessionBean.java index eb65758..6cb4c06 100644 --- a/src/java/org/mxchange/jusercore/model/user/PizzaAdminUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/PizzaAdminUserSessionBean.java @@ -29,7 +29,7 @@ import org.mxchange.jusercore.exceptions.UserStatusLockedException; import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException; import org.mxchange.jusercore.model.user.status.UserAccountStatus; import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * An administrative user EJB @@ -37,7 +37,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "adminUser", description = "A bean handling the user data") -public class PizzaAdminUserSessionBean extends BasePizzaDatabaseBean implements AdminUserSessionBeanRemote { +public class PizzaAdminUserSessionBean extends BasePizzaEnterpriseBean implements AdminUserSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java index 9fa1b74..1427407 100644 --- a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java @@ -42,7 +42,7 @@ import org.mxchange.jusercore.model.user.password_history.UserPasswordHistory; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A user EJB @@ -50,7 +50,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "user", description = "A bean handling the user data") -public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserSessionBeanRemote { +public class PizzaUserSessionBean extends BasePizzaEnterpriseBean implements UserSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivityLogMessageBean.java b/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivityLogMessageBean.java index 6637169..21a8a7e 100644 --- a/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivityLogMessageBean.java +++ b/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivityLogMessageBean.java @@ -25,7 +25,7 @@ import javax.jms.Message; import javax.jms.MessageListener; import javax.jms.ObjectMessage; import org.mxchange.jusercore.model.user.User; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A message-driven bean for adding user activity log @@ -46,7 +46,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; ) } ) -public class PizzaUserActivityLogMessageBean extends BasePizzaDatabaseBean implements MessageListener { +public class PizzaUserActivityLogMessageBean extends BasePizzaEnterpriseBean implements MessageListener { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivitySessionBean.java b/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivitySessionBean.java index f802f91..737aa18 100644 --- a/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivitySessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivitySessionBean.java @@ -24,18 +24,18 @@ import javax.ejb.Stateless; import javax.jms.JMSException; import javax.jms.ObjectMessage; import javax.persistence.Query; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jcoreee.database.BaseEnterpriseBean; import org.mxchange.jusercore.model.user.User; /** - * An EJB for user activity log. This class extends BaseDatabaseBean and not + * An EJB for user activity log. This class extends BaseEnterpriseBean and not * project-specific "base class". The simple reason is that this class requires * no email queue as no emails are ever being sent from this class. *

* @author Roland Häder */ @Stateless (name = "userActivity", description = "A bean handling the user data") -public class PizzaUserActivitySessionBean extends BaseDatabaseBean implements UserActivityLogSessionBeanRemote { +public class PizzaUserActivitySessionBean extends BaseEnterpriseBean implements UserActivityLogSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/user/email_address/PizzaUserEmailChangeSessionBean.java b/src/java/org/mxchange/jusercore/model/user/email_address/PizzaUserEmailChangeSessionBean.java index 5518554..663674b 100644 --- a/src/java/org/mxchange/jusercore/model/user/email_address/PizzaUserEmailChangeSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/email_address/PizzaUserEmailChangeSessionBean.java @@ -28,7 +28,7 @@ import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; import org.mxchange.jusercore.model.email_address.EmailAddressChange; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.juserlogincore.login.UserLoginUtils; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A session-scoped bean for changing email addresses @@ -36,7 +36,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "userEmailChange", description = "A bean handling user email changes") -public class PizzaUserEmailChangeSessionBean extends BasePizzaDatabaseBean implements UserEmailChangeSessionBeanRemote { +public class PizzaUserEmailChangeSessionBean extends BasePizzaEnterpriseBean implements UserEmailChangeSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/user/password_history/PizzaUserPasswordHistorySessionBean.java b/src/java/org/mxchange/jusercore/model/user/password_history/PizzaUserPasswordHistorySessionBean.java index c46bef6..3a3b475 100644 --- a/src/java/org/mxchange/jusercore/model/user/password_history/PizzaUserPasswordHistorySessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/password_history/PizzaUserPasswordHistorySessionBean.java @@ -21,7 +21,7 @@ import java.util.List; import javax.ejb.Stateless; import javax.persistence.Query; import org.mxchange.jusercore.model.user.User; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A user password history EJB @@ -29,7 +29,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "userPasswordHistory", description = "A stateless EJB for user's password history. This bean does return the full user's password history and not limited. The application then needs to limit it to it's purpose.") -public class PizzaUserPasswordHistorySessionBean extends BasePizzaDatabaseBean implements UserPasswordHistorySessionBeanRemote { +public class PizzaUserPasswordHistorySessionBean extends BasePizzaEnterpriseBean implements UserPasswordHistorySessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/juserlogincore/model/user/login/PizzaUserLoginSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/login/PizzaUserLoginSessionBean.java index 0bb604c..0d2c387 100644 --- a/src/java/org/mxchange/juserlogincore/model/user/login/PizzaUserLoginSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/login/PizzaUserLoginSessionBean.java @@ -29,7 +29,7 @@ import org.mxchange.juserlogincore.container.login.LoginContainer; import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; import org.mxchange.juserlogincore.login.UserLoginUtils; import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A session EJB for user logins @@ -37,7 +37,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "userLogin", description = "A bean handling the user login for Pizza project") -public class PizzaUserLoginSessionBean extends BasePizzaDatabaseBean implements UserLoginSessionBeanRemote { +public class PizzaUserLoginSessionBean extends BasePizzaEnterpriseBean implements UserLoginSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/juserlogincore/model/user/register/PizzaUserRegistrationSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/register/PizzaUserRegistrationSessionBean.java index de9fdca..692f9a5 100644 --- a/src/java/org/mxchange/juserlogincore/model/user/register/PizzaUserRegistrationSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/register/PizzaUserRegistrationSessionBean.java @@ -30,7 +30,7 @@ import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.juserlogincore.login.UserLoginUtils; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A session-scoped bean for user registration @@ -38,7 +38,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "userRegistration", description = "A bean handling the user registration") -public class PizzaUserRegistrationSessionBean extends BasePizzaDatabaseBean implements UserRegistrationSessionBeanRemote { +public class PizzaUserRegistrationSessionBean extends BasePizzaEnterpriseBean implements UserRegistrationSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/juserlogincore/model/user/resendlink/PizzaResendLinkSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/resendlink/PizzaResendLinkSessionBean.java index 12b4265..d4caca7 100644 --- a/src/java/org/mxchange/juserlogincore/model/user/resendlink/PizzaResendLinkSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/resendlink/PizzaResendLinkSessionBean.java @@ -28,7 +28,7 @@ import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.status.UserAccountStatus; import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A session-based EJB for resending confirmation links @@ -36,7 +36,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "userResendConfirmationLink", description = "A bean resending confirmation links") -public class PizzaResendLinkSessionBean extends BasePizzaDatabaseBean implements ResendLinkSessionBeanRemote { +public class PizzaResendLinkSessionBean extends BasePizzaEnterpriseBean implements ResendLinkSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/pizzaaplication/model/receipt/FinancialAdminReceiptSessionBean.java b/src/java/org/mxchange/pizzaaplication/model/receipt/FinancialAdminReceiptSessionBean.java deleted file mode 100644 index 8b4b615..0000000 --- a/src/java/org/mxchange/pizzaaplication/model/receipt/FinancialAdminReceiptSessionBean.java +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Copyright (C) 2017 Roland Häder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.jfinancials.model.receipt; - -import java.text.MessageFormat; -import java.util.GregorianCalendar; -import java.util.List; -import java.util.Objects; -import javax.ejb.Stateless; -import javax.persistence.Query; -import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; -import org.mxchange.jfinancials.exceptions.ReceiptAlreadyAddedException; -import org.mxchange.jusercore.model.user.User; - -/** - * A stateless bean for general purposes for receipts - *

- * @author Roland Häder - */ -@Stateless (name = "financialReceipt", description = "A stateless session bean for handling receipts.") -public class FinancialReceiptSessionBean extends BaseFinancialsDatabaseBean implements FinancialReceiptSessionBeanRemote { - - /** - * Serial number - */ - private static final long serialVersionUID = 659_868_076_723_741L; - - @Override - public BillableReceipt addReceipt (final BillableReceipt receipt) throws ReceiptAlreadyAddedException { - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addReceipt(): receipt={1} - CALLED!", this.getClass().getSimpleName(), receipt)); - - // Validate parameter - if (null == receipt) { - // Throw NPE - throw new NullPointerException("receipt is null"); - } else if (receipt.getReceiptId() != null) { - // Throw IAE - throw new IllegalArgumentException(MessageFormat.format("receipt.receiptId={0} is not expected.", receipt.getReceiptId())); - } else if (receipt.getReceiptIssued() == null) { - // Throw NPE again - throw new NullPointerException("receipt.receiptIssued is null"); - } else if (receipt.getReceiptBranchOffice() == null) { - // Throw it again - throw new NullPointerException("receipt.receiptBranchOffice is null"); - } else if (receipt.getReceiptBranchOffice().getBranchId() == null) { - // Throw it again - throw new NullPointerException("receipt.receiptBranchOffice.branchId is null"); - } else if (receipt.getReceiptBranchOffice().getBranchId() < 1) { - // Throw IAE - throw new IllegalArgumentException(MessageFormat.format("receipt.receiptBranchOffice.branchId={0} is not valid.", receipt.getReceiptBranchOffice().getBranchId())); - } else if (receipt.getReceiptPaymentType() == null) { - // Throw NPE - throw new NullPointerException("receipt.receiptPaymentType is null"); - } else if ((receipt.getReceiptUser() instanceof User) && receipt.getReceiptUser().getUserId() == null) { - // Throw NPE again - throw new NullPointerException("receipt.receiptUser.userId is null"); - } else if ((receipt.getReceiptUser() instanceof User) && receipt.getReceiptUser().getUserId() < 1) { - // Throw NPE again - throw new NullPointerException(MessageFormat.format("receipt.receiptUser.userId={0} is not valid", receipt.getReceiptUser().getUserId())); - } else if (this.isReceiptRegistered(receipt)) { - // Has already been registered - throw new ReceiptAlreadyAddedException(receipt); - } - - // Add created instance - receipt.setReceiptCreated(new GregorianCalendar()); - - // Persist it - this.getEntityManager().persist(receipt); - - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addReceipt(): receipt.receiptId={1} - EXIT!", this.getClass().getSimpleName(), receipt.getReceiptId())); - - // Return it - return receipt; - } - - @Override - @SuppressWarnings ("unchecked") - public List allReceipts () { - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allReceipts(): CALLED!", this.getClass().getSimpleName())); - - // Query all - final Query query = this.getEntityManager().createNamedQuery("AllReceipts"); - - // Get all - final List receipts = query.getResultList(); - - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allReceipts(): receipts.size()={1} EXIT!", this.getClass().getSimpleName(), receipts.size())); - - // Return it - return receipts; - } - - @Override - @SuppressWarnings ("unchecked") - public List allUsersReceipts (final User user) { - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allUsersReceipts(): user={1} - CALLED!", this.getClass().getSimpleName(), user)); - - // Validate parameter - if (null == user) { - // Throw NPE - throw new NullPointerException("user is null"); - } else if (user.getUserId() == null) { - // Throw it again - throw new NullPointerException("user.userId is null"); - } else if (user.getUserId() < 1) { - // Throw IAE - throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); - } - - // Query all - final Query query = this.getEntityManager().createNamedQuery("SearchAllUserReceipts"); - - // Add parameter - query.setParameter("receiptUser", user); - - // Get all - final List receipts = query.getResultList(); - - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allUsersReceipts(): receipts.size()={1} EXIT!", this.getClass().getSimpleName(), receipts.size())); - - // Return it - return receipts; - } - - /** - * Checks if given receipt is already persisted by checking receipt number - * and branch office combination. - *

- * @param receipt Receipt instance - *

- * @return Whether the receipt has already been registered - */ - private boolean isReceiptRegistered (final BillableReceipt receipt) { - // Get all receipts - final List receipts = this.allReceipts(); - - // Is the list empty? - if (receipts.isEmpty()) { - // Abort here - return false; - } - - // Default is not found - boolean isFound = false; - - // Now, check each entry - for (final BillableReceipt foundReceipt : receipts) { - // Is same entity or same receipt number and branch office found? - if (Objects.equals(foundReceipt, receipt)) { - // Yes, then stop searching - isFound = true; - break; - } else if (Receipts.isSameReceipt(foundReceipt, receipt)){ - // Yes, then stop searching - isFound = true; - break; - } - } - - // Return flag - return isFound; - } - -} diff --git a/src/java/org/mxchange/pizzaaplication/database/BasePizzaEnterpriseBean.java b/src/java/org/mxchange/pizzaapplication/enterprise/BasePizzaEnterpriseBean.java similarity index 99% rename from src/java/org/mxchange/pizzaaplication/database/BasePizzaEnterpriseBean.java rename to src/java/org/mxchange/pizzaapplication/enterprise/BasePizzaEnterpriseBean.java index 0f6477f..26661c3 100644 --- a/src/java/org/mxchange/pizzaaplication/database/BasePizzaEnterpriseBean.java +++ b/src/java/org/mxchange/pizzaapplication/enterprise/BasePizzaEnterpriseBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.pizzaaplication.database; +package org.mxchange.pizzaaplication.enterprise; import java.text.MessageFormat; import java.util.Date; @@ -39,7 +39,7 @@ import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData; import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jcoreee.database.BaseEnterpriseBean; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jcountry.model.data.CountryData; import org.mxchange.jmailee.model.delivery.wrapper.EmailDeliveryWrapper; @@ -60,7 +60,7 @@ import org.mxchange.jusercore.model.user.UserUtils; *

* @author Roland Häder */ -public abstract class BasePizzaEnterpriseBean extends BaseDatabaseBean { +public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/model/basket/PizzaBasketSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/basket/PizzaBasketSessionBean.java index 1d8e20c..561ad4f 100644 --- a/src/java/org/mxchange/pizzaapplication/model/basket/PizzaBasketSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/model/basket/PizzaBasketSessionBean.java @@ -29,7 +29,7 @@ import org.mxchange.jshopcore.model.basket.ShopBasket; import org.mxchange.jshopcore.model.customer.ShopCustomerUtils; import org.mxchange.jshopcore.model.order.Orderable; import org.mxchange.jshopcore.model.order.ShopOrder; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A basket for orderable items @@ -37,7 +37,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "basket", description = "A bean handling persisting baskets of logged-in customers") -public class PizzaBasketSessionBean extends BasePizzaDatabaseBean implements BasketSessionBeanRemote { +public class PizzaBasketSessionBean extends BasePizzaEnterpriseBean implements BasketSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/model/category/PizzaAdminCategorySessionBean.java b/src/java/org/mxchange/pizzaapplication/model/category/PizzaAdminCategorySessionBean.java index 049f8bd..e535c32 100644 --- a/src/java/org/mxchange/pizzaapplication/model/category/PizzaAdminCategorySessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/model/category/PizzaAdminCategorySessionBean.java @@ -26,7 +26,7 @@ import org.mxchange.jproduct.exceptions.CategoryTitleAlreadyUsedException; import org.mxchange.jproduct.model.category.Category; import org.mxchange.jproduct.model.category.ProductCategory; import org.mxchange.jshopcore.model.category.AdminCategorySessionBeanRemote; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * An EJB for administrative access on categories @@ -34,7 +34,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "adminCategory", description = "An administrative bean handling product categories") -public class PizzaAdminCategorySessionBean extends BasePizzaDatabaseBean implements AdminCategorySessionBeanRemote { +public class PizzaAdminCategorySessionBean extends BasePizzaEnterpriseBean implements AdminCategorySessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/model/category/PizzaCategorySessionBean.java b/src/java/org/mxchange/pizzaapplication/model/category/PizzaCategorySessionBean.java index 1e7bb0e..5abb42e 100644 --- a/src/java/org/mxchange/pizzaapplication/model/category/PizzaCategorySessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/model/category/PizzaCategorySessionBean.java @@ -23,7 +23,7 @@ import javax.persistence.Query; import org.mxchange.jproduct.model.category.Category; import org.mxchange.jproduct.model.category.ProductCategory; import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * Main shop class @@ -31,7 +31,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "category", description = "A bean handling categories for all others (non-admin)") -public class PizzaCategorySessionBean extends BasePizzaDatabaseBean implements CategorySessionBeanRemote { +public class PizzaCategorySessionBean extends BasePizzaEnterpriseBean implements CategorySessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java index a6c19ea..219f447 100644 --- a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java @@ -29,7 +29,7 @@ import org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote; import org.mxchange.jcustomercore.exceptions.CustomerAlreadyRegisteredException; import org.mxchange.jcustomercore.model.customer.Customer; import org.mxchange.jcustomercore.utils.CustomerUtils; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A stateless administrative customer session-scoped bean (EJB) @@ -37,7 +37,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "admincustomer", description = "Administrative bean handling customer data") -public class PizzaAdminCustomerSessionBean extends BasePizzaDatabaseBean implements PizzaAdminCustomerSessionBeanRemote { +public class PizzaAdminCustomerSessionBean extends BasePizzaEnterpriseBean implements PizzaAdminCustomerSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java index a75e201..f864c07 100644 --- a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java @@ -23,7 +23,7 @@ import javax.persistence.Query; import org.mxchange.jcustomercore.exceptions.CustomerAlreadyRegisteredException; import org.mxchange.jcustomercore.exceptions.CustomerNotFoundException; import org.mxchange.jcustomercore.model.customer.Customer; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A stateless customer session-scoped bean (EJB) @@ -31,7 +31,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "customer", description = "A bean handling customer data") -public class PizzaCustomerSessionBean extends BasePizzaDatabaseBean implements PizzaCustomerSessionBeanRemote { +public class PizzaCustomerSessionBean extends BasePizzaEnterpriseBean implements PizzaCustomerSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/model/product/PizzaAdminProductSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/product/PizzaAdminProductSessionBean.java index 5aa0c3e..34bf1cc 100644 --- a/src/java/org/mxchange/pizzaapplication/model/product/PizzaAdminProductSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/model/product/PizzaAdminProductSessionBean.java @@ -28,7 +28,7 @@ import org.mxchange.jproduct.exceptions.ProductTitleAlreadyUsedException; import org.mxchange.jproduct.model.product.GenericProduct; import org.mxchange.jproduct.model.product.Product; import org.mxchange.jshopcore.model.product.AdminProductSessionBeanRemote; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A session-scoped bean for non-administrative roles for products @@ -36,7 +36,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "adminProduct", description = "An administrative bean handling products") -public class PizzaAdminProductSessionBean extends BasePizzaDatabaseBean implements AdminProductSessionBeanRemote { +public class PizzaAdminProductSessionBean extends BasePizzaEnterpriseBean implements AdminProductSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/model/product/PizzaProductSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/product/PizzaProductSessionBean.java index 954d963..b5c3e47 100644 --- a/src/java/org/mxchange/pizzaapplication/model/product/PizzaProductSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/model/product/PizzaProductSessionBean.java @@ -25,7 +25,7 @@ import javax.ejb.Stateless; import org.mxchange.jproduct.model.product.Product; import org.mxchange.jshopcore.model.product.AdminProductSessionBeanRemote; import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaEnterpriseBean; /** * A session-scoped bean for non-administrative roles for products @@ -33,7 +33,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; * @author Roland Häder */ @Stateless (name = "product", description = "A bean handling products for all others (non-admin)") -public class PizzaProductSessionBean extends BasePizzaDatabaseBean implements ProductSessionBeanRemote { +public class PizzaProductSessionBean extends BasePizzaEnterpriseBean implements ProductSessionBeanRemote { /** * Serial number -- 2.39.5