Please cherry-pick:

[pizzaservice-war.git] / src / java / org / mxchange / pizzaapplication / beans / mobileprovider / PizzaMobileProviderWebRequestBean.java

diff --git a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java
index b42f1bc181e4a80420cdc30c9cc1988419648c10..1929e20fb662fb669cfac439c3e9a3ed5451eb93 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java
@@ -16,15 +16,20 @@
  */
 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;
 import java.util.List;
 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.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent;
-import org.mxchange.jphone.model.phonenumbers.model.mobileprovider.MobileProvider;
+import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
 import org.mxchange.pizzaapplication.beans.BasePizzaController;
 
@@ -34,7 +39,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController;
  * @author Roland Häder<roland@mxchange.org>
  */
 @Named ("mobileProviderController")
-@SessionScoped
+@RequestScoped
 public class PizzaMobileProviderWebRequestBean extends BasePizzaController implements PizzaMobileProviderWebRequestController {
 
        /**
@@ -43,15 +48,17 @@ public class PizzaMobileProviderWebRequestBean extends BasePizzaController imple
        private static final long serialVersionUID = 15_869_423_671_950_276L;
 
        /**
-        * "Cached" list of mobile providers
+        * Remote EJB for mobile providers (regular)
         */
-       private List<MobileProvider> mobileProviders;
+       @EJB (lookup = "java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
+       private MobileProviderSingletonBeanRemote mobileProviderBean;
 
        /**
-        * Remote EJB for mobile providers (regular)
+        * "Cached" list of mobile providers
         */
-       @EJB (lookup = "java:global/pizzaservice-ejb/mobileProvider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
-       private MobileProviderSingletonBeanRemote mobileRemoteBean;
+       @Inject
+       @NamedCache (cacheName = "mobileProviderCache")
+       private Cache<Long, MobileProvider> mobileProviderCache;
 
        /**
         * Default constructor
@@ -84,13 +91,29 @@ public class PizzaMobileProviderWebRequestBean extends BasePizzaController imple
                }
 
                // Add it to the list
-               this.mobileProviders.add(event.getAddedMobileProvider());
+               this.mobileProviderCache.put(event.getAddedMobileProvider().getProviderId(), event.getAddedMobileProvider());
        }
 
        @Override
        @SuppressWarnings ("ReturnOfCollectionOrArrayField")
        public List<MobileProvider> allMobileProviders () {
-               return this.mobileProviders;
+               // Init list
+               List<MobileProvider> list = new LinkedList<>();
+
+               // Get iterator
+               Iterator<Cache.Entry<Long, MobileProvider>> iterator = this.mobileProviderCache.iterator();
+
+               // Loop over all
+               while (iterator.hasNext()) {
+                       // Get next entry
+                       final Cache.Entry<Long, MobileProvider> next = iterator.next();
+
+                       // Add value to list
+                       list.add(next.getValue());
+               }
+
+               // Return it
+               return list;
        }
 
        /**
@@ -98,8 +121,20 @@ public class PizzaMobileProviderWebRequestBean extends BasePizzaController imple
         */
        @PostConstruct
        public void init () {
-               // Init list of mobile providers
-               this.mobileProviders = this.mobileRemoteBean.allMobileProvider();
+               // Is cache there?
+               if (!this.mobileProviderCache.iterator().hasNext()) {
+                       // Get whole list
+                       List<MobileProvider> list = this.mobileProviderBean.allMobileProviders();
+
+                       // Add all
+                       for (final Iterator<MobileProvider> iterator = list.iterator(); iterator.hasNext();) {
+                               // Get next element
+                               final MobileProvider next = iterator.next();
+
+                               // Add it to cache
+                               this.mobileProviderCache.put(next.getProviderId(), next);
+                       }
+               }
        }
 
 }