From 4e4af55c32b7c7910e1917c5c7cd48264994b310 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 20 Apr 2017 10:39:51 +0200 Subject: [PATCH] Please cherry-pick: - don't get local logger here, local invokations are CDI, but here JNDI would be needed - maybe old-feshioned System.out.println() ? MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../contact/PizzaContactConverter.java | 17 +++--------- .../country/PizzaCountryConverter.java | 20 ++++---------- .../mobile/PizzaMobileConverter.java | 17 +++--------- .../PizzaMobileProviderConverter.java | 18 +++---------- .../converter/user/PizzaUserConverter.java | 15 ++--------- .../birthday/PizzaBirthdayValidator.java | 21 ++++----------- .../password/PizzaUserPasswordValidator.java | 15 ++--------- .../validator/user/PizzaUserIdValidator.java | 26 ++++++------------- 8 files changed, 32 insertions(+), 117 deletions(-) diff --git a/src/java/org/mxchange/pizzaapplication/converter/contact/PizzaContactConverter.java b/src/java/org/mxchange/pizzaapplication/converter/contact/PizzaContactConverter.java index e0f516c6..ffd9ef35 100644 --- a/src/java/org/mxchange/pizzaapplication/converter/contact/PizzaContactConverter.java +++ b/src/java/org/mxchange/pizzaapplication/converter/contact/PizzaContactConverter.java @@ -28,8 +28,6 @@ import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; -import org.mxchange.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; /** * Converter for contact id <-> valid contact instance @@ -44,12 +42,6 @@ public class PizzaContactConverter implements Converter { */ private ContactSessionBeanRemote contactBean; - /** - * Logger instance - */ - @Log - private LoggerBeanLocal loggerBeanLocal; - /** * Initialization of this converter */ @@ -59,14 +51,11 @@ public class PizzaContactConverter implements Converter { // Get initial context Context context = new InitialContext(); - // Lookup logger - this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N - // ... and user controller this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it - throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N + throw new ConverterException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N } } @@ -78,7 +67,7 @@ public class PizzaContactConverter implements Converter { // Is the value null or empty? if ((null == submittedValue) || (submittedValue.trim().isEmpty())) { // Warning message - this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N + // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N // Return null return null; @@ -104,7 +93,7 @@ public class PizzaContactConverter implements Converter { throw new ConverterException(ex); } catch (final ContactNotFoundException ex) { // Debug message - this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N + // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N } // Trace message diff --git a/src/java/org/mxchange/pizzaapplication/converter/country/PizzaCountryConverter.java b/src/java/org/mxchange/pizzaapplication/converter/country/PizzaCountryConverter.java index 538277f4..c5cec811 100644 --- a/src/java/org/mxchange/pizzaapplication/converter/country/PizzaCountryConverter.java +++ b/src/java/org/mxchange/pizzaapplication/converter/country/PizzaCountryConverter.java @@ -22,12 +22,11 @@ import java.util.Objects; 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.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jcountry.data.Country; import org.mxchange.jcountry.data.CountrySingletonBeanRemote; @@ -44,12 +43,6 @@ public class PizzaCountryConverter implements Converter { */ private CountrySingletonBeanRemote countryBean; - /** - * Logger instance - */ - @Log - private LoggerBeanLocal loggerBeanLocal; - /** * Initialization of this converter */ @@ -59,14 +52,11 @@ public class PizzaCountryConverter implements Converter { // Get initial context Context context = new InitialContext(); - // Lookup logger - this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N - // ... and country bean this.countryBean = (CountrySingletonBeanRemote) context.lookup("java:global/pizzaservice-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it - throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N + throw new ConverterException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N } } @@ -78,7 +68,7 @@ public class PizzaCountryConverter implements Converter { // Is the value null or empty? if ((null == submittedValue) || (submittedValue.trim().isEmpty())) { // Warning message - this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N + // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N // Return null return null; @@ -111,8 +101,8 @@ public class PizzaCountryConverter implements Converter { } } } catch (final NumberFormatException ex) { - // Log exception (maybe to much?) - this.loggerBeanLocal.logException(ex); + // Throw again + throw new ConverterException(ex); } // Trace message diff --git a/src/java/org/mxchange/pizzaapplication/converter/mobile/PizzaMobileConverter.java b/src/java/org/mxchange/pizzaapplication/converter/mobile/PizzaMobileConverter.java index a01af819..d7ea6212 100644 --- a/src/java/org/mxchange/pizzaapplication/converter/mobile/PizzaMobileConverter.java +++ b/src/java/org/mxchange/pizzaapplication/converter/mobile/PizzaMobileConverter.java @@ -25,8 +25,6 @@ import javax.faces.convert.FacesConverter; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException; import org.mxchange.jphone.phonenumbers.DialableNumber; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; @@ -40,12 +38,6 @@ import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote; @FacesConverter (value = "CellphoneConverter") public class PizzaMobileConverter implements Converter { - /** - * Logger instance - */ - @Log - private LoggerBeanLocal loggerBeanLocal; - /** * Phone EJB */ @@ -60,14 +52,11 @@ public class PizzaMobileConverter implements Converter { // Get initial context Context context = new InitialContext(); - // Lookup logger - this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N - // ... and user controller this.phoneBean = (PhoneSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it - throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N + throw new ConverterException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N } } @@ -79,7 +68,7 @@ public class PizzaMobileConverter implements Converter { // Is the value null or empty? if ((null == submittedValue) || (submittedValue.trim().isEmpty())) { // Warning message - this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N + // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N // Return null return null; @@ -105,7 +94,7 @@ public class PizzaMobileConverter implements Converter { throw new ConverterException(ex); } catch (final PhoneEntityNotFoundException ex) { // Debug message - this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N + // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N } // Trace message diff --git a/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java b/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java index 85f82458..28dbba03 100644 --- a/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java +++ b/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java @@ -22,12 +22,11 @@ import java.util.Objects; 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.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote; @@ -39,12 +38,6 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBe @FacesConverter (value = "MobileProviderConverter") public class PizzaMobileProviderConverter implements Converter { - /** - * Logger instance - */ - @Log - private LoggerBeanLocal loggerBeanLocal; - /** * Mobile provider bean */ @@ -59,14 +52,11 @@ public class PizzaMobileProviderConverter implements Converter { // Get initial context Context context = new InitialContext(); - // Lookup logger - this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N - /// and SMS provider controller this.mobileRemoteBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/pizzaservice-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it - throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N + throw new ConverterException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N } } @@ -78,7 +68,7 @@ public class PizzaMobileProviderConverter implements Converter { // Is the value null or empty? if ((null == submittedValue) || (submittedValue.trim().isEmpty())) { // Warning message - this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N + // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N // Return null return null; @@ -112,7 +102,7 @@ public class PizzaMobileProviderConverter implements Converter { } } catch (final NumberFormatException ex) { // Log exception (maybe to much?) - this.loggerBeanLocal.logException(ex); + // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logException(ex); } // Trace message diff --git a/src/java/org/mxchange/pizzaapplication/converter/user/PizzaUserConverter.java b/src/java/org/mxchange/pizzaapplication/converter/user/PizzaUserConverter.java index ce1c513f..2854e1ad 100644 --- a/src/java/org/mxchange/pizzaapplication/converter/user/PizzaUserConverter.java +++ b/src/java/org/mxchange/pizzaapplication/converter/user/PizzaUserConverter.java @@ -25,8 +25,6 @@ import javax.faces.convert.FacesConverter; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; @@ -39,12 +37,6 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote; @FacesConverter (value = "UserConverter") public class PizzaUserConverter implements Converter { - /** - * Logger instance - */ - @Log - private LoggerBeanLocal loggerBeanLocal; - /** * User EJB */ @@ -59,9 +51,6 @@ public class PizzaUserConverter implements Converter { // Get initial context Context context = new InitialContext(); - // Lookup logger - this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N - // ... and user controller this.userBean = (UserSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { @@ -78,7 +67,7 @@ public class PizzaUserConverter implements Converter { // Is the value null or empty? if ((null == submittedValue) || (submittedValue.trim().isEmpty())) { // Warning message - this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N + // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N // Return null return null; @@ -104,7 +93,7 @@ public class PizzaUserConverter implements Converter { throw new ConverterException(ex); } catch (final UserNotFoundException ex) { // Debug message - this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: Exception: {0} - Returning null ...", ex)); //NOI18N + // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: Exception: {0} - Returning null ...", ex)); //NOI18N } // Trace message diff --git a/src/java/org/mxchange/pizzaapplication/validator/birthday/PizzaBirthdayValidator.java b/src/java/org/mxchange/pizzaapplication/validator/birthday/PizzaBirthdayValidator.java index 7cafab74..08e8da72 100644 --- a/src/java/org/mxchange/pizzaapplication/validator/birthday/PizzaBirthdayValidator.java +++ b/src/java/org/mxchange/pizzaapplication/validator/birthday/PizzaBirthdayValidator.java @@ -20,6 +20,7 @@ import java.text.MessageFormat; import java.util.Date; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import javax.faces.convert.ConverterException; import javax.faces.validator.FacesValidator; import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; @@ -27,15 +28,13 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreee.validator.date.BaseDateValidator; -import org.mxchange.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; /** * A birthday validator *

