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=feea5c403287584863aa7bcae6c5e0e4a7b868c3;p=pizzaservice-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/pizzaapplication/converter/contact/PizzaContactConverter.java b/src/java/org/mxchange/pizzaapplication/converter/contact/PizzaContactConverter.java
index 2cfd87ab..2db3f4cc 100644
--- a/src/java/org/mxchange/pizzaapplication/converter/contact/PizzaContactConverter.java
+++ b/src/java/org/mxchange/pizzaapplication/converter/contact/PizzaContactConverter.java
@@ -43,12 +43,6 @@ public class PizzaContactConverter implements Converter<Contact> {
 	 */
 	private static ContactSessionBeanRemote CONTACT_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public PizzaContactConverter () {
-	}
-
 	@Override
 	public Contact getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/pizzaapplication/converter/mobile/PizzaMobileNumberConverter.java b/src/java/org/mxchange/pizzaapplication/converter/mobile/PizzaMobileNumberConverter.java
index 9973054f..aeb56be2 100644
--- a/src/java/org/mxchange/pizzaapplication/converter/mobile/PizzaMobileNumberConverter.java
+++ b/src/java/org/mxchange/pizzaapplication/converter/mobile/PizzaMobileNumberConverter.java
@@ -43,12 +43,6 @@ public class PizzaMobileNumberConverter implements Converter<DialableMobileNumbe
 	 */
 	private static PhoneSessionBeanRemote PHONE_BEAN;
 
-	/**
-	 * Default constructor
-	 */
-	public PizzaMobileNumberConverter () {
-	}
-
 	@Override
 	public DialableMobileNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
diff --git a/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java b/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java
index 07fc7e83..278b4331 100644
--- a/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java
+++ b/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java
@@ -18,11 +18,15 @@ package org.mxchange.pizzaapplication.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 PizzaMobileProviderConverter implements Converter<MobileProvider> {
 	/**
 	 * Mobile provider bean
 	 */
-	@EJB(lookup = "java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
-	private MobileProviderSingletonBeanRemote mobileProviderBean;
-
-	/**
-	 * Default constructor
-	 */
-	public PizzaMobileProviderConverter () {
-	}
+	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 PizzaMobileProviderConverter implements Converter<MobileProvider> {
 		}
 
 		// 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/pizzaapplication/validator/birthday/PizzaBirthdayValidator.java b/src/java/org/mxchange/pizzaapplication/validator/birthday/PizzaBirthdayValidator.java
index 5dbc3fd1..a730a0d8 100644
--- a/src/java/org/mxchange/pizzaapplication/validator/birthday/PizzaBirthdayValidator.java
+++ b/src/java/org/mxchange/pizzaapplication/validator/birthday/PizzaBirthdayValidator.java
@@ -36,12 +36,6 @@ public class PizzaBirthdayValidator extends BaseDateValidator {
 	 */
 	private static final long serialVersionUID = 28_735_756_819_460L;
 
-	/**
-	 * Default constructor
-	 */
-	public PizzaBirthdayValidator () {
-	}
-
 	@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/pizzaapplication/validator/url/PizzaUrlValidator.java b/src/java/org/mxchange/pizzaapplication/validator/url/PizzaUrlValidator.java
index 101fd758..579d9c08 100644
--- a/src/java/org/mxchange/pizzaapplication/validator/url/PizzaUrlValidator.java
+++ b/src/java/org/mxchange/pizzaapplication/validator/url/PizzaUrlValidator.java
@@ -49,12 +49,6 @@ public class PizzaUrlValidator extends BaseStringValidator {
 	 */
 	private static final long serialVersionUID = 187_536_745_607_193L;
 
-	/**
-	 * Default constructor
-	 */
-	public PizzaUrlValidator () {
-	}
-
 	@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/pizzaapplication/validator/user/PizzaUserIdValidator.java b/src/java/org/mxchange/pizzaapplication/validator/user/PizzaUserIdValidator.java
index abde9cee..bb8dda7e 100644
--- a/src/java/org/mxchange/pizzaapplication/validator/user/PizzaUserIdValidator.java
+++ b/src/java/org/mxchange/pizzaapplication/validator/user/PizzaUserIdValidator.java
@@ -46,12 +46,6 @@ public class PizzaUserIdValidator extends BaseNumberValidator {
 	 */
 	private static final long serialVersionUID = 12_869_569_314_764_690L;
 
-	/**
-	 * Default constructor
-	 */
-	public PizzaUserIdValidator () {
-	}
-
 	@Override
 	public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
 		// Is the instance there?