Don't cherry-pick:

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

diff --git a/src/java/org/mxchange/jaddressbook/model/addressbook/AddressbookSessionBean.java b/src/java/org/mxchange/jaddressbook/model/addressbook/AddressbookSessionBean.java
index b9cb0ec6eb29c696a3ce9b622b091b3341c6dd20..cea5564353c97caa42a79aa61294e9c0ef24558e 100644 (file)
--- a/src/java/org/mxchange/jaddressbook/model/addressbook/AddressbookSessionBean.java
+++ b/src/java/org/mxchange/jaddressbook/model/addressbook/AddressbookSessionBean.java
@@ -25,7 +25,6 @@ import javax.persistence.Query;
 import org.mxchange.addressbook.enterprise.BaseAddressbookEnterpriseBean;
 import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote;
 import org.mxchange.jaddressbook.exceptions.AddressbookNameAlreadyUsedException;
-import org.mxchange.jaddressbook.exceptions.AddressbookNotFoundException;
 import org.mxchange.jaddressbook.model.addressbook.entry.AddressbookEntry;
 import org.mxchange.jusercore.model.user.User;
 
@@ -42,44 +41,6 @@ public class AddressbookSessionBean extends BaseAddressbookEnterpriseBean implem
         */
        private static final long serialVersionUID = 129_857_871_287_691L;
 
-       @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("SearchUsersAddressbookEntries", List.class); //NOI18N
-
-               // Set parameters
-               query.setParameter("addressbook", addressbook); //NOI18N
-               query.setParameter("owner", addressbook.getAddressbookUser()); //NOI18N
-
-               // Return it
-               return query.getResultList();
-       }
-
        @Override
        public Addressbook createAddressbook (final Addressbook addressbook) throws AddressbookNameAlreadyUsedException {
                // Is it not null?
@@ -113,36 +74,9 @@ public class AddressbookSessionBean extends BaseAddressbookEnterpriseBean implem
                return addressbook;
        }
 
-       @Override
-       public Addressbook getAddressbookById (final Long addressbookId) throws AddressbookNotFoundException {
-               // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("getAddressbookById: addressbookId={0} - CALLED!", addressbookId)); //NOI18N
-
-               // addressbookId should not be null or below 1
-               if (null == addressbookId) {
-                       // Throw NPE
-                       throw new NullPointerException("addressbookId is null"); //NOI18N
-               } else if (addressbookId < 1) {
-                       // Not valid
-                       throw new IllegalArgumentException(MessageFormat.format("addressbookId is not valid: {0}", addressbookId)); //NOI18N
-               } else if (!this.isAddressbookIdUsed(addressbookId)) {
-                       // No address book found
-                       throw new AddressbookNotFoundException(addressbookId);
-               }
-
-               // Get named query instance
-               Query query = this.getEntityManager().createNamedQuery("SearchAddressbookById", UserAddressbook.class); //NOI18N
-
-               // Set parameter
-               query.setParameter("id", addressbookId); //NOI18N
-
-               // Return it
-               return (Addressbook) query.getSingleResult();
-       }
-
        @Override
        @SuppressWarnings ("unchecked")
-       public List<Addressbook> getUsersAddressbookList (final User loggedInUser) {
+       public List<Addressbook> fetchAddressbooksByUser (final User loggedInUser) {
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("getUsersList: loggedInUser={0} - CALLED!", loggedInUser)); //NOI18N
 
@@ -153,18 +87,56 @@ public class AddressbookSessionBean extends BaseAddressbookEnterpriseBean implem
                }
 
                // Get query instance
-               Query query = this.getEntityManager().createNamedQuery("AllUsersAddressbooks", List.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllUsersAddressbooks", List.class); //NOI18N
 
                // Set parameter
                query.setParameter("param", loggedInUser); //NOI18N
 
                // Get full list from JPA
-               List<Addressbook> addressbooks = query.getResultList();
+               final List<Addressbook> addressbooks = query.getResultList();
 
                // Return it
                return addressbooks;
        }
 
+       @Override
+       @SuppressWarnings ("unchecked")
+       public List<AddressbookEntry> fetchAllAddressbookEntries (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("SearchUsersAddressbookEntries", List.class); //NOI18N
+
+               // Set parameters
+               query.setParameter("addressbook", addressbook); //NOI18N
+               query.setParameter("owner", addressbook.getAddressbookUser()); //NOI18N
+
+               // Return it
+               return query.getResultList();
+       }
+
        @Override
        public boolean isAddressbookIdUsed (final Long addressbookId) {
                // Trace message
@@ -180,7 +152,7 @@ public class AddressbookSessionBean extends BaseAddressbookEnterpriseBean implem
                }
 
                // Get query instance
-               Query query = this.getEntityManager().createNamedQuery("SearchAddressbookById", UserAddressbook.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchAddressbookById", UserAddressbook.class); //NOI18N
 
                // Set parameter
                query.setParameter("id", addressbookId); //NOI18N
@@ -191,7 +163,7 @@ public class AddressbookSessionBean extends BaseAddressbookEnterpriseBean implem
                // Try it again, yes no other way
                try {
                        // Get single result
-                       Addressbook addressbook = (Addressbook) query.getSingleResult();
+                       final Addressbook addressbook = (Addressbook) query.getSingleResult();
 
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("isAddressbookIdUsed: addressbook={0} - FOUND!", addressbook)); //NOI18N
@@ -212,6 +184,9 @@ public class AddressbookSessionBean extends BaseAddressbookEnterpriseBean implem
 
        @Override
        public boolean isAddressbookNameUsed (final Addressbook addressbook) {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("isAddressbookNameUsed: addressbook={0} - CALLED!", addressbook));
+
                // Is it not null?
                if (null == addressbook) {
                        // Abort here
@@ -234,7 +209,7 @@ public class AddressbookSessionBean extends BaseAddressbookEnterpriseBean implem
                }
 
                // Get query instance
-               Query query = this.getEntityManager().createNamedQuery("SearchUserAddressbookName", Addressbook.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchUserAddressbookName", Addressbook.class); //NOI18N
 
                // Set parameter
                query.setParameter("user", addressbook.getAddressbookUser()); //NOI18N
@@ -246,7 +221,7 @@ public class AddressbookSessionBean extends BaseAddressbookEnterpriseBean implem
                // Try it
                try {
                        // Get a single result
-                       Addressbook dummy = (Addressbook) query.getSingleResult();
+                       final Addressbook dummy = (Addressbook) query.getSingleResult();
 
                        // Log it
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("isAddressbookNameUsed: Found an address book: {0}", dummy)); //NOI18N