[cpp-qt-client] Replace AnyType with QJsonValue (#12642)

OpenAPITools · Jun 25, 2022 · c1b8780 · c1b8780
1 parent 22ea4a6
commit c1b8780
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 0 deletions.
diff --git a/docs/generators/cpp-qt-client.md b/docs/generators/cpp-qt-client.md
@@ -38,6 +38,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Type/Alias | Imports |
 | ---------- | ------- |
 |OAIHttpFileElement|#include &quot;OAIHttpFileElement.h&quot;|
+|QJsonValue|#include &lt;QJsonValue&gt;|
 
 
 ## INSTANTIATION TYPES

diff --git a/...penapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtClientCodegen.java b/...penapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtClientCodegen.java
@@ -108,7 +108,9 @@ public CppQtClientCodegen() {
             supportingFiles.add(new SupportingFile("Project.mustache", sourceFolder, "client.pri"));
         }
         typeMapping.put("file", PREFIX + "HttpFileElement");
+        typeMapping.put("AnyType", "QJsonValue");
         importMapping.put(PREFIX + "HttpFileElement", "#include \"" + PREFIX + "HttpFileElement.h\"");
+        importMapping.put("QJsonValue", "#include <QJsonValue>");
     }
 
     @Override
@@ -140,7 +142,9 @@ public void processOpts() {
 
 
             typeMapping.put("file", modelNamePrefix + "HttpFileElement");
+            typeMapping.put("AnyType", "QJsonValue");
             importMapping.put(modelNamePrefix + "HttpFileElement", "#include \"" + modelNamePrefix + "HttpFileElement.h\"");
+            importMapping.put("QJsonValue", "#include <QJsonValue>");
             if (optionalProjectFileFlag) {
                 supportingFiles.add(new SupportingFile("Project.mustache", sourceFolder, modelNamePrefix + "client.pri"));
             }

diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/helpers-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/helpers-body.mustache
@@ -186,6 +186,10 @@ QJsonValue toJsonValue(const {{prefix}}HttpFileElement &value) {
     return value.asJsonValue();
 }
 
+QJsonValue toJsonValue(const QJsonValue &value) {
+    return value;
+}
+
 bool fromStringValue(const QString &inStr, QString &value) {
     value.clear();
     value.append(inStr);
@@ -415,6 +419,11 @@ bool fromJsonValue({{prefix}}HttpFileElement &value, const QJsonValue &jval) {
     return value.fromJsonValue(jval);
 }
 
+bool fromJsonValue(QJsonValue &value, const QJsonValue &jval) {
+    value = jval;
+    return true;
+}
+
 {{#cppNamespaceDeclarations}}
 } // namespace {{this}}
 {{/cppNamespaceDeclarations}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/helpers-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/helpers-header.mustache
@@ -127,6 +127,7 @@ QJsonValue toJsonValue(const double &value);
 QJsonValue toJsonValue(const {{prefix}}Object &value);
 QJsonValue toJsonValue(const {{prefix}}Enum &value);
 QJsonValue toJsonValue(const {{prefix}}HttpFileElement &value);
+QJsonValue toJsonValue(const QJsonValue &value);
 
 template <typename T>
 QJsonValue toJsonValue(const QList<T> &val) {
@@ -213,6 +214,7 @@ bool fromJsonValue(double &value, const QJsonValue &jval);
 bool fromJsonValue({{prefix}}Object &value, const QJsonValue &jval);
 bool fromJsonValue({{prefix}}Enum &value, const QJsonValue &jval);
 bool fromJsonValue({{prefix}}HttpFileElement &value, const QJsonValue &jval);
+bool fromJsonValue(QJsonValue &value, const QJsonValue &jval);
 
 template <typename T>
 bool fromJsonValue(QList<T> &val, const QJsonValue &jval) {

diff --git a/samples/client/petstore/cpp-qt/client/PFXHelpers.cpp b/samples/client/petstore/cpp-qt/client/PFXHelpers.cpp
@@ -194,6 +194,10 @@ QJsonValue toJsonValue(const PFXHttpFileElement &value) {
     return value.asJsonValue();
 }
 
+QJsonValue toJsonValue(const QJsonValue &value) {
+    return value;
+}
+
 bool fromStringValue(const QString &inStr, QString &value) {
     value.clear();
     value.append(inStr);
@@ -423,4 +427,9 @@ bool fromJsonValue(PFXHttpFileElement &value, const QJsonValue &jval) {
     return value.fromJsonValue(jval);
 }
 
+bool fromJsonValue(QJsonValue &value, const QJsonValue &jval) {
+    value = jval;
+    return true;
+}
+
 } // namespace test_namespace
diff --git a/samples/client/petstore/cpp-qt/client/PFXHelpers.h b/samples/client/petstore/cpp-qt/client/PFXHelpers.h
@@ -135,6 +135,7 @@ QJsonValue toJsonValue(const double &value);
 QJsonValue toJsonValue(const PFXObject &value);
 QJsonValue toJsonValue(const PFXEnum &value);
 QJsonValue toJsonValue(const PFXHttpFileElement &value);
+QJsonValue toJsonValue(const QJsonValue &value);
 
 template <typename T>
 QJsonValue toJsonValue(const QList<T> &val) {
@@ -221,6 +222,7 @@ bool fromJsonValue(double &value, const QJsonValue &jval);
 bool fromJsonValue(PFXObject &value, const QJsonValue &jval);
 bool fromJsonValue(PFXEnum &value, const QJsonValue &jval);
 bool fromJsonValue(PFXHttpFileElement &value, const QJsonValue &jval);
+bool fromJsonValue(QJsonValue &value, const QJsonValue &jval);
 
 template <typename T>
 bool fromJsonValue(QList<T> &val, const QJsonValue &jval) {