From: Roland Häder Date: Sun, 10 Sep 2017 13:58:45 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=98cb91d2ff131e36985431349df724ad487ee7e8;p=pizzaservice-ejb.git Please cherry-pick: - cleaned up imports - fixed EJB names Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java index e73eff3..70d563f 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Objects; import javax.ejb.EJB; import javax.ejb.Stateless; -import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote; -import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException; import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jusercore.model.user.User; @@ -34,8 +32,8 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; *

* @author Roland Häder */ -@Stateless (name = "adminBusinessData", description = "An administrative statless bean for handling business data (all)") -public class PizzaAdminBusinessDataSessionBean extends BasePizzaDatabaseBean implements AdminBusinessDataSessionBeanRemote { +@Stateless (name = "adminBasicCompanyData", description = "An administrative statless bean for handling business data (all)") +public class PizzaAdminBusinessDataSessionBean extends BasePizzaDatabaseBean implements AdminBasicCompanyDataSessionBeanRemote { /** * Serial number @@ -46,7 +44,7 @@ public class PizzaAdminBusinessDataSessionBean extends BasePizzaDatabaseBean imp * Administrative EJB */ @EJB - private BusinessDataSessionBeanRemote businessDataBean; + private BasicCompanyDataSessionBeanRemote businessDataBean; /** * Default constructor diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaBusinessDataSessionBean.java index 4633530..a7ef6b9 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaBusinessDataSessionBean.java @@ -22,7 +22,6 @@ import java.util.Objects; import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; -import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException; import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; @@ -31,8 +30,8 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; *

* @author Roland Häder */ -@Stateless (name = "businessData", description = "A general statless bean for handling business data (all)") -public class PizzaBusinessDataSessionBean extends BasePizzaDatabaseBean implements BusinessDataSessionBeanRemote { +@Stateless (name = "basicCompanyData", description = "A general statless bean for handling business data (all)") +public class PizzaBusinessDataSessionBean extends BasePizzaDatabaseBean 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 001fba6..b8f30c2 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaAdminBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaAdminBranchOfficeSessionBean.java @@ -21,8 +21,6 @@ import java.util.GregorianCalendar; import java.util.List; import javax.ejb.EJB; import javax.ejb.Stateless; -import org.mxchange.jcontactsbusiness.branchoffice.AdminBranchOfficeSessionBeanRemote; -import org.mxchange.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote; import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeAlreadyAddedException; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcountry.model.data.Country; @@ -132,7 +130,7 @@ public class PizzaAdminBranchOfficeSessionBean extends BasePizzaDatabaseBean imp // 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/model/branchoffice/PizzaBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaBranchOfficeSessionBean.java index ec75390..8255d81 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaBranchOfficeSessionBean.java @@ -20,7 +20,6 @@ import java.text.MessageFormat; import java.util.List; import javax.ejb.Stateless; import javax.persistence.Query; -import org.mxchange.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote; import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminCompanyEmployeeSessionBean.java index 03f071c..e27b91b 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminCompanyEmployeeSessionBean.java @@ -17,7 +17,6 @@ package org.mxchange.jcontactsbusiness.model.employee; import javax.ejb.Stateless; -import org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote; import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaCompanyEmployeeSessionBean.java index ac7c8c0..1d5dc53 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaCompanyEmployeeSessionBean.java @@ -21,7 +21,6 @@ import java.util.List; import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; -import org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote; import org.mxchange.jcontactsbusiness.exceptions.employee.CompanyEmployeeNotFoundException; import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean;