From fa06e0a6c1152ab0f952c8d17c263d6c44e791db Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 12 Oct 2015 14:06:31 +0200
Subject: [PATCH] =?utf8?q?maybe=20not=20cascading=20fixes=20it=3F=20Signed?=
 =?utf8?q?-off-by:Roland=20H=C3=A4der=20<roland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../jphone/phonenumbers/cellphone/CellphoneNumber.java      | 6 ++----
 src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java     | 6 ++----
 .../jphone/phonenumbers/landline/LandLineNumber.java        | 6 ++----
 .../jphone/phonenumbers/smsprovider/CellphoneProvider.java  | 5 ++---
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java b/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
index f092339..af396ba 100644
--- a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
@@ -17,16 +17,15 @@
 package org.mxchange.jphone.phonenumbers.cellphone;
 
 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.jphone.phonenumbers.smsprovider.CellphoneProvider;
 import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider;
@@ -57,8 +56,7 @@ public class CellphoneNumber implements DialableCellphoneNumber, Comparable<Dial
 	 * Connection to table "cellphone_provider" (for dial prefix and more data)
 	 */
 	@JoinColumn (name = "cellphone_provider_id", nullable = false)
-	@OneToOne (targetEntity = CellphoneProvider.class, cascade = CascadeType.ALL, optional = false)
-	@Transient
+	@OneToOne (targetEntity = CellphoneProvider.class, optional = false, fetch = FetchType.EAGER)
 	private SmsProvider cellphoneProvider;
 
 	/**
diff --git a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
index 54b395c..18520a7 100644
--- a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
@@ -17,16 +17,15 @@
 package org.mxchange.jphone.phonenumbers.fax;
 
 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;
 
@@ -70,8 +69,7 @@ public class FaxNumber implements DialableFaxNumber, Comparable<DialableFaxNumbe
 	 * Country instance ('s dial data)
 	 */
 	@JoinColumn (name = "fax_country_id", nullable = false)
-	@OneToOne (targetEntity = CountryData.class, optional = false, cascade = CascadeType.ALL)
-	@Transient
+	@OneToOne(targetEntity = CountryData.class, optional = false, fetch = FetchType.EAGER)
 	private Country faxCountry;
 
 	/**
diff --git a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
index 0152bd1..70285f7 100644
--- a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
@@ -17,16 +17,15 @@
 package org.mxchange.jphone.phonenumbers.landline;
 
 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;
 
@@ -70,8 +69,7 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 	 * Connection to table "country_data"
 	 */
 	@JoinColumn (name = "phone_country_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.ALL, optional = false)
-	@Transient
+	@OneToOne(targetEntity = CountryData.class, optional = false, fetch = FetchType.EAGER)
 	private Country phoneCountry;
 
 	/**
diff --git a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
index 08d3657..26dae62 100644
--- a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
+++ b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
@@ -17,7 +17,6 @@
 package org.mxchange.jphone.phonenumbers.smsprovider;
 
 import javax.persistence.Basic;
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -75,8 +74,8 @@ public class CellphoneProvider implements SmsProvider {
 	 * Country instance ('s dial data)
 	 */
 	@JoinColumn (name = "provider_country_id", nullable = false)
-	@OneToOne (targetEntity = CountryData.class, optional = false, cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-	private transient Country providerCountry;
+	@OneToOne(targetEntity = CountryData.class, optional = false, fetch = FetchType.EAGER)
+	private Country providerCountry;
 
 	@Override
 	public Long getProviderId () {
-- 
2.39.5