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;
* <p>
* @author Roland Häder<roland@mxchange.org>
*/
-@Named ("companyDataController")
+@Named ("basicDataController")
@RequestScoped
public class PizzaBusinessDataWebRequestBean extends BasePizzaController implements PizzaBusinessDataWebRequestController {
/**
* 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
- @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
*/
- @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
} 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");
}
// Add it to list
- this.basicDataCache.put(event.getBasicData().getCompanyDataId(), event.getBasicData());
+ this.basicDataCache.put(event.getBasicData().getBasicDataId(), event.getBasicData());
}
/**
@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()) {
// 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();) {
final BusinessBasicData next = iterator.next();
// Add it to cache
- this.basicDataCache.put(next.getCompanyDataId(), next);
+ this.basicDataCache.put(next.getBasicDataId(), next);
}
}
}