Don't cherry-pick:

[addressbook-war.git] / src / java / org / mxchange / addressbook / beans / phone / AddressbookPhoneWebRequestBean.java

diff --git a/src/java/org/mxchange/addressbook/beans/phone/AddressbookPhoneWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/phone/AddressbookPhoneWebRequestBean.java
index 002b0cc1e8b6bb81580a42393909928fec01e1c0..8297429c0ece3626b4452788f95e208cfa24b418 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/phone/AddressbookPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/phone/AddressbookPhoneWebRequestBean.java
@@ -16,14 +16,16 @@
  */
 package org.mxchange.addressbook.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.jusercore.events.user.add.ObservableAdminAddedUserEvent;
  * @author Roland Häder<roland@mxchange.org>
  */
 @Named ("phoneController")
-@ApplicationScoped
+@RequestScoped
 public class AddressbookPhoneWebRequestBean extends BaseAddressbookController implements AddressbookPhoneWebRequestController {
 
        /**
@@ -64,27 +66,27 @@ public class AddressbookPhoneWebRequestBean extends BaseAddressbookController im
         * All fax numbers
         */
        @Inject
-       @Cached(cacheName = "faxNumberCache")
-       private transient Cache<Long, DialableFaxNumber> faxNumberCache;
+       @NamedCache (cacheName = "faxNumberCache")
+       private Cache<Long, DialableFaxNumber> faxNumberCache;
 
        /**
         * All land-line numbers
         */
        @Inject
-       @Cached(cacheName = "landLineNumberCache")
-       private transient Cache<Long, DialableLandLineNumber> landLineNumberCache;
+       @NamedCache (cacheName = "landLineNumberCache")
+       private Cache<Long, DialableLandLineNumber> landLineNumberCache;
 
        /**
         * All mobile numbers
         */
        @Inject
-       @Cached(cacheName = "mobileNumberCache")
-       private transient Cache<Long, DialableMobileNumber> mobileNumberCache;
+       @NamedCache (cacheName = "mobileNumberCache")
+       private Cache<Long, DialableMobileNumber> mobileNumberCache;
 
        /**
         * General EJB for phone numbers
         */
-       @EJB (lookup = "java:global/addressbook-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote")
+       @EJB (lookup = "java:global/addressbook-ejb/phone!org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote")
        private PhoneSessionBeanRemote phoneBean;
 
        /**
@@ -482,10 +484,10 @@ public class AddressbookPhoneWebRequestBean extends BaseAddressbookController im
        @SuppressWarnings ("ReturnOfCollectionOrArrayField")
        public List<DialableFaxNumber> allFaxNumbers () {
                // Init list
-               List<DialableFaxNumber> list = new LinkedList<>();
+               final List<DialableFaxNumber> list = new LinkedList<>();
 
                // Get iterator
-               Iterator<Cache.Entry<Long, DialableFaxNumber>> iterator = this.faxNumberCache.iterator();
+               final Iterator<Cache.Entry<Long, DialableFaxNumber>> iterator = this.faxNumberCache.iterator();
 
                // Loop over all
                while (iterator.hasNext()) {
@@ -504,10 +506,10 @@ public class AddressbookPhoneWebRequestBean extends BaseAddressbookController im
        @SuppressWarnings ("ReturnOfCollectionOrArrayField")
        public List<DialableLandLineNumber> allLandLineNumbers () {
                // Init list
-               List<DialableLandLineNumber> list = new LinkedList<>();
+               final List<DialableLandLineNumber> list = new LinkedList<>();
 
                // Get iterator
-               Iterator<Cache.Entry<Long, DialableLandLineNumber>> iterator = this.landLineNumberCache.iterator();
+               final Iterator<Cache.Entry<Long, DialableLandLineNumber>> iterator = this.landLineNumberCache.iterator();
 
                // Loop over all
                while (iterator.hasNext()) {
@@ -526,10 +528,10 @@ public class AddressbookPhoneWebRequestBean extends BaseAddressbookController im
        @SuppressWarnings ("ReturnOfCollectionOrArrayField")
        public List<DialableMobileNumber> allMobileNumbers () {
                // Init list
-               List<DialableMobileNumber> list = new LinkedList<>();
+               final List<DialableMobileNumber> list = new LinkedList<>();
 
                // Get iterator
-               Iterator<Cache.Entry<Long, DialableMobileNumber>> iterator = this.mobileNumberCache.iterator();
+               final Iterator<Cache.Entry<Long, DialableMobileNumber>> iterator = this.mobileNumberCache.iterator();
 
                // Loop over all
                while (iterator.hasNext()) {
@@ -552,7 +554,7 @@ public class AddressbookPhoneWebRequestBean extends BaseAddressbookController im
                // Is cache there?
                if (!this.faxNumberCache.iterator().hasNext()) {
                        // Get whole list
-                       List<DialableFaxNumber> list = this.phoneBean.allFaxNumbers();
+                       final List<DialableFaxNumber> list = this.phoneBean.allFaxNumbers();
 
                        // Add all
                        for (final Iterator<DialableFaxNumber> iterator = list.iterator(); iterator.hasNext();) {
@@ -567,7 +569,7 @@ public class AddressbookPhoneWebRequestBean extends BaseAddressbookController im
                // Is cache there?
                if (!this.landLineNumberCache.iterator().hasNext()) {
                        // Get whole list
-                       List<DialableLandLineNumber> list = this.phoneBean.allLandLineNumbers();
+                       final List<DialableLandLineNumber> list = this.phoneBean.allLandLineNumbers();
 
                        // Add all
                        for (final Iterator<DialableLandLineNumber> iterator = list.iterator(); iterator.hasNext();) {
@@ -582,7 +584,7 @@ public class AddressbookPhoneWebRequestBean extends BaseAddressbookController im
                // Is cache there?
                if (!this.mobileNumberCache.iterator().hasNext()) {
                        // Get whole list
-                       List<DialableMobileNumber> list = this.phoneBean.allMobileNumbers();
+                       final List<DialableMobileNumber> list = this.phoneBean.allMobileNumbers();
 
                        // Add all
                        for (final Iterator<DialableMobileNumber> iterator = list.iterator(); iterator.hasNext();) {