X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Fjjobs%2Fbeans%2Fmobileprovider%2FJobsMobileProviderWebRequestBean.java;h=16ba00c0c35d911734864d5368aba07b028b9a2a;hb=3ee4e77359355dc1d464a36370b78ba174e5f3f8;hp=f161c5cdec0707cc73ee9f4086c42d5d82163af9;hpb=1e6ec3c65513cfc5a753363c5464c797d9b3b9ae;p=jjobs-war.git

diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java
index f161c5cd..16ba00c0 100644
--- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Roland Häder
+ * Copyright (C) 2016 - 2022 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,20 +16,11 @@
  */
 package org.mxchange.jjobs.beans.mobileprovider;
 
-import java.text.MessageFormat;
-import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Observes;
-import javax.faces.view.facelets.FaceletException;
+import javax.ejb.EJB;
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.mxchange.jjobs.beans.BaseJobsController;
-import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent;
-import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
-import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
+import org.mxchange.jjobs.beans.BaseJobsBean;
+import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
 
 /**
  * A general bean for mobile providers
@@ -37,23 +28,19 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBe
  * @author Roland Häder<roland@mxchange.org>
  */
 @Named ("mobileProviderController")
-@SessionScoped
-public class JobsMobileProviderWebRequestBean extends BaseJobsController implements JobsMobileProviderWebRequestController {
+@RequestScoped
+public class JobsMobileProviderWebRequestBean extends BaseJobsBean implements JobsMobileProviderWebRequestController {
 
 	/**
 	 * Serial number
 	 */
 	private static final long serialVersionUID = 15_869_423_671_950_276L;
 
-	/**
-	 * "Cached" list of mobile providers
-	 */
-	private List<MobileProvider> mobileProviders;
-
 	/**
 	 * Remote EJB for mobile providers (regular)
 	 */
-	private MobileProviderSingletonBeanRemote mobileRemoteBean;
+	@EJB (lookup = "java:global/jjobs-ejb/mobileProvider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
+	private MobileProviderSingletonBeanRemote mobileProviderBean;
 
 	/**
 	 * Default constructor
@@ -62,58 +49,4 @@ public class JobsMobileProviderWebRequestBean extends BaseJobsController impleme
 		// Call super constructor
 		super();
 	}
-
-	/**
-	 * Observes events being fired after the administrator has added a new
-	 * mobile provider
-	 * <p>
-	 * @param event Event being fired
-	 */
-	public void afterAdminAddedMobileProviderEvent (@Observes final AdminAddedMobileProviderEvent event) {
-		// Is all valid?
-		if (null == event) {
-			// Throw NPE
-			throw new NullPointerException("event is null"); //NOI18N
-		} else if (event.getAddedMobileProvider() == null) {
-			// Throw again ...
-			throw new NullPointerException("event.addedMobileProvider is null"); //NOI18N
-		} else if (event.getAddedMobileProvider().getProviderId() == null) {
-			// And again ...
-			throw new NullPointerException("event.addedMobileProvider.providerId is null"); //NOI18N
-		} else if (event.getAddedMobileProvider().getProviderId() < 1) {
-			// Id is invalid
-			throw new IllegalArgumentException(MessageFormat.format("event.addedMobileProvider.providerId={0} is not valid.", event.getAddedMobileProvider().getProviderId())); //NOI18N
-		}
-
-		// Add it to the list
-		this.mobileProviders.add(event.getAddedMobileProvider());
-	}
-
-	@Override
-	@SuppressWarnings ("ReturnOfCollectionOrArrayField")
-	public List<MobileProvider> allMobileProviders () {
-		return this.mobileProviders;
-	}
-
-	/**
-	 * Post-construction method
-	 */
-	@PostConstruct
-	public void init () {
-		// Try it
-		try {
-			// Get initial context
-			Context context = new InitialContext();
-
-			// Try to lookup the beans
-			this.mobileRemoteBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/jjobs-ejb/mobileProvider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote"); //NOI18N
-		} catch (final NamingException e) {
-			// Throw it again
-			throw new FaceletException(e);
-		}
-
-		// Init list of mobile providers
-		this.mobileProviders = this.mobileRemoteBean.allMobileProvider();
-	}
-
 }