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

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/lib/gf-client.jar b/lib/gf-client.jar
deleted file mode 100644 (file)
index 2f369f3..0000000
Binary files a/lib/gf-client.jar and /dev/null differ

diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index 847addc64e364a8c99b735cbff0f1a610f88e157..db384dcd6ed14e7742c1be9817ba6d84c890117e 100644 (file)
--- 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-6.0.jar
 libs.primefaces.displayName=PrimeFaces 6.0

diff --git a/lib/payara-api/payara-api.jar b/lib/payara-api/payara-api.jar
new file mode 100644 (file)
index 0000000..02de279
Binary files /dev/null and b/lib/payara-api/payara-api.jar differ

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 1e36abd35a59c390305c821186606206406c1246..cfa5325d22498367b79bb4939dbaedd697ec4bf2 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -37,7 +37,6 @@ endorsed.classpath=
 excludes=
 file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
 file.reference.cdi-api.jar=lib/cdi-api.jar
-file.reference.gf-client.jar=lib/gf-client.jar
 file.reference.jcontacts-business-lib.jar=lib/jcontacts-business-lib.jar
 file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
 file.reference.jcontacts-lib.jar=lib/jcontacts-lib.jar
@@ -88,10 +87,10 @@ javac.classpath=\
     ${reference.jfinancials-core.jar}:\
     ${reference.jfinancials-lib.jar}:\
     ${file.reference.cdi-api.jar}:\
-    ${file.reference.gf-client.jar}:\
     ${libs.apache_poi.classpath}:\
     ${libs.primefaces.classpath}:\
