From e666b223a426ab472e604af87b37d6042059c325 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 22 Apr 2017 22:04:26 +0200 Subject: [PATCH] Please cherry-pick: - Let's always call super constructor (not the default one, of course), maybe one day there will be something added - sorted members a bit - some constructors still contain EJB-lookup code, moved to init() (@PostConstruct) method MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../beans/BaseFinancialsController.java | 108 ++++++++++++++++-- ...ancialsConfirmationLinkWebRequestBean.java | 4 +- .../FinancialsAdminContactWebRequestBean.java | 4 +- .../FinancialsContactWebSessionBean.java | 5 +- ...ncialsAdminContactPhoneWebRequestBean.java | 34 ++++-- .../FinancialsContactPhoneWebSessionBean.java | 3 + .../FinancialsAdminCountryWebRequestBean.java | 2 + .../FinancialsCountryWebApplicationBean.java | 2 + .../FinancialsEmailChangeWebSessionBean.java | 4 +- .../FinancialsFeatureWebApplicationBean.java | 2 + .../FinancialsGenderWebApplicationBean.java | 2 + .../FinancialsWebRequestHelperBean.java | 3 + .../FinancialsLocalizationSessionBean.java | 2 + .../FinancialsUserLoginWebSessionBean.java | 5 +- ...nancialsUserLoginWebSessionController.java | 2 +- ...ialsAdminMobileProviderWebRequestBean.java | 2 + ...inancialsMobileProviderWebRequestBean.java | 2 + .../FinancialsAdminPhoneWebRequestBean.java | 3 + .../FinancialsPhoneWebApplicationBean.java | 25 ++-- .../FinancialsUserProfileWebRequestBean.java | 4 +- ...nancialsProfileModeWebApplicationBean.java | 2 + .../FinancialsUserRegisterWebSessionBean.java | 14 ++- .../FinancialsResendLinkWebSessionBean.java | 2 + .../FinancialsAdminUserWebRequestBean.java | 2 + .../user/FinancialsUserWebSessionBean.java | 4 +- .../FinancialsUserPasswordWebRequestBean.java | 4 +- 26 files changed, 201 insertions(+), 45 deletions(-) rename src/java/org/mxchange/jfinancials/beans/login/{ => user}/FinancialsUserLoginWebSessionBean.java (99%) rename src/java/org/mxchange/jfinancials/beans/login/{ => user}/FinancialsUserLoginWebSessionController.java (98%) diff --git a/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java b/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java index 509dde87..28adbde7 100644 --- a/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java +++ b/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java @@ -17,8 +17,14 @@ package org.mxchange.jfinancials.beans; import java.io.Serializable; +import java.security.Principal; +import java.text.MessageFormat; +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.ResourceBundle; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; +import org.mxchange.jusercore.model.user.UserUtils; /** * A general controller @@ -32,6 +38,35 @@ public abstract class BaseFinancialsController implements Serializable { */ private static final long serialVersionUID = 50_837_597_127_567_140L; + /** + * Protected constructor + */ + protected BaseFinancialsController () { + } + + /** + * Determines principal's name or returns null if no principal (security) is + * set. + *

+ * @return Principal's name or null + */ + protected String determinePrincipalName () { + // Get principal + Principal userPrincipal = FacesContext.getCurrentInstance().getExternalContext().getUserPrincipal(); + + // Init with null + String principalName = null; + + // Is the principal set? + if (userPrincipal instanceof Principal) { + // Get principal's name + principalName = userPrincipal.getName(); + } + + // Return it + return principalName; + } + /** * Returns given property key or throws an exception if not found. *