* @author Roland Häder */ -@FacesValidator("BirthdayValidator") +@FacesValidator ("BirthdayValidator") public class PizzaBirthdayValidator extends BaseDateValidator implements Validator { /** @@ -43,12 +42,6 @@ public class PizzaBirthdayValidator extends BaseDateValidator implements Validat */ private static final long serialVersionUID = 28_735_756_819_460L; - /** - * Logger bean - */ - @Log - private LoggerBeanLocal loggerBeanLocal; - /** * Default constructor */ @@ -57,19 +50,16 @@ public class PizzaBirthdayValidator extends BaseDateValidator implements Validat try { // Get initial context Context context = new InitialContext(); - - // Lookup logger - this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N } catch (final NamingException ex) { // Continue to throw it - throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N + throw new ConverterException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N } } @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { // Trace message - this.loggerBeanLocal.logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N // All accepted, required fields String[] requiredFields = {"birthday", "contactBirthday"}; //NOI18N @@ -81,9 +71,8 @@ public class PizzaBirthdayValidator extends BaseDateValidator implements Validat Date birthday = (Date) value; // @TODO Finish this, e.g. load maximum,minimum birthday from properties file - // Trace message - this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N } } diff --git a/src/java/org/mxchange/pizzaapplication/validator/password/PizzaUserPasswordValidator.java b/src/java/org/mxchange/pizzaapplication/validator/password/PizzaUserPasswordValidator.java index 14ee8d6e..4796d05c 100644 --- a/src/java/org/mxchange/pizzaapplication/validator/password/PizzaUserPasswordValidator.java +++ b/src/java/org/mxchange/pizzaapplication/validator/password/PizzaUserPasswordValidator.java @@ -27,8 +27,6 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreee.validator.string.BaseStringValidator; -import org.mxchange.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jusercore.container.login.LoginContainer; import org.mxchange.jusercore.container.login.UserLoginContainer; import org.mxchange.jusercore.model.user.UserUtils; @@ -47,12 +45,6 @@ public class PizzaUserPasswordValidator extends BaseStringValidator implements V */ private static final long serialVersionUID = 48_581_795_687_317L; - /** - * Logger instance - */ - @Log - private LoggerBeanLocal loggerBeanLocal; - /** * User login controller */ @@ -66,9 +58,6 @@ public class PizzaUserPasswordValidator extends BaseStringValidator implements V try { // Get initial context Context context = new InitialContext(); - - // Lookup logger - this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N @@ -78,7 +67,7 @@ public class PizzaUserPasswordValidator extends BaseStringValidator implements V @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { // Trace message - this.loggerBeanLocal.logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N // The required field String[] requiredFields = {"currentPassword"}; //NOI18N @@ -96,7 +85,7 @@ public class PizzaUserPasswordValidator extends BaseStringValidator implements V } // Trace message - this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N } } diff --git a/src/java/org/mxchange/pizzaapplication/validator/user/PizzaUserIdValidator.java b/src/java/org/mxchange/pizzaapplication/validator/user/PizzaUserIdValidator.java index 7beb2630..89cd4abd 100644 --- a/src/java/org/mxchange/pizzaapplication/validator/user/PizzaUserIdValidator.java +++ b/src/java/org/mxchange/pizzaapplication/validator/user/PizzaUserIdValidator.java @@ -23,6 +23,7 @@ import javax.enterprise.event.Observes; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import javax.faces.convert.ConverterException; import javax.faces.validator.FacesValidator; import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; @@ -30,11 +31,9 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreee.validator.number.BaseLongValidator; -import org.mxchange.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; +import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; -import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent; /** * A validator for user ids @@ -54,12 +53,6 @@ public class PizzaUserIdValidator extends BaseLongValidator implements Validator */ private static final long serialVersionUID = 12_869_569_314_764_690L; - /** - * Logger instance - */ - @Log - private LoggerBeanLocal loggerBeanLocal; - /** * Remote bean */ @@ -74,14 +67,11 @@ public class PizzaUserIdValidator extends BaseLongValidator implements Validator // Get initial context Context context = new InitialContext(); - // Lookup logger - this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N - // ... and user controller this.userBean = (UserSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it - throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N + throw new ConverterException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N } } @@ -92,7 +82,7 @@ public class PizzaUserIdValidator extends BaseLongValidator implements Validator */ public void afterRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) { // Trace message - this.loggerBeanLocal.logTrace(MessageFormat.format("UserIdValidator:afterRegistrationEvent: event={0} - CALLED!", event)); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("UserIdValidator:afterRegistrationEvent: event={0} - CALLED!", event)); //NOI18N // event should not be null if (null == event) { @@ -113,19 +103,19 @@ public class PizzaUserIdValidator extends BaseLongValidator implements Validator User registeredUser = event.getRegisteredUser(); // Debug message - this.loggerBeanLocal.logDebug(MessageFormat.format("UserIdValidator:afterRegistrationEvent: registeredUser={0}", registeredUser)); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("UserIdValidator:afterRegistrationEvent: registeredUser={0}", registeredUser)); //NOI18N // Update cache PizzaUserIdValidator.cachedStatus.add(registeredUser.getUserId()); // Trace message - this.loggerBeanLocal.logTrace("UserIdValidator:afterRegistrationEvent: EXIT!"); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logTrace("UserIdValidator:afterRegistrationEvent: EXIT!"); //NOI18N } @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { // Trace message - this.loggerBeanLocal.logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N // All accepted, required fields String[] requiredFields = {"userId"}; //NOI18N @@ -158,7 +148,7 @@ public class PizzaUserIdValidator extends BaseLongValidator implements Validator PizzaUserIdValidator.cachedStatus.add(userId); // Trace message - this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N } } -- 2.39.5