RESTCOMM-2064: Add setter getter for ExtensionContext for ExtensionRequest. Set extensionContext in ExtensionController

Author: abdulazizali77

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

@@ -24,7 +24,7 @@
 /**
  * Created by gvagenas on 10/10/2016.
  */
-public class ApiRequest {
+public class ApiRequest extends ExtensionRequest {
     public static enum Type {
         AVAILABLEPHONENUMBER,INCOMINGPHONENUMBER, CREATE_SUBACCOUNT
     };

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

@@ -23,6 +23,8 @@
 public class ExtensionRequest implements IExtensionRequest{
     private boolean allowed = true;
     private String accountSid;
+    private ExtensionContext extensionContext;
+
     public ExtensionRequest() {
         this("", true);
     }
@@ -58,4 +60,22 @@ public void setAllowed(boolean allowed) {
         this.allowed = allowed;
     }
 
+    /**
+     * setExtensionContext
+     * @param ExtensionContext
+     */
+    @Override
+    public void setExtensionContext(ExtensionContext ec) {
+        this.extensionContext = ec;
+    }
+
+    /**
+     * getExtensionContext
+     * @return the current ExtensionContext
+     */
+    @Override
+    public ExtensionContext getExtensionContext() {
+        return this.extensionContext;
+    }
+
 }

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

@@ -37,4 +37,14 @@ public interface IExtensionRequest {
      * @param set to allow/restrict request
      */
     void setAllowed(boolean allowed);
+
+    /**
+     * @param set ExtensionContext
+     */
+    void setExtensionContext(ExtensionContext ec);
+
+    /**
+     * @param set ExtensionContext
+     */
+    ExtensionContext getExtensionContext();
 }

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

@@ -130,7 +130,7 @@ public ExtensionResponse executePreOutboundAction(final IExtensionRequest ier, L
         // extensionResponse
         ExtensionResponse response = new ExtensionResponse();
         if (extensions != null && extensions.size() > 0) {
-
+            ier.setExtensionContext(this);
             for (RestcommExtensionGeneric extension : extensions) {
                 if(logger.isInfoEnabled()) {
                     logger.info( extension.getName()+" is enabled="+extension.isEnabled());
@@ -160,7 +160,7 @@ public ExtensionResponse executePreOutboundAction(final IExtensionRequest ier, L
     public ExtensionResponse executePostOutboundAction(final IExtensionRequest er, List<RestcommExtensionGeneric> extensions) {
         ExtensionResponse response = new ExtensionResponse();
         if (extensions != null && extensions.size() > 0) {
-
+            er.setExtensionContext(this);
             for (RestcommExtensionGeneric extension : extensions) {
                 if(logger.isInfoEnabled()) {
                     logger.info( extension.getName()+" is enabled="+extension.isEnabled());
@@ -190,6 +190,7 @@ public ExtensionResponse executePostOutboundAction(final IExtensionRequest er, L
     public ExtensionResponse executePreInboundAction(final IExtensionRequest er, List<RestcommExtensionGeneric> extensions) {
         ExtensionResponse response = new ExtensionResponse();
         if (extensions != null && extensions.size() > 0) {
+            er.setExtensionContext(this);
             for (RestcommExtensionGeneric extension : extensions) {
                 if(logger.isInfoEnabled()) {
                     logger.info( extension.getName()+" is enabled="+extension.isEnabled());
@@ -219,6 +220,7 @@ public ExtensionResponse executePreInboundAction(final IExtensionRequest er, Lis
     public ExtensionResponse executePostInboundAction(final IExtensionRequest er,  List<RestcommExtensionGeneric> extensions) {
         ExtensionResponse response = new ExtensionResponse();
         if (extensions != null && extensions.size() > 0) {
+            er.setExtensionContext(this);
             for (RestcommExtensionGeneric extension : extensions) {
                 if(logger.isInfoEnabled()) {
                     logger.info( extension.getName()+" is enabled="+extension.isEnabled());
@@ -249,6 +251,7 @@ public ExtensionResponse executePreApiAction(final ApiRequest apiRequest, List<R
         ExtensionResponse response = new ExtensionResponse();
 
         if (extensions != null && extensions.size() > 0) {
+            apiRequest.setExtensionContext(this);
             for (RestcommExtensionGeneric extension : extensions) {
                 if(logger.isInfoEnabled()) {
                     logger.info( extension.getName()+" is enabled="+extension.isEnabled());
@@ -279,6 +282,7 @@ public ExtensionResponse executePostApiAction(final ApiRequest apiRequest, List<
         ExtensionResponse response = new ExtensionResponse();
 
         if (extensions != null && extensions.size() > 0) {
+            apiRequest.setExtensionContext(this);
             for (RestcommExtensionGeneric extension : extensions) {
                 if(logger.isInfoEnabled()) {
                     logger.info( extension.getName()+" is enabled="+extension.isEnabled());
@@ -313,9 +317,22 @@ public ExtensionConfiguration getEffectiveConfiguration(String extensionSid, Str
         OrganizationsDao od = daoManager.getOrganizationsDao();
 
         Sid sid = new Sid(scopeSid);
-        Client client = cd.getClient(sid);
-        Account account = ad.getAccount(sid);
-        Organization organization = od.getOrganization(sid);
+        Sid.Type t = Sid.getType(sid);
+        Client client = null;
+        Account account = null;
+        Organization organization = null;
+
+        switch(t) {
+            case CLIENT:
+                client = cd.getClient(sid);
+                break;
+            case ACCOUNT:
+                account = ad.getAccount(sid);
+                break;
+            case ORGANIZATION:
+                organization = od.getOrganization(sid);
+                break;
+        }
 
         //FIXME: might not be optimized
         //preliminary check for all scopes: client, acc, org

restcomm/restcomm.sms.api/src/main/java/org/restcomm/connect/sms/api/CreateSmsSession.java

@@ -21,12 +21,13 @@
 
 import org.apache.commons.configuration.Configuration;
 import org.restcomm.connect.commons.annotations.concurrency.Immutable;
+import org.restcomm.connect.extension.api.ExtensionRequest;
 import org.restcomm.connect.extension.api.IExtensionCreateSmsSessionRequest;
 /**
  * @author quintana.thomas@gmail.com (Thomas Quintana)
  */
 @Immutable
-public final class CreateSmsSession implements IExtensionCreateSmsSessionRequest {
+public final class CreateSmsSession extends ExtensionRequest implements IExtensionCreateSmsSessionRequest {
     private final String from;
     private final String to;
     private final String accountSid;

restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/CreateCall.java

@@ -23,6 +23,7 @@
 import org.restcomm.connect.commons.dao.Sid;
 import org.restcomm.connect.commons.telephony.CreateCallType;
 import org.restcomm.connect.dao.entities.MediaAttributes;
+import org.restcomm.connect.extension.api.ExtensionRequest;
 import org.restcomm.connect.extension.api.IExtensionCreateCallRequest;
 
 import java.net.URI;
@@ -36,7 +37,7 @@
  * @author gvagenas@telestax.com
  */
 @Immutable
-public final class CreateCall implements IExtensionCreateCallRequest{
+public final class CreateCall extends ExtensionRequest implements IExtensionCreateCallRequest{
 
     private final String from;
     private final String to;

restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/FeatureAccessRequest.java

@@ -21,9 +21,10 @@
 package org.restcomm.connect.telephony.api;
 
 import org.restcomm.connect.commons.dao.Sid;
+import org.restcomm.connect.extension.api.ExtensionRequest;
 import org.restcomm.connect.extension.api.IExtensionFeatureAccessRequest;
 
-public class FeatureAccessRequest implements IExtensionFeatureAccessRequest {
+public class FeatureAccessRequest extends ExtensionRequest implements IExtensionFeatureAccessRequest {
 
     public enum Feature {
         OUTBOUND_VOICE("outbound-voice"), INBOUND_VOICE("inbound-voice"), OUTBOUND_SMS("outbound-sms"),