ignored create-persistence-unit warning as no persistence.xml shall be created here...

[juser-login-core.git] / src / org / mxchange / jusercore / model / user / LoginUser.java

diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java
index 88f182365af9acc450248823608901d537940d32..33678e58aa60c177238ad1e8ca4c35da2633cbfc 100644 (file)
--- a/src/org/mxchange/jusercore/model/user/LoginUser.java
+++ b/src/org/mxchange/jusercore/model/user/LoginUser.java
@@ -70,10 +70,12 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus;
                        @NamedQuery (name = "SearchUserId", query = "SELECT u FROM users AS u WHERE u.userId = :id"),
                        @NamedQuery (name = "SearchEmailAddress", query = "SELECT u FROM users AS u INNER JOIN contacts AS c ON u.userContact = c WHERE LOWER(c.contactEmailAddress) LIKE LOWER(:param)"),
                        @NamedQuery (name = "SearchAllUsersExcept", query = "SELECT u FROM users AS u WHERE u != :user ORDER BY u.userId ASC"),
+                       @NamedQuery (name = "AllUsers", query = "SELECT u FROM users AS u ORDER BY u.userId ASC"),
                        @NamedQuery (name = "AllPublicUsers", query = "SELECT u FROM users AS u WHERE u.userAccountStatus = :status AND u.userProfileMode = :mode ORDER BY u.userId ASC"),
                        @NamedQuery (name = "AllMemberPublicUsers", query = "SELECT u FROM users AS u WHERE u.userAccountStatus = :status AND u.userProfileMode IN (:public, :members) ORDER BY u.userId ASC")
                }
 )
+@SuppressWarnings ("PersistenceUnitPresent")
 public class LoginUser implements User {
 
        /**
@@ -105,7 +107,7 @@ public class LoginUser implements User {
        /**
         * Id number from "contacts" table
         */
-       @JoinColumn (name = "user_contact_id", nullable = false, updatable = false)
+       @JoinColumn (name = "user_contact_id", referencedColumnName = "contact_id", nullable = false, updatable = false, unique = true)
        @OneToOne (targetEntity = UserContact.class, cascade = CascadeType.ALL, optional = false)
        private Contact userContact;
 
@@ -120,6 +122,7 @@ public class LoginUser implements User {
        /**
         * Encrypted password
         */
+       @Basic (optional = false)
        @Column (name = "user_encrypted_password", nullable = false)
        private String userEncryptedPassword;
 
@@ -141,6 +144,7 @@ public class LoginUser implements User {
        /**
         * User name
         */
+       @Basic (optional = false)
        @Column (name = "user_name", nullable = false, length = 20)
        private String userName;
 
@@ -169,8 +173,11 @@ public class LoginUser implements User {
 
        @Override
        public void copyAll (final User user) {
-               // Copy also contact data
-               this.getUserContact().copyAll(user.getUserContact());
+               // Is contact set?
+               if (user.getUserContact() instanceof Contact) {
+                       // Copy also contact data
+                       this.getUserContact().copyAll(user.getUserContact());
+               }
 
                // Copy other data
                this.setUserConfirmKey(user.getUserConfirmKey());
@@ -183,7 +190,7 @@ public class LoginUser implements User {
 
        @Override
        public boolean equals (final Object object) {
-               if (object == null) {
+               if (null == object) {
                        return false;
                }
                if (this.getClass() != object.getClass()) {