CPPSDK: alignment issue fix + has_value check for parameter-serializa…

…tion array

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

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

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

@@ -10,4 +10,4 @@
             for (auto& element : ${property}) {
 ${if.object}${items.with.indent}${end.if.object}${if.non.object}                ${property}Array.Add() = element;${end.if.non.object}
             }
-            ${base.title}Container.${Property.dependency}Add(_T("${property}"), &${property}Array);${end.if.impl.array.non.optional}
+            ${base.title}Container.${Property.dependency}Add(_T("${property}"), &${property}Array);${end.if.impl.array.non.optional}

languages/cpp/templates/types/object.h

@@ -1,3 +1,3 @@
 struct ${title} {
-    ${properties}
+${properties}
 };

languages/cpp/templates/types/property.h

@@ -1 +1 @@
-${if.optional}std::optional<${end.if.optional}${title}${if.optional}>${end.if.optional} ${property};
+    ${if.optional}std::optional<${end.if.optional}${title}${if.optional}>${end.if.optional} ${property};