]> git.mxchange.org Git - pizzaservice-ejb.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Tue, 5 Sep 2017 20:03:36 +0000 (22:03 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 9 Sep 2017 11:33:30 +0000 (13:33 +0200)
- added new stateless session beans for administrative and general purposes for
  branch office data and implemented business methods
- moved allCompanyBasicData() to general bean as this is a general business method
- also had to switch EJB references (maybe one day lookup="" is required again?)
- added private method isContactFound() to check if contact is already registered
  or not there
- this method is now used to throw proper checked exceptions (which in turn your
  application must catch)
- implemented business method allCompanyBasicData()
- renamed getAllContacts() -> allContacts() as this is actually no getter
  following naming-convention
- renamed getUserNameList() -> allUserNames() for same reason
- in fillUserData() added more checks on parameter 'user' as usual in many
  places, including ifUserExists() and throw checked (wanted) exception if not
  found in persistence provider
- added 'final' whereever possible, better optimization
- used not NULL when not needed, allowing more 'final' to be set
- updated persistence unit (new namespace for branch office entity)
- relicensed under Affero GPLv3 (no change to e.g. MIT will happen)
- added TODOs

Signed-off-by: Roland Häder <roland@mxchange.org>
23 files changed:
docs/COPYING.software
src/conf/persistence.xml
src/java/org/mxchange/jcontacts/contact/PizzaAdminContactSessionBean.java
src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java
src/java/org/mxchange/jcontacts/phone/PizzaAdminContactPhoneSessionBean.java
src/java/org/mxchange/jcontactsbusiness/basicdata/PizzaAdminBusinessDataSessionBean.java
src/java/org/mxchange/jcontactsbusiness/basicdata/PizzaBusinessDataSessionBean.java
src/java/org/mxchange/jcontactsbusiness/branchoffice/PizzaAdminBranchOfficeSessionBean.java [new file with mode: 0644]
src/java/org/mxchange/jcontactsbusiness/branchoffice/PizzaBranchOfficeSessionBean.java [new file with mode: 0644]
src/java/org/mxchange/jcontactsbusiness/employee/PizzaCompanyEmployeeSessionBean.java
src/java/org/mxchange/jcountry/data/PizzaCountrySingletonBean.java
src/java/org/mxchange/jphone/phonenumbers/mobileprovider/PizzaMobileProviderSingletonBean.java
src/java/org/mxchange/jphone/phonenumbers/phone/PizzaAdminPhoneSessionBean.java
src/java/org/mxchange/jphone/phonenumbers/phone/PizzaPhoneSessionBean.java
src/java/org/mxchange/jusercore/model/user/PizzaAdminUserSessionBean.java
src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java
src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivityLogMessageBean.java
src/java/org/mxchange/jusercore/model/user/email_address/PizzaUserEmailChangeSessionBean.java
src/java/org/mxchange/jusercore/model/user/password_history/PizzaUserPasswordHistorySessionBean.java
src/java/org/mxchange/juserlogincore/model/user/login/PizzaUserLoginSessionBean.java
src/java/org/mxchange/juserlogincore/model/user/register/PizzaUserRegistrationSessionBean.java
src/java/org/mxchange/juserlogincore/model/user/resendlink/PizzaResendLinkSessionBean.java
src/java/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java

index 94a9ed024d3859793618152ea559a168bbcbb5e2..dba13ed2ddf783ee8118c6a581dbf75305f816a3 100644 (file)
@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
+software for all its users.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     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
+    it under the terms of the GNU Affero General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
 <http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
index 1f690d0b165bcf80148e3bce8047279c35bc0955..9122a45d5be992e48f1304f3bbf91dddd2c06e79 100644 (file)
@@ -4,7 +4,7 @@
     <jta-data-source>jdbc/shop</jta-data-source>
     <class>org.mxchange.jcontacts.contact.UserContact</class>
     <class>org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData</class>
-    <class>org.mxchange.jcontactsbusiness.branch.CompanyBranchOffice</class>
+    <class>org.mxchange.jcontactsbusiness.branchoffice.CompanyBranchOffice</class>
     <class>org.mxchange.jcontactsbusiness.department.CompanyDepartment</class>
     <class>org.mxchange.jcontactsbusiness.employee.CompanyEmployee</class>
     <class>org.mxchange.jcontactsbusiness.headquarters.CompanyHeadquartersData</class>
index 08905849c610d2359a5490a6e1429fd4170f7d83..1841b15d86a02650eefb78a8d8fc0ab9431bd0b4 100644 (file)
@@ -19,7 +19,10 @@ package org.mxchange.jcontacts.contact;
 import java.text.MessageFormat;
 import java.util.GregorianCalendar;
 import javax.ejb.Stateless;
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
 import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException;
+import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean;
 
 /**
@@ -55,6 +58,9 @@ public class PizzaAdminContactSessionBean extends BasePizzaDatabaseBean implemen
                } else if (contact.getContactId() != null) {
                        // Should be null
                        throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} - is not null", contact.getContactId())); //NOI18N
+               } else if (this.isContactFound(contact)) {
+                       // Already registered
+                       throw new ContactAlreadyAddedException(contact);
                }
 
                // Set created timestamp
@@ -77,7 +83,7 @@ public class PizzaAdminContactSessionBean extends BasePizzaDatabaseBean implemen
        }
 
        @Override
-       public void deleteContactData (final Contact contact) {
+       public void deleteContactData (final Contact contact) throws ContactNotFoundException {
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.deleteContactData: contact={1} - CALLED!", this.getClass().getSimpleName(), contact)); //NOI18N
 
@@ -91,6 +97,9 @@ public class PizzaAdminContactSessionBean extends BasePizzaDatabaseBean implemen
                } else if (contact.getContactId() < 1) {
                        // Not valid
                        throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N
+               } else if (!this.isContactFound(contact)) {
+                       // Contact not found
+                       throw new ContactNotFoundException(contact.getContactId());
                }
 
                // Merge it to get a managed entity back
@@ -103,4 +112,43 @@ public class PizzaAdminContactSessionBean extends BasePizzaDatabaseBean implemen
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.deleteContactData: EXIT!", this.getClass().getSimpleName())); //NOI18N
        }
 
+       /**
+        * Determines if the given contact is found
+        * <p>
+        * @param contact Contact instance
+        * <p>
+        * @return Whether the contact has been found
+        */
+       private boolean isContactFound (final Contact contact) {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.isContactRegistered: contact={1} - CALLED!", this.getClass().getSimpleName(), contact)); //NOI18N
+
+               // Create query
+               Query query = this.getEntityManager().createNamedQuery("SearchContact"); //NOI18N
+
+               // Set parameter
+               query.setParameter("contact", contact); //NOI18N
+               query.setMaxResults(1);
+
+               // Default is not found
+               boolean isFound = false;
+
+               // Try it
+               try {
+                       // Try to find instance
+                       Contact dummy = (Contact) query.getSingleResult();
+
+                       // Mark as found
+                       isFound = true;
+               } catch (final NoResultException e) {
+                       // No result found
+               }
+
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.isContactRegistered: isFound={1} - EXIT!", this.getClass().getSimpleName(), isFound)); //NOI18N
+
+               // Return flag
+               return isFound;
+       }
+
 }
index 71adaf0567f10d66edab8d67fe99281ba97741ce..f1493553fb5195ef1a3f62986f4741fe4033a1cd 100644 (file)
@@ -46,6 +46,44 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
                super();
        }
 
+       @Override
+       @SuppressWarnings ("unchecked")
+       public List<Contact> allContacts () {
+               // Log trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getAllContacts - CALLED!", this.getClass().getSimpleName())); //NOI18N
+
+               // Create query instance
+               final Query query = this.getEntityManager().createNamedQuery("AllContacts"); //NOI18N
+
+               // Get list
+               final List<Contact> contacts = query.getResultList();
+
+               // Log trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getAllContacts: contacts.size()={1} - EXIT!", this.getClass().getSimpleName(), contacts.size())); //NOI18N
+
+               // Return it
+               return contacts;
+       }
+
+       @Override
+       @SuppressWarnings ("unchecked")
+       public List<String> allEmailAddresses () {
+               // Log trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getEmailAddressList - CALLED!", this.getClass().getSimpleName())); //NOI18N
+
+               // Create query instance
+               final Query query = this.getEntityManager().createNamedQuery("AllContactEmailAddresses"); //NOI18N
+
+               // Get list
+               final List<String> emailAddresses = query.getResultList();
+
+               // Log trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getEmailAddressList: emailAddresses.size()={1} - EXIT!", this.getClass().getSimpleName(), emailAddresses.size())); //NOI18N
+
+               // Return it
+               return emailAddresses;
+       }
+
        @Override
        public Contact findContactByEmailAddress (final String emailAddress) throws ContactNotFoundException {
                // Log trace message
@@ -61,13 +99,14 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
                }
 
                // Get query instance
