From: Roland Häder Date: Sat, 1 Feb 2020 02:08:48 +0000 (+0100) Subject: Don't cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b81ed5f3e1101eb734122e0a6fde5802a68731d3;p=jfinancials-ejb.git Don't cherry-pick: - removed no longer existing JobPosition import - removed duplicate method Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jfinancials/enterprise/BaseFinancialsEnterpriseBean.java b/src/java/org/mxchange/jfinancials/enterprise/BaseFinancialsEnterpriseBean.java index 654424c..bcf244e 100644 --- a/src/java/org/mxchange/jfinancials/enterprise/BaseFinancialsEnterpriseBean.java +++ b/src/java/org/mxchange/jfinancials/enterprise/BaseFinancialsEnterpriseBean.java @@ -35,7 +35,6 @@ import org.mxchange.jcontactsbusiness.model.department.Department; import org.mxchange.jcontactsbusiness.model.employee.Employable; import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter; import org.mxchange.jcontactsbusiness.model.jobposition.HireableJobPosition; -import org.mxchange.jcontactsbusiness.model.jobposition.JobPosition; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; import org.mxchange.jcoreee.bean.ejb.BaseEnterpriseBean; import org.mxchange.jcountry.model.data.Country; @@ -301,7 +300,7 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean { } /** - * Get back a managed instance from given jobPosition + * Get back a managed instance from given job position *

* @param jobPosition Unmanaged/detached job position instance *

@@ -372,42 +371,6 @@ public abstract class BaseFinancialsEnterpriseBean extends BaseEnterpriseBean { return managedHeadquarter; } - /** - * Get back a managed instance from given job position - *

- * @param jobPosition Unmanaged/detached job position instance - *

- * @return Managed job position instance - */ - protected JobPosition createManaged (final JobPosition jobPosition) { - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: jobPosition={1} - CALLED!", this.getClass().getSimpleName(), jobPosition)); //NOI18N - - // user should not be null - if (null == jobPosition) { - // Abort here - throw new NullPointerException("jobPosition is null"); //NOI18N - } else if (jobPosition.getJobPositionId() == null) { - // Id is set - throw new NullPointerException("jobPosition.jobPositionId is null"); //NOI18N - } else if (jobPosition.getJobPositionId() < 1) { - // Id is set - throw new IllegalArgumentException(MessageFormat.format("jobPosition.jobPositionId={0} is invalid", jobPosition.getJobPositionId())); //NOI18N - } - - // Try to find it (should be there) - final JobPosition managedJobPosition = this.getEntityManager().find(jobPosition.getClass(), jobPosition.getJobPositionId()); - - // Should be there - assert (managedJobPosition instanceof JobPosition) : "managedJobPosition is null"; //NOI18N - - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.createManaged: managedJobPosition={1} - EXIT!", this.getClass().getSimpleName(), managedJobPosition)); //NOI18N - - // Return it - return managedJobPosition; - } - /** * Get back a managed instance from given mobile provider *