From b5e35340cec99ac57fe20f5080fc1336ec235545 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 18 May 2016 11:01:48 +0200 Subject: [PATCH] Continued a bit: - renamed to have project name in it - sending out mails over a message-driven bean is an asynchronous approach and will keep the other EJBs running fast - use class, not interface everywhere MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../AddressbookResendLinkSessionBean.java | 88 +++++++++---------- .../user/AddressbookUserSessionBean.java | 14 +-- 2 files changed, 49 insertions(+), 53 deletions(-) diff --git a/src/java/org/mxchange/addressbook/beans/resendlink/AddressbookResendLinkSessionBean.java b/src/java/org/mxchange/addressbook/beans/resendlink/AddressbookResendLinkSessionBean.java index 036e5d0..6379033 100644 --- a/src/java/org/mxchange/addressbook/beans/resendlink/AddressbookResendLinkSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/resendlink/AddressbookResendLinkSessionBean.java @@ -16,17 +16,15 @@ */ package org.mxchange.addressbook.beans.resendlink; -import de.chotime.landingpage.beans.resendlink.ResendLinkSessionBeanRemote; +import java.io.Serializable; import java.text.MessageFormat; -import java.util.Locale; -import javax.ejb.EJBException; import javax.ejb.Stateless; -import javax.mail.Address; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.ObjectMessage; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; -import org.mxchange.jusercore.model.user.User; -import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.addressbook.mailer.model.delivery.AddressbookMailer; +import org.mxchange.addressbook.mailer.model.delivery.DeliverableAddressbookEmail; /** * A session-based EJB for resending confirmation links @@ -39,56 +37,54 @@ public class AddressbookResendLinkSessionBean extends BaseAddressbookDatabaseBea /** * Serial number */ - private static final long serialVersionUID = 71_546_726_857_195_360L; + private static final long serialVersionUID = 75_638_176_619_024L; - @Override - public String resendConfirmationLink (final User user, final Locale locale) { - // Log trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("resendConfirmationLink: user={0},locale={1} - CALLED!", user, locale)); //NOI18N + /** + * Mailer instance + */ + private final DeliverableAddressbookEmail mailer; - // The user instance should be valid - if (null == user) { + /** + * Default constructor + */ + public AddressbookResendLinkSessionBean () { + // Init mailer instance + this.mailer = new AddressbookMailer(); + } + + @Override + public void onMessage (final Message message) { + // Trace message + this.getLoggerBeanLocal().logTrace(MessageFormat.format("onMessage: message={0} - CALLED!", message)); //NOI18N + // The parameter should be valid + if (null == message) { // Throw NPE - throw new NullPointerException("user is null"); //NOI18N - } else if (user.getUserId() == null) { - // Throw NPE again - throw new NullPointerException("user.userId is null"); //NOI18N - } else if (user.getUserId() < 1) { - // Invalid id number - throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N - } else if (user.getUserConfirmKey() == null) { - // Throw NPE again - throw new NullPointerException("this.userConfirmKey is null"); //NOI18N - } else if (user.getUserAccountStatus() != UserAccountStatus.UNCONFIRMED) { - // User account status is not UNCONFIRMED - throw new IllegalStateException(MessageFormat.format("Account status from user.userId={0} is not UNCONFIRMED:{1}", user.getUserId(), user.getUserAccountStatus())); //NOI18N - } else if (null == locale) { - // Locale should be set - throw new NullPointerException("locale is null"); //NOI18N + throw new NullPointerException("message is null"); //NOI18N + } else if (!(message instanceof ObjectMessage)) { + // Not implementing right interface + throw new IllegalArgumentException(MessageFormat.format("message={0} does not implemented ObjectMessage", message)); //NOI18N } - // @TODO Unfinished: Change key + merge database + // Securely cast it + ObjectMessage objectMessage = (ObjectMessage) message; // Init variable - Address emailAddress; + Serializable serializable; try { - // Create email address and set - emailAddress = new InternetAddress(user.getUserContact().getContactEmailAddress()); - } catch (final AddressException ex) { - // Throw again - throw new EJBException(ex); + // Get object from message + serializable = objectMessage.getObject(); + } catch (final JMSException ex) { + // Log it and don't continue any further + this.getLoggerBeanLocal().logException(ex); + return; } - // Send email - // TODO: Internationlize the subject line somehow - this.sendEmail("Resend confirmation link", "resend_confirmation_link", emailAddress, user); //NOI18N - - // Log trace message - this.getLoggerBeanLocal().logTrace("resendConfirmationLink: CALLED!"); //NOI18N + // Debug message + this.getLoggerBeanLocal().logDebug(MessageFormat.format("onMessage: serializable={0}", serializable)); //NOI18N - // All fine - return "resend_done"; //NOI18N + // Trace message + this.getLoggerBeanLocal().logTrace("onMessage - EXIT!"); //NOI18N } } diff --git a/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java index 4ca1d6e..91c0156 100644 --- a/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java @@ -183,7 +183,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookDatabaseBean impl } // Try to locate it - Query query = this.getEntityManager().createNamedQuery("SearchUserByName", User.class); //NOI18N + Query query = this.getEntityManager().createNamedQuery("SearchUserByName", LoginUser.class); //NOI18N // Set parameter query.setParameter("param", user.getUserName()); //NOI18N @@ -225,7 +225,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookDatabaseBean impl } // Create query instance - Query query = this.getEntityManager().createNamedQuery("SearchUserById", User.class); //NOI18N + Query query = this.getEntityManager().createNamedQuery("SearchUserById", LoginUser.class); //NOI18N // Set user id query.setParameter("id", userId); //NOI18N @@ -308,7 +308,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookDatabaseBean impl } // Generate query - Query query = this.getEntityManager().createNamedQuery("SearchUserById", User.class); //NOI18N + Query query = this.getEntityManager().createNamedQuery("SearchUserById", LoginUser.class); //NOI18N // Set parameter query.setParameter("id", user.getUserId()); //NOI18N @@ -355,7 +355,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookDatabaseBean impl } // Generate query - Query query = this.getEntityManager().createNamedQuery("SearchUserById", User.class); //NOI18N + Query query = this.getEntityManager().createNamedQuery("SearchUserById", LoginUser.class); //NOI18N // Set parameter query.setParameter("id", userId); //NOI18N @@ -402,7 +402,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookDatabaseBean impl } // Generate query - Query query = this.getEntityManager().createNamedQuery("SearchUserByName", User.class); //NOI18N + Query query = this.getEntityManager().createNamedQuery("SearchUserByName", LoginUser.class); //NOI18N // Set parameter query.setParameter("param", userName); //NOI18N @@ -440,7 +440,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookDatabaseBean impl } // Generate query - Query query = this.getEntityManager().createNamedQuery("SearchUserByEmailAddress", User.class); //NOI18N + Query query = this.getEntityManager().createNamedQuery("SearchUserByEmailAddress", LoginUser.class); //NOI18N // Set parameter query.setParameter("param", user.getUserContact().getContactEmailAddress()); //NOI18N @@ -481,7 +481,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookDatabaseBean impl } // Generate query - Query query = this.getEntityManager().createNamedQuery("SearchUserByName", User.class); //NOI18N + Query query = this.getEntityManager().createNamedQuery("SearchUserByName", LoginUser.class); //NOI18N // Set parameter query.setParameter("param", user.getUserName()); //NOI18N -- 2.39.2