From 7ae79da6482dcdc12e2cb34001ef4ae70273703c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 3 Sep 2017 17:50:06 +0200
Subject: [PATCH] Please cherry-pick: - removed not needed constructor from
 converter/validator - reverted `@EJB` annotation in mobile-provider converter
 as it was not working
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../AddressbookBusinessContactConverter.java  |  6 ----
 .../AddressbookCompanyEmployeeConverter.java  |  6 ----
 ...dressbookCompanyHeadquartersConverter.java |  6 ----
 .../contact/AddressbookContactConverter.java  |  6 ----
 .../country/AddressbookCountryConverter.java  |  6 ----
 .../fax/AddressbookFaxNumberConverter.java    |  6 ----
 .../AddressbookLandLineNumberConverter.java   |  6 ----
 .../AddressbookMobileNumberConverter.java     |  6 ----
 .../AddressbookMobileProviderConverter.java   | 31 +++++++++++++------
 .../user/AddressbookUserConverter.java        |  6 ----
 .../AddressbookBirthdayValidator.java         |  6 ----
 .../AddressbookEmailAddressValidator.java     |  6 ----
 .../url/AddressbookUrlValidator.java          |  6 ----
 .../user/AddressbookUserIdValidator.java      |  6 ----
 14 files changed, 21 insertions(+), 88 deletions(-)

diff --git a/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java b/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java
index 9e866c36..dcc32fd3 100644
--- a/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java
@@ -43,12 +43,6 @@ public class AddressbookBusinessContactConverter implements Converter<BusinessBa
 	 */
 	private static BusinessDataSessionBeanRemote BASIC_DATA_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookBusinessContactConverter () {
-	}
-
 	@Override
 	public BusinessBasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java b/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java
index e4eaecd4..7efd4749 100644
--- a/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java
@@ -43,12 +43,6 @@ public class AddressbookCompanyEmployeeConverter implements Converter<Employee>
 	 */
 	private static CompanyEmployeeSessionBeanRemote COMPANY_EMPLOYEE_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookCompanyEmployeeConverter () {
-	}
-
 	@Override
 	public Employee getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java b/src/java/org/mxchange/addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java
index 4526fb85..23796ff5 100644
--- a/src/java/org/mxchange/addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java
@@ -43,12 +43,6 @@ public class AddressbookCompanyHeadquartersConverter implements Converter<Headqu
 	 */
 	private static CompanyHeadquartersSessionBeanRemote COMPANY_HEADQUARTERS_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookCompanyHeadquartersConverter () {
-	}
-
 	@Override
 	public HeadquartersData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java b/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java
