RESTCOMM-2064: Add ExtensionContext interface. Decorate ExtensionController with ExtensionContext. Implement getEffectiveConfiguration in impl. Add init to ExtensionController to initialize ServletContext.

Author: abdulazizali77

restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/ExtensionContext.java

@@ -0,0 +1,25 @@
+/*
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2011-2013, Telestax Inc and individual contributors
+ * by the @authors tag.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.restcomm.connect.extension.api;
+
+public interface ExtensionContext {
+    ExtensionConfiguration getEffectiveConfiguration(String extensionSid, String scopeSid);
+}

restcomm/restcomm.extension.controller/src/main/java/org/restcomm/connect/extension/controller/ExtensionBootstrapper.java

@@ -20,6 +20,7 @@
  */
 package org.restcomm.connect.extension.controller;
 
+import org.restcomm.connect.extension.api.ExtensionContext;
 import org.restcomm.connect.extension.api.RestcommExtensionGeneric;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -43,6 +44,8 @@ public class ExtensionBootstrapper {
     public ExtensionBootstrapper(final ServletContext context, final Configuration configuration) {
         this.configuration = configuration;
         this.context = context;
+        this.context.setAttribute(ExtensionContext.class.getName(), ExtensionController.getInstance());
+        ExtensionController.getInstance().init(this.context);
     }
 
     public void start() throws ClassNotFoundException, IllegalAccessException, InstantiationException {

restcomm/restcomm.extension.controller/src/main/java/org/restcomm/connect/extension/controller/ExtensionController.java

@@ -1,8 +1,19 @@
 package org.restcomm.connect.extension.controller;
 
+import org.restcomm.connect.commons.dao.Sid;
+import org.restcomm.connect.dao.AccountsDao;
+import org.restcomm.connect.dao.ClientsDao;
+import org.restcomm.connect.dao.DaoManager;
+import org.restcomm.connect.dao.ExtensionsConfigurationDao;
+import org.restcomm.connect.dao.OrganizationsDao;
+import org.restcomm.connect.dao.entities.Account;
+import org.restcomm.connect.dao.entities.Client;
+import org.restcomm.connect.dao.entities.Organization;
 import org.restcomm.connect.extension.api.ApiRequest;
+import org.restcomm.connect.extension.api.ExtensionConfiguration;
 import org.restcomm.connect.extension.api.ExtensionResponse;
 import org.restcomm.connect.extension.api.ExtensionType;
+import org.restcomm.connect.extension.api.ExtensionContext;
 import org.restcomm.connect.extension.api.IExtensionRequest;
 import org.restcomm.connect.extension.api.RestcommExtension;
 import org.restcomm.connect.extension.api.RestcommExtensionGeneric;
@@ -11,10 +22,12 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import javax.servlet.ServletContext;
+
 /**
  * Created by gvagenas on 21/09/16.
  */
-public class ExtensionController {
+public class ExtensionController implements ExtensionContext{
     private static Logger logger = Logger.getLogger(ExtensionController.class);
 
     private static ExtensionController instance;
@@ -24,6 +37,10 @@ public class ExtensionController {
     private List restApiExtensions;
     private List featureAccessControlExtensions;
 
+    private DaoManager daoManager;
+
+    private ServletContext context;
+
     private ExtensionController(){
         this.callManagerExtensions = new CopyOnWriteArrayList();
         this.smsSessionExtensions = new CopyOnWriteArrayList();
@@ -32,6 +49,11 @@ private ExtensionController(){
         this.featureAccessControlExtensions = new CopyOnWriteArrayList();
     }
 
+    public void init(ServletContext context) {
+        this.context = context;
+        daoManager = (DaoManager)context.getAttribute(DaoManager.class.getName());
+    }
+
     public static ExtensionController getInstance() {
         if (instance == null) {
             instance = new ExtensionController();
@@ -282,4 +304,29 @@ public ExtensionResponse executePostApiAction(final ApiRequest apiRequest, List<
         }
         return response;
     }
+
+    @Override
+    public ExtensionConfiguration getEffectiveConfiguration(String extensionSid, String scopeSid) {
+        ExtensionsConfigurationDao ecd = daoManager.getExtensionsConfigurationDao();
+        ClientsDao cd = daoManager.getClientsDao();
+        AccountsDao ad = daoManager.getAccountsDao();
+        OrganizationsDao od = daoManager.getOrganizationsDao();
+        ExtensionConfiguration extCfg = ecd.getAccountExtensionConfiguration(scopeSid, extensionSid);
+
+        Sid sid = new Sid(scopeSid);
+        Client client = cd.getClient(sid);
+        Account account = ad.getAccount(sid);
+        Organization organization = od.getOrganization(sid);
+
+        //check parent
+
+        //check org
+
+        //check default
+        if(extCfg==null) {
+            //if no account specific entry is defined, we use the extension config
+            extCfg = ecd.getConfigurationBySid(new Sid(extensionSid));
+        }
+        return extCfg;
+    }
 }