From 2cd03b0e9dde8b73b3b85ec3d305b5ba896c7400 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 12 Oct 2015 13:48:39 +0200 Subject: [PATCH] =?utf8?q?Rewrite:=20-=20made=20country=20transient=20as?= =?utf8?q?=20this=20one=20should=20not=20be=20entered=20by=20the=20user=20?= =?utf8?q?-=20updated=20jar(s)=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcontacts-core.jar | Bin 19902 -> 20769 bytes .../branch/CompanyBranchOffice.java | 7 +++---- .../department/CompanyDepartment.java | 12 +++++------- .../employee/CompanyEmployee.java | 12 +++++------- .../headquarters/CompanyHeadQuartersData.java | 7 +++---- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index b977044176df140d0a842f3cd87d2d9913325158..4975e08ca97c5ffeabb55432319d723655f1f73a 100644 GIT binary patch delta 6927 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 diff --git a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java index 57cbf71..93206fb 100644 --- a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java @@ -20,13 +20,13 @@ import javax.persistence.Basic; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; import javax.persistence.Table; -import javax.persistence.Transient; import org.mxchange.jcountry.data.Country; import org.mxchange.jcountry.data.CountryData; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; @@ -58,9 +58,8 @@ public class CompanyBranchOffice implements BranchOffice, Comparable { * Connection to company contact */ @JoinColumn (name = "department_company_id", nullable = false, updatable = false) - @ManyToOne (targetEntity = CompanyContact.class, cascade = CascadeType.ALL, optional = false) - @Transient - private BusinessContact departmentCompany; + @ManyToOne (targetEntity = CompanyContact.class, cascade = CascadeType.ALL, optional = false, fetch = FetchType.EAGER) + private transient BusinessContact departmentCompany; /** * Id number @@ -67,9 +66,8 @@ public class CompanyDepartment implements Department, Comparable { * Department lead employee */ @JoinColumn (name = "department_lead_id", nullable = false) - @OneToOne (targetEntity = CompanyEmployee.class, cascade = CascadeType.ALL) - @Transient - private Employee departmentLead; + @OneToOne (targetEntity = CompanyEmployee.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private transient Employee departmentLead; /** * Department name diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java index a21dfdc..61e09c1 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java @@ -19,13 +19,13 @@ package org.mxchange.jcontactsbusiness.employee; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; import javax.persistence.Table; -import javax.persistence.Transient; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontactsbusiness.branch.BranchOffice; @@ -96,9 +96,8 @@ public class CompanyEmployee implements Employee, Comparable { * Employee's personal data */ @JoinColumn (name = "employee_personal_data_id", nullable = false, updatable = false) - @OneToOne (targetEntity = UserContact.class, cascade = CascadeType.ALL, optional = false) - @Transient - private Contact employeePersonalData; + @OneToOne (targetEntity = UserContact.class, cascade = CascadeType.ALL, optional = false, fetch = FetchType.EAGER) + private transient Contact employeePersonalData; /** * Employee's phone extension (or number if different) @@ -110,9 +109,8 @@ public class CompanyEmployee implements Employee, Comparable { * Employee's position (example: CEO) */ @JoinColumn (name = "employee_position_id") - @OneToOne (targetEntity = EmployeePosition.class, cascade = CascadeType.ALL) - @Transient - private JobPosition employeePosition; + @OneToOne (targetEntity = EmployeePosition.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private transient JobPosition employeePosition; @Override public int compareTo (final Employee employee) { diff --git a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java index 3c76923..2114443 100644 --- a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java +++ b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java @@ -20,13 +20,13 @@ import javax.persistence.Basic; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; import javax.persistence.Table; -import javax.persistence.Transient; import org.mxchange.jcountry.data.Country; import org.mxchange.jcountry.data.CountryData; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; @@ -59,9 +59,8 @@ public class CompanyHeadQuartersData implements HeadQuartersData, Comparable