Please cherry-pick:

[pizzaservice-war.git] / src / java / org / mxchange / pizzaapplication / beans / business / basicdata / PizzaBusinessDataWebRequestBean.java

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 2b40cfc3fba1011db9abfd3792f9d7f75545d1c0..e4e18f19816bc03ef4f468a41b98a7361737b3aa 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebRequestBean.java
@@ -16,17 +16,21 @@
  */
 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;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent;
+import org.mxchange.jcontactsbusiness.model.basicdata.AdminBasicCompanyDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.pizzaapplication.beans.BasePizzaController;
@@ -37,7 +41,7 @@ import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionCo
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Named ("companyDataController")
+@Named ("basicDataController")
 @RequestScoped
 public class PizzaBusinessDataWebRequestBean extends BasePizzaController implements PizzaBusinessDataWebRequestController {
 
@@ -49,21 +53,21 @@ public class PizzaBusinessDataWebRequestBean extends BasePizzaController impleme
        /**
         * EJB for administrative basic business data purposes
         */
-       @EJB (lookup = "java:global/jfinancials-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote", description = "A stateless session bean for administrative purposes.")
-       private AdminBusinessDataSessionBeanRemote adminBusinessDataBean;
+       @EJB (lookup = "java:global/jfinancials-ejb/adminBasicCompanyData!org.mxchange.jcontactsbusiness.model.basicdata.AdminBasicCompanyDataSessionBeanRemote", description = "A stateless session bean for administrative purposes.")
+       private AdminBasicCompanyDataSessionBeanRemote adminBasicCompanyDataBean;
 
        /**
         * A list of all registered companies (globally)
         */
        @Inject
-       @Cached (cacheName = "basicDataCache")
-       private transient Cache<Long, BusinessBasicData> basicDataCache;
+       @NamedCache (cacheName = "basicDataCache")
+       private Cache<Long, BusinessBasicData> basicDataCache;
 
        /**
         * EJB for general basic business data purposes
         */
-       @EJB (lookup = "java:global/jfinancials-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote", description = "A stateless session bean for general purposes.")
-       private BusinessDataSessionBeanRemote businessDataBean;
+       @EJB (lookup = "java:global/jfinancials-ejb/basicCompanyData!org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote", description = "A stateless session bean for general purposes.")
+       private BasicCompanyDataSessionBeanRemote businessDataBean;
 
        /**
         * Comments for this company
@@ -138,12 +142,12 @@ public class PizzaBusinessDataWebRequestBean extends BasePizzaController impleme
                } else if (event.getBasicData() == null) {
                        // Throw NPE again
                        throw new NullPointerException("event.basicData is null");
-               } else if (event.getBasicData().getCompanyDataId() == null) {
+               } else if (event.getBasicData().getBasicDataId() == null) {
                        // Throw NPE again
-                       throw new NullPointerException("event.basicData.companyDataId is null");
-               } else if (event.getBasicData().getCompanyDataId() < 1) {
+                       throw new NullPointerException("event.basicData.basicDataId is null");
+               } else if (event.getBasicData().getBasicDataId() < 1) {
                        // Throw IAE
-                       throw new IllegalArgumentException(MessageFormat.format("event.basicData.companyDataId={0} is invalid", event.getBasicData().getCompanyDataId()));
+                       throw new IllegalArgumentException(MessageFormat.format("event.basicData.basicDataId={0} is invalid", event.getBasicData().getBasicDataId()));
                } else if (event.getBasicData().getCompanyName() == null) {
                        // Throw NPE again
                        throw new NullPointerException("event.basicData.companyName is null");
@@ -153,7 +157,7 @@ public class PizzaBusinessDataWebRequestBean extends BasePizzaController impleme
                }
 
                // Add it to list
-               this.basicDataCache.put(event.getBasicData().getCompanyDataId(), event.getBasicData());
+               this.basicDataCache.put(event.getBasicData().getBasicDataId(), event.getBasicData());
        }
 
        /**
@@ -164,10 +168,10 @@ public class PizzaBusinessDataWebRequestBean extends BasePizzaController impleme
        @SuppressWarnings ("ReturnOfCollectionOrArrayField")
        public List<BusinessBasicData> allCompanyBasicData () {
                // Init list
-               List<BusinessBasicData> list = new LinkedList<>();
+               final List<BusinessBasicData> list = new LinkedList<>();
 
                // Get iterator
-               Iterator<Cache.Entry<Long, BusinessBasicData>> iterator = this.basicDataCache.iterator();
+               final Iterator<Cache.Entry<Long, BusinessBasicData>> iterator = this.basicDataCache.iterator();
 
                // Loop over all
                while (iterator.hasNext()) {
@@ -352,7 +356,7 @@ public class PizzaBusinessDataWebRequestBean extends BasePizzaController impleme
                // Is cache there?
                if (!this.basicDataCache.iterator().hasNext()) {
                        // Get whole list
-                       List<BusinessBasicData> list = this.businessDataBean.allCompanyBasicData();
+                       final List<BusinessBasicData> list = this.businessDataBean.allCompanyBasicData();
 
                        // Add all
                        for (final Iterator<BusinessBasicData> iterator = list.iterator(); iterator.hasNext();) {
@@ -360,7 +364,7 @@ public class PizzaBusinessDataWebRequestBean extends BasePizzaController impleme
                                final BusinessBasicData next = iterator.next();
 
                                // Add it to cache
-                               this.basicDataCache.put(next.getCompanyDataId(), next);
+                               this.basicDataCache.put(next.getBasicDataId(), next);
                        }
                }
        }