From f1878e326c2acb013de254d013f14ec7c74b28b8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
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 <roland@mxchange.org>
---
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 ++---
.../FinancialsBusinessDataWebRequestBean.java | 4 ++--
...nancialsCompanyEmployeeWebRequestBean.java | 4 ++--
.../FinancialsContactWebRequestBean.java | 8 +++----
.../FinancialsContactPhoneWebRequestBean.java | 6 ++---
.../FinancialsCountryWebRequestBean.java | 4 ++--
...inancialsMobileProviderWebRequestBean.java | 16 ++++++-------
.../phone/FinancialsPhoneWebRequestBean.java | 8 +++----
.../user/FinancialsUserWebRequestBean.java | 18 +++++++-------
.../FinancialsUserActivityWebRequestBean.java | 22 +++++++++---------
.../FinancialsEmailChangeWebRequestBean.java | 4 ++--
15 files changed, 55 insertions(+), 58 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
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
diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index 847addc6..db384dcd 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-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
index 0000000000000000000000000000000000000000..02de279f789cefa4e01dbb4fa9867071257beff1
GIT binary patch
literal 8130
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
V1q-=~003&_pFc9=xv5aU{sUo`<DCEi
literal 0
HcmV?d00001
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 1e36abd3..cfa5325d 100644
--- 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 c6b4ffe3..23a4457d 100644
--- 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 ea14c631..b9a26cb7 100644
--- 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 9b00752d..f4ca6008 100644
--- 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 8d47e2b9..7443a08e 100644
--- 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 0477ae76..c43241ab 100644
--- 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 a5a9ccf8..1b99bd27 100644
--- 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 f4490ca9..51aac6d3 100644
--- 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 93ba6314..2ff45ecd 100644
--- 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 bb2c9bc2..e6c1df1d 100644
--- 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 e699cf6e..d9565b89 100644
--- 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 d3862692..0eb28e83 100644
--- 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;
/**
--
2.39.5