-               Query query = this.getEntityManager().createNamedQuery("SearchContactByEmailAddress", UserContact.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchContactByEmailAddress", UserContact.class); //NOI18N
 
-               // Set parameter
+               // Set parameter and limit
                query.setParameter("emailAddress", emailAddress); //NOI18N
+               query.setMaxResults(1);
 
                // Init contact instance
-               Contact contact;
+               final Contact contact;
 
                // Try to find a result
                try {
@@ -103,13 +142,14 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
                }
 
                // Get query instance
-               Query query = this.getEntityManager().createNamedQuery("SearchContactById", Contact.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchContactById", UserContact.class); //NOI18N
 
                // Set parameter
                query.setParameter("contactId", contactId); //NOI18N
+               query.setMaxResults(1);
 
                // Init contact instance
-               Contact contact;
+               final Contact contact;
 
                // Try to find a result
                try {
@@ -130,44 +170,6 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
                return contact;
        }
 
-       @Override
-       @SuppressWarnings ("unchecked")
-       public List<Contact> getAllContacts () {
-               // Log trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getAllContacts - CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-               // Create query instance
-               Query query = this.getEntityManager().createNamedQuery("AllContacts"); //NOI18N
-
-               // Get list
-               List<Contact> contacts = query.getResultList();
-
-               // Log trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getAllContacts: contacts.size()={1} - EXIT!", this.getClass().getSimpleName(), contacts.size())); //NOI18N
-
-               // Return it
-               return contacts;
-       }
-
-       @Override
-       @SuppressWarnings ("unchecked")
-       public List<String> getEmailAddressList () {
-               // Log trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getEmailAddressList - CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-               // Create query instance
-               Query query = this.getEntityManager().createNamedQuery("AllContactEmailAddresses"); //NOI18N
-
-               // Get list
-               List<String> emailAddresses = query.getResultList();
-
-               // Log trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getEmailAddressList: emailAddresses.size()={1} - EXIT!", this.getClass().getSimpleName(), emailAddresses.size())); //NOI18N
-
-               // Return it
-               return emailAddresses;
-       }
-
        @Override
        public boolean isEmailAddressRegistered (final String emailAddress) {
                // Log trace message
@@ -187,7 +189,7 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
 
                try {
                        // Ask other method for contact instance
-                       Contact contact = this.findContactByEmailAddress(emailAddress);
+                       final Contact contact = this.findContactByEmailAddress(emailAddress);
 
                        // Log debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.isEmailAddressRegistered: Found contact={1} for emailAddress={2}", this.getClass().getSimpleName(), contact, emailAddress)); //NOI18N
@@ -228,7 +230,7 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
                Contact foundContact = null;
 
                // Get whole list
-               List<Contact> contacts = this.getAllContacts();
+               final List<Contact> contacts = this.allContacts();
 
                // Is the list empty?
                if (contacts.isEmpty()) {
@@ -238,7 +240,7 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
                }
 
                // Get iterator
-               Iterator<Contact> iterator = contacts.iterator();
+               final Iterator<Contact> iterator = contacts.iterator();
 
                // Loop through all
                while (iterator.hasNext()) {
index 88fda4be2b43e9d7fde1da743b30e006a965a3d0..0aa00fed12b9d4bd6abfe7c3e50ac0e9d3c2fa9c 100644 (file)
@@ -23,7 +23,6 @@ import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.ContactSessionBeanRemote;
-import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jphone.exceptions.PhoneNumberAlreadyLinkedException;
 import org.mxchange.jphone.exceptions.PhoneNumberNotLinkedException;
 import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
@@ -102,20 +101,17 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaDatabaseBean imp
                        throw new IllegalArgumentException(MessageFormat.format("faxNumber.phoneNumber={0} is not valid", faxNumber.getPhoneNumber())); //NOI18N
                }
 
-               // Find contact
-               Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
-
-               // Merge phone number
-               DialableFaxNumber managedNumber = this.getEntityManager().merge(faxNumber);
-
                // Set fax number in contact
-               managedContact.setContactFaxNumber(managedNumber);
+               contact.setContactFaxNumber(faxNumber);
+
+               // Update database
+               final Contact updatedContact = this.contactBean.updateContactData(contact);
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingFaxNumberWithContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingFaxNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N
 
                // Return it
-               return managedContact;
+               return updatedContact;
        }
 
        @Override
@@ -162,20 +158,17 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaDatabaseBean imp
                        throw new IllegalArgumentException(MessageFormat.format("landLineNumber.phoneNumber={0} is not valid", landLineNumber.getPhoneNumber())); //NOI18N
                }
 
-               // Find contact
-               Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
-
-               // Merge phone number
-               DialableLandLineNumber managedNumber = this.getEntityManager().merge(landLineNumber);
+               // Set land-line number in contact
+               contact.setContactLandLineNumber(landLineNumber);
 
-               // Set fax number in contact
-               managedContact.setContactLandLineNumber(managedNumber);
+               // Update database
+               final Contact updatedContact = this.contactBean.updateContactData(contact);
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingLandLineNumberWithContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingLandLineNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N
 
                // Return it
-               return managedContact;
+               return updatedContact;
        }
 
        @Override
@@ -216,20 +209,17 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaDatabaseBean imp
                        throw new IllegalArgumentException(MessageFormat.format("mobileNumber.mobileProvider.providerId={0} is not valid", mobileNumber.getMobileProvider().getProviderId())); //NOI18N
                }
 
-               // Find contact
-               Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
+               // Set mobile number in contact
+               contact.setContactMobileNumber(mobileNumber);
 
-               // Merge phone number
-               DialableMobileNumber managedNumber = this.getEntityManager().merge(mobileNumber);
-
-               // Set fax number in contact
-               managedContact.setContactMobileNumber(managedNumber);
+               // Update database
+               final Contact updatedContact = this.contactBean.updateContactData(contact);
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingMobileNumberWithContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingMobileNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N
 
                // Return it
-               return managedContact;
+               return updatedContact;
        }
 
        @Override
@@ -276,23 +266,17 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaDatabaseBean imp
                // Set created instance
                faxNumber.setPhoneEntryCreated(new GregorianCalendar());
 
-               // Persist it
-               this.getEntityManager().persist(faxNumber);
-
-               // Flush it
-               this.getEntityManager().flush();
-
-               // Find contact
-               Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
-
                // Set fax number in contact
-               managedContact.setContactFaxNumber(faxNumber);
+               contact.setContactFaxNumber(faxNumber);
+
+               // Update database
+               final Contact updatedContact = this.contactBean.updateContactData(contact);
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewFaxNumberWithContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewFaxNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N
 
                // Return it
-               return managedContact;
+               return updatedContact;
        }
 
        @Override
@@ -339,23 +323,17 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaDatabaseBean imp
                // Set created instance
                landLineNumber.setPhoneEntryCreated(new GregorianCalendar());
 
-               // Persist it
-               this.getEntityManager().persist(landLineNumber);
+               // Set landLine number in contact
+               contact.setContactLandLineNumber(landLineNumber);
 
-               // Flush it
-               this.getEntityManager().flush();
-
-               // Find contact
-               Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
-
-               // Set land-line number in contact
-               managedContact.setContactLandLineNumber(landLineNumber);
+               // Update database
+               final Contact updatedContact = this.contactBean.updateContactData(contact);
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewLandLineNumberWithContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewLandLineNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N
 
                // Return it
-               return managedContact;
+               return updatedContact;
        }
 
        @Override
@@ -396,23 +374,17 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaDatabaseBean imp
                // Set created instance
                mobileNumber.setPhoneEntryCreated(new GregorianCalendar());
 
-               // Persist it
-               this.getEntityManager().persist(mobileNumber);
+               // Set mobile number in contact
+               contact.setContactMobileNumber(mobileNumber);
 
-               // Flush it
-               this.getEntityManager().flush();
-
-               // Find contact
-               Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
-
-               // Set land-line number in contact
-               managedContact.setContactMobileNumber(mobileNumber);
+               // Update database
+               final Contact updatedContact = this.contactBean.updateContactData(contact);
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewMobileNumberWithContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewMobileNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N
 
                // Return it
-               return managedContact;
+               return updatedContact;
        }
 
        @Override
@@ -444,17 +416,17 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaDatabaseBean imp
                        throw new IllegalArgumentException(MessageFormat.format("contact.contactFaxNumber.phoneId={0} and faxNumber.phoneId={1} are not the same.", contact.getContactFaxNumber().getPhoneId(), faxNumber.getPhoneId())); //NOI18N
                }
 
-               // Find contact
-               Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
-
                // Remove it from contact
-               managedContact.setContactFaxNumber(null);
+               contact.setContactFaxNumber(null);
+
+               // Update database
+               final Contact updatedContact = this.contactBean.updateContactData(contact);
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkFaxDataFromContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkFaxDataFromContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N
 
                // Return it
-               return managedContact;
+               return updatedContact;
        }
 
        @Override
@@ -486,17 +458,17 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaDatabaseBean imp
                        throw new IllegalArgumentException(MessageFormat.format("contact.contactLandLineNumber.phoneId={0} and landLineNumber.phoneId={1} are not the same.", contact.getContactLandLineNumber().getPhoneId(), landLineNumber.getPhoneId())); //NOI18N
                }
 
-               // Find contact
-               Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
-
                // Remove it from contact
-               managedContact.setContactLandLineNumber(null);
+               contact.setContactLandLineNumber(null);
+
+               // Update database
+               final Contact updatedContact = this.contactBean.updateContactData(contact);
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkLandLineDataFromContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkLandLineDataFromContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N
 
                // Return it
-               return managedContact;
+               return updatedContact;
        }
 
        @Override
@@ -528,17 +500,17 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaDatabaseBean imp
                        throw new IllegalArgumentException(MessageFormat.format("contact.contactMobileNumber.phoneId={0} and mobileNumber.phoneId={1} are not the same.", contact.getContactMobileNumber().getPhoneId(), mobileNumber.getPhoneId())); //NOI18N
                }
 
-               // Find contact
-               Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
-
                // Remove it from contact
-               managedContact.setContactMobileNumber(null);
+               contact.setContactMobileNumber(null);
+
+               // Update database
+               final Contact updatedContact = this.contactBean.updateContactData(contact);
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkMobileDataFromContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkMobileDataFromContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N
 
                // Return it
-               return managedContact;
+               return updatedContact;
        }
 
 }
index 9975e384541a9a8d722e36c16bbee11a8b7e298b..4ab3e779f6ac97ab250e43e86b311a95d7dec713 100644 (file)
@@ -20,8 +20,8 @@ import java.text.MessageFormat;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Objects;
+import javax.ejb.EJB;
 import javax.ejb.Stateless;
-import javax.persistence.Query;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException;
 import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean;
 
