Cleanup:

[jaddressbook-share-lib.git] / src / org / mxchange / addressbook / validator / addressbook / AddressbookIdValidator.java

diff --git a/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java b/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
index b9face6643c5cf07616e394b60c420b1b355d061..97be57db9b54f76154aa3638347989091f4f9d99 100644 (file)
--- a/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
+++ b/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Roland Haeder
+ * Copyright (C) 2016 Roland Haeder
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,26 +17,25 @@
 package org.mxchange.addressbook.validator.addressbook;
 
 import java.text.MessageFormat;
-import javax.ejb.EJB;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Any;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
 import javax.faces.validator.ValidatorException;
-import javax.inject.Inject;
-import org.mxchange.addressbook.events.AddressbookLoadedEvent;
-import org.mxchange.addressbook.events.LoadedAddressbookEvent;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 import org.mxchange.addressbook.exceptions.AddressbookNotFoundException;
 import org.mxchange.addressbook.model.addressbook.Addressbook;
 import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote;
 import org.mxchange.jcoreee.validator.number.BaseLongValidator;
+import org.mxchange.jcoreeelogger.beans.local.logger.Log;
+import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;
 
 /**
  * A validator for address book id verification
  * <p>
- * @author Roland Haeder
+ * @author Roland Haeder<roland@mxchange.org>
  */
 @FacesValidator (value = "AddressbookIdValidator")
 public class AddressbookIdValidator extends BaseLongValidator {
@@ -49,20 +48,38 @@ public class AddressbookIdValidator extends BaseLongValidator {
        /**
         * Remote bean
         */
-       @EJB (mappedName = "ejb/stateless-addressbook")
        private AddressbookSessionBeanRemote addressbookBean;
 
        /**
-        * An event for loading address book data loading
+        * Logger instance
         */
-       @Inject
-       @Any
-       private Event<AddressbookLoadedEvent> loadedEvent;
+       @Log
+       private LoggerBeanLocal loggerBeanLocal;
+
+       /**
+        * Public consutructor
+        */
+       public AddressbookIdValidator () {
+               // Try to get it
+               try {
+                       // Get initial context
+                       Context context = new InitialContext();
+
+                       // Lookup logger
+                       this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N
+
+                       // ... and user controller
+                       this.addressbookBean = (AddressbookSessionBeanRemote) context.lookup("java:global/addressbook-ejb/addressbook!org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote"); //NOI18N
+               } catch (final NamingException ex) {
+                       // Continue to throw it
+                       throw new RuntimeException("context.lookup() failed.", ex); //NOI18N
+               }
+       }
 
        @Override
        public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
                // Trace message
-               //this.getLogger().logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N
+               this.loggerBeanLocal.logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N
 
                // All accepted, required fields
                String[] requiredFileds = {"addressbookId"}; //NOI18N
@@ -86,15 +103,18 @@ public class AddressbookIdValidator extends BaseLongValidator {
                try {
                        // Get full data
                        addressbook = this.addressbookBean.getAddressbookById(addressbookId);
+
+                       // Is it set?
+                       if (null == addressbook) {
+                               // Is null?!
+                               throw new NullPointerException(MessageFormat.format("addressbook for id={0} is null", addressbookId)); //NOI18N
+                       }
                } catch (final AddressbookNotFoundException ex) {
                        // Continue to throw
-                       throw new ValidatorException(new FacesMessage(MessageFormat.format("Cannot find address book with id {0}", addressbookId)), ex);
+                       throw new ValidatorException(new FacesMessage(MessageFormat.format("Cannot find address book with id {0}", addressbookId)), ex); //NOI18N
                }
 
-               // Fire event
-               this.loadedEvent.fire(new LoadedAddressbookEvent(addressbook));
-
                // Trace message
-               //this.getLogger().logTrace("validate: EXIT!"); //NOI18N
+               this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N
        }
 }