Please cherry-pick:

[jjobs-war.git] / src / java / org / mxchange / jjobs / validator / user / JobsUserIdValidator.java

diff --git a/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.java b/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.java
index f617efd3889527f3f5ac6cd3302349eaf1013388..267a071f0c2311ad7bc04de6ea78e1f17117fcd1 100644 (file)
--- a/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.java
+++ b/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2018 Free Software Foundation
  *
  * 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,15 +17,14 @@
 package org.mxchange.jjobs.validator.user;
 
 import java.text.MessageFormat;
+import javax.enterprise.inject.spi.CDI;
 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.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jcoreee.validator.number.BaseNumberValidator;
+import org.mxchange.jjobs.beans.user.JobsUserWebRequestBean;
 import org.mxchange.jjobs.beans.user.JobsUserWebRequestController;
 
 /**
@@ -48,26 +47,18 @@ public class JobsUserIdValidator extends BaseNumberValidator {
 
        @Override
        public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
-               // Is the instance there?
-               if (USER_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               USER_CONTROLLER = (JobsUserWebRequestController) initial.lookup("java:module/userController!org.mxchange.jjobs.beans.user.JobsUserWebRequestController");
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
-                       }
-               }
-
                // All accepted, required fields
                final String[] requiredFields = {"userId"}; //NOI18N
 
                // Pre-validation (example: not null, not a string, empty string ...)
                super.preValidate(context, component, value, requiredFields, false);
 
+               // Is the instance there?
+               if (null == USER_CONTROLLER) {
+                       // Get bean from CDI directly
+                       USER_CONTROLLER = CDI.current().select(JobsUserWebRequestBean.class).get();
+               }
+
                // Cast value
                final Long userId = (Long) value;