CPPSDK: callback generation + types: with generation changes + templa…

…te updates

languages/cpp/templates/callback-context-instantiation/additionalProperties.cpp

@@ -0,0 +1,6 @@
+                if (strcmp(elements.Label(), "${property}") == 0) {
+                    ${if.namespace.notsame}${info.Title}::${end.if.namespace.notsame}JsonData_${title}::Iterator elements = elements.Current().Variants();
+                    while (elements.Next()) {
+                        ${property}.insert(elements.Label(), elements.Current().${additional.type};
+                    }
+                }

languages/cpp/templates/callback-context-instantiation/anyOf.cpp

@@ -0,0 +1 @@
+         ${property};

languages/cpp/templates/callback-context-instantiation/array.cpp

@@ -0,0 +1,6 @@
+                if (strcmp(elements.Label(), "${property}") == 0) {
+                    auto index(element.Current().Elements());
+                    while (index.Next() == true) {
+                        ${property}.push_back(index.Current().Value());
+                    }
+                }

languages/cpp/templates/callback-context-instantiation/enum.cpp

@@ -0,0 +1,3 @@
+                if (strcmp(elements.Label(), "${property}") == 0) {
+                   ${property} = WPEFramework::Core::EnumerateType<${if.namespace.notsame}${info.Title}::${end.if.namespace.notsame}${title}>(elements.Current().String().c_str(), false).Value();
+                }

languages/cpp/templates/callback-context-instantiation/generic.cpp

@@ -0,0 +1,3 @@
+                if (strcmp(elements.Label(), "${property}") == 0) {
+                    ${property} = elements.Current().Value();
+                }

languages/cpp/templates/callback-context-instantiation/namespace.cpp

@@ -0,0 +1 @@
+${if.namespace.notsame}${parent.Title}::${end.if.namespace.notsame}

languages/cpp/templates/callback-context-instantiation/object.cpp

@@ -0,0 +1,8 @@
+                if (strcmp(elements.Label(), "${property}") == 0) {
+                    WPEFramework::Core::JSON::VariantContainer container = elements.Current().Object();
+                    std::string strContainer;
+                    container.ToString(strContainer);
+                    ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} response;
+                    response.FromString(strContainer);
+${properties}
+                }

languages/cpp/templates/callback-context-instantiation/primitive.cpp

@@ -0,0 +1 @@
+${type}

languages/cpp/templates/callback-context-instantiation/property.cpp

@@ -0,0 +1 @@
+${shape}                    ${if.non.const}${if.non.anyOf}${if.non.array}${if.non.object}${base.title}.${property} = response.${Property};${end.if.non.object}${end.if.non.array}${end.if.non.anyOf}${end.if.non.const}

languages/cpp/templates/callback-context-instantiation/ref.h

@@ -0,0 +1 @@
+${shape}

languages/cpp/templates/callback-context-instantiation/string.cpp

@@ -0,0 +1,3 @@
+                if (strcmp(elements.Label(), "${property}") == 0) {
+                    ${property} = elements.Current().Value().c_str();
+                }

languages/cpp/templates/callback-context-instantiation/sub-property/anyOf.cpp

@@ -0,0 +1 @@
+${Title}

languages/cpp/templates/callback-context-instantiation/sub-property/anyOfSchemaShape.cpp

@@ -0,0 +1,3 @@
+                string ${property}Str;
+                response.${Property.dependency}${Property}.ToString(${property}Str);
+                ${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property} = ${property}Str;

languages/cpp/templates/callback-context-instantiation/sub-property/array.cpp

@@ -0,0 +1,5 @@
+                    ${if.impl.array.optional}${base.title}.${property} = std::make_optional<${type}>();${end.if.impl.array.optional}
+                    auto index(response.${Property}.Elements());
+                    while (index.Next() == true) {
+${if.object}${items.with.indent}${end.if.object}${if.non.object}                        ${base.title}.${property}${if.impl.array.optional}.value()${end.if.impl.array.optional}.push_back(index.Current().Value());${end.if.non.object}
+                    }

