custom application var schema/doc updates for 2600hz#5403

rozanecm · Feb 12, 2019 · 273e797 · 273e797
1 parent 37d49e1
commit 273e797
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 12 deletions.
diff --git a/applications/callflow/doc/ref/set_variables.md b/applications/callflow/doc/ref/set_variables.md
@@ -10,7 +10,6 @@ Validator for the set_variables callflow data object
 
 Key | Description | Type | Default | Required | Support Level
 --- | ----------- | ---- | ------- | -------- | -------------
-`custom_application_vars./[a-zA-Z0-9\-_]+/` |   | `string()` |   | `false` |  
 `custom_application_vars` | Key-value pairs to set as custom_application_vars on the channel | `object()` | `{}` | `true` |  
 `export` | When true the provided custom_application_vars are set on the channel and any channel bridged to it later | `boolean()` |   | `false` |  
 

diff --git a/applications/callflow/doc/set_variables.md b/applications/callflow/doc/set_variables.md
@@ -10,7 +10,6 @@ Validator for the set_variables callflow data object
 
 Key | Description | Type | Default | Required | Support Level
 --- | ----------- | ---- | ------- | -------- | -------------
-`custom_application_vars./[a-zA-Z0-9\-_]+/` |   | `string()` |   | `false` |  
 `custom_application_vars` | Key-value pairs to set as custom_application_vars on the channel | `object()` | `{}` | `true` |  
 `export` | When true the provided custom_application_vars are set on the channel and any channel bridged to it later | `boolean()` |   | `false` |  
 

diff --git a/applications/crossbar/priv/api/swagger.json b/applications/crossbar/priv/api/swagger.json
@@ -3609,7 +3609,6 @@
             "description": "Validator for the set_variables callflow data object",
             "properties": {
                 "custom_application_vars": {
-                    "default": {},
                     "description": "Key-value pairs to set as custom_application_vars on the channel",
                     "type": "object"
                 },

diff --git a/applications/crossbar/priv/couchdb/schemas/callflows.set_variables.json b/applications/crossbar/priv/couchdb/schemas/callflows.set_variables.json
@@ -6,11 +6,6 @@
         "custom_application_vars": {
             "default": {},
             "description": "Key-value pairs to set as custom_application_vars on the channel",
-            "patternProperties": {
-                "[a-zA-Z0-9\\-_]+": {
-                    "type": "string"
-                }
-            },
             "type": "object"
         },
         "export": {

diff --git a/applications/ecallmgr/src/ecallmgr_fs_bridge.erl b/applications/ecallmgr/src/ecallmgr_fs_bridge.erl
@@ -320,7 +320,7 @@ build_channels_vars(Node, UUID, Endpoints, JObj) ->
     Props = lists:foldl(fun(F, Acc) -> Acc ++ F(Node, UUID, Endpoints, JObj) end, [], Routines),
     ecallmgr_fs_xml:get_channel_vars(kz_json:set_values(Props, JObj)).
 
--spec maybe_force_fax(atom(), kz_term:ne_binary(), kz_json:objects(), kz_json:object()) -> kz_term:ne_binaries().
+-spec maybe_force_fax(atom(), kz_term:ne_binary(), kz_json:objects(), kz_json:object()) -> kz_term:proplist().
 maybe_force_fax(_Node, _UUID, Endpoints, JObj) ->
     case kz_json:find(<<"Force-Fax">>, Endpoints, kz_json:get_value(<<"Force-Fax">>, JObj)) of
         'undefined' -> [];
@@ -398,7 +398,7 @@ endpoint_action_cmd(Event) ->
         {_, Prefix} -> Prefix
     end.
 
--spec add_bridge_actions(atom(), kz_term:ne_binary(), kz_json:objects(), kz_json:object()) -> kz_term:ne_binaries().
+-spec add_bridge_actions(atom(), kz_term:ne_binary(), kz_json:objects(), kz_json:object()) -> kz_term:proplist().
 add_bridge_actions(Node, UUID, _Endpoints, JObj) ->
     BridgeActions = kz_json:get_json_value(<<"Bridge-Actions">>, JObj, kz_json:new()),
     Fun = fun(K, V, Acc)-> build_bridge_actions(Node, UUID, K, V, Acc) end,

diff --git a/applications/ecallmgr/src/ecallmgr_util.erl b/applications/ecallmgr/src/ecallmgr_util.erl
@@ -559,11 +559,11 @@ fs_args_to_binary(Args, Sep, Prefix) ->
 fs_arg_encode(Source = ?NE_BINARY) ->
     fs_arg_encode(Source, <<>>, <<>>).
 
--spec fs_arg_encode(kz_term:ne_binary(), kz_term:ne_binary()) -> kz_term:ne_binary().
+-spec fs_arg_encode(kz_term:ne_binary(), binary()) -> kz_term:ne_binary().
 fs_arg_encode(Source = ?NE_BINARY, Sep) ->
     fs_arg_encode(Source, Sep, <<>>).
 
--spec fs_arg_encode(kz_term:ne_binary(), kz_term:ne_binary(), binary()) -> kz_term:ne_binary().
+-spec fs_arg_encode(binary(), binary() | byte(), binary()) -> binary().
 fs_arg_encode(<<>>, _Sep, Acc) -> Acc;
 
 fs_arg_encode(<<C, R/binary>>, C, Acc) ->