From: Roland Haeder <roland@mxchange.org>
Date: Fri, 11 Mar 2016 21:02:02 +0000 (+0100)
Subject: Some cascade/fetch cleanups:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2e736be5fa0c29a4c4dd6fb5ac8ece91d2055494;p=jaddressbook-share-lib.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/lib/juser-core.jar b/lib/juser-core.jar
index 22b1352..7dad4a0 100644
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ
diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar
index 985516f..f637271 100644
Binary files a/lib/juser-lib.jar and b/lib/juser-lib.jar differ
diff --git a/src/org/mxchange/addressbook/events/sharing/type/SharingType.java b/src/org/mxchange/addressbook/events/sharing/type/SharingType.java
index 8ac9c11..c924ae4 100644
--- a/src/org/mxchange/addressbook/events/sharing/type/SharingType.java
+++ b/src/org/mxchange/addressbook/events/sharing/type/SharingType.java
@@ -17,7 +17,7 @@
 package org.mxchange.addressbook.events.sharing.type;
 
 /**
- * An enum for sharing types
+ * An enumeration for sharing types
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */
diff --git a/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java b/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
index b6e87dc..7ff7cba 100644
--- a/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
+++ b/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java
@@ -109,7 +109,7 @@ public class UserAddressbook implements Addressbook, Comparable<Addressbook> {
 	 * Connection to "users" table
 	 */
 	@JoinColumn (name = "addressbook_user_id", nullable = false)
-	@OneToOne (targetEntity = LoginUser.class, optional = false, cascade = CascadeType.MERGE)
+	@OneToOne (targetEntity = LoginUser.class, optional = false, cascade = CascadeType.REFRESH)
 	private User addressbookUser;
 
 	/**
diff --git a/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java b/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java
index c65aead..d5ad054 100644
--- a/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java
+++ b/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java
@@ -62,7 +62,7 @@ public class UserAddressbookEntry implements AddressbookEntry, Comparable<Addres
 	 * Connection to table "business_contacts" (commercial contacts)
 	 */
 	@JoinColumn (name = "entry_business_contact_id", updatable = false)
-	@OneToOne (targetEntity = CompanyContact.class, cascade = CascadeType.MERGE)
+	@OneToOne (targetEntity = CompanyContact.class, cascade = CascadeType.REFRESH)
 	private BusinessContact addressbookEntryBusinessContact;
 
 	/**
@@ -85,14 +85,14 @@ public class UserAddressbookEntry implements AddressbookEntry, Comparable<Addres
 	 * Connection to table "contacts" (private contacts)
 	 */
 	@JoinColumn (name = "entry_private_contact_id", updatable = false)
-	@OneToOne (targetEntity = UserContact.class, cascade = CascadeType.MERGE)
+	@OneToOne (targetEntity = UserContact.class, cascade = CascadeType.REFRESH)
 	private Contact addressbookEntryPrivateContact;
 
 	/**
 	 * Connection to table "addressbooks"
 	 */
 	@JoinColumn (name = "entry_addressbook_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = UserAddressbook.class, optional = false, cascade = CascadeType.MERGE)
+	@OneToOne (targetEntity = UserAddressbook.class, optional = false, cascade = CascadeType.REFRESH)
 	private Addressbook addressbookId;
 
 	@Override
diff --git a/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java b/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
index d3f9166..4373fae 100644
--- a/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
+++ b/src/org/mxchange/addressbook/model/addressbook/shared/AddressbookShare.java
@@ -69,7 +69,7 @@ public class AddressbookShare implements ShareableAddressbook, Comparable<Sharea
 	 * Address book this share is for
 	 */
 	@JoinColumn (name = "share_addressbook_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = UserAddressbook.class, cascade = CascadeType.MERGE, optional = false)
+	@OneToOne (targetEntity = UserAddressbook.class, cascade = CascadeType.REFRESH, optional = false)
 	private Addressbook shareAddressbook;
 
 	/**
@@ -92,14 +92,14 @@ public class AddressbookShare implements ShareableAddressbook, Comparable<Sharea
 	 * User who is owning the share
 	 */
 	@JoinColumn (name = "share_owner_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.MERGE, optional = false)
+	@OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false)
 	private User shareUserOwner;
 
 	/**
 	 * User the address book is shared with
 	 */
 	@JoinColumn (name = "share_sharee_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.MERGE, optional = false)
+	@OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false)
 	private User shareUserSharee;
 
 	/**
diff --git a/src/org/mxchange/addressbook/model/addressbook/status/AddressbokStatus.java b/src/org/mxchange/addressbook/model/addressbook/status/AddressbokStatus.java
index 5aab34e..b53491f 100644
--- a/src/org/mxchange/addressbook/model/addressbook/status/AddressbokStatus.java
+++ b/src/org/mxchange/addressbook/model/addressbook/status/AddressbokStatus.java
@@ -19,7 +19,7 @@ package org.mxchange.addressbook.model.addressbook.status;
 import java.io.Serializable;
 
 /**
- * An enum for the addressbook status
+ * An enumeration for the addressbook status
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */