Remove Postpaid Logic, update param to mparam, source cleanup

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/thirdparty/helper/InitializerBean.java

@@ -1,7 +1,5 @@
 package com.psi.gabontel.mobileapp.thirdparty.helper;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -12,8 +10,6 @@ import javax.annotation.PostConstruct;
 import javax.ejb.Singleton;
 import javax.ejb.Startup;
 import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 
 import org.jboss.logging.Logger;
 import org.wildfly.naming.client.WildFlyInitialContextFactory;
@@ -27,7 +23,6 @@ import com.psi.common.db.DataRowCollection;
 import com.psi.common.db.DbQuery;
 import com.psi.common.db.DbWrapper;
 import com.psi.common.util.StringUtil;
-import com.psi.ussd.interfaces.UssdReceiverFunction;
 
 @Startup
 @Singleton
@@ -35,8 +30,8 @@ public class InitializerBean {
     private static final Logger log = Logger.getLogger(InitializerBean.class);
     private static final Hashtable<String,String> ussdgwmenuejb = new Hashtable<String,String>();
     private static final Properties jndiProperties = new Properties();
-    private static AuthenticationConfiguration commonconfig = AuthenticationConfiguration.empty().setSaslMechanismSelector(SaslMechanismSelector.NONE.addMechanism("DIGEST-MD5"));
-    private static AuthenticationConfiguration userconfig = AuthenticationConfiguration.empty().setSaslMechanismSelector(SaslMechanismSelector.NONE.addMechanism("DIGEST-MD5"));
+    private static final AuthenticationConfiguration commonconfig = AuthenticationConfiguration.empty().setSaslMechanismSelector(SaslMechanismSelector.NONE.addMechanism("DIGEST-MD5"));
+    private static AuthenticationConfiguration userconfig;
 
     @PostConstruct
     public void initialize() {
@@ -60,40 +55,16 @@ public class InitializerBean {
         String username = extraparam.getOrDefault("username", "");
         String password = extraparam.getOrDefault("password", "");
         password = DbQuery.dbDecrypt(password, name);
-        //jndiProperties.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
         jndiProperties.put(Context.INITIAL_CONTEXT_FACTORY, WildFlyInitialContextFactory.class.getName());
         jndiProperties.put(Context.PROVIDER_URL, url);
-        //jndiProperties.put(Context.SECURITY_PRINCIPAL, username);
-        //jndiProperties.put(Context.SECURITY_CREDENTIALS, password);
-        //jndiProperties.put("org.jboss.ejb.client.scoped.context", "true");
+        jndiProperties.put(Context.SECURITY_PRINCIPAL, username);
+        jndiProperties.put(Context.SECURITY_CREDENTIALS, password);
         userconfig = commonconfig.useName(username).usePassword(password);
     }
-    
-    public static String getUssdgwmenuejb(String key){
-        return ussdgwmenuejb.get(key);
-    }
+
     public static boolean containsKey(String key) {
         return ussdgwmenuejb.containsKey(key);
     }
-    public static Properties getJndiProperties() {
-        return jndiProperties;
-    }
-    public static UssdReceiverFunction getInterface(String jndi) {
-        try {
-            final Context context = new InitialContext(jndiProperties);
-            UssdReceiverFunction ussdplugin = (UssdReceiverFunction) context.lookup(jndi);
-            return ussdplugin;
-        } catch (Exception e) {
-            log.error(jndi,e);
-        }
-        return null;
-    }
-    
-    public static String getPropertiesAsString() {    
-        StringWriter writer = new StringWriter();
-        jndiProperties.list(new PrintWriter(writer));
-        return writer.getBuffer().toString();
-    }
     
     public static String callUssd(final String key, final String ... params) {
         try {

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/thirdparty/helper/MobileAppThirdPartyHelper.java

@@ -1,20 +1,15 @@
 package com.psi.gabontel.mobileapp.thirdparty.helper;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 
 import javax.ejb.Remote;
 import javax.ejb.Stateless;
-import javax.naming.Context;
-import javax.naming.InitialContext;
 
 import org.jboss.logging.Logger;
 
 import com.psi.applicationmanager.AppManagerFunction;
 import com.psi.applicationmanager.AppMessage;
 import com.psi.common.transactions.Message;
-import com.psi.ussd.interfaces.UssdReceiverFunction;
 
 @Stateless
 @Remote(AppManagerFunction.class)
@@ -29,37 +24,10 @@ public class MobileAppThirdPartyHelper  implements AppManagerFunction {
 	
 	@Override
 	public AppMessage manageTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {
-		// TODO Auto-generated method stub
-		
 		try {
     		String method  =  syntax.get("method");
-    		
-    		//UssdReceiverFunction clazz = null;
-    		
-    		
     		if(InitializerBean.containsKey(method)) {
-    		    //final Context context = new InitialContext(InitializerBean.getJndiProperties());
-    		    //clazz = (UssdReceiverFunction) context.lookup(InitializerBean.getUssdgwmenuejb(method));
-    			
-    			String[] paramarr = syntax.get("param").split("\\|");
-    			//List<String> listarr = Arrays.asList(paramarr);
-    			
-    			//SPECIAL CASE
-    			if(method.equals("postpaidinvoices")){
-    				log.info(InitializerBean.getPropertiesAsString());
-    				//String arisreturn = clazz.requestFunc(listarr);
-    				String arisreturn = InitializerBean.callUssd(method, paramarr);
-    				log.info(arisreturn);
-    			    //clazz = (UssdReceiverFunction) context.lookup(InitializerBean.getUssdgwmenuejb("displayinvoices"));
-    				
-    				//listarr =  Arrays.asList(arisreturn);
-    				//String resp = clazz.requestFunc(listarr);
-    				String resp = InitializerBean.callUssd("displayinvoices", arisreturn);
-    				log.info(resp);
-    				return new Message(0,0,new JsonResponse(0,resp).toString());	
-    			}
-    			
-    			//return new Message(0,0,new JsonResponse(0,clazz.requestFunc(listarr)).toString());
+    			String[] paramarr = syntax.get("mparam").split("\\|");    			
     			return new Message(0,0,new JsonResponse(0,InitializerBean.callUssd(method, paramarr)).toString());
     		}else {
     			return new Message(99,0,new JsonResponse(99,"System is busy").toString());

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/thirdparty/helper/Test.java

@@ -21,9 +21,9 @@ import com.psi.ussd.interfaces.UssdReceiverFunction;
 public class Test {
     public static void main(String[] args) throws Exception {
         
-        //appman();
+        appman();
         //ussd();
-        test1();
+        //test1();
     }
     
     private static void test1() throws Exception {

GabonTelMobicashMobileAppHelper/src/main/resources/wildfly-config-bk.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    JBoss, Home of Professional Open Source
-    Copyright 2017, Red Hat, Inc. and/or its affiliates, and individual
-    contributors by the @authors tag. See the copyright.txt in the
-    distribution for a full listing of individual contributors.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-<configuration>
-    <authentication-client xmlns="urn:elytron:1.0">
-        <authentication-rules>
-            <rule use-configuration="default"/>
-        </authentication-rules>
-        <authentication-configurations>
-            <configuration name="default">
-                <sasl-mechanism-selector selector="DIGEST-MD5"/>
-                <set-user-name name="ejbuser"/>
-                <credentials>
-                    <clear-password password="ejbuser123!"/>
-                </credentials>
-            </configuration>
-        </authentication-configurations>
-    </authentication-client>
-</configuration>
--->