rest-api: Swagger scripts were not replacing format variable in file brief

Given resource paths did not have 'json' substituted in for the '{format}'. For
some auto generated documentation/comment strings it resulted in something like
the following:

"... REST handler for /api-docs/sounds.{format}"

This patch makes sure the resource api's path is properly substituted.

ASTERISK-25472 #close

Change-Id: Ie3e950a35db4043e284019d6c9061f3b03922e23

diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index e81d164989a27256c5016505e0ee08318c140994..dd868a602f2cd78c64859a794d792bcf2ec9260c 100644 (file)
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -496,7 +496,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/applications.{format} */
+/*! \brief REST handler for /api-docs/applications.json */
 static struct stasis_rest_handlers applications_applicationName_subscription = {
        .path_segment = "subscription",
        .callbacks = {
@@ -506,7 +506,7 @@ static struct stasis_rest_handlers applications_applicationName_subscription = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/applications.{format} */
+/*! \brief REST handler for /api-docs/applications.json */
 static struct stasis_rest_handlers applications_applicationName = {
        .path_segment = "applicationName",
        .is_wildcard = 1,
@@ -516,7 +516,7 @@ static struct stasis_rest_handlers applications_applicationName = {
        .num_children = 1,
        .children = { &applications_applicationName_subscription, }
 };
-/*! \brief REST handler for /api-docs/applications.{format} */
+/*! \brief REST handler for /api-docs/applications.json */
 static struct stasis_rest_handlers applications = {
        .path_segment = "applications",
        .callbacks = {

diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index fe6e3d3634246bc3c79e21342696321863ecfff0..b52a2a72236d58706b419cc14bff63950758499f 100644 (file)
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -1178,7 +1178,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_config_dynamic_configClass_objectType_id = {
        .path_segment = "id",
        .is_wildcard = 1,
@@ -1190,7 +1190,7 @@ static struct stasis_rest_handlers asterisk_config_dynamic_configClass_objectTyp
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_config_dynamic_configClass_objectType = {
        .path_segment = "objectType",
        .is_wildcard = 1,
@@ -1199,7 +1199,7 @@ static struct stasis_rest_handlers asterisk_config_dynamic_configClass_objectTyp
        .num_children = 1,
        .children = { &asterisk_config_dynamic_configClass_objectType_id, }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_config_dynamic_configClass = {
        .path_segment = "configClass",
        .is_wildcard = 1,
@@ -1208,7 +1208,7 @@ static struct stasis_rest_handlers asterisk_config_dynamic_configClass = {
        .num_children = 1,
        .children = { &asterisk_config_dynamic_configClass_objectType, }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_config_dynamic = {
        .path_segment = "dynamic",
        .callbacks = {
@@ -1216,7 +1216,7 @@ static struct stasis_rest_handlers asterisk_config_dynamic = {
        .num_children = 1,
        .children = { &asterisk_config_dynamic_configClass, }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_config = {
        .path_segment = "config",
        .callbacks = {
@@ -1224,7 +1224,7 @@ static struct stasis_rest_handlers asterisk_config = {
        .num_children = 1,
        .children = { &asterisk_config_dynamic, }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_info = {
        .path_segment = "info",
        .callbacks = {
@@ -1233,7 +1233,7 @@ static struct stasis_rest_handlers asterisk_info = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_modules_moduleName = {
        .path_segment = "moduleName",
        .is_wildcard = 1,
@@ -1246,7 +1246,7 @@ static struct stasis_rest_handlers asterisk_modules_moduleName = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_modules = {
        .path_segment = "modules",
        .callbacks = {
@@ -1255,7 +1255,7 @@ static struct stasis_rest_handlers asterisk_modules = {
        .num_children = 1,
        .children = { &asterisk_modules_moduleName, }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_logging_logChannelName_rotate = {
        .path_segment = "rotate",
        .callbacks = {
@@ -1264,7 +1264,7 @@ static struct stasis_rest_handlers asterisk_logging_logChannelName_rotate = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_logging_logChannelName = {
        .path_segment = "logChannelName",
        .is_wildcard = 1,
@@ -1275,7 +1275,7 @@ static struct stasis_rest_handlers asterisk_logging_logChannelName = {
        .num_children = 1,
        .children = { &asterisk_logging_logChannelName_rotate, }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_logging = {
        .path_segment = "logging",
        .callbacks = {
@@ -1284,7 +1284,7 @@ static struct stasis_rest_handlers asterisk_logging = {
        .num_children = 1,
        .children = { &asterisk_logging_logChannelName, }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk_variable = {
        .path_segment = "variable",
        .callbacks = {
@@ -1294,7 +1294,7 @@ static struct stasis_rest_handlers asterisk_variable = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/asterisk.{format} */
+/*! \brief REST handler for /api-docs/asterisk.json */
 static struct stasis_rest_handlers asterisk = {
        .path_segment = "asterisk",
        .callbacks = {

diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index 860ff1dc0348ee6592d6602ab4035f35490a5cde..889d42213ab8be01a497e47db2ae8407e0a51579 100644 (file)
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -1318,7 +1318,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId_addChannel = {
        .path_segment = "addChannel",
        .callbacks = {
@@ -1327,7 +1327,7 @@ static struct stasis_rest_handlers bridges_bridgeId_addChannel = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId_removeChannel = {
        .path_segment = "removeChannel",
        .callbacks = {
@@ -1336,7 +1336,7 @@ static struct stasis_rest_handlers bridges_bridgeId_removeChannel = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId_moh = {
        .path_segment = "moh",
        .callbacks = {
@@ -1346,7 +1346,7 @@ static struct stasis_rest_handlers bridges_bridgeId_moh = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId_play_playbackId = {
        .path_segment = "playbackId",
        .is_wildcard = 1,
@@ -1356,7 +1356,7 @@ static struct stasis_rest_handlers bridges_bridgeId_play_playbackId = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId_play = {
        .path_segment = "play",
        .callbacks = {
@@ -1365,7 +1365,7 @@ static struct stasis_rest_handlers bridges_bridgeId_play = {
        .num_children = 1,
        .children = { &bridges_bridgeId_play_playbackId, }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId_record = {
        .path_segment = "record",
        .callbacks = {
@@ -1374,7 +1374,7 @@ static struct stasis_rest_handlers bridges_bridgeId_record = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId = {
        .path_segment = "bridgeId",
        .is_wildcard = 1,
@@ -1386,7 +1386,7 @@ static struct stasis_rest_handlers bridges_bridgeId = {
        .num_children = 5,
        .children = { &bridges_bridgeId_addChannel,&bridges_bridgeId_removeChannel,&bridges_bridgeId_moh,&bridges_bridgeId_play,&bridges_bridgeId_record, }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges = {
        .path_segment = "bridges",
        .callbacks = {

diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index a14a9c8cb4dc9ac4782bbd38314bf45e3adfc54f..9dc19cc86ea2da923207421cd94f7580d6938080 100644 (file)
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -2567,7 +2567,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_continue = {
        .path_segment = "continue",
        .callbacks = {
@@ -2576,7 +2576,7 @@ static struct stasis_rest_handlers channels_channelId_continue = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_redirect = {
        .path_segment = "redirect",
        .callbacks = {
@@ -2585,7 +2585,7 @@ static struct stasis_rest_handlers channels_channelId_redirect = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_answer = {
        .path_segment = "answer",
        .callbacks = {
@@ -2594,7 +2594,7 @@ static struct stasis_rest_handlers channels_channelId_answer = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_ring = {
        .path_segment = "ring",
        .callbacks = {
@@ -2604,7 +2604,7 @@ static struct stasis_rest_handlers channels_channelId_ring = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_dtmf = {
        .path_segment = "dtmf",
        .callbacks = {
@@ -2613,7 +2613,7 @@ static struct stasis_rest_handlers channels_channelId_dtmf = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_mute = {
        .path_segment = "mute",
        .callbacks = {
@@ -2623,7 +2623,7 @@ static struct stasis_rest_handlers channels_channelId_mute = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_hold = {
        .path_segment = "hold",
        .callbacks = {
@@ -2633,7 +2633,7 @@ static struct stasis_rest_handlers channels_channelId_hold = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_moh = {
        .path_segment = "moh",
        .callbacks = {
@@ -2643,7 +2643,7 @@ static struct stasis_rest_handlers channels_channelId_moh = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_silence = {
        .path_segment = "silence",
        .callbacks = {
@@ -2653,7 +2653,7 @@ static struct stasis_rest_handlers channels_channelId_silence = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_play_playbackId = {
        .path_segment = "playbackId",
        .is_wildcard = 1,
@@ -2663,7 +2663,7 @@ static struct stasis_rest_handlers channels_channelId_play_playbackId = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_play = {
        .path_segment = "play",
        .callbacks = {
@@ -2672,7 +2672,7 @@ static struct stasis_rest_handlers channels_channelId_play = {
        .num_children = 1,
        .children = { &channels_channelId_play_playbackId, }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_record = {
        .path_segment = "record",
        .callbacks = {
@@ -2681,7 +2681,7 @@ static struct stasis_rest_handlers channels_channelId_record = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_variable = {
        .path_segment = "variable",
        .callbacks = {
@@ -2691,7 +2691,7 @@ static struct stasis_rest_handlers channels_channelId_variable = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_snoop_snoopId = {
        .path_segment = "snoopId",
        .is_wildcard = 1,
@@ -2701,7 +2701,7 @@ static struct stasis_rest_handlers channels_channelId_snoop_snoopId = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId_snoop = {
        .path_segment = "snoop",
        .callbacks = {
@@ -2710,7 +2710,7 @@ static struct stasis_rest_handlers channels_channelId_snoop = {
        .num_children = 1,
        .children = { &channels_channelId_snoop_snoopId, }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels_channelId = {
        .path_segment = "channelId",
        .is_wildcard = 1,
@@ -2722,7 +2722,7 @@ static struct stasis_rest_handlers channels_channelId = {
        .num_children = 13,
        .children = { &channels_channelId_continue,&channels_channelId_redirect,&channels_channelId_answer,&channels_channelId_ring,&channels_channelId_dtmf,&channels_channelId_mute,&channels_channelId_hold,&channels_channelId_moh,&channels_channelId_silence,&channels_channelId_play,&channels_channelId_record,&channels_channelId_variable,&channels_channelId_snoop, }
 };
-/*! \brief REST handler for /api-docs/channels.{format} */
+/*! \brief REST handler for /api-docs/channels.json */
 static struct stasis_rest_handlers channels = {
        .path_segment = "channels",
        .callbacks = {

diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c
index f15e3da7891b557ec5e180a89be88127b995eaf7..6d5d19f58e3c5ab650b2e4e07b0664a33c824a61 100644 (file)
--- a/res/res_ari_device_states.c
+++ b/res/res_ari_device_states.c
@@ -320,7 +320,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/deviceStates.{format} */
+/*! \brief REST handler for /api-docs/deviceStates.json */
 static struct stasis_rest_handlers deviceStates_deviceName = {
        .path_segment = "deviceName",
        .is_wildcard = 1,
@@ -332,7 +332,7 @@ static struct stasis_rest_handlers deviceStates_deviceName = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/deviceStates.{format} */
+/*! \brief REST handler for /api-docs/deviceStates.json */
 static struct stasis_rest_handlers deviceStates = {
        .path_segment = "deviceStates",
        .callbacks = {

diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index 4d54ff3bd4959fb675ff88dfdd180bae5adcd236..e3ade435d1d5cac2faae655308d41e884d2dc74a 100644 (file)
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -434,7 +434,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/endpoints.{format} */
+/*! \brief REST handler for /api-docs/endpoints.json */
 static struct stasis_rest_handlers endpoints_sendMessage = {
        .path_segment = "sendMessage",
        .callbacks = {
@@ -443,7 +443,7 @@ static struct stasis_rest_handlers endpoints_sendMessage = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/endpoints.{format} */
+/*! \brief REST handler for /api-docs/endpoints.json */
 static struct stasis_rest_handlers endpoints_tech_resource_sendMessage = {
        .path_segment = "sendMessage",
        .callbacks = {
@@ -452,7 +452,7 @@ static struct stasis_rest_handlers endpoints_tech_resource_sendMessage = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/endpoints.{format} */
+/*! \brief REST handler for /api-docs/endpoints.json */
 static struct stasis_rest_handlers endpoints_tech_resource = {
        .path_segment = "resource",
        .is_wildcard = 1,
@@ -462,7 +462,7 @@ static struct stasis_rest_handlers endpoints_tech_resource = {
        .num_children = 1,
        .children = { &endpoints_tech_resource_sendMessage, }
 };
-/*! \brief REST handler for /api-docs/endpoints.{format} */
+/*! \brief REST handler for /api-docs/endpoints.json */
 static struct stasis_rest_handlers endpoints_tech = {
        .path_segment = "tech",
        .is_wildcard = 1,
@@ -472,7 +472,7 @@ static struct stasis_rest_handlers endpoints_tech = {
        .num_children = 1,
        .children = { &endpoints_tech_resource, }
 };
-/*! \brief REST handler for /api-docs/endpoints.{format} */
+/*! \brief REST handler for /api-docs/endpoints.json */
 static struct stasis_rest_handlers endpoints = {
        .path_segment = "endpoints",
        .callbacks = {

diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index 65bd38d5bcba6a9969f1aa9899e38b9ce0211bda..e85db4c4510e20f8ac843b44514270893b11ef24 100644 (file)
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -407,7 +407,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/events.{format} */
+/*! \brief REST handler for /api-docs/events.json */
 static struct stasis_rest_handlers events_user_eventName = {
        .path_segment = "eventName",
        .is_wildcard = 1,
@@ -417,7 +417,7 @@ static struct stasis_rest_handlers events_user_eventName = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/events.{format} */
+/*! \brief REST handler for /api-docs/events.json */
 static struct stasis_rest_handlers events_user = {
        .path_segment = "user",
        .callbacks = {
@@ -425,7 +425,7 @@ static struct stasis_rest_handlers events_user = {
        .num_children = 1,
        .children = { &events_user_eventName, }
 };
-/*! \brief REST handler for /api-docs/events.{format} */
+/*! \brief REST handler for /api-docs/events.json */
 static struct stasis_rest_handlers events = {
        .path_segment = "events",
        .callbacks = {

diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c
index 2b3404f2bee44e75f6cadf2a7eec0ce92f4c493b..6ed16a84e61e4d7158084fca49aaf1a3093b00bf 100644 (file)
--- a/res/res_ari_mailboxes.c
+++ b/res/res_ari_mailboxes.c
@@ -326,7 +326,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/mailboxes.{format} */
+/*! \brief REST handler for /api-docs/mailboxes.json */
 static struct stasis_rest_handlers mailboxes_mailboxName = {
        .path_segment = "mailboxName",
        .is_wildcard = 1,
@@ -338,7 +338,7 @@ static struct stasis_rest_handlers mailboxes_mailboxName = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/mailboxes.{format} */
+/*! \brief REST handler for /api-docs/mailboxes.json */
 static struct stasis_rest_handlers mailboxes = {
        .path_segment = "mailboxes",
        .callbacks = {

diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c
index de38ad86da4f06ee5352b6ea18e7921e577f2a6d..2336033035e866c36fb7cb057511b55d3d8a1e9c 100644 (file)
--- a/res/res_ari_playbacks.c
+++ b/res/res_ari_playbacks.c
@@ -270,7 +270,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/playbacks.{format} */
+/*! \brief REST handler for /api-docs/playbacks.json */
 static struct stasis_rest_handlers playbacks_playbackId_control = {
        .path_segment = "control",
        .callbacks = {
@@ -279,7 +279,7 @@ static struct stasis_rest_handlers playbacks_playbackId_control = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/playbacks.{format} */
+/*! \brief REST handler for /api-docs/playbacks.json */
 static struct stasis_rest_handlers playbacks_playbackId = {
        .path_segment = "playbackId",
        .is_wildcard = 1,
@@ -290,7 +290,7 @@ static struct stasis_rest_handlers playbacks_playbackId = {
        .num_children = 1,
        .children = { &playbacks_playbackId_control, }
 };
-/*! \brief REST handler for /api-docs/playbacks.{format} */
+/*! \brief REST handler for /api-docs/playbacks.json */
 static struct stasis_rest_handlers playbacks = {
        .path_segment = "playbacks",
        .callbacks = {

diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index dede53c48490cd2c1d020f55c5725c4723c0b13e..04ce0ac9757d25edce21e6046b114bd65c5a9fd7 100644 (file)
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -737,7 +737,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/recordings.{format} */
+/*! \brief REST handler for /api-docs/recordings.json */
 static struct stasis_rest_handlers recordings_stored_recordingName_copy = {
        .path_segment = "copy",
        .callbacks = {
@@ -746,7 +746,7 @@ static struct stasis_rest_handlers recordings_stored_recordingName_copy = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/recordings.{format} */
+/*! \brief REST handler for /api-docs/recordings.json */
 static struct stasis_rest_handlers recordings_stored_recordingName = {
        .path_segment = "recordingName",
        .is_wildcard = 1,
@@ -757,7 +757,7 @@ static struct stasis_rest_handlers recordings_stored_recordingName = {
        .num_children = 1,
        .children = { &recordings_stored_recordingName_copy, }
 };
-/*! \brief REST handler for /api-docs/recordings.{format} */
+/*! \brief REST handler for /api-docs/recordings.json */
 static struct stasis_rest_handlers recordings_stored = {
        .path_segment = "stored",
        .callbacks = {
@@ -766,7 +766,7 @@ static struct stasis_rest_handlers recordings_stored = {
        .num_children = 1,
        .children = { &recordings_stored_recordingName, }
 };
-/*! \brief REST handler for /api-docs/recordings.{format} */
+/*! \brief REST handler for /api-docs/recordings.json */
 static struct stasis_rest_handlers recordings_live_recordingName_stop = {
        .path_segment = "stop",
        .callbacks = {
@@ -775,7 +775,7 @@ static struct stasis_rest_handlers recordings_live_recordingName_stop = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/recordings.{format} */
+/*! \brief REST handler for /api-docs/recordings.json */
 static struct stasis_rest_handlers recordings_live_recordingName_pause = {
        .path_segment = "pause",
        .callbacks = {
@@ -785,7 +785,7 @@ static struct stasis_rest_handlers recordings_live_recordingName_pause = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/recordings.{format} */
+/*! \brief REST handler for /api-docs/recordings.json */
 static struct stasis_rest_handlers recordings_live_recordingName_mute = {
        .path_segment = "mute",
        .callbacks = {
@@ -795,7 +795,7 @@ static struct stasis_rest_handlers recordings_live_recordingName_mute = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/recordings.{format} */
+/*! \brief REST handler for /api-docs/recordings.json */
 static struct stasis_rest_handlers recordings_live_recordingName = {
        .path_segment = "recordingName",
        .is_wildcard = 1,
@@ -806,7 +806,7 @@ static struct stasis_rest_handlers recordings_live_recordingName = {
        .num_children = 3,
        .children = { &recordings_live_recordingName_stop,&recordings_live_recordingName_pause,&recordings_live_recordingName_mute, }
 };
-/*! \brief REST handler for /api-docs/recordings.{format} */
+/*! \brief REST handler for /api-docs/recordings.json */
 static struct stasis_rest_handlers recordings_live = {
        .path_segment = "live",
        .callbacks = {
@@ -814,7 +814,7 @@ static struct stasis_rest_handlers recordings_live = {
        .num_children = 1,
        .children = { &recordings_live_recordingName, }
 };
-/*! \brief REST handler for /api-docs/recordings.{format} */
+/*! \brief REST handler for /api-docs/recordings.json */
 static struct stasis_rest_handlers recordings = {
        .path_segment = "recordings",
        .callbacks = {

diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index c53330d54f3a84990bc2f959f4cd461da120a484..935025dec2d8783028406313f74677e92ce80f33 100644 (file)
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -208,7 +208,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/sounds.{format} */
+/*! \brief REST handler for /api-docs/sounds.json */
 static struct stasis_rest_handlers sounds_soundId = {
        .path_segment = "soundId",
        .is_wildcard = 1,
@@ -218,7 +218,7 @@ static struct stasis_rest_handlers sounds_soundId = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/sounds.{format} */
+/*! \brief REST handler for /api-docs/sounds.json */
 static struct stasis_rest_handlers sounds = {
        .path_segment = "sounds",
        .callbacks = {

diff --git a/rest-api-templates/swagger_model.py b/rest-api-templates/swagger_model.py
index f3b49e12e324d888ff44f190e0b886dea9dbfe38..e0eda0143e000ab818207d3c88d179b490470ccd 100644 (file)
--- a/rest-api-templates/swagger_model.py
+++ b/rest-api-templates/swagger_model.py
@@ -688,7 +688,7 @@ class ResourceApi(Stringify):
     def load(self, api_json, processor, context):
         context = context.next_stack(api_json, 'path')
         validate_required_fields(api_json, self.required_fields, context)
-        self.path = api_json['path']
+        self.path = api_json['path'].replace('{format}', 'json')
         self.description = api_json['description']
 
         if not self.path or self.path[0] != '/':
@@ -697,7 +697,7 @@ class ResourceApi(Stringify):
         return self
 
     def load_api_declaration(self, base_dir, processor):
-        self.file = (base_dir + self.path).replace('{format}', 'json')
+        self.file = (base_dir + self.path)
         self.api_declaration = ApiDeclaration().load_file(self.file, processor)
         processor.process_resource_api(self, [self.file])