@@ -66,7 +101,7 @@ public abstract class BaseFinancialsController implements Serializable { // Is it null? if (null == contextValue) { // Throw NPE - throw new NullPointerException("parameterKey=" + parameterKey + " is not set."); + throw new NullPointerException(MessageFormat.format("parameterKey={0} is not set.", parameterKey)); //NOI18N } // Return it @@ -91,21 +126,45 @@ public abstract class BaseFinancialsController implements Serializable { } // Try to get context parameter - String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter(String.format("is_debug_%s_enabled", controllerName)); //NOI18N + String contextParameter = this.getStringContextParameter(String.format("is_debug_%s_enabled", controllerName)); //NOI18N // Is it set and true? - boolean isEnabled = ((contextParameter instanceof String) && (contextParameter.equals("true"))); //NOI18N + boolean isEnabled = (Boolean.parseBoolean(contextParameter) == Boolean.TRUE); // Return it return isEnabled; } + /** + * Checks if given password is to weak to be used + *

+ * @param password Clear-text password + *

+ * @return Whether the entered password is to weak + */ + protected boolean isWeakPassword (final String password) { + // Is parameter set? + if (null == password) { + // Throw NPE + throw new NullPointerException("password is null"); //NOI18N + } + + // Get score value + double passwordScore = UserUtils.calculatePasswordScore(password); + + // Is the score within range? + boolean isWeak = (passwordScore <= this.getIntegerContextParameter("min_user_password_score")); //NOI18N + + // Return it + return isWeak; + } + /** * Shows a faces message for given causing exception. The message from the * exception is being inserted into the message. *

* @param clientId Client id to send message to - * @param cause Causing exception + * @param cause Causing exception */ protected void showFacesMessage (final String clientId, final Throwable cause) { // Get context and add message @@ -113,12 +172,47 @@ public abstract class BaseFinancialsController implements Serializable { } /** - * Shows a faces message with given message. + * Shows a faces message with given message (i18n) key. *

* @param clientId Client id to send message to - * @param message Causing exception + * @param i18nKey Message key + *

+ * @throws NullPointerException If clientId or i18nKey is null + * @throws IllegalArgumentException If clientId or i18nKey is empty */ - protected void showFacesMessage (final String clientId, final String message) { + protected void showFacesMessage (final String clientId, final String i18nKey) throws NullPointerException, IllegalArgumentException { + // Both parameter must be valid + if (null == clientId) { + // Throw NPE + throw new NullPointerException("clientId is null"); //NOI18N + } else if (clientId.isEmpty()) { + // Is empty + throw new IllegalArgumentException("clientId is null"); //NOI18N + } else if (null == i18nKey) { + // Throw NPE + throw new NullPointerException("i18nKey is null"); //NOI18N + } else if (i18nKey.isEmpty()) { + // Is empty + throw new IllegalArgumentException("i18nKey is null"); //NOI18N + } + + // Get current locale + Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale(); + + // Get bundle bundle + ResourceBundle bundle = ResourceBundle.getBundle("org.mxchange.localization.bundle", locale); + + // Default is i18nKey + String message = i18nKey; + + // Try it + try { + // Get message + message = bundle.getString(i18nKey); + } catch (final MissingResourceException ex) { + // Did not find it, ignored + } + // Get context and add message FacesContext.getCurrentInstance().addMessage(clientId, new FacesMessage(message)); } diff --git a/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java index af574493..35d8f270 100644 --- a/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java @@ -32,6 +32,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestHelperController; import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController; import org.mxchange.jusercore.events.confirmation.ObservableUserConfirmedAccountEvent; import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent; @@ -40,7 +41,6 @@ import org.mxchange.jusercore.exceptions.UserStatusLockedException; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.status.UserAccountStatus; -import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestHelperController; /** * A web request bean for confirmation link handling @@ -89,6 +89,8 @@ public class FinancialsConfirmationLinkWebRequestBean extends BaseFinancialsCont * Default constructor */ public FinancialsConfirmationLinkWebRequestBean () { + // Call super constructor + super(); } /** diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java index 0365390d..1377ef26 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java @@ -43,6 +43,7 @@ import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContac import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; import org.mxchange.jcountry.data.Country; import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestHelperController; import org.mxchange.jphone.phonenumbers.DialableNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.fax.FaxNumber; @@ -51,7 +52,6 @@ import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.phonenumbers.mobile.MobileNumber; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; -import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestHelperController; /** * An administrative user bean (controller) @@ -247,6 +247,8 @@ public class FinancialsAdminContactWebRequestBean extends BaseFinancialsControll * Default constructor */ public FinancialsAdminContactWebRequestBean () { + // Call super constructor + super(); } @Override diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java index 1aeb0cfe..1f12d8e7 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java @@ -42,7 +42,7 @@ import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContac import org.mxchange.jcontacts.exceptions.ContactNotFoundException; import org.mxchange.jcountry.data.Country; import org.mxchange.jfinancials.beans.BaseFinancialsController; -import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController; +import org.mxchange.jfinancials.beans.login.user.FinancialsUserLoginWebSessionController; import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.fax.FaxNumber; @@ -234,6 +234,9 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im * Default constructor */ public FinancialsContactWebSessionBean () { + // Call super constructor + super(); + // Init lists/maps this.contactList = new LinkedList<>(); this.emailAddressList = new LinkedList<>(); diff --git a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java index dc0be5ce..cf05d408 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java @@ -17,6 +17,7 @@ package org.mxchange.jfinancials.beans.contact.phone; import java.text.MessageFormat; +import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; @@ -140,20 +141,11 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon * Default constructor */ public FinancialsAdminContactPhoneWebRequestBean () { + // Call super constructor + super(); + // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName()); // System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller)); - - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the beans - this.adminPhoneBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminContactPhone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } } /** @@ -414,6 +406,24 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon return "admin_show_contact"; //NOI18N } + /** + * Post-construction method + */ + @PostConstruct + public void init () { + // Try it + try { + // Get initial context + Context context = new InitialContext(); + + // Try to lookup the beans + this.adminPhoneBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminContactPhone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N + } catch (final NamingException e) { + // Throw again + throw new FaceletException(e); + } + } + @Override public String unlinkFaxContactData () { // Is all data set diff --git a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java index ae35fd41..eddc4dc7 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java @@ -78,6 +78,9 @@ public class FinancialsContactPhoneWebSessionBean extends BaseFinancialsControll * Default constructor */ public FinancialsContactPhoneWebSessionBean () { + // Call super constructor + super(); + // Init lists/maps this.contacts = new HashMap<>(10); } diff --git a/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java index 94bde72f..f7447ff6 100644 --- a/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java @@ -103,6 +103,8 @@ public class FinancialsAdminCountryWebRequestBean extends BaseFinancialsControll * Default constructor */ public FinancialsAdminCountryWebRequestBean () { + // Call super constructor + super(); } @Override diff --git a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java index aae836a1..cea6d8c2 100644 --- a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java @@ -59,6 +59,8 @@ public class FinancialsCountryWebApplicationBean extends BaseFinancialsControlle * Default constructor */ public FinancialsCountryWebApplicationBean () { + // Call super constructor + super(); } /** diff --git a/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java index 8f37ed45..ded705f1 100644 --- a/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java @@ -31,7 +31,7 @@ import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; -import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController; +import org.mxchange.jfinancials.beans.login.user.FinancialsUserLoginWebSessionController; import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; import org.mxchange.jusercore.model.email_address.EmailAddressChange; @@ -88,6 +88,8 @@ public class FinancialsEmailChangeWebSessionBean extends BaseFinancialsControlle * Default constructor */ public FinancialsEmailChangeWebSessionBean () { + // Call super constructor + super(); } @Override diff --git a/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java index 03e96e18..4fda84be 100644 --- a/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java @@ -39,6 +39,8 @@ public class FinancialsFeatureWebApplicationBean extends BaseFinancialsControlle * Default constructor */ public FinancialsFeatureWebApplicationBean () { + // Call super constructor + super(); } /** diff --git a/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java index ab117590..3990bfac 100644 --- a/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java @@ -42,6 +42,8 @@ public class FinancialsGenderWebApplicationBean extends BaseFinancialsController * Default constructor */ public FinancialsGenderWebApplicationBean () { + // Call super constructor + super(); } @Override diff --git a/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java index eb2e482f..7d39f004 100644 --- a/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java +++ b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java @@ -102,6 +102,9 @@ public class FinancialsWebRequestHelperBean implements FinancialsWebRequestHelpe * Default constructor */ public FinancialsWebRequestHelperBean () { + // Call super constructor + super(); + // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName()); // System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller)); } diff --git a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java index 3c22d855..6cd1cb75 100644 --- a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java @@ -53,6 +53,8 @@ public class FinancialsLocalizationSessionBean extends BaseFinancialsController * Default constructor */ public FinancialsLocalizationSessionBean () { + // Call super constructor + super(); } /** diff --git a/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/login/user/FinancialsUserLoginWebSessionBean.java similarity index 99% rename from src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java rename to src/java/org/mxchange/jfinancials/beans/login/user/FinancialsUserLoginWebSessionBean.java index 96ffd74e..601c8aad 100644 --- a/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/login/user/FinancialsUserLoginWebSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.login; +package org.mxchange.jfinancials.beans.login.user; import java.text.MessageFormat; import java.util.Collections; @@ -144,6 +144,9 @@ public class FinancialsUserLoginWebSessionBean extends BaseFinancialsController * Default constructor */ public FinancialsUserLoginWebSessionBean () { + // Call super constructor + super(); + // Defaul template is guest this.baseTemplatePathName = GUEST_BASE_TEMPLATE_NAME; } diff --git a/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/login/user/FinancialsUserLoginWebSessionController.java similarity index 98% rename from src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionController.java rename to src/java/org/mxchange/jfinancials/beans/login/user/FinancialsUserLoginWebSessionController.java index 8f108f49..3ddd5f7b 100644 --- a/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionController.java +++ b/src/java/org/mxchange/jfinancials/beans/login/user/FinancialsUserLoginWebSessionController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.login; +package org.mxchange.jfinancials.beans.login.user; import java.io.Serializable; import java.util.List; diff --git a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java index 6f6b8f64..9c7a3cad 100644 --- a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java @@ -94,6 +94,8 @@ public class FinancialsAdminMobileProviderWebRequestBean extends BaseFinancialsC * Default constructor */ public FinancialsAdminMobileProviderWebRequestBean () { + // Call super constructor + super(); } @Override diff --git a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java index 202abaa4..f1395ba7 100644 --- a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java @@ -59,6 +59,8 @@ public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsContro * Default constructor */ public FinancialsMobileProviderWebRequestBean () { + // Call super constructor + super(); } /** diff --git a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java index 7d20d89f..a6acca6a 100644 --- a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java @@ -196,6 +196,9 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsController * Default constructor */ public FinancialsAdminPhoneWebRequestBean () { + // Call super constructor + super(); + // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName()); // System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller)); } diff --git a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebApplicationBean.java index 2cfcf1b5..b4587a49 100644 --- a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebApplicationBean.java @@ -85,17 +85,8 @@ public class FinancialsPhoneWebApplicationBean extends BaseFinancialsController * Default constructor */ public FinancialsPhoneWebApplicationBean () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the beans - this.phoneBean = (PhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw it again - throw new FaceletException(e); - } + // Call super constructor + super(); // Init all lists this.mobileNumbers = new LinkedList<>(); @@ -450,6 +441,18 @@ public class FinancialsPhoneWebApplicationBean extends BaseFinancialsController */ @PostConstruct public void init () { + // Try it + try { + // Get initial context + Context context = new InitialContext(); + + // Try to lookup the beans + this.phoneBean = (PhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote"); //NOI18N + } catch (final NamingException e) { + // Throw it again + throw new FaceletException(e); + } + // All phone numbers this.allMobileNumbers().addAll(this.phoneBean.allMobileNumbers()); this.allFaxNumbers().addAll(this.phoneBean.allFaxNumbers()); diff --git a/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java index 795bd32e..d6920ba9 100644 --- a/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java @@ -23,7 +23,7 @@ import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jfinancials.beans.BaseFinancialsController; -import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController; +import org.mxchange.jfinancials.beans.login.user.FinancialsUserLoginWebSessionController; import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; @@ -59,6 +59,8 @@ public class FinancialsUserProfileWebRequestBean extends BaseFinancialsControlle * Default constructor */ public FinancialsUserProfileWebRequestBean () { + // Call super constructor + super(); } /** diff --git a/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java index 7e59be69..26b3d2b0 100644 --- a/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java @@ -40,6 +40,8 @@ public class FinancialsProfileModeWebApplicationBean extends BaseFinancialsContr * Default constructor */ public FinancialsProfileModeWebApplicationBean () { + // Call super constructor + super(); } @Override diff --git a/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java index e9ba733d..9e38b14b 100644 --- a/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java @@ -83,22 +83,24 @@ public class FinancialsUserRegisterWebSessionBean extends BaseFinancialsControll private UserRegistrationSessionBeanRemote registerBean; /** - * An en event fireable when a new user has registered + * User controller */ @Inject - @Any - private Event registeredEvent; + private FinancialsUserWebSessionController userController; /** - * User controller + * An en event fireable when a new user has registered */ @Inject - private FinancialsUserWebSessionController userController; + @Any + private Event userRegisteredEvent; /** * Default constructor */ public FinancialsUserRegisterWebSessionBean () { + // Call super constructor + super(); } @Override @@ -165,7 +167,7 @@ public class FinancialsUserRegisterWebSessionBean extends BaseFinancialsControll assert (registeredUser.getUserId() instanceof Long) : "registeredUser.userId is null after registerUser() was called."; //NOI18N // Fire event - this.registeredEvent.fire(new UserRegisteredEvent(registeredUser)); + this.userRegisteredEvent.fire(new UserRegisteredEvent(registeredUser)); // All fine, redirect to proper page return "register_done"; //NOI18N diff --git a/src/java/org/mxchange/jfinancials/beans/resendlink/FinancialsResendLinkWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/resendlink/FinancialsResendLinkWebSessionBean.java index d3c1330e..96d6b683 100644 --- a/src/java/org/mxchange/jfinancials/beans/resendlink/FinancialsResendLinkWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/resendlink/FinancialsResendLinkWebSessionBean.java @@ -75,6 +75,8 @@ public class FinancialsResendLinkWebSessionBean extends BaseFinancialsController * Default constructor */ public FinancialsResendLinkWebSessionBean () { + // Call super constructor + super(); } @Override diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java index 087730c8..88459f4e 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java @@ -197,6 +197,8 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController * Default constructor */ public FinancialsAdminUserWebRequestBean () { + // Call super constructor + super(); } @Override diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java index 19fd8110..6b573a60 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java @@ -36,7 +36,7 @@ import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionController; import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; -import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController; +import org.mxchange.jfinancials.beans.login.user.FinancialsUserLoginWebSessionController; import org.mxchange.jusercore.events.confirmation.ObservableUserConfirmedAccountEvent; import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent; import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent; @@ -149,6 +149,8 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple * Default constructor */ public FinancialsUserWebSessionBean () { + // Call super constructor + super(); } /** diff --git a/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java index 38cdc506..574d6789 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java @@ -30,7 +30,7 @@ import javax.naming.NamingException; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; -import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController; +import org.mxchange.jfinancials.beans.login.user.FinancialsUserLoginWebSessionController; import org.mxchange.jusercore.events.user.password_change.ObservableUpdatedUserPasswordEvent; import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent; import org.mxchange.jusercore.exceptions.UserNotFoundException; @@ -99,6 +99,8 @@ public class FinancialsUserPasswordWebRequestBean extends BaseFinancialsControll * Default constructor */ public FinancialsUserPasswordWebRequestBean () { + // Call super constructor + super(); } @Override -- 2.39.5