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=8ae1258f19bc480dd79e4e121a28e2c6221e9bc7;p=jfinancials-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/FinancialsAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java index ed3dc33..e613a39 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.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.jfinancials.database.BaseFinancialsDatabaseBean; @@ -34,8 +32,8 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Häder */ -@Stateless (name = "adminBusinessData", description = "An administrative statless bean for handling business data (all)") -public class FinancialsAdminBusinessDataSessionBean extends BaseFinancialsDatabaseBean implements AdminBusinessDataSessionBeanRemote { +@Stateless (name = "adminBasicCompanyData", description = "An administrative statless bean for handling business data (all)") +public class FinancialsAdminBusinessDataSessionBean extends BaseFinancialsDatabaseBean implements AdminBasicCompanyDataSessionBeanRemote { /** * Serial number @@ -46,7 +44,7 @@ public class FinancialsAdminBusinessDataSessionBean extends BaseFinancialsDataba * Administrative EJB */ @EJB - private BusinessDataSessionBeanRemote businessDataBean; + private BasicCompanyDataSessionBeanRemote businessDataBean; /** * Default constructor diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsBusinessDataSessionBean.java index 3ee18af..690f834 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsBusinessDataSessionBean.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.jfinancials.database.BaseFinancialsDatabaseBean; @@ -31,8 +30,8 @@ import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; *

* @author Roland Häder */ -@Stateless (name = "businessData", description = "A general statless bean for handling business data (all)") -public class FinancialsBusinessDataSessionBean extends BaseFinancialsDatabaseBean implements BusinessDataSessionBeanRemote { +@Stateless (name = "basicCompanyData", description = "A general statless bean for handling business data (all)") +public class FinancialsBusinessDataSessionBean extends BaseFinancialsDatabaseBean implements BasicCompanyDataSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java index c2f70c5..df383d1 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.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 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/model/branchoffice/FinancialsBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsBranchOfficeSessionBean.java index 2c4ab7f..fe6647b 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsBranchOfficeSessionBean.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.jfinancials.database.BaseFinancialsDatabaseBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminCompanyEmployeeSessionBean.java index e805d9f..9387418 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminCompanyEmployeeSessionBean.java @@ -17,7 +17,6 @@ package org.mxchange.jcontactsbusiness.model.employee; import javax.ejb.Stateless; -import org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsCompanyEmployeeSessionBean.java index 832d87f..f986d5c 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsCompanyEmployeeSessionBean.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.jfinancials.database.BaseFinancialsDatabaseBean;