From: Roland Häder <roland@mxchange.org>
Date: Sun, 3 Sep 2017 15:50:06 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=adaa95eb2a6697f2b333c27b34f110ef100e15ba;p=jfinancials-war.git

Please cherry-pick:
- removed not needed constructor from converter/validator
- reverted `@EJB` annotation in mobile-provider converter as it was not working

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBusinessContactConverter.java b/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBusinessContactConverter.java
index cec53b34..0d40d3cc 100644
--- a/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBusinessContactConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBusinessContactConverter.java
@@ -43,12 +43,6 @@ public class FinancialsBusinessContactConverter implements Converter<BusinessBas
 	 */
 	private static BusinessDataSessionBeanRemote BASIC_DATA_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsBusinessContactConverter () {
-	}
-
 	@Override
 	public BusinessBasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/jfinancials/converter/business/company_employee/FinancialsCompanyEmployeeConverter.java b/src/java/org/mxchange/jfinancials/converter/business/company_employee/FinancialsCompanyEmployeeConverter.java
index 1ca1397f..f2c377e0 100644
--- a/src/java/org/mxchange/jfinancials/converter/business/company_employee/FinancialsCompanyEmployeeConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/business/company_employee/FinancialsCompanyEmployeeConverter.java
@@ -43,12 +43,6 @@ public class FinancialsCompanyEmployeeConverter implements Converter<Employee> {
 	 */
 	private static CompanyEmployeeSessionBeanRemote COMPANY_EMPLOYEE_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsCompanyEmployeeConverter () {
-	}
-
 	@Override
 	public Employee getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/jfinancials/converter/business/headquarters/FinancialsCompanyHeadquartersConverter.java b/src/java/org/mxchange/jfinancials/converter/business/headquarters/FinancialsCompanyHeadquartersConverter.java
index a5e95756..f61e8df8 100644
--- a/src/java/org/mxchange/jfinancials/converter/business/headquarters/FinancialsCompanyHeadquartersConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/business/headquarters/FinancialsCompanyHeadquartersConverter.java
@@ -43,12 +43,6 @@ public class FinancialsCompanyHeadquartersConverter implements Converter<Headqua
 	 */
 	private static CompanyHeadquartersSessionBeanRemote COMPANY_HEADQUARTERS_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsCompanyHeadquartersConverter () {
-	}
-
 	@Override
 	public HeadquartersData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java b/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
index 01b36fcd..9e176743 100644
--- a/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
@@ -43,12 +43,6 @@ public class FinancialsContactConverter implements Converter<Contact> {
 	 */
 	private static ContactSessionBeanRemote CONTACT_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsContactConverter () {
-	}
-
 	@Override
 	public Contact getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java b/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java
index 953527bf..af1eb521 100644
--- a/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java
@@ -44,12 +44,6 @@ public class FinancialsCountryConverter implements Converter<Country> {
 	 */
 	private static CountrySingletonBeanRemote COUNTRY_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsCountryConverter () {
-	}
-
 	@Override
 	public Country getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java b/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java
index 64da2231..9d18d314 100644
--- a/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java
@@ -43,12 +43,6 @@ public class FinancialsFaxNumberConverter implements Converter<DialableFaxNumber
 	 */
 	private static PhoneSessionBeanRemote PHONE_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsFaxNumberConverter () {
-	}
-
 	@Override
 	public DialableFaxNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java b/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java
index 13d0b2d7..8535c655 100644
--- a/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java
@@ -43,12 +43,6 @@ public class FinancialsLandLineNumberConverter implements Converter<DialableLand
 	 */
 	private static PhoneSessionBeanRemote PHONE_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsLandLineNumberConverter () {
-	}
-
 	@Override
 	public DialableLandLineNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java b/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java
index 6a398593..7b539938 100644
--- a/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java
@@ -43,12 +43,6 @@ public class FinancialsMobileNumberConverter implements Converter<DialableMobile
 	 */
 	private static PhoneSessionBeanRemote PHONE_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsMobileNumberConverter () {
-	}
-
 	@Override
 	public DialableMobileNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java b/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
index a86619c3..f8579d5d 100644
--- a/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
@@ -18,11 +18,15 @@ package org.mxchange.jfinancials.converter.mobileprovider;
 
 import java.util.List;
 import java.util.Objects;
-import javax.ejb.EJB;
+import javax.faces.application.FacesMessage;
 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.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
 
@@ -37,17 +41,24 @@ public class FinancialsMobileProviderConverter implements Converter<MobileProvid
 	/**
 	 * Mobile provider bean
 	 */
-	@EJB(lookup = "java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
-	private MobileProviderSingletonBeanRemote mobileProviderBean;
-
-	/**
-	 * Default constructor
-	 */
-	public FinancialsMobileProviderConverter () {
-	}
+	private static MobileProviderSingletonBeanRemote MOBILE_PROVIDER_BEAN;
 
 	@Override
 	public MobileProvider getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+		// Is the instance there?
+		if (MOBILE_PROVIDER_BEAN == null) {
+			try {
+				// Not yet, attempt lookup
+				Context initial = new InitialContext();
+
+				// Lookup EJB
+				MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initial.lookup("java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote");
+			} catch (final NamingException ex) {
+				// Throw it again
+				throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex);
+			}
+		}
+
 		// Is the value null or empty?
 		if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
 			// Warning message
@@ -58,7 +69,7 @@ public class FinancialsMobileProviderConverter implements Converter<MobileProvid
 		}
 
 		// Get full list
-		List<MobileProvider> providerList = this.mobileProviderBean.allMobileProviders();
+		List<MobileProvider> providerList = this.MOBILE_PROVIDER_BEAN.allMobileProviders();
 
 		// Init value
 		MobileProvider provider = null;
diff --git a/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java b/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java
index ac63fe6d..890056a4 100644
--- a/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java
@@ -42,12 +42,6 @@ public class FinancialsUserConverter implements Converter<User> {
 	 */
 	private static UserSessionBeanRemote USER_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsUserConverter () {
-	}
-
 	@Override
 	public User getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/jfinancials/validator/birthday/FinancialsBirthdayValidator.java b/src/java/org/mxchange/jfinancials/validator/birthday/FinancialsBirthdayValidator.java
index 14b69664..c6d9e878 100644
--- a/src/java/org/mxchange/jfinancials/validator/birthday/FinancialsBirthdayValidator.java
+++ b/src/java/org/mxchange/jfinancials/validator/birthday/FinancialsBirthdayValidator.java
@@ -36,12 +36,6 @@ public class FinancialsBirthdayValidator extends BaseDateValidator {
 	 */
 	private static final long serialVersionUID = 28_735_756_819_460L;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsBirthdayValidator () {
-	}
-
 	@Override
 	public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
 		// All accepted, required fields
diff --git a/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java b/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java
index e9a0a2ae..59afe558 100644
--- a/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java
+++ b/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java
@@ -57,12 +57,6 @@ public class FinancialsEmailAddressValidator extends BaseStringValidator {
 	 */
 	private static final long serialVersionUID = 187_536_745_607_192L;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsEmailAddressValidator () {
-	}
-
 	@Override
 	public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/jfinancials/validator/url/FinancialsUrlValidator.java b/src/java/org/mxchange/jfinancials/validator/url/FinancialsUrlValidator.java
index 8e367ff1..3ceefbe1 100644
--- a/src/java/org/mxchange/jfinancials/validator/url/FinancialsUrlValidator.java
+++ b/src/java/org/mxchange/jfinancials/validator/url/FinancialsUrlValidator.java
@@ -49,12 +49,6 @@ public class FinancialsUrlValidator extends BaseStringValidator {
 	 */
 	private static final long serialVersionUID = 187_536_745_607_193L;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsUrlValidator () {
-	}
-
 	@Override
 	public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
 		// The required field
diff --git a/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
index da0ccdab..94e5414e 100644
--- a/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
+++ b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
@@ -46,12 +46,6 @@ public class FinancialsUserIdValidator extends BaseNumberValidator {
 	 */
 	private static final long serialVersionUID = 12_869_569_314_764_690L;
 
-	/**
-	 * Default constructor
-	 */
-	public FinancialsUserIdValidator () {
-	}
-
 	@Override
 	public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
 		// Is the instance there?