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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
View File

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

10
modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache
View File

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

2
modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache
View File

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

10
modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache
View File

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

2
samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
View File

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

2
samples/client/petstore/cpp-qt5/client/OAICategory.h
View File

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

10
samples/client/petstore/cpp-qt5/client/OAIObject.h
View File

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

2
samples/client/petstore/cpp-qt5/client/OAIOrder.h
View File

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

2
samples/client/petstore/cpp-qt5/client/OAIPet.h
View File

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

2
samples/client/petstore/cpp-qt5/client/OAITag.h
View File

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

2
samples/client/petstore/cpp-qt5/client/OAIUser.h
View File

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

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h
View File

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

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h
View File

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

10
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h
View File

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

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h
View File

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

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h
View File

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

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h
View File

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

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h
View File

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