X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Fjphone%2Fmodel%2Fphonenumbers%2Fphone%2FJobsAdminPhoneSessionBean.java;h=4dee83f5b4bad0132138eb3b462097878c68c0f3;hb=b63b197bdeedb919a0041c77c5272b1a6c0dc476;hp=9b387f6715cc2edf7525d8e59a87524ee22b6f4a;hpb=235c4eb1876fc4d231b41166226f3386d9fd246c;p=jjobs-ejb.git diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java index 9b387f6..4dee83f 100644 --- a/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Roland Häder + * Copyright (C) 2016 - 2020 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,10 +17,13 @@ package org.mxchange.jphone.model.phonenumbers.phone; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import javax.ejb.Stateless; -import org.mxchange.jjobs.database.BaseJobsDatabaseBean; -import org.mxchange.jphone.model.phonenumbers.phone.AdminPhoneSessionBeanRemote; +import org.mxchange.jjobs.enterprise.BaseJobsEnterpriseBean; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumbers; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumbers; /** * An EJB for administrative phone purposes @@ -28,7 +31,7 @@ import org.mxchange.jphone.model.phonenumbers.phone.AdminPhoneSessionBeanRemote; * @author Roland Häder */ @Stateless (name = "adminPhone", description = "An administrative bean handling phone data") -public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements AdminPhoneSessionBeanRemote { +public class JobsAdminPhoneSessionBean extends BaseJobsEnterpriseBean implements AdminPhoneSessionBeanRemote { /** * Serial number @@ -44,7 +47,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } @Override - public void deleteFaxData (final org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber faxNumber) { + public void deleteFaxData (final DialableFaxNumber faxNumber) { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.deleteFaxData: faxNumber={1} - CALLED!", this.getClass().getSimpleName(), faxNumber)); @@ -82,7 +85,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } // Get a managed instance - final org.mxchange.jphone.model.phonenumbers.fax.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); @@ -92,7 +95,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } @Override - public void deleteLandLineData (final org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber landLineNumber) { + public void deleteLandLineData (final DialableLandLineNumber landLineNumber) { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.deleteLandLineData: landLineNumber={1} - CALLED!", this.getClass().getSimpleName(), landLineNumber)); @@ -130,7 +133,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } // Get a managed instance - final org.mxchange.jphone.model.phonenumbers.landline.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); @@ -140,49 +143,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } @Override - public void deleteMobileData (final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber mobileNumber) { - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.deleteMobileData: mobileNumber={1} - CALLED!", this.getClass().getSimpleName(), mobileNumber)); - - // Is all data set - if (null == mobileNumber) { - // Not set, throw NPE - throw new NullPointerException("mobileNumber is null"); //NOI18N - } else if (mobileNumber.getPhoneId() == null) { - // Throw NPE again - throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N - } else if (mobileNumber.getPhoneId() < 1) { - // Invalid number - throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N - } else if (mobileNumber.getMobileProvider() == null) { - // Throw NPE - throw new NullPointerException("mobileNumber.cellphoneProvider is null"); //NOI18N - } else if (mobileNumber.getMobileProvider().getProviderId() == null) { - // ... throw again - throw new NullPointerException("mobileNumber.cellphoneProvider.providerId is null"); //NOI18N - } else if (mobileNumber.getMobileProvider().getProviderId() < 1) { - // Id not valid - throw new IllegalArgumentException(MessageFormat.format("mobileNumber.cellphoneProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N - } else if (mobileNumber.getPhoneNumber() == null) { - // Throw NPE again - throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N - } else if (mobileNumber.getPhoneNumber() < 1) { - // Throw NPE again - throw new NullPointerException(MessageFormat.format("mobileNumber.phoneNumber={0} is not valid.", mobileNumber.getPhoneNumber())); //NOI18N - } - - // Get a managed instance - final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber managedNumber = this.getEntityManager().getReference(mobileNumber.getClass(), mobileNumber.getPhoneId()); - - // Remove it from database - this.getEntityManager().remove(managedNumber); - - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.deleteMobileData: EXIT!", this.getClass().getSimpleName())); - } - - @Override - public org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber updateFaxData (final org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber faxNumber) { + public DialableFaxNumber updateFaxData (final DialableFaxNumber faxNumber) { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateFaxData: faxNumber={1} - CALLED!", this.getClass().getSimpleName(), faxNumber)); @@ -220,17 +181,17 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } // Get contact from it and find it - final org.mxchange.jphone.model.phonenumbers.fax.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 org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", faxNumber.getPhoneId()); //NOI18N + assert (managedNumber instanceof DialableFaxNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", faxNumber.getPhoneId()); //NOI18N // Debug message this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateFaxData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N // Set updated timestamp - org.mxchange.jphone.model.phonenumbers.fax.FaxNumbers.copyAll(faxNumber, managedNumber); - managedNumber.setPhoneEntryUpdated(new GregorianCalendar()); + FaxNumbers.copyFaxNumber(faxNumber, managedNumber); + managedNumber.setPhoneEntryUpdated(new Date()); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateFaxData: managedNumber={1} - EXIT!", this.getClass().getSimpleName(), managedNumber)); //NOI18N @@ -240,7 +201,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } @Override - public org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber updateLandLineData (final org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber landLineNumber) { + public DialableLandLineNumber updateLandLineData (final DialableLandLineNumber landLineNumber) { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateLandLineData: landLineNumber={1} - CALLED!", this.getClass().getSimpleName(), landLineNumber)); @@ -278,17 +239,17 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } // Get contact from it and find it - final org.mxchange.jphone.model.phonenumbers.landline.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 org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", landLineNumber.getPhoneId()); //NOI18N + assert (managedNumber instanceof DialableLandLineNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", landLineNumber.getPhoneId()); //NOI18N // Debug message this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateLandLineData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N // Set updated timestamp - org.mxchange.jphone.model.phonenumbers.landline.LandLineNumbers.copyAll(landLineNumber, managedNumber); - managedNumber.setPhoneEntryUpdated(new GregorianCalendar()); + LandLineNumbers.copyLandLineNumber(landLineNumber, managedNumber); + managedNumber.setPhoneEntryUpdated(new Date()); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateLandLineData: managedNumber={1} - EXIT!", this.getClass().getSimpleName(), managedNumber)); //NOI18N @@ -297,56 +258,4 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A return managedNumber; } - @Override - public org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber updateMobileData (final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber mobileNumber) { - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateMobileData: mobileNumber={1} - CALLED!", this.getClass().getSimpleName(), mobileNumber)); - - // Is all data set - if (null == mobileNumber) { - // Not set, throw NPE - throw new NullPointerException("mobileNumber is null"); //NOI18N - } else if (mobileNumber.getPhoneId() == null) { - // Throw NPE again - throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N - } else if (mobileNumber.getPhoneId() < 1) { - // Invalid number - throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N - } else if (mobileNumber.getMobileProvider() == null) { - // Throw NPE - throw new NullPointerException("mobileNumber.cellphoneProvider is null"); //NOI18N - } else if (mobileNumber.getMobileProvider().getProviderId() == null) { - // ... throw again - throw new NullPointerException("mobileNumber.cellphoneProvider.providerId is null"); //NOI18N - } else if (mobileNumber.getMobileProvider().getProviderId() < 1) { - // Id not valid - throw new IllegalArgumentException(MessageFormat.format("mobileNumber.cellphoneProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N - } else if (mobileNumber.getPhoneNumber() == null) { - // Throw NPE again - throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N - } else if (mobileNumber.getPhoneNumber() < 1) { - // Throw NPE again - throw new NullPointerException(MessageFormat.format("mobileNumber.phoneNumber={0} is not valid.", mobileNumber.getPhoneNumber())); //NOI18N - } - - // Get contact from it and find it - final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber managedNumber = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId()); - - // Should be found - assert (managedNumber instanceof org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", mobileNumber.getPhoneId()); //NOI18N - - // Debug message - this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateMobileData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N - - // Set updated timestamp - org.mxchange.jphone.model.phonenumbers.mobile.MobileNumbers.copyAll(mobileNumber, managedNumber); - managedNumber.setPhoneEntryUpdated(new GregorianCalendar()); - - // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateMobileData: managedNumber={1} - EXIT!", this.getClass().getSimpleName(), managedNumber)); //NOI18N - - // Return it - return managedNumber; - } - }