From 8fd877f0aeabd727ec35ec9f88738b134a324613 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 3 Sep 2017 03:31:36 +0200 Subject: [PATCH] Please cherry-pick: - no more fully container-independency in favour of caching - removed gf-client (no more Glassfish for already a long time) - used `@NamedCache` (Payara-specific) for annotating fields, very nice, should become generic one day MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/gf-client.jar | Bin 22389 -> 0 bytes lib/nblibraries.properties | 8 +++--- lib/payara-api/payara-api.jar | Bin 0 -> 8130 bytes nbproject/project.properties | 5 ++-- nbproject/project.xml | 6 ++--- .../PizzaBusinessDataWebRequestBean.java | 4 ++- .../PizzaCompanyEmployeeWebRequestBean.java | 3 ++- .../checkout/PizzaCheckoutWebSessionBean.java | 2 +- .../contact/PizzaContactWebRequestBean.java | 12 +++++---- .../PizzaAdminContactPhoneWebRequestBean.java | 6 ++--- .../PizzaContactPhoneWebRequestBean.java | 8 +++--- .../country/PizzaCountryWebRequestBean.java | 4 ++- .../PizzaMobileProviderWebRequestBean.java | 3 ++- .../beans/phone/PizzaPhoneWebRequestBean.java | 12 +++++---- .../receipt/PizzaReceiptWebRequestBean.java | 4 +-- .../beans/user/PizzaUserWebRequestBean.java | 21 ++++++++------- .../user/PizzaUserWebRequestController.java | 25 ------------------ .../PizzaUserActivityWebRequestBean.java | 22 ++++++++------- .../PizzaEmailChangeWebRequestBean.java | 8 +++--- .../PizzaUserRegisterWebRequestBean.java | 2 +- .../PizzaResendLinkWebRequestBean.java | 6 ++--- 21 files changed, 75 insertions(+), 86 deletions(-) delete mode 100644 lib/gf-client.jar create mode 100644 lib/payara-api/payara-api.jar diff --git a/lib/gf-client.jar b/lib/gf-client.jar deleted file mode 100644 index 2f369f3b60805a93cb43e1eec7d0f027e940d59c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22389 zcmbrlW0WpklO|lYZQHhO+qP}nwr!lUZS$0E>r~Y#&UyOnulwz%XS%1q$(8xzUMqIw z-aBJQTvtTg3evzJPyhfB003xIsG

