From: Roland Haeder <roland@mxchange.org>
Date: Mon, 12 Oct 2015 11:54:42 +0000 (+0200)
Subject: eager fetch type ... + updated jar(s)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ea8db4d29cb67fb12f8a02357db0d8649a5e9a4b;p=jcontacts-business-core.git

eager fetch type ... + updated jar(s)
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index 4975e08..6e2e2d3 100644
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ
diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
index b8dca2d..414efac 100644
Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ
diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java
index 3aab32f..b67e721 100644
--- a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java
+++ b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java
@@ -21,6 +21,7 @@ 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;
@@ -75,7 +76,7 @@ public class CompanyBasicData implements BusinessBasicData, Comparable<BusinessB
 	 * Company's main fax numbers: +ccxxxxxxxxxx
 	 */
 	@JoinColumn (name = "company_fax_number_id")
-	@OneToMany (targetEntity = FaxNumber.class, cascade = CascadeType.ALL)
+	@OneToMany (targetEntity = FaxNumber.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	private List<DialableFaxNumber> companyFaxNumberList;
 
 	/**
@@ -103,7 +104,7 @@ public class CompanyBasicData implements BusinessBasicData, Comparable<BusinessB
 	 * Company's main phone number: +ccxxxxxxxxxx
 	 */
 	@JoinColumn (name = "company_phone_number")
-	@OneToMany (targetEntity = LandLineNumber.class, cascade = CascadeType.ALL)
+	@OneToMany (targetEntity = LandLineNumber.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	private List<DialableLandLineNumber> companyPhoneNumber;
 
 	/**
diff --git a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
index 93206fb..c7aea0f 100644
--- a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
+++ b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java
@@ -59,7 +59,7 @@ public class CompanyBranchOffice implements BranchOffice, Comparable<BranchOffic
 	 */
 	@JoinColumn (name = "branch_country_id", nullable = false)
 	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.ALL, optional = false, fetch = FetchType.EAGER)
-	private transient Country branchCountry;
+	private Country branchCountry;
 
 	/**
 	 * Branch office's main email address (example: branch-name@company.com)
diff --git a/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java b/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java
index 77ed6d0..a55f58a 100644
--- a/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java
+++ b/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java
@@ -52,7 +52,7 @@ public class CompanyDepartment implements Department, Comparable<Department> {
 	 */
 	@JoinColumn (name = "department_company_id", nullable = false, updatable = false)
 	@ManyToOne (targetEntity = CompanyContact.class, cascade = CascadeType.ALL, optional = false, fetch = FetchType.EAGER)
-	private transient BusinessContact departmentCompany;
+	private BusinessContact departmentCompany;
 
 	/**
 	 * Id number
@@ -67,7 +67,7 @@ public class CompanyDepartment implements Department, Comparable<Department> {
 	 */
 	@JoinColumn (name = "department_lead_id", nullable = false)
 	@OneToOne (targetEntity = CompanyEmployee.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-	private transient Employee departmentLead;
+	private Employee departmentLead;
 
 	/**
 	 * Department name
diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java
index 61e09c1..757a4f0 100644
--- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java
+++ b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java
@@ -97,7 +97,7 @@ public class CompanyEmployee implements Employee, Comparable<Employee> {
 	 */
 	@JoinColumn (name = "employee_personal_data_id", nullable = false, updatable = false)
 	@OneToOne (targetEntity = UserContact.class, cascade = CascadeType.ALL, optional = false, fetch = FetchType.EAGER)
-	private transient Contact employeePersonalData;
+	private Contact employeePersonalData;
 
 	/**
 	 * Employee's phone extension (or number if different)
@@ -110,7 +110,7 @@ public class CompanyEmployee implements Employee, Comparable<Employee> {
 	 */
 	@JoinColumn (name = "employee_position_id")
 	@OneToOne (targetEntity = EmployeePosition.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-	private transient JobPosition employeePosition;
+	private 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 2114443..b7ee975 100644
--- a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java
+++ b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java
@@ -60,7 +60,7 @@ public class CompanyHeadQuartersData implements HeadQuartersData, Comparable<Hea
 	 */
 	@JoinColumn (name = "headquarters_country_id", nullable = false)
 	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.ALL, optional = false, fetch = FetchType.EAGER)
-	private transient Country headquartersCountry;
+	private Country headquartersCountry;
 
 	/**
 	 * Headquarters' fax number