Added email address for author

[addressbook-ejb.git] / src / java / org / mxchange / addressbook / model / addressbook / AddressbookSessionBean.java

diff --git a/src/java/org/mxchange/addressbook/model/addressbook/AddressbookSessionBean.java b/src/java/org/mxchange/addressbook/model/addressbook/AddressbookSessionBean.java
index d52c1bbaa5b554281e9844bcd0506ef6fa32fd3e..38e51542f774c7699e28a87266ca87ed2650e705 100644 (file)
--- a/src/java/org/mxchange/addressbook/model/addressbook/AddressbookSessionBean.java
+++ b/src/java/org/mxchange/addressbook/model/addressbook/AddressbookSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Roland Haeder
+ * Copyright (C) 2016 Roland Haeder
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,9 +33,9 @@ import org.mxchange.jusercore.model.user.User;
 /**
  * A stateless bean handling addressbooks
  * <p>
- * @author Roland Haeder
+ * @author Roland Haeder<roland@mxchange.org>
  */
-@Stateless (name = "addressbook", mappedName = "ejb/stateless-addressbook", description = "A stateless bean for handling addressbooks")
+@Stateless (name = "addressbook", mappedName = "ejb/stateless-addressbook-adr", description = "A stateless bean for handling Addressbook addressbooks")
 public class AddressbookSessionBean extends BaseDatabaseBean implements AddressbookSessionBeanRemote {
 
        /**
@@ -46,13 +46,36 @@ public class AddressbookSessionBean extends BaseDatabaseBean implements Addressb
        @Override
        @SuppressWarnings ("unchecked")
        public List<AddressbookEntry> allEntries (final Addressbook addressbook) {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("allEntries: addressbook={0} - CALLED!", addressbook)); //NOI18N
+
+               // Validate parameter
+               if (null == addressbook) {
+                       // Throw NPE
+                       throw new NullPointerException("addressbook is null");
+               } else if (addressbook.getAddressbookId() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("addressbook.addressbookId is null");
+               } else if (addressbook.getAddressbookId() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("addressbook.addressbookId={0} is invalid.", addressbook.getAddressbookId()));
+               } else if (addressbook.getAddressbookUser() == null) {
+                       // Throw again NPE
+                       throw new NullPointerException("addressbook.addressbookUser is null");
+               } else if (addressbook.getAddressbookUser().getUserId() == null) {
+                       // Throw again NPE
+                       throw new NullPointerException("addressbook.addressbookUser.userId is null");
+               } else if (addressbook.getAddressbookUser().getUserId() < 1) {
+                       // Invalid id number again
+                       throw new IllegalArgumentException(MessageFormat.format("addressbook.addressbookUser.userId={0} is invalid", addressbook.getAddressbookUser().getUserId()));
+               }
+
                // Generate query
-               Query query = this.getEntityManager().createNamedQuery("AllAddressbookEntries", List.class); //NOI18N
+               Query query = this.getEntityManager().createNamedQuery("SearchUsersAddressbookEntries", List.class); //NOI18N
 
                // Set parameters
                query.setParameter("addressbook", addressbook); //NOI18N
                query.setParameter("owner", addressbook.getAddressbookUser()); //NOI18N
-               query.setParameter("sharer", addressbook.getAddressbookUser()); //NOI18N
 
                // Return it
                return query.getResultList();
@@ -122,7 +145,7 @@ public class AddressbookSessionBean extends BaseDatabaseBean implements Addressb
                }
 
                // Debug message
-               this.getLoggerBeanLocal().logDebug("allUsersNotSharing: sharingUsers.size()=" + sharingUsers.size());
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("allUsersNotSharing: sharingUsers.size()={0}", sharingUsers.size())); //NOI18N
 
                // Init final user list
                List<User> userList = new LinkedList<>();
@@ -330,7 +353,13 @@ public class AddressbookSessionBean extends BaseDatabaseBean implements Addressb
                        throw new NullPointerException("addressbook is null"); //NOI18N
                } else if (addressbook.getAddressbookUser() == null) {
                        // User instance is null
-                       throw new NullPointerException("addressbook.user should not be null."); //NOI18N
+                       throw new NullPointerException("addressbook.addressbookUser is null."); //NOI18N
+               } else if (addressbook.getAddressbookUser().getUserId() == null) {
+                       // User instance is null
+                       throw new NullPointerException("addressbook.addressbookUser.userId is null."); //NOI18N
+               } else if (addressbook.getAddressbookUser().getUserId() < 1) {
+                       // User instance is null
+                       throw new NullPointerException(MessageFormat.format("addressbook.addressbookUser.userId={0} is invalid.", addressbook.getAddressbookUser().getUserId())); //NOI18N
                } else if (addressbook.getAddressbookName() == null) {
                        // Address book name not set
                        throw new NullPointerException("addressbook.addressbookName should not be null"); //NOI18N