@@ -38,6 +38,12 @@ public class PizzaAdminBusinessDataSessionBean extends BasePizzaDatabaseBean imp
         */
        private static final long serialVersionUID = 56_389_504_892_184_572L;
 
+       /**
+        * Administrative EJB
+        */
+       @EJB
+       private BusinessDataSessionBeanRemote businessDataBean;
+
        /**
         * Default constructor
         */
@@ -61,7 +67,7 @@ public class PizzaAdminBusinessDataSessionBean extends BasePizzaDatabaseBean imp
                }
 
                // Get all available entries
-               List<BusinessBasicData> list = this.allCompanyBasicData();
+               final List<BusinessBasicData> list = this.businessDataBean.allCompanyBasicData();
 
                // Is the list filled?
                if (!list.isEmpty()) {
@@ -91,23 +97,4 @@ public class PizzaAdminBusinessDataSessionBean extends BasePizzaDatabaseBean imp
                return basicData;
        }
 
-       @Override
-       @SuppressWarnings ("unchecked")
-       public List<BusinessBasicData> allCompanyBasicData () {
-               // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allBusinessContacts: CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-               // Get query
-               Query query = this.getEntityManager().createNamedQuery("AllBusinessData"); //NOI18N
-
-               // Get list from it
-               List<BusinessBasicData> list = query.getResultList();
-
-               // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allBusinessContacts: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
-
-               // Return it
-               return list;
-       }
-
 }
index d2d2657067645eb2dffe2db29ff092e2c3aa8354..8fe3192939e8ccefd60a6bc5d2055f2cfefc7c97 100644 (file)
@@ -19,7 +19,6 @@ package org.mxchange.jcontactsbusiness.basicdata;
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Objects;
-import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
@@ -39,12 +38,6 @@ public class PizzaBusinessDataSessionBean extends BasePizzaDatabaseBean implemen
         */
        private static final long serialVersionUID = 56_389_504_892_184_571L;
 
-       /**
-        * Administrative EJB
-        */
-       @EJB
-       private AdminBusinessDataSessionBeanRemote adminBusinessDataBean;
-
        /**
         * Default constructor
         */
@@ -53,19 +46,38 @@ public class PizzaBusinessDataSessionBean extends BasePizzaDatabaseBean implemen
                super();
        }
 
