]> git.mxchange.org Git - pizzaservice-core.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Tue, 30 Aug 2016 10:07:52 +0000 (12:07 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 31 Aug 2016 19:51:52 +0000 (21:51 +0200)
- more tests added on user instance (may prevent message-less NPE somewhere else which is harder to debug)

src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java

index 17e2b0d8b0fc3df816d8397cdc0e2ef54ab30574..257579487b6aa1a080a47089bc4532291f349db0 100644 (file)
@@ -510,6 +510,36 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                } else if (null == emailAddress) {
                        // Throw NPE
                        throw new NullPointerException("emailAddress is null"); //NOI18N
+               }else if (null == user) {
+                       // Throw NPE
+                       throw new NullPointerException("user is null"); //NOI18N
+               } else if (user.getUserId() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("user.userId is null"); //NOI18N
+               } else if (user.getUserId() < 1) {
+                       // Not valid number
+                       throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid.", user.getUserId())); //NOI18N
+               } else if (user.getUserName() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("user.userName is null"); //NOI18N
+               } else if (user.getUserName().isEmpty()) {
+                       // Empty string
+                       throw new IllegalArgumentException("user.userName is empty"); //NOI18N
+               } else if (user.getUserAccountStatus() == null) {
+                       // Throw NPE
+                       throw new NullPointerException("user.userAccountStatus is null"); //NOI18N
+               } else if (user.getUserContact() == null) {
+                       // Throw it again
+                       throw new NullPointerException("user.userContact is null"); //NOI18N
+               } else if (user.getUserContact().getContactId() == null) {
+                       // .. and again
+                       throw new NullPointerException("user.userContact.contactId is null"); //NOI18N
+               } else if (user.getUserContact().getContactId() < 1) {
+                       // Invalid id
+                       throw new IllegalArgumentException(MessageFormat.format("user.userContact.contactId={0} is invalid", user.getUserContact().getContactId())); //NOI18N
+               } else if (user.getUserContact().getContactGender() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("user.userContact.contactGender is null"); //NOI18N
                }
 
                // Prepare mail wrapper