languages/cpp/templates/callback-context-instantiation/sub-property/const.cpp

@@ -0,0 +1 @@
+                ${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property} = response.${Property.dependency}${Property};

languages/cpp/templates/callback-context-instantiation/sub-property/generic.cpp

@@ -0,0 +1 @@
+                ${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property} = response.${Property.dependency}${Property};

languages/cpp/templates/callback-context-instantiation/sub-property/namespace.cpp

@@ -0,0 +1 @@
+${if.namespace.notsame}${parent.Title}::${end.if.namespace.notsame}

languages/cpp/templates/callback-context-instantiation/sub-property/object-array.cpp

@@ -0,0 +1,4 @@
+                ${type} ${property}Result${level};
+                ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} jsonResult = index.Current();
+${properties}
+                ${base.title}.${property}${if.impl.array.optional}.value()${end.if.impl.array.optional}.push_back(${property}Result${level});

languages/cpp/templates/callback-context-instantiation/sub-property/object-separator.cpp

@@ -0,0 +1 @@
+.

languages/cpp/templates/callback-context-instantiation/sub-property/object.cpp

@@ -0,0 +1,3 @@
+${if.impl.optional}
+                    ${base.title}${property.dependency} = std::make_optional<${type}>();${end.if.impl.optional}
+${properties}

languages/cpp/templates/callback-context-instantiation/sub-property/property.cpp

@@ -0,0 +1 @@
+${shape}                    ${if.non.const}${if.non.anyOf}${if.non.array}${if.non.object}${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property} = response.${Property.dependency}${Property};${end.if.non.object}${end.if.non.array}${end.if.non.anyOf}${end.if.non.const}

languages/cpp/templates/callback-context-instantiation/sub-property/ref.h

@@ -0,0 +1 @@
+${shape}

languages/cpp/templates/callback-context-instantiation/sub-property/title.cpp

@@ -0,0 +1 @@
+${Title}

languages/cpp/templates/callback-context-instantiation/title.cpp

@@ -0,0 +1 @@
+${Title}

languages/cpp/templates/callback-context-instantiation/tuple.cpp

@@ -0,0 +1,4 @@
+                if (strcmp(elements.Label(), "${property}") == 0) {
+                    ${property}.first = elements.Current().Get(0);
+                    ${property}.second = elements.Current().Get(1);
+                }

languages/cpp/templates/callback-initialization/additionalProperties.cpp

@@ -0,0 +1 @@
+            ${if.namespace.notsame}${parent.Title}::${end.if.namespace.notsame}${title} ${property};

languages/cpp/templates/callback-initialization/anyOf.cpp

@@ -0,0 +1 @@
+{property};

languages/cpp/templates/callback-initialization/array.cpp

@@ -0,0 +1 @@
+            ${type} ${property};

languages/cpp/templates/callback-initialization/enum.cpp

@@ -0,0 +1 @@
+            ${if.namespace.notsame}${parent.Title}::${end.if.namespace.notsame}${title} ${property};

languages/cpp/templates/callback-initialization/generic.cpp

@@ -0,0 +1 @@
+            ${type} ${property};

languages/cpp/templates/callback-initialization/object-empty-property.cpp

@@ -0,0 +1 @@
+            std::string ${property};

languages/cpp/templates/callback-initialization/object.cpp

@@ -0,0 +1 @@
+            ${if.namespace.notsame}${parent.Title}::${end.if.namespace.notsame}${title} ${property};

languages/cpp/templates/callback-initialization/primitive.cpp

@@ -0,0 +1 @@
+${type}

languages/cpp/templates/callback-initialization/title.cpp

@@ -0,0 +1 @@
+${Title}

languages/cpp/templates/callback-instantiation/generic.cpp

