Merge branch 'master' into restcomm-1861-sl

Author: gvagenas

restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/CallsEndpoint.java

@@ -367,7 +367,7 @@ protected Response putCall(final String accountSid, final MultivaluedMap<String,
 
         String customHeaders = getCustomHeaders(to);
 
-        if (customHeaders != null && !to.contains("@")) {
+        if (customHeaders != null) {
             to = (customHeaders != null) ? to.substring(0, to.indexOf("?")) : to;
             data.remove(to);
             data.putSingle("To", to);
@@ -403,7 +403,7 @@ protected Response putCall(final String accountSid, final MultivaluedMap<String,
         try {
             if (to.contains("@")) {
                 create = new CreateCall(from, to, username, password, true, timeout, CreateCallType.SIP,
-                        accountId, null, statusCallback, statusCallbackMethod, statusCallbackEvent, null);
+                        accountId, null, statusCallback, statusCallbackMethod, statusCallbackEvent, customHeaders);
             } else if (to.startsWith("client")) {
                 create = new CreateCall(from, to, username, password, true, timeout, CreateCallType.CLIENT,
                         accountId, null, statusCallback, statusCallbackMethod, statusCallbackEvent, customHeaders);

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

@@ -65,6 +65,15 @@ public CreateCall(final String from, final String to, final String username, fin
                 statusCallbackEvent, "", null, new MediaAttributes(), null);
     }
 
+    //Used to create CreateCall objects (CallsEndpoint, UssdPushEndpoint, VI)
+    public CreateCall(final String from, final String to, final String username, final String password,
+                      final boolean isFromApi, final int timeout, final CreateCallType type, final Sid accountId, final Sid parentCallSid,
+                      final URI statusCallbackUrl, final String statusCallbackMethod, final List<String> statusCallbackEvent, final String customHeaders) {
+        this(from, to, username, password, isFromApi, timeout, type, accountId, parentCallSid, statusCallbackUrl, statusCallbackMethod,
+                statusCallbackEvent, "", null, new MediaAttributes(), customHeaders);
+    }
+
+    //Used to create CreateCall objects with MediaAttributes (VI)
     public CreateCall(final String from, final String to, final String username, final String password,
                       final boolean isFromApi, final int timeout, final CreateCallType type, final Sid accountId, final Sid parentCallSid,
                       final URI statusCallbackUrl, final String statusCallbackMethod, final List<String> statusCallbackEvent, final MediaAttributes mediaAttributes, final String customHeaders) {