loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Daniel Renninghoff 2022-06-25 03:40:28 +02:00 committed by GitHub
parent 22ea4a60a1
commit c1b8780fff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/generators/cpp-qt-client.md
View File

@ -38,6 +38,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
| Type/Alias | Imports | | Type/Alias | Imports |
| ---------- | ------- | | ---------- | ------- |
|OAIHttpFileElement|#include "OAIHttpFileElement.h"| |OAIHttpFileElement|#include "OAIHttpFileElement.h"|
|QJsonValue|#include <QJsonValue>|
## INSTANTIATION TYPES ## INSTANTIATION TYPES

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtClientCodegen.java
View File

@ -108,7 +108,9 @@ public class CppQtClientCodegen extends CppQtAbstractCodegen implements CodegenC
supportingFiles.add(new SupportingFile("Project.mustache", sourceFolder, "client.pri")); supportingFiles.add(new SupportingFile("Project.mustache", sourceFolder, "client.pri"));
} }
typeMapping.put("file", PREFIX + "HttpFileElement"); typeMapping.put("file", PREFIX + "HttpFileElement");
typeMapping.put("AnyType", "QJsonValue");
importMapping.put(PREFIX + "HttpFileElement", "#include \"" + PREFIX + "HttpFileElement.h\""); importMapping.put(PREFIX + "HttpFileElement", "#include \"" + PREFIX + "HttpFileElement.h\"");
importMapping.put("QJsonValue", "#include <QJsonValue>");
} }
@Override @Override
@ -140,7 +142,9 @@ public class CppQtClientCodegen extends CppQtAbstractCodegen implements CodegenC
typeMapping.put("file", modelNamePrefix + "HttpFileElement"); typeMapping.put("file", modelNamePrefix + "HttpFileElement");
typeMapping.put("AnyType", "QJsonValue");
importMapping.put(modelNamePrefix + "HttpFileElement", "#include \"" + modelNamePrefix + "HttpFileElement.h\""); importMapping.put(modelNamePrefix + "HttpFileElement", "#include \"" + modelNamePrefix + "HttpFileElement.h\"");
importMapping.put("QJsonValue", "#include <QJsonValue>");
if (optionalProjectFileFlag) { if (optionalProjectFileFlag) {
supportingFiles.add(new SupportingFile("Project.mustache", sourceFolder, modelNamePrefix + "client.pri")); supportingFiles.add(new SupportingFile("Project.mustache", sourceFolder, modelNamePrefix + "client.pri"));
} }

9
modules/openapi-generator/src/main/resources/cpp-qt-client/helpers-body.mustache vendored
View File

@ -186,6 +186,10 @@ QJsonValue toJsonValue(const {{prefix}}HttpFileElement &value) {
return value.asJsonValue(); return value.asJsonValue();
} }
QJsonValue toJsonValue(const QJsonValue &value) {
return value;
}
bool fromStringValue(const QString &inStr, QString &value) { bool fromStringValue(const QString &inStr, QString &value) {
value.clear(); value.clear();
value.append(inStr); value.append(inStr);
@ -415,6 +419,11 @@ bool fromJsonValue({{prefix}}HttpFileElement &value, const QJsonValue &jval) {
return value.fromJsonValue(jval); return value.fromJsonValue(jval);
} }
bool fromJsonValue(QJsonValue &value, const QJsonValue &jval) {
value = jval;
return true;
}
{{#cppNamespaceDeclarations}} {{#cppNamespaceDeclarations}}
} // namespace {{this}} } // namespace {{this}}
{{/cppNamespaceDeclarations}} {{/cppNamespaceDeclarations}}

2
modules/openapi-generator/src/main/resources/cpp-qt-client/helpers-header.mustache vendored
View File

@ -127,6 +127,7 @@ QJsonValue toJsonValue(const double &value);
QJsonValue toJsonValue(const {{prefix}}Object &value); QJsonValue toJsonValue(const {{prefix}}Object &value);
QJsonValue toJsonValue(const {{prefix}}Enum &value); QJsonValue toJsonValue(const {{prefix}}Enum &value);
QJsonValue toJsonValue(const {{prefix}}HttpFileElement &value); QJsonValue toJsonValue(const {{prefix}}HttpFileElement &value);
QJsonValue toJsonValue(const QJsonValue &value);
template <typename T> template <typename T>
QJsonValue toJsonValue(const QList<T> &val) { 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}}Object &value, const QJsonValue &jval);
bool fromJsonValue({{prefix}}Enum &value, const QJsonValue &jval); bool fromJsonValue({{prefix}}Enum &value, const QJsonValue &jval);
bool fromJsonValue({{prefix}}HttpFileElement &value, const QJsonValue &jval); bool fromJsonValue({{prefix}}HttpFileElement &value, const QJsonValue &jval);
bool fromJsonValue(QJsonValue &value, const QJsonValue &jval);
template <typename T> template <typename T>
bool fromJsonValue(QList<T> &val, const QJsonValue &jval) { bool fromJsonValue(QList<T> &val, const QJsonValue &jval) {

9
samples/client/petstore/cpp-qt/client/PFXHelpers.cpp
View File

@ -194,6 +194,10 @@ QJsonValue toJsonValue(const PFXHttpFileElement &value) {
return value.asJsonValue(); return value.asJsonValue();
} }
QJsonValue toJsonValue(const QJsonValue &value) {
return value;
}
bool fromStringValue(const QString &inStr, QString &value) { bool fromStringValue(const QString &inStr, QString &value) {
value.clear(); value.clear();
value.append(inStr); value.append(inStr);
@ -423,4 +427,9 @@ bool fromJsonValue(PFXHttpFileElement &value, const QJsonValue &jval) {
return value.fromJsonValue(jval); return value.fromJsonValue(jval);
} }
bool fromJsonValue(QJsonValue &value, const QJsonValue &jval) {
value = jval;
return true;
}
} // namespace test_namespace } // namespace test_namespace

2
samples/client/petstore/cpp-qt/client/PFXHelpers.h
View File

@ -135,6 +135,7 @@ QJsonValue toJsonValue(const double &value);
QJsonValue toJsonValue(const PFXObject &value); QJsonValue toJsonValue(const PFXObject &value);
QJsonValue toJsonValue(const PFXEnum &value); QJsonValue toJsonValue(const PFXEnum &value);
QJsonValue toJsonValue(const PFXHttpFileElement &value); QJsonValue toJsonValue(const PFXHttpFileElement &value);
QJsonValue toJsonValue(const QJsonValue &value);
template <typename T> template <typename T>
QJsonValue toJsonValue(const QList<T> &val) { 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(PFXObject &value, const QJsonValue &jval);
bool fromJsonValue(PFXEnum &value, const QJsonValue &jval); bool fromJsonValue(PFXEnum &value, const QJsonValue &jval);
bool fromJsonValue(PFXHttpFileElement &value, const QJsonValue &jval); bool fromJsonValue(PFXHttpFileElement &value, const QJsonValue &jval);
bool fromJsonValue(QJsonValue &value, const QJsonValue &jval);
template <typename T> template <typename T>
bool fromJsonValue(QList<T> &val, const QJsonValue &jval) { bool fromJsonValue(QList<T> &val, const QJsonValue &jval) {