From: Roland Häder <roland@mxchange.org>
Date: Mon, 9 May 2016 09:36:52 +0000 (+0200)
Subject: Continued a bit:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=32fa73a65903794dba7a1ce925a3aaf0380d87de;p=jaddressbook-core.git

Continued a bit:
- used interface for target entities
- added missing annotations (as these warnings are not being fixed)
---

diff --git a/src/org/mxchange/jaddressbookcore/model/addressbook/UserAddressbook.java b/src/org/mxchange/jaddressbookcore/model/addressbook/UserAddressbook.java
index 766ceaa..d765b2e 100644
--- a/src/org/mxchange/jaddressbookcore/model/addressbook/UserAddressbook.java
+++ b/src/org/mxchange/jaddressbookcore/model/addressbook/UserAddressbook.java
@@ -36,7 +36,6 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import org.mxchange.jaddressbookcore.model.addressbook.status.AddressbokStatus;
-import org.mxchange.jusercore.model.user.LoginUser;
 import org.mxchange.jusercore.model.user.User;
 
 /**
@@ -109,7 +108,7 @@ public class UserAddressbook implements Addressbook {
 	 * Connection to "users" table
 	 */
 	@JoinColumn (name = "addressbook_user_id", nullable = false)
-	@OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false)
+	@OneToOne (targetEntity = User.class, cascade = CascadeType.REFRESH, optional = false)
 	private User addressbookUser;
 
 	/**
diff --git a/src/org/mxchange/jaddressbookcore/model/addressbook/entry/UserAddressbookEntry.java b/src/org/mxchange/jaddressbookcore/model/addressbook/entry/UserAddressbookEntry.java
index 73a51f0..aa00544 100644
--- a/src/org/mxchange/jaddressbookcore/model/addressbook/entry/UserAddressbookEntry.java
+++ b/src/org/mxchange/jaddressbookcore/model/addressbook/entry/UserAddressbookEntry.java
@@ -32,12 +32,9 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jcontactsbusiness.BusinessContact;
-import org.mxchange.jcontactsbusiness.CompanyContact;
-import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
-import org.mxchange.jaddressbookcore.model.addressbook.UserAddressbook;
 
 /**
  * A POJO for address book entries
@@ -51,6 +48,7 @@ import org.mxchange.jaddressbookcore.model.addressbook.UserAddressbook;
 				name = "SearchUsersAddressbookEntries",
 				query = "SELECT e FROM addressbook_entries AS e INNER JOIN addressbooks AS a ON e.addressbookId = a WHERE e.addressbookId = :addressbook AND a.addressbookUser = :owner ORDER BY e.addressbookEntryId ASC")
 )
+@SuppressWarnings ("PersistenceUnitPresent")
 public class UserAddressbookEntry implements AddressbookEntry {
 
 	/**
@@ -62,7 +60,7 @@ public class UserAddressbookEntry implements AddressbookEntry {
 	 * Connection to table "business_contacts" (commercial contacts)
 	 */
 	@JoinColumn (name = "entry_business_contact_id", updatable = false)
-	@OneToOne (targetEntity = CompanyContact.class, cascade = CascadeType.REFRESH)
+	@OneToOne (targetEntity = BusinessContact.class, cascade = CascadeType.REFRESH)
 	private BusinessContact addressbookEntryBusinessContact;
 
 	/**
@@ -85,14 +83,14 @@ public class UserAddressbookEntry implements AddressbookEntry {
 	 * Connection to table "contacts" (private contacts)
 	 */
 	@JoinColumn (name = "entry_private_contact_id", updatable = false)
-	@OneToOne (targetEntity = UserContact.class, cascade = CascadeType.REFRESH)
+	@OneToOne (targetEntity = Contact.class, cascade = CascadeType.REFRESH)
 	private Contact addressbookEntryPrivateContact;
 
 	/**
 	 * Connection to table "addressbooks"
 	 */
 	@JoinColumn (name = "entry_addressbook_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = UserAddressbook.class, cascade = CascadeType.REFRESH, optional = false)
+	@OneToOne (targetEntity = Addressbook.class, cascade = CascadeType.REFRESH, optional = false)
 	private Addressbook addressbookId;
 
 	@Override
@@ -119,9 +117,11 @@ public class UserAddressbookEntry implements AddressbookEntry {
 	@Override
 	public int hashCode () {
 		int hash = 3;
+
 		hash = 19 * hash + Objects.hashCode(this.getAddressbookEntryBusinessContact());
 		hash = 19 * hash + Objects.hashCode(this.getAddressbookEntryPrivateContact());
 		hash = 19 * hash + Objects.hashCode(this.getAddressbookId());
+
 		return hash;
 	}
 
@@ -136,11 +136,13 @@ public class UserAddressbookEntry implements AddressbookEntry {
 	}
 
 	@Override
+	@SuppressWarnings ("ReturnOfDateField")
 	public Calendar getAddressbookEntryCreated () {
 		return this.addressbookEntryCreated;
 	}
 
 	@Override
+	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
 	public void setAddressbookEntryCreated (final Calendar addressbookEntryCreated) {
 		this.addressbookEntryCreated = addressbookEntryCreated;
 	}
diff --git a/src/org/mxchange/jaddressbookcore/model/addressbook/shared/AddressbookShare.java b/src/org/mxchange/jaddressbookcore/model/addressbook/shared/AddressbookShare.java
index 29536db..f42eb9a 100644
--- a/src/org/mxchange/jaddressbookcore/model/addressbook/shared/AddressbookShare.java
+++ b/src/org/mxchange/jaddressbookcore/model/addressbook/shared/AddressbookShare.java
@@ -35,7 +35,6 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
 import org.mxchange.jaddressbookcore.model.addressbook.UserAddressbook;
-import org.mxchange.jusercore.model.user.LoginUser;
 import org.mxchange.jusercore.model.user.User;
 
 /**
@@ -91,14 +90,14 @@ public class AddressbookShare implements ShareableAddressbook {
 	 * User who is owning the share
 	 */
 	@JoinColumn (name = "share_owner_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false)
+	@OneToOne (targetEntity = User.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.REFRESH, optional = false)
+	@OneToOne (targetEntity = User.class, cascade = CascadeType.REFRESH, optional = false)
 	private User shareUserSharee;
 
 	/**