@@ -0,0 +1,12 @@
+            WPEFramework::Core::JSON::VariantContainer::Iterator elements = proxyResponse->Variants();
+            while (elements.Next()) {
+${callback.result.instantiation}
+                else if (strcmp(elements.Label(), "context") == 0) {
+                    WPEFramework::Core::JSON::VariantContainer::Iterator params = elements.Current().Object().Variants();
+                    while (params.Next()) {
+        ${callback.param.instantiation.with.indent}
+                    }
+                } else {
+                    ASSERT(false);
+                }
+            }

languages/cpp/templates/callback-response-instantiation/additionalProperties.cpp

@@ -0,0 +1 @@
+${property}

languages/cpp/templates/callback-response-instantiation/generic.cpp

@@ -1 +1 @@
-response
+${property}

languages/cpp/templates/callback-result-instantiation/additionalProperties.cpp

@@ -1,5 +1,7 @@
-            ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} elements = (*proxyResponse)->Variants();
-            ${if.namespace.notsame}${info.Title}::${end.if.namespace.notsame}${title} response;
+            ${if.namespace.notsame}${info.Title}::${end.if.namespace.notsame}JsonData_${title}::Iterator elements = proxyResponse->Variants();
             while (elements.Next()) {
-                response.insert(elements.Label(), elements.Current().${additional.type}.Value());
-            }
+${if.not.default}                ${namespace}${key} key = WPEFramework::Core::EnumerateType<${namespace}${key}>(elements.Label(), false).Value();${end.if.not.default}${if.default}                ${key} key = elements.Label();${end.if.default}
+                ${property}.emplace(std::piecewise_construct,
+                    std::forward_as_tuple(key),
+                    std::forward_as_tuple(elements.Current().${additional.type}));
+            }

languages/cpp/templates/callback-result-instantiation/anyOf.cpp

@@ -0,0 +1 @@
+         ${property};

languages/cpp/templates/callback-result-instantiation/array.cpp

@@ -1,5 +1,4 @@
-            auto index((*proxyResponse)->Elements());
-            ${type} response;
+            auto index(proxyResponse->Elements());
             while (index.Next() == true) {
-                response.push_back(index.Current().Value());
-            }
+                ${property}.push_back(index.Current().Value());
+            }

languages/cpp/templates/callback-result-instantiation/generic.cpp

@@ -1 +1 @@
-            ${type} response = (*proxyResponse)->Value();
+            ${property} = proxyResponse->Value();

languages/cpp/templates/callback-result-instantiation/namespace.cpp

@@ -0,0 +1 @@
+${if.namespace.notsame}${parent.Title}::${end.if.namespace.notsame}

languages/cpp/templates/callback-result-instantiation/object.cpp

@@ -1,2 +1 @@
-            ${title} response;
 ${properties}

languages/cpp/templates/callback-result-instantiation/property.cpp

@@ -1 +1 @@
-${shape}            ${if.non.object}response.${property} = (*proxyResponse)->${Property};${end.if.non.object}
+${shape}            ${if.non.const}${if.non.anyOf}${if.non.array}${if.non.object}${base.title}.${property} = proxyResponse->${Property};${end.if.non.object}${end.if.non.array}${end.if.non.anyOf}${end.if.non.const}

languages/cpp/templates/callback-result-instantiation/sub-property/anyOf.cpp

@@ -0,0 +1 @@
+${Title}

languages/cpp/templates/callback-result-instantiation/sub-property/anyOfSchemaShape.cpp

@@ -0,0 +1,3 @@
+            string ${property}Str;
+            proxyResponse->${Property.dependency}${Property}.ToString(${property}Str);
+            ${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property} = ${property}Str;

languages/cpp/templates/callback-result-instantiation/sub-property/array.cpp

@@ -0,0 +1,5 @@
+            ${if.impl.array.optional}${base.title}.${property} = std::make_optional<${type}>();${end.if.impl.array.optional} 
+            auto index(proxyResponse->${Property}.Elements());
+            while (index.Next() == true) {
+${if.object}${items.with.indent}${end.if.object}${if.non.object}                ${base.title}.${property}${if.impl.array.optional}.value()${end.if.impl.array.optional}.push_back(index.Current().Value());${end.if.non.object}
+            }