bU^}u0LY4}2+~T*iP3*e0stud5k&!jfPetN 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 diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties index e8a87089..94a5e000 100644 --- a/lib/nblibraries.properties +++ b/lib/nblibraries.properties @@ -13,11 +13,9 @@ libs.CopyLibs.classpath=\ ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar libs.CopyLibs.displayName=CopyLibs Task libs.CopyLibs.prop-version=2.0 -libs.JCache_CDI.classpath=\ - ${base}/JCache_CDI/jcache-cdi-0.1-SNAPSHOT.jar -libs.JCache_CDI.displayName=JCache CDI -libs.JCache_CDI.src=\ - ${base}/JCache_CDI/jcache-cdi-0.1-SNAPSHOT-sources.jar!// +libs.payara-api.classpath=\ + ${base}/payara-api/payara-api.jar +libs.payara-api.displayName=Payara API libs.primefaces.classpath=\ ${base}/primefaces/primefaces-5.3.jar libs.primefaces.displayName=PrimeFaces 5.3 diff --git a/lib/payara-api/payara-api.jar b/lib/payara-api/payara-api.jar new file mode 100644 index 0000000000000000000000000000000000000000..02de279f789cefa4e01dbb4fa9867071257beff1 GIT binary patch literal 8130 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 V1q-=~003&_pFc9=xv5aU{sUo` ${file.reference.cdi-api.jar} - - ${file.reference.gf-client.jar} - ${libs.apache_poi.classpath} @@ -93,6 +90,9 @@ ${libs.cache.classpath} + + ${libs.payara-api.classpath} + 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 2b40cfc3..bdd880e7 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java @@ -16,11 +16,13 @@ */ package org.mxchange.pizzaapplication.beans.business.basicdata; +import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import javax.annotation.PostConstruct; +import javax.cache.Cache; import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; @@ -56,7 +58,7 @@ public class PizzaBusinessDataWebRequestBean extends BasePizzaController impleme * A list of all registered companies (globally) */ @Inject - @Cached (cacheName = "basicDataCache") + @NamedCache (cacheName = "basicDataCache", managementEnabled = true) private transient Cache basicDataCache; /** 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 5ab3a04f..f7ec105a 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java @@ -16,6 +16,7 @@ */ package org.mxchange.pizzaapplication.beans.business.employee; +import fish.payara.cdi.jsr107.impl.NamedCache; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -53,7 +54,7 @@ public class PizzaCompanyEmployeeWebRequestBean extends BasePizzaController impl * List of all company employees */ @Inject - @Cached(cacheName = "companyEmployeeCache") + @NamedCache (cacheName = "companyEmployeeCache", managementEnabled = true) private transient Cache companyEmployeeCache; /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java index 45a22202..25a065ba 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java @@ -42,9 +42,9 @@ import org.mxchange.jshopcore.wrapper.CheckoutWrapper; import org.mxchange.jshopcore.wrapper.WrapableCheckout; import org.mxchange.pizzaapplication.beans.BasePizzaController; import org.mxchange.pizzaapplication.beans.basket.PizzaBasketWebSessionController; +import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebRequestController; import org.mxchange.pizzaapplication.beans.customer.PizzaCustomerWebSessionController; import org.mxchange.pizzaapplication.beans.helper.PizzaWebRequestHelperController; -import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebRequestController; import org.mxchange.pizzaapplication.beans.receipt.PizzaReceiptWebRequestController; /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java index a6b79abd..7d374b89 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java @@ -16,6 +16,7 @@ */ package org.mxchange.pizzaapplication.beans.contact; +import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; import java.util.Collections; import java.util.Date; @@ -24,8 +25,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Objects; import javax.annotation.PostConstruct; +import javax.cache.Cache; import javax.ejb.EJB; -import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; @@ -38,7 +40,6 @@ import org.mxchange.jcontacts.model.contact.ContactUtils; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jfinancials.beans.user.PizzaUserWebRequestController; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; @@ -54,6 +55,7 @@ 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.user.PizzaUserWebRequestController; import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionController; /** @@ -62,7 +64,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo * @author Roland Häder */ @Named ("contactController") -@SessionScoped +@RequestScoped public class PizzaContactWebRequestBean extends BasePizzaController implements PizzaContactWebRequestController { /** @@ -100,7 +102,7 @@ public class PizzaContactWebRequestBean extends BasePizzaController implements P * Contact list */ @Inject - @Cached (cacheName = "contactsCache") + @NamedCache (cacheName = "contactsCache", managementEnabled = true) private transient Cache contactsCache; /** @@ -117,7 +119,7 @@ public class PizzaContactWebRequestBean extends BasePizzaController implements P * Email address list */ @Inject - @Cached (cacheName = "emailAddressCache") + @NamedCache (cacheName = "emailAddressCache", managementEnabled = true) private transient Cache emailAddressCache; /** 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 1ee88627..b804ab1b 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java @@ -25,7 +25,6 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.Any; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.created.ObservableCreatedContactEvent; import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent; @@ -41,6 +40,7 @@ import org.mxchange.jcontacts.events.mobile.linked.AdminLinkedMobileNumberEvent; import org.mxchange.jcontacts.events.mobile.linked.ObservableAdminLinkedMobileNumberEvent; import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent; import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobileNumberEvent; +import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent; @@ -52,9 +52,9 @@ import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; 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.jphone.model.phonenumbers.model.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; -import org.mxchange.jphone.model.phonenumbers.model.mobileprovider.MobileProvider; +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.phone.PizzaAdminPhoneWebRequestController; 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 3de41314..7c1ffd64 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaContactPhoneWebRequestBean.java @@ -16,11 +16,13 @@ */ package org.mxchange.pizzaapplication.beans.contact.phone; +import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; import java.util.LinkedList; import java.util.List; import java.util.Objects; -import javax.enterprise.context.SessionScoped; +import javax.cache.Cache; +import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Named; @@ -47,7 +49,7 @@ import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebRequestControl * @author Roland Häder */ @Named ("contactPhoneController") -@SessionScoped +@RequestScoped public class PizzaContactPhoneWebRequestBean extends BasePizzaController implements PizzaContactPhoneWebRequestController { /** @@ -67,7 +69,7 @@ public class PizzaContactPhoneWebRequestBean extends BasePizzaController impleme * relationship (one contact, many numbers). */ @Inject - @Cached(cacheName = "contactsPhoneCache") + @NamedCache (cacheName = "contactsPhoneCache", managementEnabled = true) private transient Cache> contactsPhoneCache; /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaCountryWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaCountryWebRequestBean.java index fb4e088e..eaa490f3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaCountryWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaCountryWebRequestBean.java @@ -16,11 +16,13 @@ */ package org.mxchange.pizzaapplication.beans.country; +import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import javax.annotation.PostConstruct; +import javax.cache.Cache; import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; @@ -55,7 +57,7 @@ public class PizzaCountryWebRequestBean extends BasePizzaController implements P * List of all countries */ @Inject - @Cached (cacheName = "countryCache") + @NamedCache (cacheName = "countryCache", managementEnabled = true) private transient Cache countryCache; /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java index d623fd7d..4eacb4e0 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java @@ -16,6 +16,7 @@ */ package org.mxchange.pizzaapplication.beans.mobileprovider; +import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; import java.util.Iterator; import java.util.LinkedList; @@ -56,7 +57,7 @@ public class PizzaMobileProviderWebRequestBean extends BasePizzaController imple * "Cached" list of mobile providers */ @Inject - @Cached (cacheName = "mobileProviderCache") + @NamedCache (cacheName = "mobileProviderCache", managementEnabled = true) private transient Cache mobileProviderCache; /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaPhoneWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaPhoneWebRequestBean.java index 5c5e2a96..dca8cd8c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaPhoneWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaPhoneWebRequestBean.java @@ -16,14 +16,16 @@ */ package org.mxchange.pizzaapplication.beans.phone; +import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Objects; import javax.annotation.PostConstruct; +import javax.cache.Cache; import javax.ejb.EJB; -import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Named; @@ -52,7 +54,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; * @author Roland Häder */ @Named ("phoneController") -@ApplicationScoped +@RequestScoped public class PizzaPhoneWebRequestBean extends BasePizzaController implements PizzaPhoneWebRequestController { /** @@ -64,21 +66,21 @@ public class PizzaPhoneWebRequestBean extends BasePizzaController implements Piz * All fax numbers */ @Inject - @Cached(cacheName = "faxNumberCache") + @NamedCache (cacheName = "faxNumberCache", managementEnabled = true) private transient Cache faxNumberCache; /** * All land-line numbers */ @Inject - @Cached(cacheName = "landLineNumberCache") + @NamedCache (cacheName = "landLineNumberCache", managementEnabled = true) private transient Cache landLineNumberCache; /** * All mobile numbers */ @Inject - @Cached(cacheName = "mobileNumberCache") + @NamedCache (cacheName = "mobileNumberCache", managementEnabled = true) private transient Cache mobileNumberCache; /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebRequestBean.java index 8d17abec..a27cc1fd 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/receipt/PizzaReceiptWebRequestBean.java @@ -17,7 +17,7 @@ package org.mxchange.pizzaapplication.beans.receipt; import javax.annotation.PostConstruct; -import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.RequestScoped; import javax.faces.FacesException; import javax.inject.Inject; import javax.inject.Named; @@ -34,7 +34,7 @@ import org.mxchange.pizzaapplication.beans.helper.PizzaWebRequestHelperControlle * @author Roland Häder */ @Named ("receiptController") -@SessionScoped +@RequestScoped public class PizzaReceiptWebRequestBean extends BasePizzaController implements PizzaReceiptWebRequestController { /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestBean.java index 24cc2a1c..a86c7186 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestBean.java @@ -16,6 +16,7 @@ */ package org.mxchange.pizzaapplication.beans.user; +import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; import java.util.Iterator; import java.util.LinkedList; @@ -23,8 +24,9 @@ import java.util.List; import java.util.Locale; import java.util.Objects; import javax.annotation.PostConstruct; +import javax.cache.Cache; import javax.ejb.EJB; -import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; import javax.enterprise.inject.Any; @@ -34,7 +36,6 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcoreee.events.locale.ObservableLocaleChangeEvent; -import org.mxchange.jfinancials.beans.user.PizzaUserWebRequestController; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; import org.mxchange.jusercore.events.user.clear.password.ObservableClearUserPasswordEvent; import org.mxchange.jusercore.events.user.clear.username.ObservableClearUserNameEvent; @@ -70,7 +71,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo * @author Roland Häder */ @Named ("userController") -@SessionScoped +@RequestScoped public class PizzaUserWebRequestBean extends BasePizzaController implements PizzaUserWebRequestController { /** @@ -114,18 +115,18 @@ public class PizzaUserWebRequestBean extends BasePizzaController implements Pizz @EJB (lookup = "java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; - /** - * User id - */ - private Long userId; - /** * A list of all user profiles */ @Inject - @Cached (cacheName = "userCache") + @NamedCache (cacheName = "userCache", managementEnabled = true) private transient Cache userCache; + /** + * User id + */ + private Long userId; + /** * Login controller (bean) */ @@ -141,7 +142,7 @@ public class PizzaUserWebRequestBean extends BasePizzaController implements Pizz * User name list */ @Inject - @Cached (cacheName = "userNameCache") + @NamedCache (cacheName = "userNameCache", managementEnabled = true) private transient Cache userNameCache; /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestController.java index d3d0dec7..665ffb88 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebRequestController.java @@ -44,16 +44,6 @@ public interface PizzaUserWebRequestController extends Serializable { */ String getUserPassword (); - /** - * Clears both user passwords - */ - void clearUserPasswords (); - - /** - * Clears user name - */ - void clearUserName (); - /** * Checks if both user passwords are left empty and if this is enabled * (allowed) in context parameter. If true, the calling bean should create a @@ -71,13 +61,6 @@ public interface PizzaUserWebRequestController extends Serializable { */ List allUsers (); - /** - * All public user profiles - *

