Don't cherry-pick:

[addressbook-war.git] / src / java / org / mxchange / addressbook / converter / mobileprovider / AddressbookMobileProviderConverter.java

diff --git a/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java b/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
index 4e3b52ef0ed9608d4163dfc59405c51cd0cad0ba..3547fe3615988d5d14f479b9ec91dd8fa1958014 100644 (file)
--- a/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
@@ -16,19 +16,16 @@
  */
 package org.mxchange.addressbook.converter.mobileprovider;
 
-import java.util.List;
-import java.util.Objects;
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
+import org.mxchange.addressbook.beans.mobileprovider.list.AddressbookMobileProviderListWebViewBean;
+import org.mxchange.addressbook.beans.mobileprovider.list.AddressbookMobileProviderListWebViewController;
+import org.mxchange.jphone.exceptions.mobileprovider.MobileProviderNotFoundException;
 import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider;
-import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
 
 /**
  * Converter for SMS provider instance
@@ -39,65 +36,44 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingl
 public class AddressbookMobileProviderConverter implements Converter<MobileProvider> {
 
        /**
-        * Mobile provider bean
+        * Mobile provider backing bean
         */
-       private static MobileProviderSingletonBeanRemote MOBILE_PROVIDER_BEAN;
+       private static AddressbookMobileProviderListWebViewController MOBILE_PROVIDER_LIST_CONTROLLER;
 
        @Override
        public MobileProvider getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
-               // Is the instance there?
-               if (MOBILE_PROVIDER_BEAN == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initial.lookup("java:global/addressbook-ejb/mobileProvider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote");
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex);
-                       }
-               }
-
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
-                       // Warning message
-                       // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N
-
                        // Return null
                        return null;
                }
 
-               // Get full list
-               final List<MobileProvider> providerList = MOBILE_PROVIDER_BEAN.allMobileProviders();
-
                // Init value
-               MobileProvider provider = null;
+               MobileProvider mobileProvider = null;
+
+               // Is the instance there?
+               if (null == MOBILE_PROVIDER_LIST_CONTROLLER) {
+                       // Get bean from CDI directly
+                       MOBILE_PROVIDER_LIST_CONTROLLER = CDI.current().select(AddressbookMobileProviderListWebViewBean.class).get();
+               }
 
                // Try this better
                try {
                        // Convert it to long
                        final Long providerId = Long.parseLong(submittedValue);
 
-                       // Category id should not be below 1
-                       assert (providerId > 0) : "providerId is smaller than one: " + providerId; //NOI18N
-
-                       // Try to find it
-                       for (final MobileProvider prov : providerList) {
-                               // Is the id the same? (null-safe)
-                               if (Objects.equals(prov.getProviderId(), providerId)) {
-                                       // Found it
-                                       provider = prov;
-                                       break;
-                               }
-                       }
+                       // Lookup of mobile provider
+                       mobileProvider = MOBILE_PROVIDER_LIST_CONTROLLER.findMobileProviderById(providerId);
                } catch (final NumberFormatException ex) {
+                       // Throw again
+                       throw new ConverterException(ex);
+               } catch (final MobileProviderNotFoundException ex) {
                        // Log exception (maybe to much?)
                        // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logException(ex);
                }
 
                // Return it
-               return provider;
+               return mobileProvider;
        }
 
        @Override