Update base class due to failed compilation in case of plain object type with no properties or additionalProperties specified (#1826)

This commit is contained in:
sunn 2019-01-06 18:20:23 +01:00 committed by GitHub
parent fda35ea263
commit 651395d426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 50 additions and 18 deletions

View File

@ -27,7 +27,6 @@ public:
{{classname}}(); {{classname}}();
{{classname}}(QString json); {{classname}}(QString json);
~{{classname}}() override; ~{{classname}}() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -43,6 +42,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
{{#vars}} {{#vars}}
{{{dataType}}} {{name}}; {{{dataType}}} {{name}};
bool m_{{name}}_isSet; bool m_{{name}}_isSet;

View File

@ -11,6 +11,14 @@ namespace {{this}} {
class {{prefix}}Object { class {{prefix}}Object {
public: public:
{{prefix}}Object() {
}
{{prefix}}Object(QString jsonString) {
fromJson(jsonString);
}
virtual ~{{prefix}}Object(){ virtual ~{{prefix}}Object(){
} }
@ -41,7 +49,7 @@ class {{prefix}}Object {
return true; return true;
} }
private : private :
QJsonObject jObj; QJsonObject jObj;
}; };
{{#cppNamespaceDeclarations}} {{#cppNamespaceDeclarations}}

View File

@ -27,7 +27,6 @@ public:
{{classname}}(); {{classname}}();
{{classname}}(QString json); {{classname}}(QString json);
~{{classname}}() override; ~{{classname}}() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -43,6 +42,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
{{#vars}} {{#vars}}
{{{dataType}}} {{name}}; {{{dataType}}} {{name}};
bool m_{{name}}_isSet; bool m_{{name}}_isSet;

View File

@ -11,6 +11,14 @@ namespace {{this}} {
class {{prefix}}Object { class {{prefix}}Object {
public: public:
{{prefix}}Object() {
}
{{prefix}}Object(QString jsonString) {
fromJson(jsonString);
}
virtual ~{{prefix}}Object(){ virtual ~{{prefix}}Object(){
} }
@ -41,7 +49,7 @@ class {{prefix}}Object {
return true; return true;
} }
private : private :
QJsonObject jObj; QJsonObject jObj;
}; };
{{#cppNamespaceDeclarations}} {{#cppNamespaceDeclarations}}

View File

@ -33,7 +33,6 @@ public:
OAIApiResponse(); OAIApiResponse();
OAIApiResponse(QString json); OAIApiResponse(QString json);
~OAIApiResponse() override; ~OAIApiResponse() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -53,6 +52,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint32 code; qint32 code;
bool m_code_isSet; bool m_code_isSet;
bool m_code_isValid; bool m_code_isValid;

View File

@ -33,7 +33,6 @@ public:
OAICategory(); OAICategory();
OAICategory(QString json); OAICategory(QString json);
~OAICategory() override; ~OAICategory() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -50,6 +49,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint64 id; qint64 id;
bool m_id_isSet; bool m_id_isSet;
bool m_id_isValid; bool m_id_isValid;

View File

@ -20,6 +20,14 @@ namespace OpenAPI {
class OAIObject { class OAIObject {
public: public:
OAIObject() {
}
OAIObject(QString jsonString) {
fromJson(jsonString);
}
virtual ~OAIObject(){ virtual ~OAIObject(){
} }
@ -50,7 +58,7 @@ class OAIObject {
return true; return true;
} }
private : private :
QJsonObject jObj; QJsonObject jObj;
}; };
} }

View File

@ -34,7 +34,6 @@ public:
OAIOrder(); OAIOrder();
OAIOrder(QString json); OAIOrder(QString json);
~OAIOrder() override; ~OAIOrder() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -63,6 +62,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint64 id; qint64 id;
bool m_id_isSet; bool m_id_isSet;
bool m_id_isValid; bool m_id_isValid;

View File

@ -36,7 +36,6 @@ public:
OAIPet(); OAIPet();
OAIPet(QString json); OAIPet(QString json);
~OAIPet() override; ~OAIPet() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -65,6 +64,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint64 id; qint64 id;
bool m_id_isSet; bool m_id_isSet;
bool m_id_isValid; bool m_id_isValid;

View File

@ -33,7 +33,6 @@ public:
OAITag(); OAITag();
OAITag(QString json); OAITag(QString json);
~OAITag() override; ~OAITag() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -50,6 +49,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint64 id; qint64 id;
bool m_id_isSet; bool m_id_isSet;
bool m_id_isValid; bool m_id_isValid;

View File

@ -33,7 +33,6 @@ public:
OAIUser(); OAIUser();
OAIUser(QString json); OAIUser(QString json);
~OAIUser() override; ~OAIUser() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -68,6 +67,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint64 id; qint64 id;
bool m_id_isSet; bool m_id_isSet;
bool m_id_isValid; bool m_id_isValid;

View File

@ -33,7 +33,6 @@ public:
OAIApiResponse(); OAIApiResponse();
OAIApiResponse(QString json); OAIApiResponse(QString json);
~OAIApiResponse() override; ~OAIApiResponse() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -53,6 +52,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint32 code; qint32 code;
bool m_code_isSet; bool m_code_isSet;
bool m_code_isValid; bool m_code_isValid;

View File

@ -33,7 +33,6 @@ public:
OAICategory(); OAICategory();
OAICategory(QString json); OAICategory(QString json);
~OAICategory() override; ~OAICategory() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -50,6 +49,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint64 id; qint64 id;
bool m_id_isSet; bool m_id_isSet;
bool m_id_isValid; bool m_id_isValid;

View File

@ -20,6 +20,14 @@ namespace OpenAPI {
class OAIObject { class OAIObject {
public: public:
OAIObject() {
}
OAIObject(QString jsonString) {
fromJson(jsonString);
}
virtual ~OAIObject(){ virtual ~OAIObject(){
} }
@ -50,7 +58,7 @@ class OAIObject {
return true; return true;
} }
private : private :
QJsonObject jObj; QJsonObject jObj;
}; };
} }

View File

@ -34,7 +34,6 @@ public:
OAIOrder(); OAIOrder();
OAIOrder(QString json); OAIOrder(QString json);
~OAIOrder() override; ~OAIOrder() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -63,6 +62,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint64 id; qint64 id;
bool m_id_isSet; bool m_id_isSet;
bool m_id_isValid; bool m_id_isValid;

View File

@ -36,7 +36,6 @@ public:
OAIPet(); OAIPet();
OAIPet(QString json); OAIPet(QString json);
~OAIPet() override; ~OAIPet() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -65,6 +64,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint64 id; qint64 id;
bool m_id_isSet; bool m_id_isSet;
bool m_id_isValid; bool m_id_isValid;

View File

@ -33,7 +33,6 @@ public:
OAITag(); OAITag();
OAITag(QString json); OAITag(QString json);
~OAITag() override; ~OAITag() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -50,6 +49,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint64 id; qint64 id;
bool m_id_isSet; bool m_id_isSet;
bool m_id_isValid; bool m_id_isValid;

View File

@ -33,7 +33,6 @@ public:
OAIUser(); OAIUser();
OAIUser(QString json); OAIUser(QString json);
~OAIUser() override; ~OAIUser() override;
void init();
QString asJson () const override; QString asJson () const override;
QJsonObject asJsonObject() const override; QJsonObject asJsonObject() const override;
@ -68,6 +67,7 @@ public:
virtual bool isValid() const override; virtual bool isValid() const override;
private: private:
void init();
qint64 id; qint64 id;
bool m_id_isSet; bool m_id_isSet;
bool m_id_isValid; bool m_id_isValid;