languages/cpp/templates/callback-result-instantiation/sub-property/const.cpp

@@ -0,0 +1 @@
+            ${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property} = proxyResponse->${Property.dependency}${Property};

languages/cpp/templates/callback-result-instantiation/sub-property/namespace.cpp

@@ -0,0 +1 @@
+${if.namespace.notsame}${parent.Title}::${end.if.namespace.notsame}

languages/cpp/templates/callback-result-instantiation/sub-property/object-array.cpp

@@ -0,0 +1,4 @@
+                ${type} ${property}Result${level};
+            ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} jsonResult = index.Current();
+${properties}
+            ${property}response.${property}${if.impl.array.optional}.value()${end.if.impl.array.optional}.push_back(${property}Result${level});

languages/cpp/templates/callback-result-instantiation/sub-property/object.cpp

@@ -1 +1,3 @@
+${if.impl.optional}
+            ${base.title}${property.dependency} = std::make_optional<${type}>();${end.if.impl.optional}
 ${properties}

languages/cpp/templates/callback-result-instantiation/sub-property/property.cpp

@@ -1 +1 @@
-${shape}            ${if.non.object}response.${property.dependency}${property} = (*proxyResponse)->${Property.dependency}${Property};${end.if.non.object}
+${shape}            ${if.non.const}${if.non.anyOf}${if.non.array}${if.non.object}${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property} = proxyResponse->${Property.dependency}${Property};${end.if.non.object}${end.if.non.array}${end.if.non.anyOf}${end.if.non.const}

languages/cpp/templates/callback-result-instantiation/tuple.cpp

@@ -1,4 +1,2 @@
-                auto index((*proxyResponse)->Elements());
-                ${if.namespace.notsame}${info.Title}::${end.if.namespace.notsame}${title} response;
-                response.first = index.Get(0);
-                response.second = index.Get(1);
+            ${property}.first = proxyResponse->Get(0);
+            ${property}.second = proxyResponse->Get(1);

languages/cpp/templates/callback-result-serialization/additionalProperties.cpp

@@ -0,0 +1 @@
+        WPEFramework::Core::ProxyType<WPEFramework::Core::JSON::VariantContainer>& proxyResponse = *(reinterpret_cast<WPEFramework::Core::ProxyType<WPEFramework::Core::JSON::VariantContainer>*>(jsonResponse));

languages/cpp/templates/callback-result-serialization/generic.cpp

@@ -0,0 +1 @@
+        WPEFramework::Core::ProxyType<${method.result.json}>& proxyResponse = *(reinterpret_cast<WPEFramework::Core::ProxyType<${method.result.json}>*>(jsonResponse));

languages/cpp/templates/callback-result-serialization/primitive.cpp

@@ -0,0 +1 @@
+${type}

languages/cpp/templates/callback-result-serialization/ref.h

@@ -0,0 +1 @@
+${shape}

languages/cpp/templates/callback-serialization/generic.cpp

@@ -0,0 +1 @@
+        WPEFramework::Core::ProxyType<WPEFramework::Core::JSON::VariantContainer>& proxyResponse = *(reinterpret_cast<WPEFramework::Core::ProxyType<WPEFramework::Core::JSON::VariantContainer>*>(jsonResponse));

languages/cpp/templates/declarations-override/calls-metrics.h

@@ -0,0 +1 @@
+

languages/cpp/templates/declarations/calls-metrics.h

@@ -0,0 +1 @@
+

languages/cpp/templates/json-types/anyOfSchemaShape.h

@@ -1 +1 @@
-    /* anyOf schema shape is not supported right now */
+    /* anyOf schema shape is not supported right now */

languages/cpp/templates/json-types/const.h

@@ -0,0 +1 @@
+FireboltSDK::JSON::String

languages/cpp/templates/json-types/integer.h

