Please cherry-pick:

[jjobs-ejb.git] / src / java / org / mxchange / jcontacts / phone / JobsAdminContactPhoneSessionBean.java

diff --git a/src/java/org/mxchange/jcontacts/phone/JobsAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/phone/JobsAdminContactPhoneSessionBean.java
index fcd6d024c0a296dd5c089a25bbf4a4a52cb5b27f..1cadb32df02e895acc07d887ec282ca0c0bc6311 100644 (file)
--- a/src/java/org/mxchange/jcontacts/phone/JobsAdminContactPhoneSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/phone/JobsAdminContactPhoneSessionBean.java
@@ -17,9 +17,13 @@
 package org.mxchange.jcontacts.phone;
 
 import java.text.MessageFormat;
-import java.util.GregorianCalendar;
+import java.util.Objects;
+import javax.ejb.EJB;
 import javax.ejb.Stateless;
+import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jcontacts.contact.ContactSessionBeanRemote;
 import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
+import org.mxchange.jphone.exceptions.CellphoneNotLinkedException;
 import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
 
 /**
@@ -27,7 +31,7 @@ import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */
-@Stateless (name = "admincontactphone", description = "An administrative bean handling contact's phone data")
+@Stateless (name = "adminContactPhone", description = "An administrative bean handling contact's phone data")
 public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean implements AdminContactsPhoneSessionBeanRemote {
 
        /**
@@ -35,58 +39,52 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple
         */
        private static final long serialVersionUID = 189_217_561_460_237_108L;
 
+       /**
+        * Contact EJB
+        */
+       @EJB
+       private ContactSessionBeanRemote contactBean;
+
        @Override
-       public DialableCellphoneNumber updateCellphoneData (final DialableCellphoneNumber cellPhoneNumber) {
+       public Contact unlinkCellphoneDataFromContact (final Contact contact, final DialableCellphoneNumber cellphoneNumber) throws CellphoneNotLinkedException {
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateCellphoneData: cellPhoneNumber={1} - CALLED!", this.getClass().getSimpleName(), cellPhoneNumber));
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkCellphoneDataFromContact: contact={1},cellphoneNumber={2} - CALLED!", this.getClass().getSimpleName(), contact, cellphoneNumber)); //NOI18N
 
-               // Is all data set
-               if (null == cellPhoneNumber) {
-                       // Not set, throw NPE
-                       throw new NullPointerException("cellphoneNumber is null"); //NOI18N
-               } else if (cellPhoneNumber.getPhoneId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("cellphoneNumber.phoneId is null"); //NOI18N
-               } else if (cellPhoneNumber.getPhoneId() < 1) {
-                       // Invalid number
-                       throw new IllegalArgumentException(MessageFormat.format("cellphoneNumber.phoneId={0} is not valid", cellPhoneNumber.getPhoneId())); //NOI18N
-               } else if (cellPhoneNumber.getCellphoneProvider() == null) {
+               // Is the contact set?
+               if (null == contact) {
                        // Throw NPE
-                       throw new NullPointerException("cellphoneNumber.cellphoneProvider is null"); //NOI18N
-               } else if (cellPhoneNumber.getCellphoneProvider().getProviderId() == null) {
-                       // ... throw again
-                       throw new NullPointerException("cellphoneNumber.cellphoneProvider.providerId is null"); //NOI18N
-               } else if (cellPhoneNumber.getCellphoneProvider().getProviderId() < 1) {
-                       // Id not valid
-                       throw new IllegalArgumentException(MessageFormat.format("cellphoneNumber.cellphoneProvider.providerId={0} is not valid.", cellPhoneNumber.getCellphoneProvider().getProviderId())); //NOI18N
-               } else if (cellPhoneNumber.getPhoneNumber() == null) {
+                       throw new NullPointerException("contact is null"); //NOI18N
+               } else if (contact.getContactId() == null) {
+                       // ... and throw again
+                       throw new NullPointerException("contact.contactId is null"); //NOI18N
+               } else if (contact.getContactId() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N
+               } else if (contact.getContactCellphoneNumber() == null) {
+                       // Not set cell phone instance
+                       throw new CellphoneNotLinkedException(cellphoneNumber);
+               } else if (contact.getContactCellphoneNumber().getPhoneId() == null) {
                        // Throw NPE again
-                       throw new NullPointerException("cellphoneNumber.phoneNumber is null"); //NOI18N
-               } else if (cellPhoneNumber.getPhoneNumber() < 1) {
-                       // Throw NPE again
-                       throw new NullPointerException(MessageFormat.format("cellphoneNumber.phoneNumber={0} is not valid.", cellPhoneNumber.getPhoneNumber())); //NOI18N
+                       throw new NullPointerException("contact.contactCellphoneNumber.phoneId is null"); //NOI18N
+               } else if (contact.getContactCellphoneNumber().getPhoneId() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactCellphoneNumber.phoneId={0} is invalid.", contact.getContactCellphoneNumber().getPhoneId())); //NOI18N
+               } else if (!Objects.equals(cellphoneNumber.getPhoneId(), contact.getContactCellphoneNumber().getPhoneId())) {
+                       // Not same object
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactCellphoneNumber.phoneId={0} and cellphoneNumber.phoneId={1} are not the same.", contact.getContactCellphoneNumber().getPhoneId(), cellphoneNumber.getPhoneId())); //NOI18N
                }
 
-               // Set updated timestamp
-               cellPhoneNumber.setPhoneEntryUpdated(new GregorianCalendar());
-
-               // Get contact from it and find it
-               DialableCellphoneNumber foundNumber = this.getEntityManager().find(cellPhoneNumber.getClass(), cellPhoneNumber.getPhoneId());
-
-               // Should be found
-               assert (foundNumber instanceof DialableCellphoneNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", cellPhoneNumber.getPhoneId()); //NOI18N
-
-               // Debug message
-               this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateCellphoneData: foundNumber.phoneId={0}", foundNumber.getPhoneId())); //NOI18N
+               // Remove it from contact
+               contact.setContactCellphoneNumber(null);
 
-               // Merge contact instance
-               DialableCellphoneNumber detachedNumber = this.getEntityManager().merge(foundNumber);
+               // Update database
+               Contact updatedContact = this.contactBean.updateContactData(contact);
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateCellphoneData: detachedNumber={1} - EXIT!", this.getClass().getSimpleName(), detachedNumber)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkCellphoneDataFromContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N
 
                // Return it
-               return detachedNumber;
+               return updatedContact;
        }
 
 }