]> git.mxchange.org Git - pizzaservice-ejb.git/commitdiff
fixed EJB name for email delivery beans
authorRoland Häder <roland@mxchange.org>
Sat, 24 Jun 2017 21:41:21 +0000 (23:41 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 24 Jun 2017 21:41:21 +0000 (23:41 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/jmailee/model/delivery/PizzaEmailDeliveryMessageBean.java
src/java/org/mxchange/pizzaapplication/mailer/model/delivery/PizzaEmailDeliveryMessageBean.java [deleted file]

index ff40ba0831e858204af5e5b43c949aaab2593aed..f432fa35952cd5af0351ab90533f52d5bac04737 100644 (file)
@@ -37,7 +37,7 @@ import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery;
  * @author Roland Häder<roland@mxchange.org>
  */
 @MessageDriven (
-               name = "rateCalcEmail",
+               name = "pizzaEmailDelivery",
                description = "A message bean for email delivery",
                activationConfig = {
                        @ActivationConfigProperty (propertyName = "destinationLookup", propertyValue = "jms/pizzaservice-email-queue"),
diff --git a/src/java/org/mxchange/pizzaapplication/mailer/model/delivery/PizzaEmailDeliveryMessageBean.java b/src/java/org/mxchange/pizzaapplication/mailer/model/delivery/PizzaEmailDeliveryMessageBean.java
deleted file mode 100644 (file)
index 2490ef6..0000000
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (C) 2016, 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.pizzaapplication.mailer.model.delivery;
-
-import java.io.Serializable;
-import java.text.MessageFormat;
-import java.util.Properties;
-import java.util.ResourceBundle;
-import javax.annotation.PostConstruct;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-import javax.mail.MessagingException;
-import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery;
-import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean;
-
-/**
- * A message-driven bean for sending out emails
- * <p>
- * @author Roland Häder<roland@mxchange.org>
- */
-@MessageDriven (
-               name = "emailDelivery",
-               description = "A message-driven bean for email delivery (some kind of 'queue')",
-               activationConfig = {
-                       @ActivationConfigProperty (
-                                       propertyName = "destinationLookup",
-                                       propertyValue = "jms/pizzaservice-email-queue"
-                       ),
-                       @ActivationConfigProperty (
-                                       propertyName = "destinationType",
-                                       propertyValue = "javax.jms.Queue"
-                       )
-               }
-)
-public class PizzaEmailDeliveryMessageBean extends BasePizzaDatabaseBean implements MessageListener {
-
-       /**
-        * Serial number
-        */
-       private static final long serialVersionUID = 75_638_176_619_024L;
-
-       /**
-        * Configuration file
-        */
-       private final String configFile = "org.mxchange.jmailer.config"; //NOI18N
-
-       /**
-        * Mailer instance
-        */
-       private final DeliverablePizzaEmail mailer;
-
-       /**
-        * Default constructor
-        */
-       public PizzaEmailDeliveryMessageBean () {
-               // Call super constructor
-               super();
-
-               // Init mailer instance
-               this.mailer = new PizzaMailer();
-       }
-
-       /**
-        * Post-construction
-        */
-       @PostConstruct
-       public void init () {
-               // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.init: CALLED!", this.getClass().getSimpleName())); //NOI18N
-
-               // Try to load bundle
-               ResourceBundle bundle = ResourceBundle.getBundle(this.configFile);
-
-               // Debug message
-               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.init: bundle={1}", this.getClass().getSimpleName(), bundle)); //NOI18N
-
-               // The bunble should be valid
-               if (null == bundle) {
-                       // Throw NPE
-                       throw new NullPointerException(MessageFormat.format("bundle is null, maybe file {0} does not exist?", this.configFile)); //NOI18N
-               }
-
-               // Init Properties
-               Properties properties = new Properties();
-
-               // Is the bundle not empty?
-               if (!bundle.keySet().isEmpty()) {
-                       // Loop through all
-                       for (final String key : bundle.keySet()) {
-                               // Log debug message
-                               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.init: key={1}", this.getClass().getSimpleName(), key)); //NOI18N
-
-                               // Get string from bundle and set it in properties
-                               properties.put(key, bundle.getString(key));
-                       }
-               }
-
-               // Handle it over to the mailer
-               this.mailer.init(properties);
-
-               // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.init: EXIT!", this.getClass().getSimpleName())); //NOI18N
-       }
-
-       @Override
-       public void onMessage (final Message message) {
-               // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.onMessage: message={1} - CALLED!", this.getClass().getSimpleName(), message)); //NOI18N
-
-               // The parameter should be valid
-               if (null == message) {
-                       // Throw NPE
-                       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
-               }
-
-               // Securely cast it
-               ObjectMessage objectMessage = (ObjectMessage) message;
-
-               // Init variable
-               Serializable serializable;
-
-               try {
-                       // Get object from message
-                       serializable = objectMessage.getObject();
-               } catch (final JMSException ex) {
-                       // Log it and don't continue any further
-                       this.getLoggerBeanLocal().logException(ex);
-                       return;
-               }
-
-               // Debug message
-               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.onMessage: serializable={1}", this.getClass().getSimpleName(), serializable)); //NOI18N
-
-               // Okay, is it the right interface?
-               if (null == serializable) {
-                       // Throw NPE
-                       throw new NullPointerException("serializable is null"); //NOI18N
-               } else if (!(serializable instanceof WrapableEmailDelivery)) {
-                       // Not correct object send
-                       throw new IllegalArgumentException(MessageFormat.format("serializable={0} does not implement WrapableEmailDelivery", serializable)); //NOI18N
-               }
-
-               // Securely cast it
-               WrapableEmailDelivery wrapper = (WrapableEmailDelivery) serializable;
-
-               // Is all required set?
-               if (wrapper.getLocale() == null) {
-                       // Throw NPE
-                       throw new NullPointerException("wrapper.locale is null"); //NOI18N
-               } else if (wrapper.getRecipient() == null) {
-                       // Throw again ...
-                       throw new NullPointerException("wrapper.recipient is null"); //NOI18N
-               } else if (wrapper.getSubjectLine() == null) {
-                       // ... and again
-                       throw new NullPointerException("wrapper.subjectLine is null"); //NOI18N
-               } else if (wrapper.getSubjectLine().isEmpty()) {
-                       // Is empty
-                       throw new IllegalArgumentException("wrapper.subjectLine is empty"); //NOI18N
-               } else if (wrapper.getTemplateName() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("wrapper.templateName is null"); //NOI18N
-               } else if (wrapper.getTemplateName().isEmpty()) {
-                       // Is empty
-                       throw new IllegalArgumentException("wrapper.templateName is empty"); //NOI18N
-               } else if (wrapper.getTemplateVariables() == null) {
-                       // No template variables set, should not happen
-                       throw new NullPointerException("wrapper.templateVariables is null"); //NOI18N
-               }
-
-               try {
-                       // Send email out
-                       this.mailer.sendDeliverableMail(wrapper);
-               } catch (final MessagingException ex) {
-                       // Opps, something went wrong
-                       this.getLoggerBeanLocal().logException(ex);
-                       return;
-               }
-
-               // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.onMessage - EXIT!", this.getClass().getSimpleName())); //NOI18N
-       }
-}