@@ -1 +1 @@
-WPEFramework::Core::JSON::DecSInt32
+WPEFramework::Core::JSON::DecSInt32

languages/cpp/templates/methods/event.cpp

@@ -1,12 +1,14 @@
     /* ${method.rpc.name} - ${method.description} */
     static void ${method.name}InnerCallback( void* notification, const void* userData, void* jsonResponse )
     {
-${event.callback.params.serialization}
-        ASSERT(proxyResponse->IsValid() == true);
+${event.callback.serialization}
+        ASSERT(proxyResponse.IsValid() == true);
 
-        if (proxyResponse->IsValid() == true) {
-${event.callback.result.instantiation}
-            proxyResponse->Release();
+        if (proxyResponse.IsValid() == true) {
+${event.callback.initialization}
+
+${event.callback.instantiation}
+            proxyResponse.Release();
 
             I${info.Title}::I${method.Name}Notification& notifier = *(reinterpret_cast<I${info.Title}::I${method.Name}Notification*>(notification));
             notifier.${method.name}(${event.callback.response.instantiation});
@@ -32,4 +34,4 @@
         if (err != nullptr) {
             *err = status;
         }
-    }
+    }

languages/cpp/templates/methods/property.cpp

@@ -15,4 +15,4 @@
         }
 
         return ${method.result.name};
-    }${method.setter}
+    }${method.setter}

languages/cpp/templates/parameter-serialization/additionalProperties.cpp

@@ -0,0 +1,9 @@
+        ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}${title} map = ${property}${if.impl.optional}.value()${end.if.impl.optional};
+        WPEFramework::Core::JSON::Variant ${property}Variant;
+        for (auto element: map) {
+            WPEFramework::Core::JSON::Variant jsonElement = element.second;
+            WPEFramework::Core::JSON::VariantContainer jsonContainer;
+            jsonContainer.Set(element.first.c_str(), jsonElement);
+            ${property}Variant = jsonContainer;
+        }
+        jsonParameters.Set(_T("${property}"), ${property}Variant);

languages/cpp/templates/parameter-serialization/array.cpp

@@ -4,4 +4,4 @@
         }
         WPEFramework::Core::JSON::Variant ${Property}Variant;
         ${Property}Variant.Array(${Property});
-        jsonParameters.Set(_T("${property}"), ${Property}Variant);
+        jsonParameters.Set(_T("${property}"), ${Property}Variant);

languages/cpp/templates/parameter-serialization/enum.cpp

@@ -1,3 +1,3 @@
         ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} jsonValue = ${property}${if.optional}.value()${end.if.optional};
         WPEFramework::Core::JSON::Variant ${Property}(jsonValue.Data());
-        jsonParameters.Set(_T("${property}"), ${Property});
+        jsonParameters.Set(_T("${property}"), ${Property});

languages/cpp/templates/parameter-serialization/generic.cpp

@@ -1,2 +1,2 @@
         WPEFramework::Core::JSON::Variant ${Property}(${property}${if.optional}.value()${end.if.optional});
-        jsonParameters.Set(_T("${property}"), ${Property});
+        jsonParameters.Set(_T("${property}"), ${Property});

languages/cpp/templates/parameter-serialization/object-empty-property.cpp

@@ -0,0 +1,2 @@
+        WPEFramework::Core::JSON::Variant ${Property}(${property}${if.optional}.value()${end.if.optional});
+        jsonParameters.Set(_T("${property}"), ${Property});

languages/cpp/templates/parameter-serialization/object.cpp

@@ -1,4 +1,4 @@
-        auto element = ${property};
+        auto element = ${property}${if.impl.optional}.value()${end.if.impl.optional};
         ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} ${Property}Container;
 ${properties}
         string ${Property}Str;

languages/cpp/templates/parameter-serialization/property.cpp

