kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 11:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ari: User better nicknames for ARI operations

Browse Source 
While working on building client libraries from the Swagger API, I
noticed a problem with the nicknames.

    channel.deleteChannel()
    channel.answerChannel()
    channel.muteChannel()

Etc. We put the object name in the nickname (since we were generating C
code), but it makes OO generators redundant.

This patch makes the nicknames more OO friendly. This resulted in a lot
of name changing within the res_ari_*.so modules, but not much else.

There were a couple of other fixed I made in the process.

 * When reversible operations (POST /hold, POST /unhold) were made more
   RESTful (POST /hold, DELETE /unhold), the path for the second operation
   was left in the API declaration. This worked, but really the two
   operations should have been on the same API.
 * The POST /unmute operation had still not been REST-ified.

Review: https://reviewboard.asterisk.org/r/2940/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@402528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David M. Lee
2013-11-07 21:09:18 +00:00
parent e327b401da
commit 2f92695c22
41 changed files with 614 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rest-api-templates/res_ari_resource.c.mustache
View File

@@ -73,11 +73,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
static void ast_ari_{{c_nickname}}_cb(
static void ast_ari_{{c_name}}_{{c_nickname}}_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct ast_ari_response *response)
{
struct ast_{{c_nickname}}_args args = {};
struct ast_ari_{{c_name}}_{{c_nickname}}_args args = {};
{{#has_parameters}}
struct ast_variable *i;
{{/has_parameters}}
@@ -87,7 +87,7 @@ static void ast_ari_{{c_nickname}}_cb(
#endif /* AST_DEVMODE */
{{> param_parsing}}
ast_ari_{{c_nickname}}(headers, &args, response);
ast_ari_{{c_name}}_{{c_nickname}}(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -133,10 +133,10 @@ fin: __attribute__((unused))
}
{{/is_req}}
{{#is_websocket}}
static void ast_ari_{{c_nickname}}_ws_cb(struct ast_websocket *ws_session,
static void ast_ari_{{c_name}}_{{c_nickname}}_ws_cb(struct ast_websocket *ws_session,
struct ast_variable *get_params, struct ast_variable *headers)
{
struct ast_{{c_nickname}}_args args = {};
struct ast_ari_{{c_name}}_{{c_nickname}}_args args = {};
{{#has_parameters}}
RAII_VAR(struct ast_ari_response *, response, NULL, ast_free);
struct ast_variable *i;
@@ -171,7 +171,7 @@ static void ast_ari_{{c_nickname}}_ws_cb(struct ast_websocket *ws_session,
{{> param_parsing}}
ast_ari_websocket_{{c_nickname}}(session, headers, &args);
ast_ari_websocket_{{c_name}}_{{c_nickname}}(session, headers, &args);
fin: __attribute__((unused))
if (response && response->response_code != 0) {
@@ -216,7 +216,7 @@ static int load_module(void)
{{#operations}}
{{#is_websocket}}
res |= ast_websocket_server_add_protocol({{full_name}}.ws_server,
"{{websocket_protocol}}", ast_ari_{{c_nickname}}_ws_cb);
"{{websocket_protocol}}", ast_ari_{{c_name}}_{{c_nickname}}_ws_cb);
{{/is_websocket}}
{{/operations}}
{{/apis}}