CPPSDK: getMethodSignatureResult updates based on latest changes

rdkcentral · Oct 10, 2023 · b3cb7e6 · b3cb7e6
1 parent 399d97e
commit b3cb7e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/languages/cpp/templates/result/default.h b/languages/cpp/templates/result/default.h
@@ -0,0 +1 @@
+const ${method.result.type}
diff --git a/src/macrofier/types.mjs b/src/macrofier/types.mjs
@@ -78,23 +78,8 @@ function getMethodSignatureParams(method, module, { destination, callback }) {
   }).join(', ')
 }
 
-function getMethodSignatureResult(method, module, { destination, callback }) {
-    let type = getSchemaType(method.result.schema, module, { destination, namespace : true })
-
-    let result = ''
-    let jsonType = getJsonType(method.result.schema, module, { destination })
-
-    if (!isVoid(type) && !isPrimitiveType(jsonType) && getTemplate('/result/nonprimitive')) {
-      result = getTemplate('/result/nonprimitive')
-    }
-    else if ((jsonType === 'string') && getTemplate('/result/string')) {
-      result = getTemplate('/result/string')
-    }
-    else {
-      result = getTemplate('/result/default')
-    }
-
-    return result.replace(/\$\{method\.result\.type\}/g, type)
+function getMethodSignatureResult(method, module, { destination, callback, overrideRule = false }) {
+    return getTemplate('/result/default').replace(/\$\{method\.result\.type\}/g, getSchemaType(method.result.schema, module, { destination, namespace : true, overrideRule }))
 }
 
 const getTemplate = (name) => {