-    ${libs.cache.classpath}
+    ${libs.cache.classpath}:\
+    ${libs.payara-api.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.debug=true

diff --git a/nbproject/project.xml b/nbproject/project.xml
index c6b4ffe3229f99cb7cc909ba1cb29bcaadb70af1..23a4457d9103593e803dbeeb45f95e1d1cf9a0da 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -66,9 +66,6 @@
                 <library dirs="200">
                     <file>${file.reference.cdi-api.jar}</file>
                 </library>
-                <library dirs="200">
-                    <file>${file.reference.gf-client.jar}</file>
-                </library>
                 <library dirs="200">
                     <file>${libs.apache_poi.classpath}</file>
                 </library>
@@ -78,6 +75,9 @@
                 <library dirs="200">
                     <file>${libs.cache.classpath}</file>
                 </library>
+                <library dirs="200">
+                    <file>${libs.payara-api.classpath}</file>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>

diff --git a/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java
index ea14c631552bb03d36dfed7a9eb6fd8639ea11e3..b9a26cb7bde2b627f211c44c401885e0c38096e4 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jfinancials.beans.business.basicdata;
 
+import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -31,7 +32,6 @@ import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemo
 import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent;
-import org.mxchange.jcoreee.jcache.Cached;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController;
@@ -60,7 +60,7 @@ public class FinancialsBusinessDataWebRequestBean extends BaseFinancialsControll
         * A list of all registered companies (globally)
         */
        @Inject
-       @Cached (cacheName = "basicDataCache")
+       @NamedCache (cacheName = "basicDataCache", managementEnabled = true)
        private transient Cache<Long, BusinessBasicData> basicDataCache;
 
        /**

diff --git a/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java
index 9b00752df139eb81bcd78f5d3b6dd8889c4ed5d8..f4ca6008b2e08c8dac335390c6691b14d220974f 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jfinancials.beans.business.employee;
 
+import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -27,7 +28,6 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.employee.Employee;
-import org.mxchange.jcoreee.jcache.Cached;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 
 /**
@@ -54,7 +54,7 @@ public class FinancialsCompanyEmployeeWebRequestBean extends BaseFinancialsContr
         * List of all company employees
         */
        @Inject
-       @Cached(cacheName = "companyEmployeeCache")
+       @NamedCache (cacheName = "companyEmployeeCache", managementEnabled = true)
        private transient Cache<Long, Employee> companyEmployeeCache;
 
        /**

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.java
index 8d47e2b9e9778de687520d97917713b5440ee566..7443a08ec81ae635af95bd7ecb373fb3f328e61a 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jfinancials.beans.contact;
 
+import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
 import java.util.Collections;
 import java.util.Date;
@@ -38,9 +39,9 @@ import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jcontacts.contact.title.PersonalTitle;
 import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
-import org.mxchange.jcoreee.jcache.Cached;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
+import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController;
 import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController;
 import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.phonenumbers.fax.FaxNumber;
@@ -56,7 +57,6 @@ 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.jfinancials.beans.user.FinancialsUserWebRequestController;
 
 /**
  * A general contact bean (controller)
@@ -102,7 +102,7 @@ public class FinancialsContactWebRequestBean extends BaseFinancialsController im
         * Contact list
         */
        @Inject
-       @Cached (cacheName = "contactsCache")
+       @NamedCache (cacheName = "contactsCache", managementEnabled = true)
        private transient Cache<Long, Contact> contactsCache;
 
        /**
@@ -119,7 +119,7 @@ public class FinancialsContactWebRequestBean extends BaseFinancialsController im
         * Email address list
         */
        @Inject
-       @Cached (cacheName = "emailAddressCache")
+       @NamedCache (cacheName = "emailAddressCache", managementEnabled = true)
        private transient Cache<Long, String> emailAddressCache;
 
        /**

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebRequestBean.java
index 0477ae7661f65502a9cc75b2ac5e1a3ded9acd0b..c43241abc4fed619d83887edd143dd2d9648e9ef 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebRequestBean.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jfinancials.beans.contact.phone;
 
+import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
 import java.util.LinkedList;
 import java.util.List;
@@ -31,8 +32,8 @@ import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContac
 import org.mxchange.jcontacts.events.fax.unlinked.ObservableAdminUnlinkedFaxNumberEvent;
 import org.mxchange.jcontacts.events.landline.unlinked.ObservableAdminUnlinkedLandLineNumberEvent;
 import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobileNumberEvent;
-import org.mxchange.jcoreee.jcache.Cached;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
+import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController;
 import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
 import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
 import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent;
@@ -41,7 +42,6 @@ import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
-import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController;
 
 /**
  * A general contact bean (controller)
@@ -69,7 +69,7 @@ public class FinancialsContactPhoneWebRequestBean extends BaseFinancialsControll
         * relationship (one contact, many numbers).
         */
        @Inject
-       @Cached(cacheName = "contactsPhoneCache")
+       @NamedCache (cacheName = "contactsPhoneCache", managementEnabled = true)
        private transient Cache<DialableNumber, List<Contact>> contactsPhoneCache;
 
        /**

diff --git a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebRequestBean.java
index a5a9ccf84510736ce777fc8036eb7230493ffb1d..1b99bd270b149f5bbd7a7c82492826661c548ad0 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebRequestBean.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jfinancials.beans.country;
 
+import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -27,7 +28,6 @@ import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import javax.inject.Named;
-import org.mxchange.jcoreee.jcache.Cached;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jcountry.data.CountrySingletonBeanRemote;
 import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent;
@@ -57,7 +57,7 @@ public class FinancialsCountryWebRequestBean extends BaseFinancialsController im
         * List of all countries
         */
        @Inject
-       @Cached (cacheName = "countryCache")
+       @NamedCache (cacheName = "countryCache", managementEnabled = true)
        private transient Cache<Long, Country> countryCache;
 
        /**

diff --git a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java
index f4490ca908d986bd2e24823291c2f0ea0d6a979e..51aac6d3bf19c28f0f58b39e38610ec628e4ea07 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jfinancials.beans.mobileprovider;
 
+import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -27,7 +28,6 @@ import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import javax.inject.Named;
-import org.mxchange.jcoreee.jcache.Cached;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
@@ -47,19 +47,19 @@ public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsContro
         */
        private static final long serialVersionUID = 15_869_423_671_950_276L;
 
-       /**
-        * "Cached" list of mobile providers
-        */
-       @Inject
-       @Cached (cacheName = "mobileProviderCache")
-       private transient Cache<Long, MobileProvider> mobileProviderCache;
-
        /**
         * Remote EJB for mobile providers (regular)
         */
        @EJB (lookup = "java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
        private MobileProviderSingletonBeanRemote mobileProviderBean;
 
+       /**
+        * "Cached" list of mobile providers
+        */
+       @Inject
+       @NamedCache (cacheName = "mobileProviderCache", managementEnabled = true)
+       private transient Cache<Long, MobileProvider> mobileProviderCache;
+
        /**
         * Default constructor
         */

diff --git a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebRequestBean.java
index 93ba631452767244b975cdbe8ae7e4b9d1c26a5d..2ff45ecd730b4843b39ae9e23af172ea99b84688 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebRequestBean.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jfinancials.beans.phone;
 
+import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -34,7 +35,6 @@ import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContac
 import org.mxchange.jcontacts.events.fax.linked.ObservableAdminLinkedFaxNumberEvent;
 import org.mxchange.jcontacts.events.landline.linked.ObservableAdminLinkedLandLineNumberEvent;
 import org.mxchange.jcontacts.events.mobile.linked.ObservableAdminLinkedMobileNumberEvent;
-import org.mxchange.jcoreee.jcache.Cached;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent;
 import org.mxchange.jphone.events.fax.updated.AdminUpdatedFaxNumberEvent;
@@ -66,21 +66,21 @@ public class FinancialsPhoneWebRequestBean extends BaseFinancialsController impl
         * All fax numbers
         */
        @Inject
-       @Cached(cacheName = "faxNumberCache")
+       @NamedCache (cacheName = "faxNumberCache", managementEnabled = true)
        private transient Cache<Long, DialableFaxNumber> faxNumberCache;
 
        /**
         * All land-line numbers
         */
        @Inject
-       @Cached(cacheName = "landLineNumberCache")
+       @NamedCache (cacheName = "landLineNumberCache", managementEnabled = true)
        private transient Cache<Long, DialableLandLineNumber> landLineNumberCache;
 
        /**
         * All mobile numbers
         */
        @Inject
-       @Cached(cacheName = "mobileNumberCache")
+       @NamedCache (cacheName = "mobileNumberCache", managementEnabled = true)
        private transient Cache<Long, DialableMobileNumber> mobileNumberCache;
 
        /**

diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebRequestBean.java
index bb2c9bc2c1b5ac63210673f437df8cd9408afa46..e6c1df1d9b7cef45e1cdf3d73560ad847b47e4e5 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebRequestBean.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jfinancials.beans.user;
 
+import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -35,8 +36,8 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcoreee.events.locale.ObservableLocaleChangeEvent;
-import org.mxchange.jcoreee.jcache.Cached;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
+import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController;
 import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController;
 import org.mxchange.jfinancials.beans.localization.FinancialsLocalizationSessionController;
 import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController;
@@ -63,7 +64,6 @@ 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.jfinancials.beans.contact.FinancialsContactWebRequestController;
 
 /**
  * A user bean (controller)
@@ -115,18 +115,18 @@ public class FinancialsUserWebRequestBean extends BaseFinancialsController imple
        @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<Long, User> userCache;
 
+       /**
+        * User id
+        */
+       private Long userId;
+
        /**
         * Login controller (bean)
         */
@@ -142,7 +142,7 @@ public class FinancialsUserWebRequestBean extends BaseFinancialsController imple
         * User name list
         */
        @Inject
-       @Cached (cacheName = "userNameCache")
+       @NamedCache (cacheName = "userNameCache", managementEnabled = true)
        private transient Cache<Long, String> userNameCache;
 
        /**

diff --git a/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebRequestBean.java
index e699cf6e1b4a61e227d5c6d42d5a1b4d390bc6c1..d9565b89f16af90684b62808460b8c6713d5e4c0 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebRequestBean.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jfinancials.beans.user.activity;
 
+import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
 import java.util.Collections;
 import java.util.GregorianCalendar;
@@ -28,7 +29,6 @@ import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import javax.inject.Named;
-import org.mxchange.jcoreee.jcache.Cached;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
 import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent;
@@ -79,8 +79,8 @@ public class FinancialsUserActivityWebRequestBean extends BaseFinancialsControll
         * "Cache" for activity log per user
         */
        @Inject
-       @Cached(cacheName = "usersActivityCache")
-       private transient Cache<User, List<LogableUserActivity>> usersActivityCache;
+       @NamedCache (cacheName = "userActivityCache", managementEnabled = true)
+       private transient Cache<User, List<LogableUserActivity>> userActivityCache;
 
        /**
         * Default constructor
@@ -508,9 +508,9 @@ public class FinancialsUserActivityWebRequestBean extends BaseFinancialsControll
                List<LogableUserActivity> 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());
@@ -550,13 +550,13 @@ public class FinancialsUserActivityWebRequestBean extends BaseFinancialsControll
                // 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<LogableUserActivity>());
+                               this.userActivityCache.put(userActivity.getActivityUser(), new LinkedList<LogableUserActivity>());
                        }
 
                        // 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
@@ -665,13 +665,13 @@ public class FinancialsUserActivityWebRequestBean extends BaseFinancialsControll
                }
 
                // Is it there?
-               if (!this.usersActivityCache.containsKey(userActivity.getActivityUser())) {
+               if (!this.userActivityCache.containsKey(userActivity.getActivityUser())) {
                        // Init it
-                       this.usersActivityCache.put(userActivity.getActivityUser(), new LinkedList<LogableUserActivity>());
+                       this.userActivityCache.put(userActivity.getActivityUser(), new LinkedList<LogableUserActivity>());
                }
 
                // 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/jfinancials/beans/user/email_address/FinancialsEmailChangeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebRequestBean.java
index d3862692b7e77264b19b6b59e9651528b232cfbf..0eb28e83467702f58745b6a61fb37397b8b71587 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebRequestBean.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jfinancials.beans.user.email_address;
 
+import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.List;
@@ -28,7 +29,6 @@ import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcoreee.jcache.Cached;
 import org.mxchange.jcoreee.utils.FacesUtils;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController;
@@ -79,7 +79,7 @@ public class FinancialsEmailChangeWebRequestBean extends BaseFinancialsControlle
         * Local list of already queued email addresses
         */
        @Inject
-       @Cached (cacheName = "queuedEmailCache")
+       @NamedCache (cacheName = "queuedEmailCache", managementEnabled = true)
        private transient Cache<String, Boolean> queuedEmailCache;
 
        /**