+       @Override
+       @SuppressWarnings ("unchecked")
+       public List<BusinessBasicData> allCompanyBasicData () {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allBusinessContacts: CALLED!", this.getClass().getSimpleName())); //NOI18N
+
+               // Get query
+               final Query query = this.getEntityManager().createNamedQuery("AllBusinessData"); //NOI18N
+
+               // Get list from it
+               final List<BusinessBasicData> list = query.getResultList();
+
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allBusinessContacts: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
+
+               // Return it
+               return list;
+       }
+
        @Override
        public BusinessBasicData findBasicDataById (final Long companyDataId) throws BusinessDataNotFoundException {
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findBasicDataById: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get query
-               Query query = this.getEntityManager().createNamedQuery("SearchBusinessDataById", CompanyBasicData.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchBusinessDataById", CompanyBasicData.class); //NOI18N
 
                // Set parameter
                query.setParameter("companyDataId", companyDataId); //NOI18N
 
                // Get single instance
-               BusinessBasicData businessData = null;
+               final BusinessBasicData businessData;
 
                // Try to find a result
                try {
@@ -104,7 +116,7 @@ public class PizzaBusinessDataSessionBean extends BasePizzaDatabaseBean implemen
                Boolean isCompanyNameUsed = Boolean.FALSE;
 
                // Get whole list
-               List<BusinessBasicData> list = this.adminBusinessDataBean.allCompanyBasicData();
+               final List<BusinessBasicData> list = this.allCompanyBasicData();
 
                // Check whole list
                for (final BusinessBasicData basicData : list) {
diff --git a/src/java/org/mxchange/jcontactsbusiness/branchoffice/PizzaAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/branchoffice/PizzaAdminBranchOfficeSessionBean.java
new file mode 100644 (file)
index 0000000..9244482
--- /dev/null
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017 Roland Häder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jcontactsbusiness.branchoffice;
+
+import javax.ejb.Stateless;
+import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean;
+
+/**
+ * A stateless session bean for administrative branch office purposes
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@Stateless (name = "adminBranchOffice", description = "An administrative statless bean for handling branch office data (all)")
+public class PizzaAdminBranchOfficeSessionBean extends BasePizzaDatabaseBean implements AdminBranchOfficeSessionBeanRemote {
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 58_467_386_571_701L;
+
+}
diff --git a/src/java/org/mxchange/jcontactsbusiness/branchoffice/PizzaBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/branchoffice/PizzaBranchOfficeSessionBean.java
new file mode 100644 (file)
index 0000000..5d74c9e
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2017 Roland Häder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jcontactsbusiness.branchoffice;
+
+import java.text.MessageFormat;
+import java.util.List;
+import javax.ejb.Stateless;
+import javax.persistence.Query;
+import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean;
+
+/**
+ * A stateless session bean for general branch office purposes
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@Stateless (name = "branchOffice", description = "A general statless bean for handling branch office data (all)")
+public class PizzaBranchOfficeSessionBean extends BaseFinancialsDatabaseBean implements BranchOfficeSessionBeanRemote {
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 58_467_386_571_701L;
+
+       @Override
+       @SuppressWarnings ("unchecked")
+       public List<BranchOffice> allBranchOffices () {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allBranchOffices: CALLED!", this.getClass().getSimpleName())); //NOI18N
+
+               // Get query
+               final Query query = this.getEntityManager().createNamedQuery("AllBranchOffices"); //NOI18N
+
+               // Get list from it
+               final List<BranchOffice> list = query.getResultList();
+
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allBranchOffices: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
+
+               // Return it
+               return list;
+       }
+
+}
index 2d32bc86401280ae100b3377f87197fa2d7b5952..3efaf89642ab91ddebf6a7dc3ed1924b814c74d1 100644 (file)
@@ -51,10 +51,10 @@ public class PizzaCompanyEmployeeSessionBean extends BasePizzaDatabaseBean imple
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCompanyEmployees(): CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get named query
-               Query query = this.getEntityManager().createNamedQuery("AllCompanyEmployees"); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllCompanyEmployees"); //NOI18N
 
                // Get list form it
-               List<Employee> employees = query.getResultList();
+               final List<Employee> employees = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCompanyEmployees(): employees.size()={1} - EXIT!", this.getClass().getSimpleName(), employees.size())); //NOI18N
@@ -78,13 +78,13 @@ public class PizzaCompanyEmployeeSessionBean extends BasePizzaDatabaseBean imple
                }
 
                // Now get named query
-               Query query = this.getEntityManager().createNamedQuery("SearchCompanyEmployeeById"); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchCompanyEmployeeById"); //NOI18N
 
                // Set parameter
                query.setParameter("employeeId", employeeId); //NOI18N
 
                // Declare instance
-               Employee employee;
+               final Employee employee;
 
                // Try to find a result
                try {
index bb8133f53e80f0d7c3ba2759ed3c113de9d26287..6dc7bbbdad68c64c71c7b073bce4a0aea9fa75f1 100644 (file)
@@ -94,10 +94,10 @@ public class PizzaCountrySingletonBean extends BasePizzaDatabaseBean implements
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCountries: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Init query
-               Query query = this.getEntityManager().createNamedQuery("AllCountries", CountryData.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllCountries", CountryData.class); //NOI18N
 
                // Get list
-               List<Country> countries = query.getResultList();
+               final List<Country> countries = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCountries: countries.size()={1} - EXIT!", this.getClass().getSimpleName(), countries.size())); //NOI18N
@@ -133,7 +133,7 @@ public class PizzaCountrySingletonBean extends BasePizzaDatabaseBean implements
                boolean isAdded = false;
 
                // Get query instance
-               Query query = this.getEntityManager().createNamedQuery("SearchCountryByCodeI18nKey", CountryData.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchCountryByCodeI18nKey", CountryData.class); //NOI18N
 
                // Assign all parameters
                query.setParameter("code", country.getCountryCode()); //NOI18N
@@ -142,7 +142,7 @@ public class PizzaCountrySingletonBean extends BasePizzaDatabaseBean implements
                // Try to get a single result
                try {
                        // Get single result
-                       Country foundCountry = (Country) query.getSingleResult();
+                       final Country foundCountry = (Country) query.getSingleResult();
 
                        // Found it?
                        isAdded = (foundCountry instanceof Country);
index f63f9a6e1f07a6a02dce615afa0803cfc2fd9391..222842c9cbab799ef44559e816ebf6051f80243b 100644 (file)
@@ -47,15 +47,15 @@ public class PizzaMobileProviderSingletonBean extends BasePizzaDatabaseBean impl
 
        @Override
        @SuppressWarnings ("unchecked")
-       public List<MobileProvider> allMobileProvider () {
+       public List<MobileProvider> allMobileProviders () {
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMobileProvider: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Init query
-               Query query = this.getEntityManager().createNamedQuery("AllMobileProvider", CellphoneProvider.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllMobileProvider", CellphoneProvider.class); //NOI18N
 
                // Get list from it
-               List<MobileProvider> mobileProviders = query.getResultList();
+               final List<MobileProvider> mobileProviders = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMobileProvider: mobileProviders.size()={1} - EXIT!", this.getClass().getSimpleName(), mobileProviders.size())); //NOI18N
index c8c0d23f392fb7b35dd25155e082afe8c02835f4..f1a9f39cb54fe021851a165a19349c4173464fde 100644 (file)
@@ -87,7 +87,7 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaDatabaseBean implements
                }
 
                // Get a managed instance
-               DialableFaxNumber managedNumber = this.getEntityManager().getReference(faxNumber.getClass(), faxNumber.getPhoneId());
+               final DialableFaxNumber managedNumber = this.getEntityManager().getReference(faxNumber.getClass(), faxNumber.getPhoneId());
 
                // Remove it from database
                this.getEntityManager().remove(managedNumber);
@@ -135,7 +135,7 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaDatabaseBean implements
                }
 
                // Get a managed instance
-               DialableLandLineNumber managedNumber = this.getEntityManager().getReference(landLineNumber.getClass(), landLineNumber.getPhoneId());
+               final DialableLandLineNumber managedNumber = this.getEntityManager().getReference(landLineNumber.getClass(), landLineNumber.getPhoneId());
 
                // Remove it from database
                this.getEntityManager().remove(managedNumber);
@@ -177,7 +177,7 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaDatabaseBean implements
                }
 
                // Get a managed instance
-               DialableMobileNumber managedNumber = this.getEntityManager().getReference(mobileNumber.getClass(), mobileNumber.getPhoneId());
+               final DialableMobileNumber managedNumber = this.getEntityManager().getReference(mobileNumber.getClass(), mobileNumber.getPhoneId());
 
                // Remove it from database
                this.getEntityManager().remove(managedNumber);
@@ -225,7 +225,7 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaDatabaseBean implements
                }
 
                // Get contact from it and find it
-               DialableFaxNumber managedNumber = this.getEntityManager().find(faxNumber.getClass(), faxNumber.getPhoneId());
+               final DialableFaxNumber managedNumber = this.getEntityManager().find(faxNumber.getClass(), faxNumber.getPhoneId());
 
                // Should be found
                assert (managedNumber instanceof DialableFaxNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", faxNumber.getPhoneId()); //NOI18N
@@ -283,7 +283,7 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaDatabaseBean implements
                }
 
                // Get contact from it and find it
-               DialableLandLineNumber managedNumber = this.getEntityManager().find(landLineNumber.getClass(), landLineNumber.getPhoneId());
+               final DialableLandLineNumber managedNumber = this.getEntityManager().find(landLineNumber.getClass(), landLineNumber.getPhoneId());
 
                // Should be found
                assert (managedNumber instanceof DialableLandLineNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", landLineNumber.getPhoneId()); //NOI18N
@@ -335,7 +335,7 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaDatabaseBean implements
                }
 
                // Get contact from it and find it
-               DialableMobileNumber managedNumber = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId());
+               final DialableMobileNumber managedNumber = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId());
 
                // Should be found
                assert (managedNumber instanceof DialableMobileNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", mobileNumber.getPhoneId()); //NOI18N
index e24d3823182f329565e01c45eade74906f235ae5..cb89a775dfe9cb857074300ef62bef651ace4a1e 100644 (file)
@@ -26,9 +26,9 @@ import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.phonenumbers.fax.FaxNumber;
 import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jphone.phonenumbers.landline.LandLineNumber;
-import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean;
 import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jphone.phonenumbers.mobile.MobileNumber;
+import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean;
 
 /**
  * A general phone EJB
@@ -58,10 +58,10 @@ public class PizzaPhoneSessionBean extends BasePizzaDatabaseBean implements Phon
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allFaxNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get query
-               Query query = this.getEntityManager().createNamedQuery("AllFaxNumbers", FaxNumber.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllFaxNumbers", FaxNumber.class); //NOI18N
 
                // Get list from it
-               List<DialableFaxNumber> list = query.getResultList();
+               final List<DialableFaxNumber> list = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allFaxNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
@@ -77,10 +77,10 @@ public class PizzaPhoneSessionBean extends BasePizzaDatabaseBean implements Phon
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allLandLineNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get query
-               Query query = this.getEntityManager().createNamedQuery("AllLandLineNumbers", LandLineNumber.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllLandLineNumbers", LandLineNumber.class); //NOI18N
 
                // Get list from it
-               List<DialableLandLineNumber> list = query.getResultList();
+               final List<DialableLandLineNumber> list = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allLandLineNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
@@ -96,10 +96,10 @@ public class PizzaPhoneSessionBean extends BasePizzaDatabaseBean implements Phon
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMobileNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get query
-               Query query = this.getEntityManager().createNamedQuery("AllMobileNumbers", MobileNumber.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllMobileNumbers", MobileNumber.class); //NOI18N
 
                // Get list from it
-               List<DialableMobileNumber> list = query.getResultList();
+               final List<DialableMobileNumber> list = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMobileNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
@@ -123,13 +123,13 @@ public class PizzaPhoneSessionBean extends BasePizzaDatabaseBean implements Phon
                }
 
                // Now find it
-               Query query = this.getEntityManager().createNamedQuery("SearchFaxNumberId", FaxNumber.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchFaxNumberId", FaxNumber.class); //NOI18N
 
                // Set parameter
                query.setParameter("faxNumberId", faxNumberId); //NOI18N
 
                // Init instance
-               DialableFaxNumber faxNumber = null;
+               final DialableFaxNumber faxNumber;
 
                // Try to get a result
                try {
@@ -141,7 +141,7 @@ public class PizzaPhoneSessionBean extends BasePizzaDatabaseBean implements Phon
                }
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findFaxNumberById: cellphone={1} - EXIT!", this.getClass().getSimpleName(), faxNumber)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findFaxNumberById: mobile={1} - EXIT!", this.getClass().getSimpleName(), faxNumber)); //NOI18N
 
                // Return found instance
                return faxNumber;
@@ -162,13 +162,13 @@ public class PizzaPhoneSessionBean extends BasePizzaDatabaseBean implements Phon
                }
 
                // Now find it
-               Query query = this.getEntityManager().createNamedQuery("SearchLandLineNumberId", LandLineNumber.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchLandLineNumberId", LandLineNumber.class); //NOI18N
 
                // Set parameter
                query.setParameter("landLineNumberId", landLineNumberId); //NOI18N
 
                // Init instance
-               DialableLandLineNumber landLineNumber = null;
+               final DialableLandLineNumber landLineNumber;
 
                // Try to get a result
                try {
@@ -180,7 +180,7 @@ public class PizzaPhoneSessionBean extends BasePizzaDatabaseBean implements Phon
                }
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findLandLineNumberById: cellphone={1} - EXIT!", this.getClass().getSimpleName(), landLineNumber)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findLandLineNumberById: mobile={1} - EXIT!", this.getClass().getSimpleName(), landLineNumber)); //NOI18N
 
                // Return found instance
                return landLineNumber;
@@ -201,28 +201,28 @@ public class PizzaPhoneSessionBean extends BasePizzaDatabaseBean implements Phon
                }
 
                // Now find it
-               Query query = this.getEntityManager().createNamedQuery("SearchMobileNumberId", MobileNumber.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchMobileNumberId", MobileNumber.class); //NOI18N
 
                // Set parameter
                query.setParameter("mobileNumberId", mobileNumberId); //NOI18N
 
                // Init instance
-               DialableMobileNumber cellphone = null;
+               final DialableMobileNumber mobile;
 
                // Try to get a result
                try {
                        // Get a single result
-                       cellphone = (DialableMobileNumber) query.getSingleResult();
+                       mobile = (DialableMobileNumber) query.getSingleResult();
                } catch (NoResultException ex) {
                        // The entry was not found, so throw it again
                        throw new PhoneEntityNotFoundException(mobileNumberId, ex);
                }
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findMobileNumberById: cellphone={1} - EXIT!", this.getClass().getSimpleName(), cellphone)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findMobileNumberById: mobile={1} - EXIT!", this.getClass().getSimpleName(), mobile)); //NOI18N
 
                // Return found instance
-               return cellphone;
+               return mobile;
        }
 
 }
index 315f68396f94efaa3b70fbc20b2827b6e0f087a6..af908863f9726e4ccb73ea68b252d3f360c4aa66 100644 (file)
@@ -140,13 +140,13 @@ public class PizzaAdminUserSessionBean extends BasePizzaDatabaseBean implements
                }
 
                // Get a managed instance
-               User updatedUser = this.getManagedUser(user);
+               final User managedUser = this.getManagedUser(user);
 
                // Should be found!
-               assert (updatedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
+               assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
 
                // Delete it
-               this.getEntityManager().remove(updatedUser);
+               this.getEntityManager().remove(managedUser);
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.deleteUser: EXIT!", this.getClass().getSimpleName())); //NOI18N
@@ -182,13 +182,10 @@ public class PizzaAdminUserSessionBean extends BasePizzaDatabaseBean implements
                }
 
                // Try to find the contact
-               Contact managedContact = this.getEntityManager().find(user.getUserContact().getClass(), user.getUserContact().getContactId());
-
-               // Should be found!
-               assert (managedContact instanceof Contact) : MessageFormat.format("Contact with id {0} not found, but should be.", user.getUserContact().getContactId()); //NOI18N
+               final Contact foundContact = this.getEntityManager().find(user.getUserContact().getClass(), user.getUserContact().getContactId());
 
                // Set detached object in rexcruiter instance
-               user.setUserContact(managedContact);
+               user.setUserContact(foundContact);
 
                // Set timestamp
                user.setUserCreated(new GregorianCalendar());
@@ -259,7 +256,7 @@ public class PizzaAdminUserSessionBean extends BasePizzaDatabaseBean implements
                user.setUserLastLockedReason(userLockReason);
 
                // Update user
-               User updatedUser = this.userBean.updateUserData(user);
+               final User updatedUser = this.userBean.updateUserData(user);
 
                // @TODO Create user lock history entry
                // Send out email
@@ -318,7 +315,7 @@ public class PizzaAdminUserSessionBean extends BasePizzaDatabaseBean implements
                user.setUserAccountStatus(UserAccountStatus.CONFIRMED);
 
                // Update user
-               User updatedUser = this.userBean.updateUserData(user);
+               final User updatedUser = this.userBean.updateUserData(user);
 
                // @TODO Create user lock history entry
                // Send out email
index 5d196106ac87e292a3942f5900e2ef26d75f6f09..567710b807be0162db1f3c7479c6a926dc0563bc 100644 (file)
@@ -78,7 +78,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMemberPublicVisibleUsers: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get named query
-               Query query = this.getEntityManager().createNamedQuery("AllMemberPublicUsers", LoginUser.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllMemberPublicUsers", LoginUser.class); //NOI18N
 
                // Set parameters
                query.setParameter("status", UserAccountStatus.CONFIRMED); //NOI18N
@@ -86,7 +86,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                query.setParameter("public", ProfileMode.PUBLIC); //NOI18N
 
                // Get result
-               List<User> users = query.getResultList();
+               final List<User> users = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMemberPublicVisibleUsers: users.size()={1} - EXIT!", this.getClass().getSimpleName(), users.size())); //NOI18N
@@ -102,14 +102,14 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allPublicUsers: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get named query
-               Query query = this.getEntityManager().createNamedQuery("AllPublicUsers", LoginUser.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllPublicUsers", LoginUser.class); //NOI18N
 
                // Set parameters
                query.setParameter("status", UserAccountStatus.CONFIRMED); //NOI18N
                query.setParameter("mode", ProfileMode.PUBLIC); //NOI18N
 
                // Get result
-               List<User> users = query.getResultList();
+               final List<User> users = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allPublicUsers: users.size()={1} - EXIT!", this.getClass().getSimpleName(), users.size())); //NOI18N
@@ -118,6 +118,25 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                return users;
        }
 
+       @Override
+       @SuppressWarnings ("unchecked")
+       public List<String> allUserNames () {
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getUserNameList: CALLED!", this.getClass().getSimpleName())); //NOI18N
+
+               // Get query
+               final Query query = this.getEntityManager().createNamedQuery("AllUserNames", String.class); //NOI18N
+
+               // Get result list
+               final List<String> userNameList = query.getResultList();
+
+               // Trace message
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getUserNameList: userNameList.size()={1} - EXIT!", this.getClass().getSimpleName(), userNameList.size())); //NOI18N
+
+               // Return it
+               return userNameList;
+       }
+
        @Override
        @SuppressWarnings ("unchecked")
        public List<User> allUsers () {
@@ -125,10 +144,10 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allUsers: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get named query
-               Query query = this.getEntityManager().createNamedQuery("AllUsers", LoginUser.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllUsers", LoginUser.class); //NOI18N
 
                // Get result
-               List<User> users = query.getResultList();
+               final List<User> users = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allUsers: users.size()={1} - EXIT!", this.getClass().getSimpleName(), users.size())); //NOI18N
@@ -170,7 +189,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Update user account
-               User managedUser = this.updateUserData(user);
+               final User managedUser = this.updateUserData(user);
 
                // Update user status and remove confirmation key
                managedUser.setUserAccountStatus(UserAccountStatus.CONFIRMED);
@@ -188,7 +207,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
        }
 
        @Override
-       public User fillUserData (final User user) {
+       public User fillUserData (final User user) throws UserNotFoundException {
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.fillUserData: user={1} - CALLED!", this.getClass().getSimpleName(), user)); //NOI18N
 
@@ -196,16 +215,25 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                if (null == user) {
                        // Abort here
                        throw new NullPointerException("user is null"); //NOI18N
+               } else if (user.getUserName() == null) {
+                       // Throw NPE
+                       throw new NullPointerException("user.userName is null");
+               } else if (user.getUserName().isEmpty()) {
+                       // Throw IAE
+                       throw new IllegalArgumentException("user.userName is empty");
+               } else if (!this.ifUserExists(user)) {
+                       // User does not exist
+                       throw new UserNotFoundException(user);
                }
 
                // Try to locate it
-               Query query = this.getEntityManager().createNamedQuery("SearchUserByName", LoginUser.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchUserByName", LoginUser.class); //NOI18N
 
                // Set parameter
                query.setParameter("userName", user.getUserName()); //NOI18N
 
                // Initialize variable
-               User foundUser = null;
+               final User foundUser;
 
                // Try it
                try {
@@ -214,6 +242,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                } catch (final NoResultException ex) {
                        // Log it
                        this.getLoggerBeanLocal().logException(ex);
+                       return null;
                }
 
                // Trace message
@@ -241,13 +270,13 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Create query instance
-               Query query = this.getEntityManager().createNamedQuery("SearchUserById", LoginUser.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchUserById", LoginUser.class); //NOI18N
 
                // Set user id
                query.setParameter("id", userId); //NOI18N
 
                // Fetch the result, it should be there by now
-               User user = (User) query.getSingleResult();
+               final User user = (User) query.getSingleResult();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findUserById: user={1} - EXIT!", this.getClass().getSimpleName(), user)); //NOI18N
@@ -262,7 +291,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.generateRandomUserName - CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get full list
-               List<String> userList = this.getUserNameList();
+               final List<String> userList = this.allUserNames();
 
                // Init variable
                String userName = null;
@@ -287,10 +316,10 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getEmailAddressList: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get query
-               Query query = this.getEntityManager().createNamedQuery("AllEmailAddresses", String.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllEmailAddresses", String.class); //NOI18N
 
                // Get result list
-               List<String> emailAddressList = query.getResultList();
+               final List<String> emailAddressList = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getEmailAddressList: emailAddressList.size()={1} - EXIT!", this.getClass().getSimpleName(), emailAddressList.size())); //NOI18N
@@ -299,25 +328,6 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                return emailAddressList;
        }
 
-       @Override
-       @SuppressWarnings ("unchecked")
-       public List<String> getUserNameList () {
-               // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getUserNameList: CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-               // Get query
-               Query query = this.getEntityManager().createNamedQuery("AllUserNames", String.class); //NOI18N
-
-               // Get result list
-               List<String> userNameList = query.getResultList();
-
-               // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getUserNameList: userNameList.size()={1} - EXIT!", this.getClass().getSimpleName(), userNameList.size())); //NOI18N
-
-               // Return it
-               return userNameList;
-       }
-
        @Override
        public boolean ifUserExists (final User user) {
                // Trace message
@@ -336,14 +346,15 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Generate query
-               Query query = this.getEntityManager().createNamedQuery("SearchUserById", LoginUser.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchUserById", LoginUser.class); //NOI18N
 
                // Set parameter
                query.setParameter("id", user.getUserId()); //NOI18N
 
                // Try this
                try {
-                       User dummy = (User) query.getSingleResult();
+                       // Try to get single result
+                       final User dummy = (User) query.getSingleResult();
 
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("ifUserExists: dummy.userId={0} found.", dummy.getUserId())); //NOI18N
@@ -383,14 +394,15 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Generate query
-               Query query = this.getEntityManager().createNamedQuery("SearchUserById", LoginUser.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchUserById", LoginUser.class); //NOI18N
 
                // Set parameter
                query.setParameter("id", userId); //NOI18N
 
                // Try this
                try {
-                       User dummy = (User) query.getSingleResult();
+                       // Try to get single result
+                       final User dummy = (User) query.getSingleResult();
 
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.ifUserIdExists: dummy.userId={1} found.", this.getClass().getSimpleName(), dummy.getUserId())); //NOI18N
@@ -430,14 +442,15 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Generate query
-               Query query = this.getEntityManager().createNamedQuery("SearchUserByName", LoginUser.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchUserByName", LoginUser.class); //NOI18N
 
                // Set parameter
                query.setParameter("userName", userName); //NOI18N
 
                // Try this
                try {
-                       User dummy = (User) query.getSingleResult();
+                       // Try to get single result
+                       final User dummy = (User) query.getSingleResult();
 
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.ifUserNameExists: dummy.userId={1} found.", this.getClass().getSimpleName(), dummy.getUserId())); //NOI18N
@@ -468,14 +481,15 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Generate query
-               Query query = this.getEntityManager().createNamedQuery("SearchUserByEmailAddress", LoginUser.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchUserByEmailAddress", LoginUser.class); //NOI18N
 
                // Set parameter
                query.setParameter("emailAddress", user.getUserContact().getContactEmailAddress()); //NOI18N
 
                // Search for it
                try {
-                       User dummy = (User) query.getSingleResult();
+                       // Try to get single result
+                       final User dummy = (User) query.getSingleResult();
 
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.isEmailAddressRegistered: dummy.userId={1} found.", this.getClass().getSimpleName(), dummy.getUserId())); //NOI18N
@@ -512,14 +526,15 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Generate query
-               Query query = this.getEntityManager().createNamedQuery("SearchUserByName", LoginUser.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchUserByName", LoginUser.class); //NOI18N
 
                // Set parameter
                query.setParameter("userName", user.getUserName()); //NOI18N
 
                // Try this
                try {
-                       User dummy = (User) query.getSingleResult();
+                       // Try to get single result
+                       final User dummy = (User) query.getSingleResult();
 
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.isUserNameRegistered: dummy.userId={1} found.", this.getClass().getSimpleName(), dummy.getUserId())); //NOI18N
@@ -568,22 +583,28 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Find the instance
-               User updatedUser = this.getEntityManager().find(user.getClass(), user.getUserId());
+               final User foundUser = this.getEntityManager().find(user.getClass(), user.getUserId());
+
+               // Should be found!
+               assert (foundUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
+
+               // Merge user
+               final User managedUser = this.getEntityManager().merge(foundUser);
 
                // Should be found!
-               assert (updatedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
+               assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not merged, but should be.", managedUser.getUserId()); //NOI18N
 
                // Copy all data
-               UserUtils.copyAll(user, updatedUser);
+               UserUtils.copyAll(user, managedUser);
 
                // Set as updated
-               updatedUser.setUserUpdated(new GregorianCalendar());
+               managedUser.setUserUpdated(new GregorianCalendar());
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateUserData: updatedUser={1} - EXIT!", this.getClass().getSimpleName(), updatedUser)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateUserData: managedUser={1} - EXIT!", this.getClass().getSimpleName(), managedUser)); //NOI18N
 
                // Return updated instance
-               return updatedUser;
+               return managedUser;
        }
 
        @Override
@@ -634,7 +655,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Call other method
-               User managedUser = this.updateUserData(user);
+               final User managedUser = this.updateUserData(user);
 
                // Update user account
                managedUser.setUserUpdated(new GregorianCalendar());
@@ -646,7 +667,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                entry.setUserPasswordHistoryCreated(new GregorianCalendar());
 
                // Merge user to make sure it is not re-persisted
-               User mergedUser = this.getEntityManager().merge(managedUser);
+               final User mergedUser = this.getEntityManager().merge(managedUser);
                entry.setUserPasswordHistoryUser(mergedUser);
 
                // Persist it
@@ -689,7 +710,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Find the instance
-               User managedUser = this.getEntityManager().find(user.getClass(), user.getUserId());
+               final User managedUser = this.getEntityManager().find(user.getClass(), user.getUserId());
 
                // Should be found!
                assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
@@ -702,13 +723,16 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                managedUser.getUserContact().setContactUpdated(new GregorianCalendar());
 
                // Get contact from it and find it
-               Contact managedContact = this.getEntityManager().find(user.getUserContact().getClass(), user.getUserContact().getContactId());
+               final Contact foundContact = this.getEntityManager().find(managedUser.getUserContact().getClass(), managedUser.getUserContact().getContactId());
 
                // Should be found
-               assert (managedContact instanceof Contact) : MessageFormat.format("Contact with id {0} not found, but should be.", user.getUserContact().getContactId()); //NOI18N
+               assert (foundContact instanceof Contact) : MessageFormat.format("Contact with id {0} not found, but should be.", user.getUserContact().getContactId()); //NOI18N
 
                // Debug message
-               this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: managedContact.contactId={0}", managedContact.getContactId())); //NOI18N
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: contact.contactId={0}", foundContact.getContactId())); //NOI18N
+
+               // Merge contact instance
+               final Contact managedContact = this.getEntityManager().merge(foundContact);
 
                // Copy all
                ContactUtils.copyAll(user.getUserContact(), managedContact);
@@ -720,7 +744,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                assert (managedContact instanceof Contact) : MessageFormat.format("Contact with id {0} not merged, but should be.", user.getUserContact().getContactId()); //NOI18N
 
                // Get mobile instance
-               DialableMobileNumber mobileNumber = managedContact.getContactMobileNumber();
+               final DialableMobileNumber mobileNumber = managedContact.getContactMobileNumber();
 
                // Is there a  mobile instance set?
                if (mobileNumber instanceof DialableMobileNumber) {
@@ -728,13 +752,13 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: mobile.phoneId={0} is being updated ...", mobileNumber.getPhoneId())); //NOI18N
 
                        // Then find it, too
-                       DialableMobileNumber foundMobile = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId());
+                       final DialableMobileNumber foundMobile = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId());
 
                        // Should be there
                        assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getPhoneId()); //NOI18N
 
                        // Then merge it, too
-                       DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
+                       final DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
 
                        // Should be there
                        assert (managedMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", managedMobile.getPhoneId()); //NOI18N
@@ -747,7 +771,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Get mobile instance
-               DialableFaxNumber faxNumber = managedContact.getContactFaxNumber();
+               final DialableFaxNumber faxNumber = managedContact.getContactFaxNumber();
 
                // Is there a  fax instance set?
                if (faxNumber instanceof DialableFaxNumber) {
@@ -755,13 +779,13 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: faxNumber.phoneId={0} is being updated ...", faxNumber.getPhoneId())); //NOI18N
 
                        // Then find it, too
-                       DialableFaxNumber foundFax = this.getEntityManager().find(faxNumber.getClass(), faxNumber.getPhoneId());
+                       final DialableFaxNumber foundFax = this.getEntityManager().find(faxNumber.getClass(), faxNumber.getPhoneId());
 
                        // Should be there
                        assert (foundFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", foundFax.getPhoneId()); //NOI18N
 
                        // Then merge it, too
-                       DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
+                       final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
 
                        // Should be there
                        assert (managedFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", managedFax.getPhoneId()); //NOI18N
@@ -774,7 +798,7 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                }
 
                // Get mobile instance
-               DialableLandLineNumber landLineNumber = managedContact.getContactLandLineNumber();
+               final DialableLandLineNumber landLineNumber = managedContact.getContactLandLineNumber();
 
                // Is there a  fax instance set?
                if (landLineNumber instanceof DialableLandLineNumber) {
@@ -782,13 +806,13 @@ public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserS
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: landLineNumber.phoneId={0} is being updated ...", landLineNumber.getPhoneId())); //NOI18N
 
                        // Then find it, too
-                       DialableLandLineNumber foundLandLine = this.getEntityManager().find(landLineNumber.getClass(), landLineNumber.getPhoneId());
+                       final DialableLandLineNumber foundLandLine = this.getEntityManager().find(landLineNumber.getClass(), landLineNumber.getPhoneId());
 
                        // Should be there
                        assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N
 
                        // Then merge it, too
-                       DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);
+                       final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);
 
                        // Should be there
                        assert (managedLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", managedLandLine.getPhoneId()); //NOI18N
index e86b944dd506a44577a5ad83e4c86c338d8cac23..75f991cacfbafd1a43dccc981b0c1f1eef94724f 100644 (file)
@@ -76,10 +76,10 @@ public class PizzaUserActivityLogMessageBean extends BasePizzaDatabaseBean imple
                }
 
                // Securely cast it
-               ObjectMessage objectMessage = (ObjectMessage) message;
+               final ObjectMessage objectMessage = (ObjectMessage) message;
 
                // Init variable
-               Serializable serializable;
+               final Serializable serializable;
 
                try {
                        // Get object from message
@@ -103,7 +103,7 @@ public class PizzaUserActivityLogMessageBean extends BasePizzaDatabaseBean imple
                }
 
                // Securely cast it
-               LogableUserActivity userActivity = (LogableUserActivity) serializable;
+               final LogableUserActivity userActivity = (LogableUserActivity) serializable;
 
                // Should be valid
                if (null == userActivity) {
@@ -136,7 +136,7 @@ public class PizzaUserActivityLogMessageBean extends BasePizzaDatabaseBean imple
                }
 
                // Make user instance managed
-               User managedUser = this.getManagedUser(userActivity.getActivityUser());
+               final User managedUser = this.getManagedUser(userActivity.getActivityUser());
 
                // Set it back
                userActivity.setActivityUser(managedUser);
index 075f8451312753de0169ab9e11e9a08744d0964b..488224e7705a99753c18d9a958907fd8858f5c07 100644 (file)
@@ -64,10 +64,10 @@ public class PizzaUserEmailChangeSessionBean extends BasePizzaDatabaseBean imple
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allQueuedAddresses: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get named query
-               Query query = this.getEntityManager().createNamedQuery("AllEmailAddressChanges", String.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllEmailAddressChanges", String.class); //NOI18N
 
                // Get all entries
-               List<String> emailAddresses = query.getResultList();
+               final List<String> emailAddresses = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allQueuedAddresses: emailAddresses.size()={1} - EXIT!", this.getClass().getSimpleName(), emailAddresses.size())); //NOI18N
@@ -128,7 +128,7 @@ public class PizzaUserEmailChangeSessionBean extends BasePizzaDatabaseBean imple
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.isEmailAddressEnqueued: emailAddress={1} - CALLED!", this.getClass().getSimpleName(), emailAddress)); //NOI18N
 
                // Create query instance
-               Query query = this.getEntityManager().createNamedQuery("SearchEmailChangeByEmail"); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchEmailChangeByEmail"); //NOI18N
 
                // Add email address as parameter
                query.setParameter("email", emailAddress); //NOI18N
@@ -139,7 +139,7 @@ public class PizzaUserEmailChangeSessionBean extends BasePizzaDatabaseBean imple
                // Try it
                try {
                        // Try to get single result
-                       ChangeableEmailAddress dummy = (ChangeableEmailAddress) query.getSingleResult();
+                       final ChangeableEmailAddress dummy = (ChangeableEmailAddress) query.getSingleResult();
 
                        // Found it
                        isFound = true;
@@ -212,7 +212,7 @@ public class PizzaUserEmailChangeSessionBean extends BasePizzaDatabaseBean imple
                        hash = UserLoginUtils.encryptPassword(String.format("%s:%s", emailAddressChange.getEmailAddress(), emailAddressChange.toString())); //NOI18N
 
                        // The hash *may* be unique, better test it
-                       Query query = this.getEntityManager().createNamedQuery("SearchEmailChangeByHash", EmailAddressChange.class); //NOI18N
+                       final Query query = this.getEntityManager().createNamedQuery("SearchEmailChangeByHash", EmailAddressChange.class); //NOI18N
 
                        // Set hash as parameter
                        query.setParameter("hash", hash); //NOI18N
@@ -220,7 +220,7 @@ public class PizzaUserEmailChangeSessionBean extends BasePizzaDatabaseBean imple
                        // Try to get single result
                        try {
                                // Get single result
-                               ChangeableEmailAddress dummy = (ChangeableEmailAddress) query.getSingleResult();
+                               final ChangeableEmailAddress dummy = (ChangeableEmailAddress) query.getSingleResult();
                        } catch (final NoResultException ex) {
                                // Not found
                                isUsed = false;
index 1a71faf18097a910073bbc3fe2fa5aed63929287..c46bef65b6a348ccf8818d705e7ab7f3140a3650 100644 (file)
@@ -63,13 +63,13 @@ public class PizzaUserPasswordHistorySessionBean extends BasePizzaDatabaseBean i
                }
 
                // Get named query
-               Query query = this.getEntityManager().createNamedQuery("AllUsersHistoryEntries", UserPasswordHistory.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("AllUsersHistoryEntries", UserPasswordHistory.class); //NOI18N
 
                // Set parameter
                query.setParameter("user", user); //NOI18N
 
                // Get full history
-               List<PasswordHistory> history = query.getResultList();
+               final List<PasswordHistory> history = query.getResultList();
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getUserPasswordHistory(): history.size()={1} - EXIT !", this.getClass().getSimpleName(), history.size())); //NOI18N
index 115bdcb93e7271a081f45a3f1b83d04d6f52d46b..0bb604c10a09b149578954eaf6a11302d569a314 100644 (file)
@@ -95,7 +95,7 @@ public class PizzaUserLoginSessionBean extends BasePizzaDatabaseBean implements
                }
 
                // Get user instance from persistance
-               User updatedUser = this.userBean.fillUserData(container.getUser());
+               final User updatedUser = this.userBean.fillUserData(container.getUser());
 
                // Debug message
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("loginUser: updatedUser={0}", updatedUser)); //NOI18N
index 3db1949d57f9320e6433616cd18f4f31e3b93c66..1d7d30a23ca4f968def3ce7f0e8256af17616a2c 100644 (file)
@@ -77,7 +77,7 @@ public class PizzaUserRegistrationSessionBean extends BasePizzaDatabaseBean impl
                }
 
                // Create named instance
-               Query query = this.getEntityManager().createNamedQuery("SearchUserByConfirmKey", LoginUser.class); //NOI18N
+               final Query query = this.getEntityManager().createNamedQuery("SearchUserByConfirmKey", LoginUser.class); //NOI18N
 
                // Init confirmation key
                String confirmationKey = null;
@@ -85,7 +85,7 @@ public class PizzaUserRegistrationSessionBean extends BasePizzaDatabaseBean impl
                // Find a free one
                while (confirmationKey == null) {
                        // Create new one
-                       String key = UserLoginUtils.generatedConfirmationKey(user);
+                       final String key = UserLoginUtils.generatedConfirmationKey(user);
 
                        // Set key as parameter
                        query.setParameter("confirmKey", key); //NOI18N
@@ -93,7 +93,7 @@ public class PizzaUserRegistrationSessionBean extends BasePizzaDatabaseBean impl
                        // Try it
                        try {
                                // Get contact instance
-                               Contact contact = (Contact) query.getSingleResult();
+                               final Contact contact = (Contact) query.getSingleResult();
 
                                // Warning message
                                this.getLoggerBeanLocal().logWarning(MessageFormat.format("{0}.generateConfirmationKey: key {1} already found: contact.contactId={2}", this.getClass().getSimpleName(), key, contact.getContactId())); //NOI18N
@@ -177,7 +177,7 @@ public class PizzaUserRegistrationSessionBean extends BasePizzaDatabaseBean impl
                }
 
                // Call other EJB
-               User addedUser = this.adminUserBean.addUser(user);
+               final User addedUser = this.adminUserBean.addUser(user);
 
                // Default template is with no random password
                String templateName = "user_registration"; //NOI18N
index b30336ea198c063d06bc455711ed2a572f481872..12b4265154e844e6d82bd7499a4ef4a7e80573b7 100644 (file)
@@ -96,13 +96,13 @@ public class PizzaResendLinkSessionBean extends BasePizzaDatabaseBean implements
                }
 
                // Get new registration key
-               String confirmationKey = this.registerBean.generateConfirmationKey(user);
+               final String confirmationKey = this.registerBean.generateConfirmationKey(user);
 
                // Debug message
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.resendConfirmationLink: confirmationKey={1}", this.getClass().getSimpleName(), confirmationKey)); //NOI18N
 
                // Get managed instance
-               User managedUser = this.getEntityManager().find(LoginUser.class, user.getUserId());
+               final User managedUser = this.getEntityManager().find(LoginUser.class, user.getUserId());
 
                // Set it in user
                managedUser.setUserConfirmKey(confirmationKey);
index 2382192c2c65ccd5d8abd4559535ea0f0a162846..724108378f1c2a6a7500b23c2e60fc716a9014db 100644 (file)
@@ -89,9 +89,9 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                }
 
                // Get all phone instances
-               DialableLandLineNumber landLineNumber = contact.getContactLandLineNumber();
-               DialableFaxNumber faxNumber = contact.getContactFaxNumber();
-               DialableMobileNumber mobileNumber = contact.getContactMobileNumber();
+               final DialableLandLineNumber landLineNumber = contact.getContactLandLineNumber();
+               final DialableFaxNumber faxNumber = contact.getContactFaxNumber();
+               final DialableMobileNumber mobileNumber = contact.getContactMobileNumber();
 
                // Debug message
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntriesCreated: landLineNumber={1},faxNumber={2},mobileNumber={3}", this.getClass().getSimpleName(), landLineNumber, faxNumber, mobileNumber)); //NOI18N
@@ -117,7 +117,7 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                // Is a mobile number instance set?
                if ((mobileNumber instanceof DialableMobileNumber) && (mobileNumber.getPhoneId() == null)) {
                        // Debug message
-                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntriesCreated: Setting created timestamp for cellphone number ...", this.getClass().getSimpleName())); //NOI18N
+                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntriesCreated: Setting created timestamp for mobile number ...", this.getClass().getSimpleName())); //NOI18N
 
                        // Set updated timestamp
                        mobileNumber.setPhoneEntryCreated(new GregorianCalendar());
@@ -152,22 +152,30 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                }
 
                // Debug message
-               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.getDetached: fetchedNumber.phoneId={1}", this.getClass().getSimpleName(), fetchedNumber.getPhoneId())); //NOI18N
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: fetchedNumber.phoneId={0}", fetchedNumber.getPhoneId())); //NOI18N
+
+               // Init query instance
+               final DialableMobileNumber foundNumber = this.getEntityManager().find(fetchedNumber.getClass(), fetchedNumber.getPhoneId());
+
+               // Debug message
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: foundNumber={0}", foundNumber)); //NOI18N
 
                // Default is null
-               DialableMobileNumber managedNumber = null;
+               DialableMobileNumber detachedNumber = null;
 
                // Is there a difference?
                if (!PhoneUtils.isSameMobileNumber(mobileNumber, fetchedNumber)) {
                        // Merge this entry
-                       managedNumber = this.getEntityManager().merge(fetchedNumber);
+                       detachedNumber = this.getEntityManager().merge(foundNumber);
+
+                       // @TODO Copy all
                }
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getDetached: managedNumber={1} - EXIT!", this.getClass().getSimpleName(), managedNumber)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getDetached: detachedNumber={1} - EXIT!", this.getClass().getSimpleName(), detachedNumber)); //NOI18N
 
                // Return it
-               return managedNumber;
+               return detachedNumber;
        }
 
        /**
@@ -195,22 +203,30 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                }
 
                // Debug message
-               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.getDetached: fetchedNumber.phoneId={1}", this.getClass().getSimpleName(), fetchedNumber.getPhoneId())); //NOI18N
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: fetchedNumber.phoneId={0}", fetchedNumber.getPhoneId())); //NOI18N
+
+               // Init query instance
+               final DialableLandLineNumber foundNumber = this.getEntityManager().find(fetchedNumber.getClass(), fetchedNumber.getPhoneId());
+
+               // Debug message
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: foundNumber={0}", foundNumber)); //NOI18N
 
                // Default is null
-               DialableLandLineNumber managedNumber = null;
+               DialableLandLineNumber detachedNumber = null;
 
                // Is there a difference?
                if (!PhoneUtils.isSameLandLineNumber(landLineNumber, fetchedNumber)) {
                        // Merge this entry
-                       managedNumber = this.getEntityManager().merge(fetchedNumber);
+                       detachedNumber = this.getEntityManager().merge(foundNumber);
+
+                       // @TODO Copy all
                }
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getDetached: managedNumber={1} - EXIT!", this.getClass().getSimpleName(), managedNumber)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getDetached: detachedNumber={1} - EXIT!", this.getClass().getSimpleName(), detachedNumber)); //NOI18N
 
                // Return it
-               return managedNumber;
+               return detachedNumber;
        }
 
        /**
@@ -238,22 +254,30 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                }
 
                // Debug message
-               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.getDetached: fetchedNumber.phoneId={1}", this.getClass().getSimpleName(), fetchedNumber.getPhoneId())); //NOI18N
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: fetchedNumber.phoneId={0}", fetchedNumber.getPhoneId())); //NOI18N
+
+               // Init query instance
+               final DialableFaxNumber foundNumber = this.getEntityManager().find(fetchedNumber.getClass(), fetchedNumber.getPhoneId());
+
+               // Debug message
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: foundNumber={0}", foundNumber)); //NOI18N
 
                // Default is null
-               DialableFaxNumber managedNumber = null;
+               DialableFaxNumber detachedNumber = null;
 
                // Is there a difference?
                if (!PhoneUtils.isSameFaxNumber(faxNumber, fetchedNumber)) {
                        // Merge this entry
-                       managedNumber = this.getEntityManager().merge(fetchedNumber);
+                       detachedNumber = this.getEntityManager().merge(foundNumber);
+
+                       // @TODO Copy all
                }
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getDetached: managedNumber={1} - EXIT!", this.getClass().getSimpleName(), managedNumber)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.getDetached: detachedNumber={1} - EXIT!", this.getClass().getSimpleName(), detachedNumber)); //NOI18N
 
                // Return it
-               return managedNumber;
+               return detachedNumber;
        }
 
        /**
@@ -289,7 +313,7 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                }
 
                // Try to find it (should be there)
-               User managedUser = this.getEntityManager().find(LoginUser.class, user.getUserId());
+               final User managedUser = this.getEntityManager().find(LoginUser.class, user.getUserId());
 
                // Should be there
                assert (managedUser instanceof User) : "managedUser is null"; //NOI18N
@@ -325,34 +349,34 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                }
 
                // Get contact from it and find it
-               Contact managedContact = this.getEntityManager().find(detachedContact.getClass(), detachedContact.getContactId());
+               final Contact foundContact = this.getEntityManager().find(detachedContact.getClass(), detachedContact.getContactId());
 
                // Should be found
-               assert (managedContact instanceof Contact) : MessageFormat.format("Contact with id {0} not found, but should be.", detachedContact.getContactId()); //NOI18N
+               assert (foundContact instanceof Contact) : MessageFormat.format("Contact with id {0} not found, but should be.", detachedContact.getContactId()); //NOI18N
 
                // Debug message
-               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateUserPersonalData: managedContact.contactId={1}", this.getClass().getSimpleName(), managedContact.getContactId())); //NOI18N
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateUserPersonalData: foundContact.contactId={1}", this.getClass().getSimpleName(), foundContact.getContactId())); //NOI18N
 
                // Is a fax number set?
                if (detachedContact.getContactFaxNumber() instanceof DialableFaxNumber) {
                        // Make fax numbers managed
-                       managedContact.setContactFaxNumber(this.getManaged(detachedContact.getContactFaxNumber(), detachedContact.getContactFaxNumber()));
+                       foundContact.setContactFaxNumber(this.getManaged(detachedContact.getContactFaxNumber(), detachedContact.getContactFaxNumber()));
                }
 
                // Is a land-line number set?
                if (detachedContact.getContactLandLineNumber() instanceof DialableLandLineNumber) {
                        // Make land-line numbers managed
-                       managedContact.setContactLandLineNumber(this.getManaged(detachedContact.getContactLandLineNumber(), detachedContact.getContactLandLineNumber()));
+                       foundContact.setContactLandLineNumber(this.getManaged(detachedContact.getContactLandLineNumber(), detachedContact.getContactLandLineNumber()));
                }
 
                // Is a mobile number set?
                if (detachedContact.getContactMobileNumber() instanceof DialableMobileNumber) {
                        // Make mobile numbers managed
-                       managedContact.setContactMobileNumber(this.getManaged(detachedContact.getContactMobileNumber(), detachedContact.getContactMobileNumber()));
+                       foundContact.setContactMobileNumber(this.getManaged(detachedContact.getContactMobileNumber(), detachedContact.getContactMobileNumber()));
                }
 
-               // Set updated timestamp
-               managedContact.setContactUpdated(new GregorianCalendar());
+               // Merge contact instance
+               final Contact managedContact = this.getEntityManager().merge(foundContact);
 
                // Copy all
                ContactUtils.copyAll(detachedContact, managedContact);
@@ -365,7 +389,7 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
        }
 
        /**
-        * Merges given (detached) contact's cellphone, land-line and fax numbers
+        * Merges given (detached) contact's mobile, land-line and fax numbers
         * <p>
         * @param detachedContact Detached contact instance
         */
@@ -386,23 +410,23 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                }
 
                // Get all instances
-               DialableMobileNumber cellphone = detachedContact.getContactMobileNumber();
-               DialableLandLineNumber landLine = detachedContact.getContactLandLineNumber();
-               DialableFaxNumber fax = detachedContact.getContactFaxNumber();
+               final DialableMobileNumber mobile = detachedContact.getContactMobileNumber();
+               final DialableLandLineNumber landLine = detachedContact.getContactLandLineNumber();
+               final DialableFaxNumber fax = detachedContact.getContactFaxNumber();
 
-               // Is there a  cellphone instance set?
-               if (cellphone instanceof DialableMobileNumber) {
+               // Is there a  mobile instance set?
+               if (mobile instanceof DialableMobileNumber) {
                        // Debug message
-                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: cellphone.phoneId={0} is being updated ...", cellphone.getPhoneId())); //NOI18N
+                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: mobile.phoneId={0} is being updated ...", mobile.getPhoneId())); //NOI18N
 
                        // Then find it, too
-                       DialableMobileNumber foundMobile = this.getEntityManager().find(cellphone.getClass(), cellphone.getPhoneId());
+                       final DialableMobileNumber foundMobile = this.getEntityManager().find(mobile.getClass(), mobile.getPhoneId());
 
                        // Should be there
                        assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getPhoneId()); //NOI18N
 
                        // Then merge it, too
-                       DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
+                       final DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
 
                        // Should be there
                        assert (managedMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", managedMobile.getPhoneId()); //NOI18N
@@ -420,13 +444,13 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: fax.phoneId={0} is being updated ...", fax.getPhoneId())); //NOI18N
 
                        // Then find it, too
-                       DialableFaxNumber foundFax = this.getEntityManager().find(fax.getClass(), fax.getPhoneId());
+                       final DialableFaxNumber foundFax = this.getEntityManager().find(fax.getClass(), fax.getPhoneId());
 
                        // Should be there
                        assert (foundFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", foundFax.getPhoneId()); //NOI18N
 
                        // Then merge it, too
-                       DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
+                       final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
 
                        // Should be there
                        assert (managedFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", managedFax.getPhoneId()); //NOI18N
@@ -444,13 +468,13 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: landLine.phoneId={0} is being updated ...", landLine.getPhoneId())); //NOI18N
 
                        // Then find it, too
-                       DialableLandLineNumber foundLandLine = this.getEntityManager().find(landLine.getClass(), landLine.getPhoneId());
+                       final DialableLandLineNumber foundLandLine = this.getEntityManager().find(landLine.getClass(), landLine.getPhoneId());
 
                        // Should be there
                        assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N
 
                        // Then merge it, too
-                       DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);
+                       final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);
 
                        // Should be there
                        assert (managedLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", managedLandLine.getPhoneId()); //NOI18N
@@ -533,7 +557,7 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                }
 
                // Set all values
-               Properties variables = UserUtils.getAllUserFields(user);
+               final Properties variables = UserUtils.getAllUserFields(user);
 
                // Set base URL and random password
                variables.put("baseUrl", baseUrl); //NOI18N
@@ -545,7 +569,7 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                }
 
                // Init addresss
-               Address recipientAddress;
+               final Address recipientAddress;
 
                try {
                        // Create email address and set
@@ -557,7 +581,7 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
 
                // Prepare mail wrapper
                // @TODO Language from message bundle
-               WrapableEmailDelivery emailWrapper = new EmailDeliveryWrapper(recipientAddress, subjectLine, templateName, variables, user.getUserLocale());
+               final WrapableEmailDelivery emailWrapper = new EmailDeliveryWrapper(recipientAddress, subjectLine, templateName, variables, user.getUserLocale());
 
                try {
                        // Send out email change
@@ -601,14 +625,14 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                // Debug message
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: other.contactMobileNumber={0}", other.getContactMobileNumber())); //NOI18N
 
-               // Is other cellphone not set?
+               // Is other mobile not set?
                if ((other.getContactMobileNumber() == null) || (PhoneUtils.isSameMobileNumber(contact.getContactMobileNumber(), other.getContactMobileNumber()))) {
                        // Debug message
-                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: Copying cellphone entry ...", this.getClass().getSimpleName())); //NOI18N
+                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: Copying mobile entry ...", this.getClass().getSimpleName())); //NOI18N
 
                        // Is the fax number set?
                        if (other.getContactMobileNumber() instanceof DialableMobileNumber) {
-                               // Copy cellphone number
+                               // Copy mobile number
                                contact.setContactMobileNumber(this.getManaged(other.getContactMobileNumber(), contact.getContactMobileNumber()));
                        } else {
                                // Null it
@@ -619,7 +643,7 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                // Debug message
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: other.contactLandLineNumber={0}", other.getContactLandLineNumber())); //NOI18N
 
-               // Is other cellphone not set?
+               // Is other mobile not set?
                if ((other.getContactLandLineNumber() == null) || (PhoneUtils.isSameLandLineNumber(contact.getContactLandLineNumber(), other.getContactLandLineNumber()))) {
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: Copying land-line entry ...", this.getClass().getSimpleName())); //NOI18N
@@ -637,7 +661,7 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                // Debug message
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: other.contactFaxNumber={1}", this.getClass().getSimpleName(), other.getContactFaxNumber())); //NOI18N
 
-               // Is other cellphone not set?
+               // Is other mobile not set?
                if ((other.getContactFaxNumber() == null) || (PhoneUtils.isSameFaxNumber(contact.getContactFaxNumber(), other.getContactFaxNumber()))) {
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: Copying fax entry ...", this.getClass().getSimpleName())); //NOI18N
@@ -684,9 +708,9 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                }
 
                // Get all phone instances
-               DialableLandLineNumber landLineNumber = contact.getContactLandLineNumber();
-               DialableFaxNumber faxNumber = contact.getContactFaxNumber();
-               DialableMobileNumber mobileNumber = contact.getContactMobileNumber();
+               final DialableLandLineNumber landLineNumber = contact.getContactLandLineNumber();
+               final DialableFaxNumber faxNumber = contact.getContactFaxNumber();
+               final DialableMobileNumber mobileNumber = contact.getContactMobileNumber();
 
                // Flags and instances must be constistent
                if (isMobileUnlinked && mobileNumber instanceof DialableMobileNumber) {
@@ -721,7 +745,7 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                // Is a mobile number instance set?
                if ((mobileNumber instanceof DialableMobileNumber) && (mobileNumber.getPhoneId() instanceof Long) && (mobileNumber.getPhoneId() > 0)) {
                        // Debug message
-                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntriesUpdated: Setting updated timestamp for cellphone number ...", this.getClass().getSimpleName())); //NOI18N
+                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntriesUpdated: Setting updated timestamp for mobile number ...", this.getClass().getSimpleName())); //NOI18N
 
                        // Set updated timestamp
                        mobileNumber.setPhoneEntryUpdated(new GregorianCalendar());