Continued:

[jaddressbook-core.git] / src / org / mxchange / jaddressbook / model / addressbook / UserAddressbook.java

diff --git a/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java b/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java
index a6edb940757f95f7490f1245b353c6b2a2561650..1781f33275418514ddec3c63385c2a00c6b534ac 100644 (file)
--- a/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java
+++ b/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jaddressbook.model.addressbook;
 
+import java.text.MessageFormat;
 import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
@@ -36,8 +37,10 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
+import org.apache.commons.lang3.StringUtils;
 import org.mxchange.jaddressbook.model.addressbook.status.AddressbokStatus;
 import org.mxchange.jcoreutils.comparable.ComparableUtils;
+import org.mxchange.jcoreutils.enums.EnumUtils;
 import org.mxchange.jusercore.model.user.LoginUser;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.utils.UserUtils;
@@ -134,6 +137,24 @@ public class UserAddressbook implements Addressbook {
                // Invoke default constructor
                this();
 
+               // Check all parameters
+               if (null == addressbookName) {
+                       // Throw NPE
+                       throw new NullPointerException("Parameter 'addressbookName' is null"); //NOI18N
+               } else if (addressbookName.isEmpty()) {
+                       // Throw IAE
+                       throw new IllegalArgumentException("Parameter 'addressbookName' is empty"); //NOI18N
+               } else if (null == addressbookUser) {
+                       // Throw NPE again
+                       throw new NullPointerException("Parameter 'addressbookUser' is null"); //NOI18N
+               } else if (addressbookUser.getUserId() == null) {
+                       // Throw it again
+                       throw new NullPointerException("addressbookUser.userId is null"); //NOI18N
+               } else if (addressbookUser.getUserId() < 1) {
+                       // Throw IAE again
+                       throw new IllegalArgumentException(MessageFormat.format("addressbookUser.userId={0} is invalid", addressbookUser.getUserId())); //NOI18N
+               }
+
                // Set name and user instance
                this.addressbookName = addressbookName;
                this.addressbookUser = addressbookUser;
@@ -159,9 +180,9 @@ public class UserAddressbook implements Addressbook {
                // All comparators
                final int comparators[] = {
                        // First name ...
-                       this.getAddressbookName().compareToIgnoreCase(addressbook.getAddressbookName()),
+                       StringUtils.compare(this.getAddressbookName(), addressbook.getAddressbookName()),
                        // ... status
-                       this.getAddressbookStatus().compareTo(addressbook.getAddressbookStatus()),
+                       EnumUtils.compare(this.getAddressbookStatus(), addressbook.getAddressbookStatus()),
                        // .. then user
                        UserUtils.compare(this.getAddressbookUser(), addressbook.getAddressbookUser())
                };