@@ -1 +1 @@
-${shape}        ${if.non.object}${base.Title}Container.${Property} = element${if.base.optional}.value()${end.if.base.optional}.${property}${if.optional}.value()${end.if.optional};${end.if.non.object}
+${shape}        ${if.non.const}${if.non.anyOf}${if.non.array}${if.non.object}${base.Title}Container.${Property} = element.${property}${if.optional}.value()${end.if.optional};${end.if.non.object}${end.if.non.array}${end.if.non.anyOf}${end.if.non.const}

languages/cpp/templates/parameter-serialization/sub-property/anyOf.cpp

@@ -0,0 +1 @@
+${Title}

languages/cpp/templates/parameter-serialization/sub-property/anyOfSchemaShape.cpp

@@ -0,0 +1 @@
+        ${base.Title}Container.${Property.dependency}${Property} = element${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property}${if.optional}.value()${end.if.optional};

languages/cpp/templates/parameter-serialization/sub-property/array.cpp

@@ -0,0 +1,8 @@
+        WPEFramework::Core::JSON::ArrayType<WPEFramework::Core::JSON::Variant> ${Property};
+        ${type} ${property} = element.${property}${if.impl.array.optional}.value()${end.if.impl.array.optional};
+        for (auto& element : ${property}) {
+${if.object}${items.with.indent}${end.if.object}${if.non.object}${Property}.Add() = element;${end.if.non.object}
+        }
+        WPEFramework::Core::JSON::Variant ${Property}Variant;
+        ${Property}Variant.Array(${Property});
+        jsonParameters.Set(_T("${property}"), ${Property}Variant);

languages/cpp/templates/parameter-serialization/sub-property/const.cpp

@@ -0,0 +1 @@
+        ${base.Title}Container.${Property.dependency}${Property} = element${property.dependency}.${property}${if.optional}.value()${end.if.optional};

languages/cpp/templates/parameter-serialization/sub-property/object-array.cpp

@@ -0,0 +1,7 @@
+            ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} ${Property}Container;
+${properties}
+        string ${Property}Str;
+        ${Property}Container.ToString(${Property}Str);
+        WPEFramework::Core::JSON::VariantContainer ${Property}VariantContainer(${Property}Str);
+        WPEFramework::Core::JSON::Variant ${Property}Variant = ${Property}VariantContainer;
+        ${Property}.Add() = ${Property}Variant;

languages/cpp/templates/parameter-serialization/sub-property/object.cpp

@@ -1 +1 @@
-${properties}
+${properties}

languages/cpp/templates/parameter-serialization/sub-property/property.cpp

@@ -1 +1 @@
-${shape}            ${if.non.object}${title}.${Property.dependency}${Property} = element${if.base.optional}.value()${end.if.base.optional}.${property.dependency}${property}${if.optional}.value()${end.if.optional};${end.if.non.object}
+${shape}        ${if.non.const}${if.non.anyOf}${if.non.array}${if.non.object}${base.Title}Container.${Property.dependency}${Property} = element${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property}${if.optional}.value()${end.if.optional};${end.if.non.object}${end.if.non.array}${end.if.non.anyOf}${end.if.non.const}

languages/cpp/templates/parameter-serialization/sub-property/title.cpp

@@ -1 +1 @@
-${Title}
+${Title}

languages/cpp/templates/parameter-serialization/title.cpp

@@ -0,0 +1 @@
+${Title}

languages/cpp/templates/result-initialization/additionalProperties.cpp

@@ -1 +1 @@
-        ${Title} ${property};
+        ${if.namespace.notsame}${parent.Title}::${end.if.namespace.notsame}${Title} ${property};

languages/cpp/templates/result-initialization/anyOf.cpp

@@ -0,0 +1 @@
+        std::string ${property};

languages/cpp/templates/result-initialization/object-empty-property.cpp

@@ -0,0 +1 @@
+        ${if.namespace.notsame}${parent.Title}::${end.if.namespace.notsame}${Title} ${property};

languages/cpp/templates/result-initialization/ref.h

@@ -0,0 +1 @@
+${shape}