index 240af7df..d7aa83ea 100644
--- a/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java
@@ -43,12 +43,6 @@ public class AddressbookContactConverter implements Converter<Contact> {
 	 */
 	private static ContactSessionBeanRemote CONTACT_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookContactConverter () {
-	}
-
 	@Override
 	public Contact getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java b/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java
index 15df38e1..0d489d51 100644
--- a/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java
@@ -44,12 +44,6 @@ public class AddressbookCountryConverter implements Converter<Country> {
 	 */
 	private static CountrySingletonBeanRemote COUNTRY_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookCountryConverter () {
-	}
-
 	@Override
 	public Country getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java b/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java
index c58556f9..3cc35cb4 100644
--- a/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java
@@ -43,12 +43,6 @@ public class AddressbookFaxNumberConverter implements Converter<DialableFaxNumbe
 	 */
 	private static PhoneSessionBeanRemote PHONE_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookFaxNumberConverter () {
-	}
-
 	@Override
 	public DialableFaxNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/addressbook/converter/landline/AddressbookLandLineNumberConverter.java b/src/java/org/mxchange/addressbook/converter/landline/AddressbookLandLineNumberConverter.java
index cd918ead..4f273938 100644
--- a/src/java/org/mxchange/addressbook/converter/landline/AddressbookLandLineNumberConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/landline/AddressbookLandLineNumberConverter.java
@@ -43,12 +43,6 @@ public class AddressbookLandLineNumberConverter implements Converter<DialableLan
 	 */
 	private static PhoneSessionBeanRemote PHONE_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookLandLineNumberConverter () {
-	}
-
 	@Override
 	public DialableLandLineNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/addressbook/converter/mobile/AddressbookMobileNumberConverter.java b/src/java/org/mxchange/addressbook/converter/mobile/AddressbookMobileNumberConverter.java
index c56efdc1..80a3c756 100644
--- a/src/java/org/mxchange/addressbook/converter/mobile/AddressbookMobileNumberConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/mobile/AddressbookMobileNumberConverter.java
@@ -43,12 +43,6 @@ public class AddressbookMobileNumberConverter implements Converter<DialableMobil
 	 */
 	private static PhoneSessionBeanRemote PHONE_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookMobileNumberConverter () {
-	}
-
 	@Override
 	public DialableMobileNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java b/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
index 3183523a..7d6b71cc 100644
--- a/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
@@ -18,11 +18,15 @@ package org.mxchange.addressbook.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.model.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
 
@@ -37,17 +41,24 @@ public class AddressbookMobileProviderConverter implements Converter<MobileProvi
 	/**
 	 * Mobile provider bean
 	 */
-	@EJB(lookup = "java:global/addressbook-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
-	private MobileProviderSingletonBeanRemote mobileProviderBean;
-
-	/**
-	 * Default constructor
-	 */
-	public AddressbookMobileProviderConverter () {
-	}
+	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 AddressbookMobileProviderConverter implements Converter<MobileProvi
 		}
 
 		// 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/addressbook/converter/user/AddressbookUserConverter.java b/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java
index f47729c3..56b9ba70 100644
--- a/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java
@@ -42,12 +42,6 @@ public class AddressbookUserConverter implements Converter<User> {
 	 */
 	private static UserSessionBeanRemote USER_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookUserConverter () {
-	}
-
 	@Override
 	public User getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/addressbook/validator/birthday/AddressbookBirthdayValidator.java b/src/java/org/mxchange/addressbook/validator/birthday/AddressbookBirthdayValidator.java
index ae26fc00..b68420fe 100644
--- a/src/java/org/mxchange/addressbook/validator/birthday/AddressbookBirthdayValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/birthday/AddressbookBirthdayValidator.java
@@ -36,12 +36,6 @@ public class AddressbookBirthdayValidator extends BaseDateValidator {
 	 */
 	private static final long serialVersionUID = 28_735_756_819_460L;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookBirthdayValidator () {
-	}
-
 	@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/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
index f11e40a7..9b2b2780 100644
--- a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
@@ -57,12 +57,6 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator {
 	 */
 	private static final long serialVersionUID = 187_536_745_607_192L;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookEmailAddressValidator () {
-	}
-
 	@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/addressbook/validator/url/AddressbookUrlValidator.java b/src/java/org/mxchange/addressbook/validator/url/AddressbookUrlValidator.java
index 43b9daab..ac026649 100644
--- a/src/java/org/mxchange/addressbook/validator/url/AddressbookUrlValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/url/AddressbookUrlValidator.java
@@ -49,12 +49,6 @@ public class AddressbookUrlValidator extends BaseStringValidator {
 	 */
 	private static final long serialVersionUID = 187_536_745_607_193L;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookUrlValidator () {
-	}
-
 	@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/addressbook/validator/user/AddressbookUserIdValidator.java b/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java
index 7c4aac1d..2ea1d717 100644
--- a/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java
@@ -46,12 +46,6 @@ public class AddressbookUserIdValidator extends BaseNumberValidator {
 	 */
 	private static final long serialVersionUID = 12_869_569_314_764_690L;
 
-	/**
-	 * Default constructor
-	 */
-	public AddressbookUserIdValidator () {
-	}
-
 	@Override
 	public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
 		// Is the instance there?
-- 
2.39.5