Skip to content

[C++] [Qt5]Update isSet when the object is received from callback. #4385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2019
Merged

[C++] [Qt5]Update isSet when the object is received from callback. #4385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-header.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,27 @@
namespace {{this}} {
{{/cppNamespaceDeclarations}}

template <typename T> QString
toStringValue(const QList<T> &val);

template <typename T>
bool fromStringValue(const QList<QString> &inStr, QList<T> &val);

template <typename T>
bool fromStringValue(const QMap<QString, QString> &inStr, QMap<QString, T> &val);

template <typename T>
QJsonValue toJsonValue(const QList<T> &val);

template <typename T>
QJsonValue toJsonValue(const QMap<QString, T> &val);

template <typename T>
bool fromJsonValue(QList<T> &val, const QJsonValue &jval);

template <typename T>
bool fromJsonValue(QMap<QString, T> &val, const QJsonValue &jval);

QString toStringValue(const QString &value);
QString toStringValue(const QDateTime &value);
QString toStringValue(const QByteArray &value);
Expand Down Expand Up @@ -128,7 +149,7 @@ namespace {{this}} {
bool fromJsonValue(QList<T> &val, const QJsonValue &jval) {
bool ok = true;
if(jval.isArray()){
for(const auto& jitem : jval.toArray()){
for(const auto jitem : jval.toArray()){
T item;
ok &= fromJsonValue(item, jitem);
val.push_back(item);
Expand Down
31 changes: 18 additions & 13 deletions modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,27 @@ namespace {{this}} {
{{/cppNamespaceDeclarations}}

{{classname}}::{{classname}}(QString json) {
this->init();
this->initializeModel();
this->fromJson(json);
}

{{classname}}::{{classname}}() {
this->init();
this->initializeModel();
}

{{classname}}::~{{classname}}() {

}

void
{{classname}}::init() {
{{classname}}::initializeModel() {
{{^isEnum}}{{#vars}}
m_{{name}}_isSet = false;
m_{{name}}_isValid = false;
{{/vars}}{{/isEnum}}{{#isEnum}}
m_value_isSet = false;
m_value_isValid = false;
m_value = e{{classname}}::INVALID_VALUE_OPENAPI_GENERATED;
{{/isEnum}}
m_value = e{{classname}}::INVALID_VALUE_OPENAPI_GENERATED;{{/isEnum}}
}

void
Expand All @@ -46,22 +45,27 @@ void
this->fromJsonObject(jsonObject);{{/isEnum}}{{#isEnum}}{{#allowableValues}}{{#enumVars}}
{{#-first}}if{{/-first}}{{^-first}}else if{{/-first}} ( jsonString.compare({{#isString}}"{{value}}"{{/isString}}{{^isString}}QString::number({{value}}){{/isString}}, Qt::CaseInsensitive) == 0) {
m_value = e{{classname}}::{{name}};
m_value_isValid = true;
m_value_isSet = m_value_isValid = true;
}{{/enumVars}}{{/allowableValues}}{{/isEnum}}
}

void
{{classname}}::fromJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnum}}(QJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnum}} json) {
{{^isEnum}}{{#vars}}
{{^isContainer}}m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue({{name}}, json[QString("{{baseName}}")]);{{/isContainer}}
{{#isContainer}}{{^items.isContainer}}m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue({{name}}, json[QString("{{baseName}}")]);{{/items.isContainer}}{{#items.isContainer}}{{#isListContainer}}
{{^isEnum}}{{#vars}}{{^isContainer}}
m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue({{name}}, json[QString("{{baseName}}")]);
m_{{name}}_isSet = !json[QString("{{baseName}}")].isNull() && m_{{name}}_isValid;{{/isContainer}}{{#isContainer}}{{^items.isContainer}}
m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue({{name}}, json[QString("{{baseName}}")]);
m_{{name}}_isSet = !json[QString("{{baseName}}")].isNull() && m_{{name}}_isValid;{{/items.isContainer}}{{#items.isContainer}}{{#isListContainer}}
if(json["{{baseName}}"].isArray()){
auto arr = json["{{baseName}}"].toArray();
m_{{name}}_isValid = true;
for (const QJsonValue & jval : arr) {
{{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMapContainer}}QMap<QString, {{items.items.baseType}}>{{/items.isMapContainer}} item;
m_{{name}}_isValid &= ::{{cppNamespace}}::fromJsonValue(item, jval)
{{name}}.push_back(item);
if(arr.count() > 0) {
for (const QJsonValue jval : arr) {
{{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMapContainer}}QMap<QString, {{items.items.baseType}}>{{/items.isMapContainer}} item;
m_{{name}}_isValid &= ::{{cppNamespace}}::fromJsonValue(item, jval);
m_{{name}}_isSet = !jval.isNull() && m_{{name}}_isValid;
{{name}}.push_back(item);
}
}
}{{/isListContainer}}{{#isMapContainer}}
if(json["{{baseName}}"].isObject()){
Expand All @@ -72,6 +76,7 @@ void
{{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMapContainer}}QMap<QString, {{items.items.baseType}}>{{/items.isMapContainer}} item;
auto jval = QJsonValue::fromVariant(varmap.value(val));
m_{{name}}_isValid &= ::{{cppNamespace}}::fromJsonValue(item, jval);
m_{{name}}_isSet &= !jval.isNull() && m_{{name}}_isValid;
{{name}}.insert({{name}}.end(), val, item);
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public:
virtual bool isValid() const override;

private:
void init();
void initializeModel();
{{^isEnum}}{{#vars}}
{{{dataType}}} {{name}};
bool m_{{name}}_isSet;
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/cpp-qt5/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.0-SNAPSHOT
4.2.1-SNAPSHOT
15 changes: 8 additions & 7 deletions samples/client/petstore/cpp-qt5/client/OAIApiResponse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@
namespace OpenAPI {

OAIApiResponse::OAIApiResponse(QString json) {
this->init();
this->initializeModel();
this->fromJson(json);
}

OAIApiResponse::OAIApiResponse() {
this->init();
this->initializeModel();
}

OAIApiResponse::~OAIApiResponse() {

}

void
OAIApiResponse::init() {
OAIApiResponse::initializeModel() {

m_code_isSet = false;
m_code_isValid = false;
Expand All @@ -46,7 +46,8 @@ OAIApiResponse::init() {

m_message_isSet = false;
m_message_isValid = false;
}

}

void
OAIApiResponse::fromJson(QString jsonString) {
Expand All @@ -60,13 +61,13 @@ void
OAIApiResponse::fromJsonObject(QJsonObject json) {

m_code_isValid = ::OpenAPI::fromJsonValue(code, json[QString("code")]);

m_code_isSet = !json[QString("code")].isNull() && m_code_isValid;

m_type_isValid = ::OpenAPI::fromJsonValue(type, json[QString("type")]);

m_type_isSet = !json[QString("type")].isNull() && m_type_isValid;

m_message_isValid = ::OpenAPI::fromJsonValue(message, json[QString("message")]);

m_message_isSet = !json[QString("message")].isNull() && m_message_isValid;

}

Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class OAIApiResponse: public OAIObject {
virtual bool isValid() const override;

private:
void init();
void initializeModel();

qint32 code;
bool m_code_isSet;
Expand Down
13 changes: 7 additions & 6 deletions samples/client/petstore/cpp-qt5/client/OAICategory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,28 @@
namespace OpenAPI {

OAICategory::OAICategory(QString json) {
this->init();
this->initializeModel();
this->fromJson(json);
}

OAICategory::OAICategory() {
this->init();
this->initializeModel();
}

OAICategory::~OAICategory() {

}

void
OAICategory::init() {
OAICategory::initializeModel() {

m_id_isSet = false;
m_id_isValid = false;

m_name_isSet = false;
m_name_isValid = false;
}

}

void
OAICategory::fromJson(QString jsonString) {
Expand All @@ -57,10 +58,10 @@ void
OAICategory::fromJsonObject(QJsonObject json) {

m_id_isValid = ::OpenAPI::fromJsonValue(id, json[QString("id")]);

m_id_isSet = !json[QString("id")].isNull() && m_id_isValid;

m_name_isValid = ::OpenAPI::fromJsonValue(name, json[QString("name")]);

m_name_isSet = !json[QString("name")].isNull() && m_name_isValid;

}

Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/cpp-qt5/client/OAICategory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class OAICategory: public OAIObject {
virtual bool isValid() const override;

private:
void init();
void initializeModel();

qint64 id;
bool m_id_isSet;
Expand Down
23 changes: 22 additions & 1 deletion samples/client/petstore/cpp-qt5/client/OAIHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,27 @@

namespace OpenAPI {

template <typename T> QString
toStringValue(const QList<T> &val);

template <typename T>
bool fromStringValue(const QList<QString> &inStr, QList<T> &val);

template <typename T>
bool fromStringValue(const QMap<QString, QString> &inStr, QMap<QString, T> &val);

template <typename T>
QJsonValue toJsonValue(const QList<T> &val);

template <typename T>
QJsonValue toJsonValue(const QMap<QString, T> &val);

template <typename T>
bool fromJsonValue(QList<T> &val, const QJsonValue &jval);

template <typename T>
bool fromJsonValue(QMap<QString, T> &val, const QJsonValue &jval);

QString toStringValue(const QString &value);
QString toStringValue(const QDateTime &value);
QString toStringValue(const QByteArray &value);
Expand Down Expand Up @@ -137,7 +158,7 @@ namespace OpenAPI {
bool fromJsonValue(QList<T> &val, const QJsonValue &jval) {
bool ok = true;
if(jval.isArray()){
for(const auto& jitem : jval.toArray()){
for(const auto jitem : jval.toArray()){
T item;
ok &= fromJsonValue(item, jitem);
val.push_back(item);
Expand Down
21 changes: 11 additions & 10 deletions samples/client/petstore/cpp-qt5/client/OAIOrder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@
namespace OpenAPI {

OAIOrder::OAIOrder(QString json) {
this->init();
this->initializeModel();
this->fromJson(json);
}

OAIOrder::OAIOrder() {
this->init();
this->initializeModel();
}

OAIOrder::~OAIOrder() {

}

void
OAIOrder::init() {
OAIOrder::initializeModel() {

m_id_isSet = false;
m_id_isValid = false;
Expand All @@ -55,7 +55,8 @@ OAIOrder::init() {

m_complete_isSet = false;
m_complete_isValid = false;
}

}

void
OAIOrder::fromJson(QString jsonString) {
Expand All @@ -69,22 +70,22 @@ void
OAIOrder::fromJsonObject(QJsonObject json) {

m_id_isValid = ::OpenAPI::fromJsonValue(id, json[QString("id")]);

m_id_isSet = !json[QString("id")].isNull() && m_id_isValid;

m_pet_id_isValid = ::OpenAPI::fromJsonValue(pet_id, json[QString("petId")]);

m_pet_id_isSet = !json[QString("petId")].isNull() && m_pet_id_isValid;

m_quantity_isValid = ::OpenAPI::fromJsonValue(quantity, json[QString("quantity")]);

m_quantity_isSet = !json[QString("quantity")].isNull() && m_quantity_isValid;

m_ship_date_isValid = ::OpenAPI::fromJsonValue(ship_date, json[QString("shipDate")]);

m_ship_date_isSet = !json[QString("shipDate")].isNull() && m_ship_date_isValid;

m_status_isValid = ::OpenAPI::fromJsonValue(status, json[QString("status")]);

m_status_isSet = !json[QString("status")].isNull() && m_status_isValid;

m_complete_isValid = ::OpenAPI::fromJsonValue(complete, json[QString("complete")]);

m_complete_isSet = !json[QString("complete")].isNull() && m_complete_isValid;

}

Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/cpp-qt5/client/OAIOrder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class OAIOrder: public OAIObject {
virtual bool isValid() const override;

private:
void init();
void initializeModel();

qint64 id;
bool m_id_isSet;
Expand Down
Loading