From 65bc678960567038ca4d07d1f9c5784b6c7a7834 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Tue, 17 May 2016 23:36:23 +0200 Subject: improves plugin interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit improves the names and the organisation of the plugin interface for the developpers. Change-Id: Iaf191efbf8fd5d248884304b648258f0770ec5f5 Signed-off-by: José Bollo --- plugins/samples/ClientCtx.c | 14 ++++++++------ plugins/samples/HelloWorld.c | 14 ++++++++------ plugins/samples/SamplePost.c | 14 ++++++++------ 3 files changed, 24 insertions(+), 18 deletions(-) (limited to 'plugins/samples') diff --git a/plugins/samples/ClientCtx.c b/plugins/samples/ClientCtx.c index bf26937f..6b7eb631 100644 --- a/plugins/samples/ClientCtx.c +++ b/plugins/samples/ClientCtx.c @@ -87,7 +87,7 @@ static void myClose (struct afb_req request) // NOTE: this sample does not use session to keep test a basic as possible // in real application most APIs should be protected with AFB_SESSION_CHECK -static const struct AFB_restapi pluginApis[]= { +static const struct AFB_verb_desc_v1 verbs[]= { {"create", AFB_SESSION_CREATE, myCreate , "Create a new session"}, {"action", AFB_SESSION_CHECK , myAction , "Use Session Context"}, {"close" , AFB_SESSION_CLOSE , myClose , "Free Context"}, @@ -95,13 +95,15 @@ static const struct AFB_restapi pluginApis[]= { }; static const struct AFB_plugin plugin_desc = { - .type = AFB_PLUGIN_JSON, - .info = "Sample of Client Context Usage", - .prefix = "context", - .apis = pluginApis, + .type = AFB_PLUGIN_VERSION_1, + .v1 = { + .info = "Sample of Client Context Usage", + .prefix = "context", + .verbs = verbs, + } }; -const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf) +const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf) { return &plugin_desc; } diff --git a/plugins/samples/HelloWorld.c b/plugins/samples/HelloWorld.c index 4795dd36..35b95cab 100644 --- a/plugins/samples/HelloWorld.c +++ b/plugins/samples/HelloWorld.c @@ -78,7 +78,7 @@ static void pingJson (struct afb_req request) { // NOTE: this sample does not use session to keep test a basic as possible // in real application most APIs should be protected with AFB_SESSION_CHECK -static const struct AFB_restapi pluginApis[]= { +static const struct AFB_verb_desc_v1 verbs[]= { {"ping" , AFB_SESSION_NONE, pingSample , "Ping Application Framework"}, {"pingfail" , AFB_SESSION_NONE, pingFail , "Fails"}, {"pingnull" , AFB_SESSION_NONE, pingNull , "Return NULL"}, @@ -89,13 +89,15 @@ static const struct AFB_restapi pluginApis[]= { }; static const struct AFB_plugin plugin_desc = { - .type = AFB_PLUGIN_JSON, - .info = "Minimal Hello World Sample", - .prefix = "hello", - .apis = pluginApis + .type = AFB_PLUGIN_VERSION_1, + .v1 = { + .info = "Minimal Hello World Sample", + .prefix = "hello", + .verbs = verbs + } }; -const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf) +const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf) { interface = itf; return &plugin_desc; diff --git a/plugins/samples/SamplePost.c b/plugins/samples/SamplePost.c index 1d3069e8..b61b91c4 100644 --- a/plugins/samples/SamplePost.c +++ b/plugins/samples/SamplePost.c @@ -76,7 +76,7 @@ static void UploadImage (struct afb_req request) // NOTE: this sample does not use session to keep test a basic as possible // in real application upload-xxx should be protected with AFB_SESSION_CHECK -static const struct AFB_restapi pluginApis[]= { +static const struct AFB_verb_desc_v1 verbs[]= { {"ping" , AFB_SESSION_NONE , getPingTest ,"Ping Rest Test Service"}, {"upload-json" , AFB_SESSION_NONE , GetJsonByPost ,"Demo for Json Buffer on Post"}, {"upload-image" , AFB_SESSION_NONE , UploadImage ,"Demo for file upload"}, @@ -86,13 +86,15 @@ static const struct AFB_restapi pluginApis[]= { }; static const struct AFB_plugin plugin_desc = { - .type = AFB_PLUGIN_JSON, - .info = "Sample with Post Upload Files", - .prefix = "post", - .apis = pluginApis + .type = AFB_PLUGIN_VERSION_1, + .v1 = { + .info = "Sample with Post Upload Files", + .prefix = "post", + .verbs = verbs + } }; -const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf) +const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf) { return &plugin_desc; }; -- cgit 1.2.3-korg