Continued a bit:

[jaddressbook-core.git] / src / org / mxchange / jaddressbookcore / model / addressbook / entry / UserAddressbookEntry.java

diff --git a/src/org/mxchange/jaddressbookcore/model/addressbook/entry/UserAddressbookEntry.java b/src/org/mxchange/jaddressbookcore/model/addressbook/entry/UserAddressbookEntry.java
index 73a51f00b350df3e4b918b358b3e8eaa23c23b14..aa005448522233b5cb7ca89bf5785545d820b799 100644 (file)
--- 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;
        }