X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Fjjobs%2Fconverter%2Fbusiness%2Fbasicdata%2FJobsBusinessContactConverter.java;h=4f41c2b4339e72ef5b753cde983b601b0d21ae05;hb=626418b9ee6d5d7f548431bc89f8400e9cbc93e3;hp=9cbf1eb7020571f285d1e306d50fdfd1aef244a2;hpb=8cfd660e2c35d31c376908044688b1e24d3d4137;p=jjobs-war.git

diff --git a/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java b/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
index 9cbf1eb7..4f41c2b4 100644
--- a/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
@@ -16,47 +16,36 @@
  */
 package org.mxchange.jjobs.converter.business.basicdata;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
-import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
-import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException;
+import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicDataNotFoundException;
+import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
+import org.mxchange.jjobs.beans.business.basicdata.JobsBasicDataWebRequestBean;
+import org.mxchange.jjobs.beans.business.basicdata.JobsBasicDataWebRequestController;
 
 /**
- * Converter for contact id <-> valid business contact instance
+ * Converter for basic company data id <-> valid basic company data instance
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@FacesConverter ("BusinessContactConverter")
-public class JobsBusinessContactConverter implements Converter<BusinessBasicData> {
+@FacesConverter ("BasicCompanyDataConverter")
+public class JobsBasicCompanyDataConverter implements Converter<BasicData> {
 
 	/**
-	 * Business contact EJB
+	 * Basic company data backing bean
 	 */
-	private static BusinessDataSessionBeanRemote BASIC_DATA_BEAN;
+	private static JobsBasicDataWebRequestController BASIC_DATA_CONTROLLER;
 
 	@Override
-	public BusinessBasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+	public BasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
-		if (BASIC_DATA_BEAN == null) {
-			try {
-				// Not yet, attempt lookup
-				Context initial = new InitialContext();
-
-				// Lookup EJB
-				BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote");
-			} catch (final NamingException ex) {
-				// Throw it again
-				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex);
-			}
+		if (null == BASIC_DATA_CONTROLLER) {
+			// Get bean from CDI directly
+			BASIC_DATA_CONTROLLER = CDI.current().select(JobsBasicDataWebRequestBean.class).get();
 		}
 
 		// Is the value null or empty?
@@ -69,28 +58,28 @@ public class JobsBusinessContactConverter implements Converter<BusinessBasicData
 		}
 
 		// Init instance
-		BusinessBasicData businessContact = null;
+		BasicData basicData = null;
 
 		try {
 			// Try to parse the value as long
-			Long basicDataId = Long.valueOf(submittedValue);
+			final Long basicDataId = Long.valueOf(submittedValue);
 
 			// Try to get user instance from it
-			businessContact = BASIC_DATA_BEAN.findBasicDataById(basicDataId);
+			basicData = BASIC_DATA_CONTROLLER.findBasicDataById(basicDataId);
 		} catch (final NumberFormatException ex) {
 			// Throw again
 			throw new ConverterException(ex);
-		} catch (final BusinessDataNotFoundException ex) {
+		} catch (final BasicDataNotFoundException ex) {
 			// Debug message
 			// @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N
 		}
 
 		// Return it
-		return businessContact;
+		return basicData;
 	}
 
 	@Override
-	public String getAsString (final FacesContext context, final UIComponent component, final BusinessBasicData value) {
+	public String getAsString (final FacesContext context, final UIComponent component, final BasicData value) {
 		// Is the object null?
 		if ((null == value) || (String.valueOf(value).isEmpty())) {
 			// Is null
@@ -98,7 +87,7 @@ public class JobsBusinessContactConverter implements Converter<BusinessBasicData
 		}
 
 		// Return id number
-		return String.valueOf(value.getCompanyDataId());
+		return String.valueOf(value.getBasicDataId());
 	}
 
 }