Please cherry-pick:

[pizzaservice-war.git] / src / java / org / mxchange / pizzaapplication / beans / register / PizzaUserRegisterWebSessionBean.java

diff --git a/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java
index 59b97c9435efd9cefc38050b8a66bcee09a41412..84aa05a4ff31d3fd4ab21dafa52f2c75ae312008 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Roland Häder
+ * Copyright (C) 2016, 2017 Roland Häder
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -17,6 +17,7 @@
 package org.mxchange.pizzaapplication.beans.register;
 
 import java.text.MessageFormat;
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;
@@ -29,6 +30,7 @@ import javax.naming.NamingException;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jcoreee.utils.FacesUtils;
+import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
 import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
 import org.mxchange.jusercore.exceptions.DataRepeatMismatchException;
 import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException;
@@ -42,7 +44,6 @@ import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionControl
 import org.mxchange.pizzaapplication.beans.features.PizzaFeaturesWebApplicationController;
 import org.mxchange.pizzaapplication.beans.user.PizzaAdminUserWebRequestController;
 import org.mxchange.pizzaapplication.beans.user.PizzaUserWebSessionController;
-import org.mxchange.jusercore.events.registration.ObservableUserRegisteredEvent;
 
 /**
  * A web bean for user registration
@@ -77,37 +78,29 @@ public class PizzaUserRegisterWebSessionBean extends BasePizzaController impleme
        private PizzaFeaturesWebApplicationController featureController;
 
        /**
-        * Reemote register session bean
+        * Remote register session-scoped bean
         */
        private UserRegistrationSessionBeanRemote registerBean;
 
        /**
-        * An en event fireable when a new user has registered
+        * User controller
         */
        @Inject
-       @Any
-       private Event<ObservableUserRegisteredEvent> registeredEvent;
+       private PizzaUserWebSessionController userController;
 
        /**
-        * User controller
+        * An en event fireable when a new user has registered
         */
        @Inject
-       private PizzaUserWebSessionController userController;
+       @Any
+       private Event<ObservableUserRegisteredEvent> userRegisteredEvent;
 
        /**
         * Default constructor
         */
        public PizzaUserRegisterWebSessionBean () {
-               try {
-                       // Get initial context
-                       Context context = new InitialContext();
-
-                       // Try to lookup
-                       this.registerBean = (UserRegistrationSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/register!org.mxchange.jusercore.model.register.UserRegistrationSessionBeanRemote"); //NOI18N
-               } catch (final NamingException ex) {
-                       // Continue to throw
-                       throw new FaceletException(ex);
-               }
+               // Call super constructor
+               super();
        }
 
        @Override
@@ -174,7 +167,7 @@ public class PizzaUserRegisterWebSessionBean extends BasePizzaController impleme
                        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
@@ -221,7 +214,24 @@ public class PizzaUserRegisterWebSessionBean extends BasePizzaController impleme
                }
 
                // Now only redirect to next page as the JSF does it
-               return "register_page2"; //NOI18N
+               return "user_register_page2"; //NOI18N
+       }
+
+       /**
+        * Post-construction method
+        */
+       @PostConstruct
+       public void init () {
+               try {
+                       // Get initial context
+                       Context context = new InitialContext();
+
+                       // Try to lookup
+                       this.registerBean = (UserRegistrationSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/register!org.mxchange.jusercore.model.register.UserRegistrationSessionBeanRemote"); //NOI18N
+               } catch (final NamingException ex) {
+                       // Continue to throw
+                       throw new FaceletException(ex);
+               }
        }
 
 }