From: Roland Häder Date: Fri, 13 Oct 2017 23:32:27 +0000 (+0200) Subject: Pre-commit: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=38e9f47d0def5e04f95a0ae03721413de386ce61;p=pizzaservice-war.git Pre-commit: - renamed BasePizzaController -> BasePizzaBean as "Controller" is reserverd for interfaces of backing beans - category/product beans are no longer application-scoped, was some old-lost "cache" faking, now there is JCache (and sadly dependency to Payara) Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/pizzaapplication/beans/BasePizzaBean.java b/src/java/org/mxchange/pizzaapplication/beans/BasePizzaBean.java new file mode 100644 index 00000000..16365b0e --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/beans/BasePizzaBean.java @@ -0,0 +1,52 @@ +/* + * 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.mxchange.pizzaapplication.beans; + +import java.util.Locale; +import java.util.ResourceBundle; +import org.mxchange.jcoreee.bean.faces.BaseFacesBean; + +/** + * A general controller + *

+ * @author Roland Häder + */ +public abstract class BasePizzaBean extends BaseFacesBean { + + /** + * Serial number + */ + private static final long serialVersionUID = 50_837_597_127_567_140L; + + /** + * Protected constructor + */ + protected BasePizzaBean () { + // Call super constructor + super(); + } + + @Override + protected ResourceBundle loadResourceBundle (final Locale locale) { + // Load resource bundle + ResourceBundle bundle = ResourceBundle.getBundle("org.mxchange.localization.bundle", locale); + + // Return it + return bundle; + } + +} diff --git a/src/java/org/mxchange/pizzaapplication/beans/BasePizzaController.java b/src/java/org/mxchange/pizzaapplication/beans/BasePizzaController.java deleted file mode 100644 index 5dd11dd0..00000000 --- a/src/java/org/mxchange/pizzaapplication/beans/BasePizzaController.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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 - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.pizzaapplication.beans; - -import java.util.Locale; -import java.util.ResourceBundle; -import org.mxchange.jcoreee.bean.faces.BaseFacesBean; - -/** - * A general controller - *

- * @author Roland Häder - */ -public abstract class BasePizzaController extends BaseFacesBean { - - /** - * Serial number - */ - private static final long serialVersionUID = 50_837_597_127_567_140L; - - /** - * Protected constructor - */ - protected BasePizzaController () { - // Call super constructor - super(); - } - - @Override - protected ResourceBundle loadResourceBundle (final Locale locale) { - // Load resource bundle - ResourceBundle bundle = ResourceBundle.getBundle("org.mxchange.localization.bundle", locale); - - // Return it - return bundle; - } - -} diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java index ba0a5793..b20440cb 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebSessionBean.java @@ -33,7 +33,7 @@ import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.model.basket.Basket; import org.mxchange.jshopcore.model.basket.BasketSessionBeanRemote; import org.mxchange.jshopcore.model.basket.items.BasketItem; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * A bean for the basket @@ -42,7 +42,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("basketController") @SessionScoped -public class PizzaBasketWebSessionBean extends BasePizzaController implements PizzaBasketWebSessionController { +public class PizzaBasketWebSessionBean extends BasePizzaBean implements PizzaBasketWebSessionController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaAdminBusinessDataWebRequestBean.java index ed09de22..566118e7 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaAdminBusinessDataWebRequestBean.java @@ -37,7 +37,7 @@ import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * An administrative business contact bean (controller) @@ -46,7 +46,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("adminCompanyDataController") @RequestScoped -public class PizzaAdminBusinessDataWebRequestBean extends BasePizzaController implements PizzaAdminBusinessDataWebRequestController { +public class PizzaAdminBusinessDataWebRequestBean extends BasePizzaBean implements PizzaAdminBusinessDataWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java index 6cc45beb..a3abfae3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java @@ -33,7 +33,7 @@ import org.mxchange.jcontactsbusiness.model.basicdata.AdminBasicCompanyDataSessi import org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionController; /** @@ -43,7 +43,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo */ @Named ("basicDataController") @RequestScoped -public class PizzaBusinessDataWebRequestBean extends BasePizzaController implements PizzaBusinessDataWebRequestController { +public class PizzaBusinessDataWebRequestBean extends BasePizzaBean implements PizzaBusinessDataWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/business/branchoffice/PizzaAdminBranchOfficeWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/branchoffice/PizzaAdminBranchOfficeWebRequestBean.java index f8a7c9bf..498e870b 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/branchoffice/PizzaAdminBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/branchoffice/PizzaAdminBranchOfficeWebRequestBean.java @@ -38,7 +38,7 @@ import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * An administrative bean for branch offices @@ -47,7 +47,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("adminBranchOfficeController") @RequestScoped -public class PizzaAdminBranchOfficeWebRequestBean extends BasePizzaController implements PizzaAdminBranchOfficeWebRequestController { +public class PizzaAdminBranchOfficeWebRequestBean extends BasePizzaBean implements PizzaAdminBranchOfficeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/business/branchoffice/PizzaBranchOfficeWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/branchoffice/PizzaBranchOfficeWebRequestBean.java index 90934360..17e22420 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/branchoffice/PizzaBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/branchoffice/PizzaBranchOfficeWebRequestBean.java @@ -31,7 +31,7 @@ import javax.inject.Named; import org.mxchange.jcontactsbusiness.events.branchoffice.added.ObservableBranchOfficeAddedEvent; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * A general bean for branch offices @@ -40,7 +40,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("branchOfficeController") @RequestScoped -public class PizzaBranchOfficeWebRequestBean extends BasePizzaController implements PizzaBranchOfficeWebRequestController { +public class PizzaBranchOfficeWebRequestBean extends BasePizzaBean implements PizzaBranchOfficeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaAdminCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaAdminCompanyEmployeeWebRequestBean.java index e71b686e..32120ce2 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaAdminCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaAdminCompanyEmployeeWebRequestBean.java @@ -20,7 +20,7 @@ import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.inject.Named; import org.mxchange.jcontactsbusiness.model.employee.AdminCompanyEmployeeSessionBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * A request-scoped bean for administrative purposes for company employees. @@ -29,7 +29,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("adminCompanyEmployeeController") @RequestScoped -public class PizzaAdminCompanyEmployeeWebRequestBean extends BasePizzaController implements PizzaAdminCompanyEmployeeWebRequestController { +public class PizzaAdminCompanyEmployeeWebRequestBean extends BasePizzaBean implements PizzaAdminCompanyEmployeeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java index b6cf024a..3077a897 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java @@ -28,7 +28,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.employee.Employee; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * A request-scoped bean for general purposes for company employees. @@ -37,7 +37,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("companyEmployeeController") @RequestScoped -public class PizzaCompanyEmployeeWebRequestBean extends BasePizzaController implements PizzaCompanyEmployeeWebRequestController { +public class PizzaCompanyEmployeeWebRequestBean extends BasePizzaBean implements PizzaCompanyEmployeeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java index dd1592ec..7ce3904c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestBean.java @@ -31,8 +31,8 @@ import org.mxchange.jproduct.exceptions.CannotAddCategoryException; import org.mxchange.jproduct.exceptions.CategoryTitleAlreadyUsedException; import org.mxchange.jproduct.model.category.Category; import org.mxchange.jproduct.model.category.ProductCategory; -import org.mxchange.jshopcore.model.category.AdminCategorySessionBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.jproduct.model.category.AdminCategorySessionBeanRemote; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * Main application class @@ -41,7 +41,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("adminCategoryController") @RequestScoped -public class PizzaAdminCategoryWebRequestBean extends BasePizzaController implements PizzaAdminCategoryWebRequestController { +public class PizzaAdminCategoryWebRequestBean extends BasePizzaBean implements PizzaAdminCategoryWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java index f7ef7f21..a42aa4de 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaAdminCategoryWebRequestController.java @@ -17,52 +17,12 @@ package org.mxchange.pizzaapplication.beans.category; import java.io.Serializable; -import javax.ejb.Local; -import javax.faces.view.facelets.FaceletException; -import org.mxchange.jproduct.model.category.Category; /** * An interface for product controllers for "ADMIN" role *

* @author Roland Häder */ -@Local public interface PizzaAdminCategoryWebRequestController extends Serializable { - /** - * Adds given category data from request to database - *

- * @throws javax.faces.view.facelets.FaceletException If something - * unexpected happened - */ - void addCategory () throws FaceletException; - - /** - * Getter for parent id - *

- * @return Parent id - */ - Category getParentCategory (); - - /** - * Setter for parent category - *

- * @param parentCategory Parent category to set - */ - void setParentCategory (final Category parentCategory); - - /** - * Getter for category title - *

- * @return the title - */ - String getCategoryTitle (); - - /** - * Setter for category title - *

- * @param categoryTitle the title to set - */ - void setCategoryTitle (final String categoryTitle); - } diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java deleted file mode 100644 index 1a5aef38..00000000 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationBean.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * 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 - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.pizzaapplication.beans.category; - -import java.text.MessageFormat; -import java.util.LinkedList; -import java.util.List; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.faces.FacesException; -import javax.faces.view.facelets.FaceletException; -import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import org.mxchange.jproduct.events.category.AddedCategoryEvent; -import org.mxchange.jproduct.model.category.Category; -import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; - -/** - * General (product) category controller - *

- * @author Roland Häder - */ -@Named ("categoryController") -@ApplicationScoped -public class PizzaCategoryWebApplicationBean extends BasePizzaController implements PizzaCategoryWebApplicationController { - - /** - * Serial number - */ - private static final long serialVersionUID = 58_137_539_530_279L; - - /** - * All categories - */ - private List categories; - - @Override - public void afterShopCategoryAdded (@Observes final AddedCategoryEvent event) { - // Is all valid? - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getAddedCategory() == null) { - // Throw again ... - throw new NullPointerException("event.addedCategory is null"); //NOI18N - } else if (event.getAddedCategory().getCategoryId() == null) { - // And again ... - throw new NullPointerException("event.addedCategory.categoryId is null"); //NOI18N - } else if (event.getAddedCategory().getCategoryId() < 1) { - // Id is invalid - throw new IllegalArgumentException(MessageFormat.format("event.addedCategory.categoryId={0} is not valid.", event.getAddedCategory().getCategoryId())); //NOI18N - } - - // Add the category - this.categories.add(event.getAddedCategory()); - } - - @Override - @SuppressWarnings ("ReturnOfCollectionOrArrayField") - public List getAllCategories () throws FacesException { - // Return it - return this.categories; - } - - @Override - public List getAllCategoriesParent () throws FaceletException { - // Get regular list - List list = new LinkedList<>(this.getAllCategories()); - - // Return it - return list; - } - - /** - * Initialization of this bean - */ - @PostConstruct - public void init () { - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the bean - CategorySessionBeanRemote categoryBean = (CategorySessionBeanRemote) context.lookup("java:global/jshop-ejb/category!org.mxchange.jshopcore.model.category.CategorySessionBeanRemote"); //NOI18N - - // Get all categories - this.categories = categoryBean.getAllCategories(); - } catch (final NamingException e) { - // Continued to throw - throw new FacesException(e); - } - } - -} diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java deleted file mode 100644 index 089525ca..00000000 --- a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebApplicationController.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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 - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.pizzaapplication.beans.category; - -import java.io.Serializable; -import java.util.List; -import javax.ejb.Local; -import javax.faces.view.facelets.FaceletException; -import org.mxchange.jproduct.events.category.AddedCategoryEvent; -import org.mxchange.jproduct.model.category.Category; - -/** - * An interface for (product) categories - *

- * @author Roland Häder - */ -@Local -public interface PizzaCategoryWebApplicationController extends Serializable { - - /** - * Some "getter" for a linked list of all categories - *

- * @return All categories - *

- * @throws javax.faces.view.facelets.FaceletException If anything went wrong - */ - List getAllCategories () throws FaceletException; - - /** - * Some "getter" for a linked list of all categories including "Has no - * parent" fake category. - *

- * @return All categories - *

- * @throws javax.faces.view.facelets.FaceletException If anything went wrong - */ - List getAllCategoriesParent () throws FaceletException; - - /** - * Observes events fired after a new product category has been added - *

- * @param event Event to be observed - */ - void afterShopCategoryAdded (final AddedCategoryEvent event); - -} diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebRequestBean.java new file mode 100644 index 00000000..4b1e13ba --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebRequestBean.java @@ -0,0 +1,112 @@ +/* + * 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.mxchange.pizzaapplication.beans.category; + +import java.text.MessageFormat; +import java.util.LinkedList; +import java.util.List; +import javax.annotation.PostConstruct; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.event.Observes; +import javax.faces.FacesException; +import javax.faces.view.facelets.FaceletException; +import javax.inject.Named; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import org.mxchange.jproduct.events.category.AddedCategoryEvent; +import org.mxchange.jproduct.model.category.Category; +import org.mxchange.jproduct.model.category.CategorySessionBeanRemote; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; + +/** + * General (product) category controller + *

+ * @author Roland Häder + */ +@Named ("categoryController") +@RequestScoped +public class PizzaCategoryWebRequestBean extends BasePizzaBean implements PizzaCategoryWebRequestController { + + /** + * Serial number + */ + private static final long serialVersionUID = 58_137_539_530_279L; + + /** + * All categories + */ + private List categories; + + @Override + public void afterShopCategoryAdded (@Observes final AddedCategoryEvent event) { + // Is all valid? + if (null == event) { + // Throw NPE + throw new NullPointerException("event is null"); //NOI18N + } else if (event.getAddedCategory() == null) { + // Throw again ... + throw new NullPointerException("event.addedCategory is null"); //NOI18N + } else if (event.getAddedCategory().getCategoryId() == null) { + // And again ... + throw new NullPointerException("event.addedCategory.categoryId is null"); //NOI18N + } else if (event.getAddedCategory().getCategoryId() < 1) { + // Id is invalid + throw new IllegalArgumentException(MessageFormat.format("event.addedCategory.categoryId={0} is not valid.", event.getAddedCategory().getCategoryId())); //NOI18N + } + + // Add the category + this.categories.add(event.getAddedCategory()); + } + + @Override + @SuppressWarnings ("ReturnOfCollectionOrArrayField") + public List getAllCategories () throws FacesException { + // Return it + return this.categories; + } + + @Override + public List getAllCategoriesParent () throws FaceletException { + // Get regular list + List list = new LinkedList<>(this.getAllCategories()); + + // Return it + return list; + } + + /** + * Initialization of this bean + */ + @PostConstruct + public void init () { + try { + // Get initial context + Context context = new InitialContext(); + + // Try to lookup the bean + CategorySessionBeanRemote categoryBean = (CategorySessionBeanRemote) context.lookup("java:global/jshop-ejb/category!org.mxchange.jshopcore.model.category.CategorySessionBeanRemote"); //NOI18N + + // Get all categories + this.categories = categoryBean.allCategories(); + } catch (final NamingException e) { + // Continued to throw + throw new FacesException(e); + } + } + +} diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebRequestController.java new file mode 100644 index 00000000..a1f0f246 --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/beans/category/PizzaCategoryWebRequestController.java @@ -0,0 +1,28 @@ +/* + * 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.mxchange.pizzaapplication.beans.category; + +import java.io.Serializable; + +/** + * An interface for (product) categories + *

+ * @author Roland Häder + */ +public interface PizzaCategoryWebRequestController extends Serializable { + +} diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java index 25a065ba..b20046eb 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java @@ -40,7 +40,7 @@ import org.mxchange.jshopcore.events.ShopCheckoutCompletedEvent; import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.wrapper.CheckoutWrapper; import org.mxchange.jshopcore.wrapper.WrapableCheckout; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.basket.PizzaBasketWebSessionController; import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebRequestController; import org.mxchange.pizzaapplication.beans.customer.PizzaCustomerWebSessionController; @@ -54,7 +54,7 @@ import org.mxchange.pizzaapplication.beans.receipt.PizzaReceiptWebRequestControl */ @Named ("checkoutController") @SessionScoped -public class PizzaCheckoutWebSessionBean extends BasePizzaController implements PizzaCheckoutWebSessionController { +public class PizzaCheckoutWebSessionBean extends BasePizzaBean implements PizzaCheckoutWebSessionController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java index efd9726d..56bd8269 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java @@ -48,7 +48,7 @@ import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * Administrative user bean (controller) @@ -57,7 +57,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("adminContactController") @RequestScoped -public class PizzaAdminContactWebRequestBean extends BasePizzaController implements PizzaAdminContactWebRequestController { +public class PizzaAdminContactWebRequestBean extends BasePizzaBean implements PizzaAdminContactWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java index 246420d2..87924a65 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java @@ -53,7 +53,7 @@ import org.mxchange.juserlogincore.events.confirmation.ObservableUserConfirmedAc import org.mxchange.juserlogincore.events.login.ObservableUserLoggedInEvent; import org.mxchange.juserlogincore.events.registration.ObservableUserRegisteredEvent; import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.user.PizzaUserWebRequestController; import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionController; @@ -64,7 +64,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo */ @Named ("contactController") @RequestScoped -public class PizzaContactWebRequestBean extends BasePizzaController implements PizzaContactWebRequestController { +public class PizzaContactWebRequestBean extends BasePizzaBean implements PizzaContactWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java index a99e880f..7c515dd8 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java @@ -56,7 +56,7 @@ import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.phone.PizzaAdminPhoneWebRequestController; /** @@ -66,7 +66,7 @@ import org.mxchange.pizzaapplication.beans.phone.PizzaAdminPhoneWebRequestContro */ @Named ("adminContactPhoneController") @RequestScoped -public class PizzaAdminContactPhoneWebRequestBean extends BasePizzaController implements PizzaAdminContactPhoneWebRequestController { +public class PizzaAdminContactPhoneWebRequestBean extends BasePizzaBean implements PizzaAdminContactPhoneWebRequestController { /** * Call-stack instance (5 may show BeanELResolver.getValue as caller) diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaContactPhoneWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaContactPhoneWebRequestBean.java index d7100d3c..ebf28135 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaContactPhoneWebRequestBean.java @@ -40,7 +40,7 @@ import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebRequestController; /** @@ -50,7 +50,7 @@ import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebRequestControl */ @Named ("contactPhoneController") @RequestScoped -public class PizzaContactPhoneWebRequestBean extends BasePizzaController implements PizzaContactPhoneWebRequestController { +public class PizzaContactPhoneWebRequestBean extends BasePizzaBean implements PizzaContactPhoneWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java index 492eb84d..15938fb6 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java @@ -32,7 +32,7 @@ import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jcountry.model.data.CountryData; import org.mxchange.jcountry.model.data.CountrySingletonBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * An administrative country bean @@ -41,7 +41,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("adminCountryController") @RequestScoped -public class PizzaAdminCountryWebRequestBean extends BasePizzaController implements PizzaAdminCountryWebRequestController { +public class PizzaAdminCountryWebRequestBean extends BasePizzaBean implements PizzaAdminCountryWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaCountryWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaCountryWebRequestBean.java index 1e005a04..7d85c00c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaCountryWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaCountryWebRequestBean.java @@ -31,7 +31,7 @@ import javax.inject.Named; import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jcountry.model.data.CountrySingletonBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * A country bean @@ -40,7 +40,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("countryController") @RequestScoped -public class PizzaCountryWebRequestBean extends BasePizzaController implements PizzaCountryWebRequestController { +public class PizzaCountryWebRequestBean extends BasePizzaBean implements PizzaCountryWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java index c3f7f134..c62cb94f 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java @@ -36,7 +36,7 @@ import org.mxchange.jcustomercore.events.customer.created.ObservableCreatedCusto import org.mxchange.jcustomercore.exceptions.CustomerAlreadyRegisteredException; import org.mxchange.jcustomercore.model.customer.Customer; import org.mxchange.jcustomercore.model.customer.status.CustomerAccountStatus; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController; import org.mxchange.pizzaapplication.beans.helper.PizzaWebRequestHelperController; import org.mxchange.pizzaapplication.model.customer.PizzaAdminCustomerSessionBeanRemote; @@ -49,7 +49,7 @@ import org.mxchange.jcustomercore.model.customer.ContactCustomer; */ @Named ("adminCustomerController") @RequestScoped -public class PizzaAdminCustomerWebRequestBean extends BasePizzaController implements PizzaAdminCustomerWebRequestController { +public class PizzaAdminCustomerWebRequestBean extends BasePizzaBean implements PizzaAdminCustomerWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionBean.java index 190c9082..2f33ee2d 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaCustomerWebSessionBean.java @@ -35,7 +35,7 @@ import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote; import org.mxchange.jcustomercore.events.customer.added.ObservableAdminAddedCustomerEvent; import org.mxchange.jcustomercore.model.customer.Customer; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController; import org.mxchange.pizzaapplication.model.customer.PizzaAdminCustomerSessionBeanRemote; @@ -46,7 +46,7 @@ import org.mxchange.pizzaapplication.model.customer.PizzaAdminCustomerSessionBea */ @Named ("customerController") @SessionScoped -public class PizzaCustomerWebSessionBean extends BasePizzaController implements PizzaCustomerWebSessionController { +public class PizzaCustomerWebSessionBean extends BasePizzaBean implements PizzaCustomerWebSessionController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/features/PizzaFeatureWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/features/PizzaFeatureWebApplicationBean.java index 910c5c58..9595e5b7 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/features/PizzaFeatureWebApplicationBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/features/PizzaFeatureWebApplicationBean.java @@ -19,7 +19,7 @@ package org.mxchange.pizzaapplication.beans.features; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * A feature bean @@ -28,7 +28,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("featureController") @ApplicationScoped -public class PizzaFeatureWebApplicationBean extends BasePizzaController implements PizzaFeaturesWebApplicationController { +public class PizzaFeatureWebApplicationBean extends BasePizzaBean implements PizzaFeaturesWebApplicationController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationBean.java index 3dbe7151..4a8af86b 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaGenderWebApplicationBean.java @@ -21,7 +21,7 @@ import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * A gender and title bean @@ -30,7 +30,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("genderController") @ApplicationScoped -public class PizzaGenderWebApplicationBean extends BasePizzaController implements PizzaGenderWebApplicationController { +public class PizzaGenderWebApplicationBean extends BasePizzaBean implements PizzaGenderWebApplicationController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/localization/PizzaLocalizationSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/localization/PizzaLocalizationSessionBean.java index 2cf13e06..83e9001f 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/localization/PizzaLocalizationSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/localization/PizzaLocalizationSessionBean.java @@ -34,7 +34,7 @@ import org.mxchange.jcoreee.events.locale.LocaleChangeEvent; import org.mxchange.jcoreee.events.locale.ObservableLocaleChangeEvent; import org.mxchange.juserlogincore.events.login.ObservableUserLoggedInEvent; import org.mxchange.juserlogincore.events.logout.ObservableUserLogoutEvent; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * A session-scoped bean for handling localization/internationalization changes. @@ -46,7 +46,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("localizationController") @SessionScoped -public class PizzaLocalizationSessionBean extends BasePizzaController implements PizzaLocalizationSessionController { +public class PizzaLocalizationSessionBean extends BasePizzaBean implements PizzaLocalizationSessionController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java index b2cfa7f6..300ede2e 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java @@ -33,7 +33,7 @@ import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException; import org.mxchange.jphone.model.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote; import org.mxchange.jphone.model.phonenumbers.mobileprovider.CellphoneProvider; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * Administrative bean (controller) for mobile provider @@ -42,7 +42,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("adminMobileProviderController") @RequestScoped -public class PizzaAdminMobileProviderWebRequestBean extends BasePizzaController implements PizzaAdminMobileProviderWebRequestController { +public class PizzaAdminMobileProviderWebRequestBean extends BasePizzaBean implements PizzaAdminMobileProviderWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java index 84b9959c..6b622af7 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java @@ -32,7 +32,7 @@ import javax.inject.Named; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * A general bean for mobile providers @@ -41,7 +41,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("mobileProviderController") @RequestScoped -public class PizzaMobileProviderWebRequestBean extends BasePizzaController implements PizzaMobileProviderWebRequestController { +public class PizzaMobileProviderWebRequestBean extends BasePizzaBean implements PizzaMobileProviderWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java index 0b41a754..6959cc78 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java @@ -57,7 +57,7 @@ import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jphone.model.phonenumbers.phone.AdminPhoneSessionBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * Administrative bean (controller) for phone numbers @@ -66,7 +66,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("adminPhoneController") @RequestScoped -public class PizzaAdminPhoneWebRequestBean extends BasePizzaController implements PizzaAdminPhoneWebRequestController { +public class PizzaAdminPhoneWebRequestBean extends BasePizzaBean implements PizzaAdminPhoneWebRequestController { /** * Call-stack position diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaPhoneWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaPhoneWebRequestBean.java index 22509449..496988c6 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaPhoneWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaPhoneWebRequestBean.java @@ -46,7 +46,7 @@ import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * Regular controller (bean) for phone numbers @@ -55,7 +55,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("phoneController") @RequestScoped -public class PizzaPhoneWebRequestBean extends BasePizzaController implements PizzaPhoneWebRequestController { +public class PizzaPhoneWebRequestBean extends BasePizzaBean implements PizzaPhoneWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java index 7ff6b9af..702251f7 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestBean.java @@ -35,8 +35,8 @@ import org.mxchange.jproduct.exceptions.ProductTitleAlreadyUsedException; import org.mxchange.jproduct.model.category.Category; import org.mxchange.jproduct.model.product.GenericProduct; import org.mxchange.jproduct.model.product.Product; -import org.mxchange.jshopcore.model.product.AdminProductSessionBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.jproduct.model.product.AdminProductSessionBeanRemote; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * Main application class @@ -45,7 +45,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("adminProductController") @RequestScoped -public class PizzaAdminProductWebRequestBean extends BasePizzaController implements PizzaAdminProductWebRequestController { +public class PizzaAdminProductWebRequestBean extends BasePizzaBean implements PizzaAdminProductWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java index bb0ea5b7..c7be52da 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaAdminProductWebRequestController.java @@ -17,91 +17,12 @@ package org.mxchange.pizzaapplication.beans.product; import java.io.Serializable; -import java.util.List; -import javax.ejb.Local; -import javax.faces.view.facelets.FaceletException; -import org.mxchange.jproduct.model.category.Category; -import org.mxchange.jproduct.model.product.Product; /** * An interface for product controllers for "ADMIN" role *

* @author Roland Häder */ -@Local public interface PizzaAdminProductWebRequestController extends Serializable { - /** - * Adds given product data from request to database - *

- * @throws javax.faces.view.facelets.FaceletException If something - * unexpected happened - */ - void addProduct () throws FaceletException; - - /** - * Some "getter" for a linked list of all products - *

- * @return All products - *

- * @throws javax.faces.view.facelets.FaceletException If anything went wrong - */ - List getAllProducts () throws FaceletException; - - /** - * Getter for product's available property - *

- * @return Product's available property - */ - Boolean getProductAvailability (); - - /** - * Setter for product's available property - *

- * @param available Product's available property - */ - void setProductAvailability (final Boolean available); - - /** - * Getter for product's category - *

- * @return Product's category - */ - Category getProductCategory (); - - /** - * Setter for product's category instance - *

- * @param productCategory Product's category instance - */ - void setProductCategory (final Category productCategory); - - /** - * Getter for product's price property - *

- * @return Product's price property - */ - Float getProductPrice (); - - /** - * Setter for product's price property - *

- * @param price Product's price property - */ - void setProductPrice (final Float price); - - /** - * Getter for product's title property - *

- * @return Product's title - */ - String getProductTitle (); - - /** - * Setter for product's title property - *

- * @param title Product's title - */ - void setProductTitle (final String title); - } diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java deleted file mode 100644 index 7c94eba4..00000000 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationBean.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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 - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.pizzaapplication.beans.product; - -import java.text.MessageFormat; -import java.util.Collections; -import java.util.List; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.faces.FacesException; -import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import org.mxchange.jproduct.events.product.AddedProductEvent; -import org.mxchange.jproduct.model.product.Product; -import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; - -/** - * General product controller - *

- * @author Roland Häder - */ -@Named ("productController") -@ApplicationScoped -public class PizzaProductWebApplicationBean extends BasePizzaController implements PizzaProductWebApplicationController { - - /** - * Serial number - */ - private static final long serialVersionUID = 58_137_539_530_279L; - - /** - * "Cache" for all available products - */ - private List availableProducts; - - @Override - public void afterShopProductAdded (@Observes final AddedProductEvent event) { - // Is all valid? - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getAddedProduct()== null) { - // Throw again ... - throw new NullPointerException("event.addedProduct is null"); //NOI18N - } else if (event.getAddedProduct().getProductId() == null) { - // And again ... - throw new NullPointerException("event.addedProduct.productId is null"); //NOI18N - } else if (event.getAddedProduct().getProductId() < 1) { - // Id is invalid - throw new IllegalArgumentException(MessageFormat.format("event.addedProduct.productId={0} is not valid.", event.getAddedProduct().getProductId())); //NOI18N - } - - // Is the product available? - if (event.getAddedProduct().getProductAvailability()) { - // Add it - this.availableProducts.add(event.getAddedProduct()); - } - } - - @Override - public List getAvailableProducts () throws FacesException { - // Return it - return Collections.unmodifiableList(this.availableProducts); - } - - /** - * Initialization of this bean - */ - @PostConstruct - public void init () { - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the bean - ProductSessionBeanRemote productBean = (ProductSessionBeanRemote) context.lookup("java:global/jshop-ejb/product!org.mxchange.jshopcore.model.product.ProductSessionBeanRemote"); //NOI18N - - // Get available products list - this.availableProducts = productBean.getAvailableProducts(); - } catch (final NamingException e) { - // Continued to throw - throw new FacesException(e); - } - } - -} diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java deleted file mode 100644 index 513fc655..00000000 --- a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebApplicationController.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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 - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.pizzaapplication.beans.product; - -import java.io.Serializable; -import java.util.List; -import javax.ejb.Local; -import javax.faces.view.facelets.FaceletException; -import org.mxchange.jproduct.events.product.AddedProductEvent; -import org.mxchange.jproduct.model.product.Product; - -/** - * An interface for products - *

- * @author Roland Häder - */ -@Local -public interface PizzaProductWebApplicationController extends Serializable { - - /** - * Some "getter" for a linked list of only available products - *

- * @return Only available products - *

- * @throws javax.faces.view.facelets.FaceletException If anything went wrong - */ - List getAvailableProducts () throws FaceletException; - - /** - * Observes events fired after a new product has been added - *

- * @param event Event to be observed - *

- * @todo Move this to own controller - */ - void afterShopProductAdded (final AddedProductEvent event); - -} diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebRequestBean.java new file mode 100644 index 00000000..05e3ee21 --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebRequestBean.java @@ -0,0 +1,104 @@ +/* + * 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.mxchange.pizzaapplication.beans.product; + +import java.text.MessageFormat; +import java.util.Collections; +import java.util.List; +import javax.annotation.PostConstruct; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.event.Observes; +import javax.faces.FacesException; +import javax.inject.Named; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import org.mxchange.jproduct.events.product.AddedProductEvent; +import org.mxchange.jproduct.model.product.Product; +import org.mxchange.jproduct.model.product.ProductSessionBeanRemote; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; + +/** + * General product controller + *

+ * @author Roland Häder + */ +@Named ("productController") +@RequestScoped +public class PizzaProductWebRequestBean extends BasePizzaBean implements PizzaProductWebRequestController { + + /** + * Serial number + */ + private static final long serialVersionUID = 58_137_539_530_279L; + + /** + * "Cache" for all available products + */ + private List availableProducts; + + @Override + public void afterShopProductAdded (@Observes final AddedProductEvent event) { + // Is all valid? + if (null == event) { + // Throw NPE + throw new NullPointerException("event is null"); //NOI18N + } else if (event.getAddedProduct()== null) { + // Throw again ... + throw new NullPointerException("event.addedProduct is null"); //NOI18N + } else if (event.getAddedProduct().getProductId() == null) { + // And again ... + throw new NullPointerException("event.addedProduct.productId is null"); //NOI18N + } else if (event.getAddedProduct().getProductId() < 1) { + // Id is invalid + throw new IllegalArgumentException(MessageFormat.format("event.addedProduct.productId={0} is not valid.", event.getAddedProduct().getProductId())); //NOI18N + } + + // Is the product available? + if (event.getAddedProduct().getProductAvailability()) { + // Add it + this.availableProducts.add(event.getAddedProduct()); + } + } + + @Override + public List getAvailableProducts () throws FacesException { + // Return it + return Collections.unmodifiableList(this.availableProducts); + } + + /** + * Initialization of this bean + */ + @PostConstruct + public void init () { + try { + // Get initial context + Context context = new InitialContext(); + + // Try to lookup the bean + ProductSessionBeanRemote productBean = (ProductSessionBeanRemote) context.lookup("java:global/jshop-ejb/product!org.mxchange.jshopcore.model.product.ProductSessionBeanRemote"); //NOI18N + + // Get available products list + this.availableProducts = productBean.getAvailableProducts(); + } catch (final NamingException e) { + // Continued to throw + throw new FacesException(e); + } + } + +} diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebRequestController.java new file mode 100644 index 00000000..ee5addfe --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/beans/product/PizzaProductWebRequestController.java @@ -0,0 +1,28 @@ +/* + * 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.mxchange.pizzaapplication.beans.product; + +import java.io.Serializable; + +/** + * An interface for products + *

+ * @author Roland Häder + */ +public interface PizzaProductWebRequestController extends Serializable { + +} diff --git a/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java index 1a6cb6d4..cb13f285 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java @@ -24,7 +24,7 @@ import javax.inject.Named; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.user.PizzaUserWebRequestController; import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionController; @@ -35,7 +35,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo */ @Named (value = "profileController") @RequestScoped -public class PizzaUserProfileWebRequestBean extends BasePizzaController implements PizzaUserProfileWebRequestController { +public class PizzaUserProfileWebRequestBean extends BasePizzaBean implements PizzaUserProfileWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/profilemode/PizzaProfileModeWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/profilemode/PizzaProfileModeWebApplicationBean.java index be191181..2f4f4b9c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/profilemode/PizzaProfileModeWebApplicationBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/profilemode/PizzaProfileModeWebApplicationBean.java @@ -19,7 +19,7 @@ package org.mxchange.pizzaapplication.beans.profilemode; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * A profile mode bean @@ -28,7 +28,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("profileModeController") @ApplicationScoped -public class PizzaProfileModeWebApplicationBean extends BasePizzaController implements PizzaProfileModeWebApplicationController { +public class PizzaProfileModeWebApplicationBean extends BasePizzaBean implements PizzaProfileModeWebApplicationController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebRequestBean.java index a27cc1fd..e93c1989 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebRequestBean.java @@ -25,7 +25,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jshopcore.model.receipt.ReceiptBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.helper.PizzaWebRequestHelperController; /** @@ -35,7 +35,7 @@ import org.mxchange.pizzaapplication.beans.helper.PizzaWebRequestHelperControlle */ @Named ("receiptController") @RequestScoped -public class PizzaReceiptWebRequestBean extends BasePizzaController implements PizzaReceiptWebRequestController { +public class PizzaReceiptWebRequestBean extends BasePizzaBean implements PizzaReceiptWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java index 639c1d11..804a8fbd 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java @@ -60,7 +60,7 @@ import org.mxchange.juserlogincore.container.login.UserLoginContainer; import org.mxchange.juserlogincore.events.registration.ObservableUserRegisteredEvent; import org.mxchange.juserlogincore.exceptions.UserPasswordRepeatMismatchException; import org.mxchange.juserlogincore.login.UserLoginUtils; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController; import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebRequestController; import org.mxchange.pizzaapplication.beans.localization.PizzaLocalizationSessionController; @@ -72,7 +72,7 @@ import org.mxchange.pizzaapplication.beans.localization.PizzaLocalizationSession */ @Named ("adminUserController") @RequestScoped -public class PizzaAdminUserWebRequestBean extends BasePizzaController implements PizzaAdminUserWebRequestController { +public class PizzaAdminUserWebRequestBean extends BasePizzaBean implements PizzaAdminUserWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestBean.java index 8c8fc6b7..b0808d8b 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestBean.java @@ -59,7 +59,7 @@ import org.mxchange.juserlogincore.events.registration.ObservableUserRegisteredE import org.mxchange.juserlogincore.events.user.password_change.ObservableUpdatedUserPasswordEvent; import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; import org.mxchange.juserlogincore.login.UserLoginUtils; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebRequestController; import org.mxchange.pizzaapplication.beans.features.PizzaFeaturesWebApplicationController; import org.mxchange.pizzaapplication.beans.localization.PizzaLocalizationSessionController; @@ -72,7 +72,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo */ @Named ("userController") @RequestScoped -public class PizzaUserWebRequestBean extends BasePizzaController implements PizzaUserWebRequestController { +public class PizzaUserWebRequestBean extends BasePizzaBean implements PizzaUserWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebRequestBean.java index f44893e2..a0fae9ce 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebRequestBean.java @@ -48,7 +48,7 @@ import org.mxchange.juserlogincore.events.logout.ObservableUserLogoutEvent; import org.mxchange.juserlogincore.events.registration.ObservableUserRegisteredEvent; import org.mxchange.juserlogincore.events.resendlink.ObservableUserResendLinkAccountEvent; import org.mxchange.juserlogincore.events.user.password_change.ObservableUpdatedUserPasswordEvent; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; /** * A controller (bean) for user activity log @@ -57,7 +57,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("userActivityController") @RequestScoped -public class PizzaUserActivityWebRequestBean extends BasePizzaController implements PizzaUserActivityWebRequestController { +public class PizzaUserActivityWebRequestBean extends BasePizzaBean implements PizzaUserActivityWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/confirmlink/PizzaConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/confirmlink/PizzaConfirmationLinkWebRequestBean.java index 4dd63dd2..c6650711 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/confirmlink/PizzaConfirmationLinkWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/confirmlink/PizzaConfirmationLinkWebRequestBean.java @@ -39,7 +39,7 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.status.UserAccountStatus; import org.mxchange.juserlogincore.events.confirmation.ObservableUserConfirmedAccountEvent; import org.mxchange.juserlogincore.events.confirmation.UserConfirmedAccountEvent; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.user.PizzaUserWebRequestController; /** @@ -49,7 +49,7 @@ import org.mxchange.pizzaapplication.beans.user.PizzaUserWebRequestController; */ @Named ("userConfirmationLinkController") @RequestScoped -public class PizzaConfirmationLinkWebRequestBean extends BasePizzaController implements PizzaConfirmationLinkWebRequestController { +public class PizzaConfirmationLinkWebRequestBean extends BasePizzaBean implements PizzaConfirmationLinkWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/email_address/PizzaEmailChangeWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/email_address/PizzaEmailChangeWebRequestBean.java index fae80555..fb4a7ce3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/email_address/PizzaEmailChangeWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/email_address/PizzaEmailChangeWebRequestBean.java @@ -35,7 +35,7 @@ import org.mxchange.jusercore.model.email_address.EmailAddressChange; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.email_address.UserEmailChangeSessionBeanRemote; import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.features.PizzaFeaturesWebApplicationController; import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionController; @@ -46,7 +46,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo */ @Named ("userEmailChangeController") @RequestScoped -public class PizzaEmailChangeWebRequestBean extends BasePizzaController implements PizzaEmailChangeWebRequestController { +public class PizzaEmailChangeWebRequestBean extends BasePizzaBean implements PizzaEmailChangeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/login/PizzaUserLoginWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/login/PizzaUserLoginWebSessionBean.java index cec9cced..5ea2d812 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/login/PizzaUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/login/PizzaUserLoginWebSessionBean.java @@ -46,7 +46,7 @@ import org.mxchange.juserlogincore.events.user.password_change.ObservableUpdated import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; import org.mxchange.juserlogincore.login.UserLoginUtils; import org.mxchange.juserlogincore.model.user.login.UserLoginSessionBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.user.PizzaUserWebRequestController; /** @@ -56,7 +56,7 @@ import org.mxchange.pizzaapplication.beans.user.PizzaUserWebRequestController; */ @Named ("userLoginController") @SessionScoped -public class PizzaUserLoginWebSessionBean extends BasePizzaController implements PizzaUserLoginWebSessionController { +public class PizzaUserLoginWebSessionBean extends BasePizzaBean implements PizzaUserLoginWebSessionController { /** * Path name for guest base template diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestBean.java index 500f0897..53fc1dbd 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestBean.java @@ -35,7 +35,7 @@ import org.mxchange.juserlogincore.events.user.password_change.ObservableUpdated import org.mxchange.juserlogincore.events.user.password_change.UpdatedUserPasswordEvent; import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; import org.mxchange.juserlogincore.login.UserLoginUtils; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.features.PizzaFeaturesWebApplicationController; import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionController; @@ -46,7 +46,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo */ @Named ("userPasswordController") @RequestScoped -public class PizzaUserPasswordWebRequestBean extends BasePizzaController implements PizzaUserPasswordWebRequestController { +public class PizzaUserPasswordWebRequestBean extends BasePizzaBean implements PizzaUserPasswordWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebRequestBean.java index 65bf8066..1d36de35 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebRequestBean.java @@ -43,7 +43,7 @@ import org.mxchange.juserlogincore.events.user.password_change.ObservableUpdated import org.mxchange.juserlogincore.events.user.password_change.UpdatedUserPasswordEvent; import org.mxchange.juserlogincore.login.UserLoginUtils; import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebRequestController; import org.mxchange.pizzaapplication.beans.features.PizzaFeaturesWebApplicationController; import org.mxchange.pizzaapplication.beans.user.PizzaAdminUserWebRequestController; @@ -56,7 +56,7 @@ import org.mxchange.pizzaapplication.beans.user.PizzaUserWebRequestController; */ @Named ("userRegistrationController") @RequestScoped -public class PizzaUserRegisterWebRequestBean extends BasePizzaController implements PizzaUserRegisterWebRequestController { +public class PizzaUserRegisterWebRequestBean extends BasePizzaBean implements PizzaUserRegisterWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/resendlink/PizzaResendLinkWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/resendlink/PizzaResendLinkWebRequestBean.java index 5f04df0a..0de92c66 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/resendlink/PizzaResendLinkWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/resendlink/PizzaResendLinkWebRequestBean.java @@ -35,7 +35,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; import org.mxchange.juserlogincore.events.resendlink.ObservableUserResendLinkAccountEvent; import org.mxchange.juserlogincore.events.resendlink.UserResendLinkAccountEvent; import org.mxchange.juserlogincore.model.user.resendlink.ResendLinkSessionBeanRemote; -import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.BasePizzaBean; import org.mxchange.pizzaapplication.beans.localization.PizzaLocalizationSessionController; import org.mxchange.pizzaapplication.beans.user.PizzaUserWebRequestController; @@ -46,7 +46,7 @@ import org.mxchange.pizzaapplication.beans.user.PizzaUserWebRequestController; */ @Named ("userResendConfirmationController") @RequestScoped -public class PizzaResendLinkWebRequestBean extends BasePizzaController implements PizzaResendLinkWebRequestController { +public class PizzaResendLinkWebRequestBean extends BasePizzaBean implements PizzaResendLinkWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java b/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java index fa3e66fd..262c5d23 100644 --- a/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java +++ b/src/java/org/mxchange/pizzaapplication/converter/category/PizzaCategoryConverter.java @@ -29,7 +29,7 @@ import javax.naming.NamingException; import org.mxchange.jcoreeelogger.beans.local.logger.Log; import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jproduct.model.category.Category; -import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote; +import org.mxchange.jproduct.model.category.CategorySessionBeanRemote; /** * A converter for transferring category objects @@ -76,7 +76,7 @@ public class PizzaCategoryConverter implements Converter { // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: context={0},component={1},submittedValue={2} - CALLED!", context, component, submittedValue)); //NOI18N // Get full list - List categoryList = this.categoryBean.getAllCategories(); + List categoryList = this.categoryBean.allCategories(); // Is the value null or empty? if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {