X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Forg%2Fmxchange%2Faddressbook%2Fvalidator%2Faddressbook%2FAddressbookIdValidator.java;h=a3edc657a153fdb134c33898ba8dee24923bca37;hb=70706a1baaec83f83f6657fc9650d26707b1157e;hp=6d363bcdb71dfc157626733de68d7e11426e9cea;hpb=c1d49c4eb90d2b548f1d1149ca9b9ce3d1cce9a1;p=jbonuscard-lib.git

diff --git a/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java b/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
index 6d363bc..a3edc65 100644
--- a/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
+++ b/src/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java
@@ -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.addressbook.AddressbookLoadedEvent;
-import org.mxchange.addressbook.events.addressbook.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 (addressbook == null) {
+				// 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
 	}
 }