@Override
public Contact addContact (final Contact contact) throws ContactAlreadyAddedException {
- // Log trace message
- this.getLoggerBeanLocal().logTrace(MessageFormat.format("addContact: contact={0} - CALLED!", contact)); //NOI18N
+ // Trace message
+ this.getLoggerBeanLocal().logTrace(MessageFormat.format("addContact: contact={0} - CALLED!", contact));
- // The contact instance must be valid
+ // Is the instance set?
if (null == contact) {
- // Throw NPE again
- throw new NullPointerException("contact is null"); //NOI18N
- } else if (contact.getContactId() instanceof Long) {
- // Throw NPE again
- throw new NullPointerException("contact.contactId is not null"); //NOI18N //NOI18N
- } else if (this.lookupContact(contact) instanceof Contact) {
- // Already found
- throw new ContactAlreadyAddedException(contact);
+ // Throw NPE
+ throw new NullPointerException("contact is null");
+ } else if (contact.getContactId() != null) {
+ // Should be null
+ throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} - is not null", contact.getContactId()));
}
// Set created timestamp
contact.setContactCreated(new GregorianCalendar());
- // Set all created timestamps in cellphone, land-line and fax number(s)
+ // Set all created timestamps, if instance is there
this.setAllContactPhoneEntriesCreated(contact);
// Persist it
this.getEntityManager().persist(contact);
- // Flush it
+ // Flush it to get contactId set
this.getEntityManager().flush();
- // Return updated instance
+ // Trace message
+ this.getLoggerBeanLocal().logTrace(MessageFormat.format("addContact: contact.contactId={0} after persisting - EXIT!", contact.getContactId()));
+
+ // Return it
return contact;
}