- * @return A list of all public user profiles - */ - List allVisibleUsers (); - /** * Checks whether the given contact is a user *

@@ -87,14 +70,6 @@ public interface PizzaUserWebRequestController extends Serializable { */ boolean isContactFound (final Contact contact); - /** - * Checks whether a public user account is registered. This means that at - * least one user profile has its flag "public user profile" enabled. - *

- * @return Whether at least one user has a public profile - */ - boolean isVisibleUserFound (); - /** * Checks whether given user instance's name is used *

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 7cfdde38..c9857a12 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebRequestBean.java @@ -16,12 +16,14 @@ */ package org.mxchange.pizzaapplication.beans.user.activity; +import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; import java.util.Collections; import java.util.GregorianCalendar; import java.util.LinkedList; import java.util.List; import javax.annotation.PostConstruct; +import javax.cache.Cache; import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; @@ -77,8 +79,8 @@ public class PizzaUserActivityWebRequestBean extends BasePizzaController impleme * "Cache" for activity log per user */ @Inject - @Cached(cacheName = "usersActivityCache") - private transient Cache> usersActivityCache; + @NamedCache (cacheName = "userActivityCache", managementEnabled = true) + private transient Cache> userActivityCache; /** * Default constructor @@ -506,9 +508,9 @@ public class PizzaUserActivityWebRequestBean extends BasePizzaController impleme List list = new LinkedList<>(); // Is the user set? - if (this.usersActivityCache.containsKey(this.getUser())) { + if (this.userActivityCache.containsKey(this.getUser())) { // Return it - list.addAll(this.usersActivityCache.get(this.getUser())); + list.addAll(this.userActivityCache.get(this.getUser())); // Sort list and reverse it Collections.sort(list, new UserActivityLogTimestampComparator()); @@ -548,13 +550,13 @@ public class PizzaUserActivityWebRequestBean extends BasePizzaController impleme // Put all in map, per-user for (final LogableUserActivity userActivity : list) { // Is the list there? - if (!this.usersActivityCache.containsKey(userActivity.getActivityUser())) { + if (!this.userActivityCache.containsKey(userActivity.getActivityUser())) { // Init list - this.usersActivityCache.put(userActivity.getActivityUser(), new LinkedList()); + this.userActivityCache.put(userActivity.getActivityUser(), new LinkedList()); } // Add by user instance - boolean added = this.usersActivityCache.get(userActivity.getActivityUser()).add(userActivity); + boolean added = this.userActivityCache.get(userActivity.getActivityUser()).add(userActivity); // Should be added assert (added) : "Activity log not added"; //NOI18N @@ -663,13 +665,13 @@ public class PizzaUserActivityWebRequestBean extends BasePizzaController impleme } // Is it there? - if (!this.usersActivityCache.containsKey(userActivity.getActivityUser())) { + if (!this.userActivityCache.containsKey(userActivity.getActivityUser())) { // Init it - this.usersActivityCache.put(userActivity.getActivityUser(), new LinkedList()); + this.userActivityCache.put(userActivity.getActivityUser(), new LinkedList()); } // Add activity to log - this.usersActivityCache.get(userActivity.getActivityUser()).add(userActivity); + this.userActivityCache.get(userActivity.getActivityUser()).add(userActivity); } } 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 a94f08d0..9391927a 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 @@ -16,13 +16,15 @@ */ package org.mxchange.pizzaapplication.beans.user.email_address; +import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; import java.util.Iterator; import java.util.List; import java.util.Objects; import javax.annotation.PostConstruct; +import javax.cache.Cache; import javax.ejb.EJB; -import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; @@ -43,7 +45,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo * @author Roland Häder */ @Named ("userEmailChangeController") -@SessionScoped +@RequestScoped public class PizzaEmailChangeWebRequestBean extends BasePizzaController implements PizzaEmailChangeWebRequestController { /** @@ -77,7 +79,7 @@ public class PizzaEmailChangeWebRequestBean extends BasePizzaController implemen * Local list of already queued email addresses */ @Inject - @Cached (cacheName = "queuedEmailCache") + @NamedCache (cacheName = "queuedEmailCache", managementEnabled = true) private transient Cache queuedEmailCache; /** 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 44b682af..e7dfd6bb 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebRequestBean.java @@ -26,7 +26,6 @@ import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jfinancials.beans.user.PizzaUserWebRequestController; import org.mxchange.jusercore.events.user.clear.password.ClearUserPasswordEvent; import org.mxchange.jusercore.events.user.clear.password.ObservableClearUserPasswordEvent; import org.mxchange.jusercore.events.user.clear.username.ClearUserNameEvent; @@ -48,6 +47,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebRequestController; import org.mxchange.pizzaapplication.beans.features.PizzaFeaturesWebApplicationController; import org.mxchange.pizzaapplication.beans.user.PizzaAdminUserWebRequestController; +import org.mxchange.pizzaapplication.beans.user.PizzaUserWebRequestController; /** * A web bean for user registration 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 63d428bc..386794d8 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/resendlink/PizzaResendLinkWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/resendlink/PizzaResendLinkWebRequestBean.java @@ -18,7 +18,7 @@ package org.mxchange.pizzaapplication.beans.user.resendlink; import java.util.Locale; import javax.ejb.EJB; -import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; import javax.enterprise.inject.Any; @@ -26,7 +26,6 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcoreee.events.locale.ObservableLocaleChangeEvent; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jfinancials.beans.user.PizzaUserWebRequestController; import org.mxchange.jusercore.exceptions.UserEmailAddressNotFoundException; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserStatusConfirmedException; @@ -38,6 +37,7 @@ 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.localization.PizzaLocalizationSessionController; +import org.mxchange.pizzaapplication.beans.user.PizzaUserWebRequestController; /** * A web session-scoped bean for resending confirmation link @@ -45,7 +45,7 @@ import org.mxchange.pizzaapplication.beans.localization.PizzaLocalizationSession * @author Roland Häder */ @Named ("userResendConfirmationController") -@SessionScoped +@RequestScoped public class PizzaResendLinkWebRequestBean extends BasePizzaController implements PizzaResendLinkWebRequestController { /** -- 2.39.5