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 4975e08ca97c5ffeabb55432319d723655f1f73a..6e2e2d3d9a5f84eddb00e082d9ae8d8e500fcb46 100644 (file)
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 b8dca2dabf7a76459a987f1aa219cbae8f80a21f..414efac950081166b94266e38fee672969ff647f 100644 (file)
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 3aab32f2cf011506b8fb8b77c84f6feebbcc7d43..b67e721bcf02d0bf6e3bad0cf377daf67c1b6508 100644 (file)
--- 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 93206fb4d76cd5e6c319e834ff6613be371851e8..c7aea0f4a531e5d8ec3bfcee62139db0408fb721 100644 (file)
--- 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 77ed6d0f3d527c1807657a23f105b28066e9911e..a55f58a747a2636f0aff57870917e5e1c78f7478 100644 (file)
--- 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 61e09c15eb026d782133734359d9cd2de8ae5c74..757a4f0a2e14a917f45ac3258330fac390422cbd 100644 (file)
--- 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 21144431b9ac70d4b3b0dd4fcddee2f0b3d2721d..b7ee9752695f59952bc75b555189b088b829c59e 100644 (file)
--- 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