From: Roland Haeder <roland@mxchange.org>
Date: Fri, 11 Mar 2016 21:03:13 +0000 (+0100)
Subject: Some cascade/fetch cleanups:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f0109f721ceab836e7d7b1caced135351d95e16b;p=jphone-core.git

Some cascade/fetch cleanups:
- CascadeType.MERGE is basicly an UPDATE statement, it needs to be REFRESH (from database to local entity object)
- Fetch strategy EAGER is default, no need to specify it
- updated jar(s)
---

diff --git a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java b/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
index b69c4da..e98fa08 100644
--- a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
@@ -52,7 +52,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.MERGE, optional = false)
+	@OneToOne (targetEntity = CellphoneProvider.class, cascade = CascadeType.REFRESH, optional = false)
 	private SmsProvider cellphoneProvider;
 
 	/**
diff --git a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
index 2beb7bd..870127c 100644
--- a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
@@ -58,7 +58,7 @@ public class FaxNumber implements DialableFaxNumber, Comparable<DialableFaxNumbe
 	 * Country instance ('s dial data)
 	 */
 	@JoinColumn (name = "fax_country_id", nullable = false)
-	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false)
+	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.REFRESH, optional = false)
 	private Country faxCountry;
 
 	/**
diff --git a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
index 44a373c..e5365d1 100644
--- a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
@@ -58,7 +58,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.MERGE, optional = false)
+	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.REFRESH, optional = false)
 	private Country phoneCountry;
 
 	/**
diff --git a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
index 6703989..e6ee369 100644
--- a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
+++ b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
@@ -56,7 +56,7 @@ public class CellphoneProvider implements SmsProvider, Comparable<SmsProvider> {
 	 * Country instance ('s dial data)
 	 */
 	@JoinColumn (name = "provider_country_id", nullable = false)
-	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false)
+	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.REFRESH, optional = false)
 	private Country providerCountry;
 
 	/**