Please cherry-pick:

[jjobs-war.git] / src / java / org / mxchange / jjobs / beans / business / basicdata / JobsBusinessDataWebRequestBean.java

diff --git a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java
index 62f5ba125c32217b256e312c90b0b6143d562756..a7b0c9f00c60e74874e5296fa976cbdf65d38874 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java
@@ -22,17 +22,19 @@ 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.basicdata.AdminBusinessDataSessionBeanRemote;
-import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
-import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.basicdata.AdminBusinessDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
+import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent;
-import org.mxchange.jcountry.data.Country;
+import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jjobs.beans.BaseJobsController;
+import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController;
 
 /**
  * A business contact bean (controller)
@@ -58,8 +60,8 @@ public class JobsBusinessDataWebRequestBean extends BaseJobsController implement
         * A list of all registered companies (globally)
         */
        @Inject
-       @NamedCache (cacheName = "basicDataCache", managementEnabled = true)
-       private transient Cache<Long, BusinessBasicData> basicDataCache;
+       @NamedCache (cacheName = "basicDataCache")
+       private Cache<Long, BusinessBasicData> basicDataCache;
 
        /**
         * EJB for general basic business data purposes
@@ -140,12 +142,12 @@ public class JobsBusinessDataWebRequestBean extends BaseJobsController implement
                } 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");
@@ -155,7 +157,7 @@ public class JobsBusinessDataWebRequestBean extends BaseJobsController implement
                }
 
                // Add it to list
-               this.basicDataCache.put(event.getBasicData().getCompanyDataId(), event.getBasicData());
+               this.basicDataCache.put(event.getBasicData().getBasicDataId(), event.getBasicData());
        }
 
        /**
@@ -166,10 +168,10 @@ public class JobsBusinessDataWebRequestBean extends BaseJobsController implement
        @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()) {
@@ -354,7 +356,7 @@ public class JobsBusinessDataWebRequestBean extends BaseJobsController implement
                // 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();) {
@@ -362,7 +364,7 @@ public class JobsBusinessDataWebRequestBean extends BaseJobsController implement
                                final BusinessBasicData next = iterator.next();
 
                                // Add it to cache
-                               this.basicDataCache.put(next.getCompanyDataId(), next);
+                               this.basicDataCache.put(next.getBasicDataId(), next);
                        }
                }
        }