Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328 2016-10-22 23:08:36 +08:00
commit af16601654
44 changed files with 522 additions and 498 deletions

View File

@ -3171,7 +3171,12 @@ public class DefaultCodegen {
buf.append(StringUtils.capitalize(part)); buf.append(StringUtils.capitalize(part));
} }
} }
return buf.toString().replaceAll("[^a-zA-Z ]", ""); String returnTag = buf.toString().replaceAll("[^a-zA-Z0-9_]", "");
if (returnTag.matches("\\d.*")) {
return "_" + returnTag;
} else {
return returnTag;
}
} }
/** /**

View File

@ -134,7 +134,7 @@ namespace {{packageName}}.{{packageContext}}.Utils
private static IDictionary<Type, Func<Parameter, object>> CreateParsers() private static IDictionary<Type, Func<Parameter, object>> CreateParsers()
{ {
var parsers = ImmutableDictionary.CreateBuilder<Type, Func<Parameter, object>>(); var parsers = ImmutableDictionary.CreateBuilder<Type, Func<Parameter, object>>();
parsers.Put(typeof(string), value => value); parsers.Put(typeof(string), value => value.Value);
parsers.Put(typeof(bool), SafeParse(bool.Parse)); parsers.Put(typeof(bool), SafeParse(bool.Parse));
parsers.Put(typeof(bool?), SafeParse(bool.Parse)); parsers.Put(typeof(bool?), SafeParse(bool.Parse));
parsers.Put(typeof(byte), SafeParse(byte.Parse)); parsers.Put(typeof(byte), SafeParse(byte.Parse));

View File

@ -37,7 +37,7 @@ void HttpRequestInput::add_file(QString variable_name, QString local_filename, Q
HttpRequestWorker::HttpRequestWorker(QObject *parent) HttpRequestWorker::HttpRequestWorker(QObject *parent)
: QObject(parent), manager(NULL) : QObject(parent), manager(nullptr)
{ {
qsrand(QDateTime::currentDateTime().toTime_t()); qsrand(QDateTime::currentDateTime().toTime_t());
@ -181,8 +181,8 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
// ensure necessary variables are available // ensure necessary variables are available
if ( if (
file_info->local_filename == NULL || file_info->local_filename.isEmpty() file_info->local_filename == nullptr || file_info->local_filename.isEmpty()
|| file_info->variable_name == NULL || file_info->variable_name.isEmpty() || file_info->variable_name == nullptr || file_info->variable_name.isEmpty()
|| !fi.exists() || !fi.isFile() || !fi.isReadable() || !fi.exists() || !fi.isFile() || !fi.isReadable()
) { ) {
// silent abort for the current file // silent abort for the current file
@ -196,7 +196,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
} }
// ensure filename for the request // ensure filename for the request
if (file_info->request_filename == NULL || file_info->request_filename.isEmpty()) { if (file_info->request_filename == nullptr || file_info->request_filename.isEmpty()) {
file_info->request_filename = fi.fileName(); file_info->request_filename = fi.fileName();
if (file_info->request_filename.isEmpty()) { if (file_info->request_filename.isEmpty()) {
file_info->request_filename = "file"; file_info->request_filename = "file";
@ -215,7 +215,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
)); ));
request_content.append(new_line); request_content.append(new_line);
if (file_info->mime_type != NULL && !file_info->mime_type.isEmpty()) { if (file_info->mime_type != nullptr && !file_info->mime_type.isEmpty()) {
request_content.append("Content-Type: "); request_content.append("Content-Type: ");
request_content.append(file_info->mime_type); request_content.append(file_info->mime_type);
request_content.append(new_line); request_content.append(new_line);

View File

@ -87,7 +87,7 @@ void
HttpRequestWorker *worker = new HttpRequestWorker(); HttpRequestWorker *worker = new HttpRequestWorker();
HttpRequestInput input(fullPath, "{{httpMethod}}"); HttpRequestInput input(fullPath, "{{httpMethod}}");
{{#formParams}}if ({{paramName}} != NULL) { {{#formParams}}if ({{paramName}} != nullptr) {
{{^isFile}}input.add_var("{{baseName}}", *{{paramName}});{{/isFile}}{{#isFile}}input.add_file("{{baseName}}", (*{{paramName}}).local_filename, (*{{paramName}}).request_filename, (*{{paramName}}).mime_type);{{/isFile}} {{^isFile}}input.add_var("{{baseName}}", *{{paramName}});{{/isFile}}{{#isFile}}input.add_file("{{baseName}}", (*{{paramName}}).local_filename, (*{{paramName}}).request_filename, (*{{paramName}}).mime_type);{{/isFile}}
} }
{{/formParams}} {{/formParams}}

View File

@ -10,7 +10,7 @@ namespace Swagger {
void void
setValue(void* value, QJsonValue obj, QString type, QString complexType) { setValue(void* value, QJsonValue obj, QString type, QString complexType) {
if(value == NULL) { if(value == nullptr) {
// can't set value with a null pointer // can't set value with a null pointer
return; return;
} }
@ -37,7 +37,7 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
else if (QStringLiteral("QString").compare(type) == 0) { else if (QStringLiteral("QString").compare(type) == 0) {
QString **val = static_cast<QString**>(value); QString **val = static_cast<QString**>(value);
if(val != NULL) { if(val != nullptr) {
if(!obj.isNull()) { if(!obj.isNull()) {
// create a new value and return // create a new value and return
delete *val; delete *val;
@ -45,19 +45,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
return; return;
} }
else { else {
// set target to NULL // set target to nullptr
delete *val; delete *val;
*val = NULL; *val = nullptr;
} }
} }
else { else {
qDebug() << "Can't set value because the target pointer is NULL"; qDebug() << "Can't set value because the target pointer is nullptr";
} }
} }
else if (QStringLiteral("QDateTime").compare(type) == 0) { else if (QStringLiteral("QDateTime").compare(type) == 0) {
QDateTime **val = static_cast<QDateTime**>(value); QDateTime **val = static_cast<QDateTime**>(value);
if(val != NULL) { if(val != nullptr) {
if(!obj.isNull()) { if(!obj.isNull()) {
// create a new value and return // create a new value and return
delete *val; delete *val;
@ -65,19 +65,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
return; return;
} }
else { else {
// set target to NULL // set target to nullptr
delete *val; delete *val;
*val = NULL; *val = nullptr;
} }
} }
else { else {
qDebug() << "Can't set value because the target pointer is NULL"; qDebug() << "Can't set value because the target pointer is nullptr";
} }
} }
else if (QStringLiteral("QDate").compare(type) == 0) { else if (QStringLiteral("QDate").compare(type) == 0) {
QDate **val = static_cast<QDate**>(value); QDate **val = static_cast<QDate**>(value);
if(val != NULL) { if(val != nullptr) {
if(!obj.isNull()) { if(!obj.isNull()) {
// create a new value and return // create a new value and return
delete *val; delete *val;
@ -85,19 +85,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
return; return;
} }
else { else {
// set target to NULL // set target to nullptr
delete *val; delete *val;
*val = NULL; *val = nullptr;
} }
} }
else { else {
qDebug() << "Can't set value because the target pointer is NULL"; qDebug() << "Can't set value because the target pointer is nullptr";
} }
} }
else if (QStringLiteral("QByteArray").compare(type) == 0) { else if (QStringLiteral("QByteArray").compare(type) == 0) {
QByteArray **val = static_cast<QByteArray**>(value); QByteArray **val = static_cast<QByteArray**>(value);
if(val != NULL) { if(val != nullptr) {
if(!obj.isNull()) { if(!obj.isNull()) {
// create a new value and return // create a new value and return
delete *val; delete *val;
@ -106,20 +106,20 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
return; return;
} }
else { else {
// set target to NULL // set target to nullptr
delete *val; delete *val;
*val = NULL; *val = nullptr;
} }
} }
else { else {
qDebug() << "Can't set value because the target pointer is NULL"; qDebug() << "Can't set value because the target pointer is nullptr";
} }
} }
else if(type.startsWith("SWG") && obj.isObject()) { else if(type.startsWith("SWG") && obj.isObject()) {
// complex type // complex type
QJsonObject jsonObj = obj.toObject(); QJsonObject jsonObj = obj.toObject();
SWGObject * so = (SWGObject*)Swagger::create(type); SWGObject * so = (SWGObject*)Swagger::create(type);
if(so != NULL) { if(so != nullptr) {
so->fromJsonObject(jsonObj); so->fromJsonObject(jsonObj);
SWGObject **val = static_cast<SWGObject**>(value); SWGObject **val = static_cast<SWGObject**>(value);
delete *val; delete *val;
@ -167,19 +167,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
output->append((void*)&val); output->append((void*)&val);
} }
else if(QStringLiteral("QString").compare(complexType) == 0) { else if(QStringLiteral("QString").compare(complexType) == 0) {
QString val; QString * val = new QString();
setValue(&val, jval, QStringLiteral("QString"), QStringLiteral("")); setValue(&val, jval, QStringLiteral("QString"), QStringLiteral(""));
output->append((void*)&val); output->append((void*)val);
} }
else if(QStringLiteral("QDate").compare(complexType) == 0) { else if(QStringLiteral("QDate").compare(complexType) == 0) {
QDate val; QDate * val = new QDate();
setValue(&val, jval, QStringLiteral("QDate"), QStringLiteral("")); setValue(&val, jval, QStringLiteral("QDate"), QStringLiteral(""));
output->append((void*)&val); output->append((void*)val);
} }
else if(QStringLiteral("QDateTime").compare(complexType) == 0) { else if(QStringLiteral("QDateTime").compare(complexType) == 0) {
QDateTime val; QDateTime * val = new QDateTime();
setValue(&val, jval, QStringLiteral("QDateTime"), QStringLiteral("")); setValue(&val, jval, QStringLiteral("QDateTime"), QStringLiteral(""));
output->append((void*)&val); output->append((void*)val);
} }
} }
} }
@ -191,14 +191,14 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
void void
toJsonValue(QString name, void* value, QJsonObject* output, QString type) { toJsonValue(QString name, void* value, QJsonObject* output, QString type) {
if(value == NULL) { if(value == nullptr) {
return; return;
} }
if(type.startsWith("SWG")) { if(type.startsWith("SWG")) {
SWGObject *swgObject = reinterpret_cast<SWGObject *>(value); SWGObject *swgObject = reinterpret_cast<SWGObject *>(value);
if(swgObject != NULL) { if(swgObject != nullptr) {
QJsonObject* o = (*swgObject).asJsonObject(); QJsonObject* o = (*swgObject).asJsonObject();
if(name != NULL) { if(name != nullptr) {
output->insert(name, *o); output->insert(name, *o);
delete o; delete o;
} }
@ -253,7 +253,7 @@ toJsonArray(QList<void*>* value, QJsonArray* output, QString innerName, QString
foreach(void* obj, *value) { foreach(void* obj, *value) {
QJsonObject element; QJsonObject element;
toJsonValue(NULL, obj, &element, innerType); toJsonValue(nullptr, obj, &element, innerType);
output->append(element); output->append(element);
} }
} }

View File

@ -27,13 +27,15 @@ namespace Swagger {
void void
{{classname}}::init() { {{classname}}::init() {
{{#vars}}{{name}} = {{{defaultValue}}}; {{#vars}}
{{name}} = {{{defaultValue}}};
{{/vars}} {{/vars}}
} }
void void
{{classname}}::cleanup() { {{classname}}::cleanup() {
{{#vars}}{{#complexType}}if({{name}} != NULL) { {{#vars}}{{#complexType}}
if({{name}} != nullptr) {
{{#isContainer}}QList<{{complexType}}*>* arr = {{name}}; {{#isContainer}}QList<{{complexType}}*>* arr = {{name}};
foreach({{complexType}}* o, *arr) { foreach({{complexType}}* o, *arr) {
delete o; delete o;
@ -54,7 +56,12 @@ void
void void
{{classname}}::fromJsonObject(QJsonObject &pJson) { {{classname}}::fromJsonObject(QJsonObject &pJson) {
{{#vars}}setValue(&{{name}}, pJson["{{name}}"], "{{baseType}}", "{{complexType}}"); {{#vars}}
{{^isContainer}}::Swagger::setValue(&{{name}}, pJson["{{name}}"], "{{baseType}}", "{{complexType}}");{{/isContainer}}
{{#isContainer}}
{{#complexType}}::Swagger::setValue(&{{name}}, pJson["{{name}}"], "{{baseType}}", "{{complexType}}");{{/complexType}}
{{^complexType}}::Swagger::setValue(&{{name}}, pJson["{{name}}"], "{{baseType}}", "{{items.baseType}}");{{/complexType}}
{{/isContainer}}
{{/vars}} {{/vars}}
} }
@ -71,21 +78,18 @@ QString
QJsonObject* QJsonObject*
{{classname}}::asJsonObject() { {{classname}}::asJsonObject() {
QJsonObject* obj = new QJsonObject(); QJsonObject* obj = new QJsonObject();
{{#vars}}{{#complexType}} {{#vars}}{{#complexType}}{{^isContainer}}{{#complexType}}
{{^isContainer}}{{#complexType}} toJsonValue(QString("{{name}}"), {{name}}, obj, QString("{{complexType}}"));{{/complexType}}{{^complexType}}
toJsonValue(QString("{{name}}"), {{name}}, obj, QString("{{complexType}}")); if({{name}} != nullptr && *{{name}} != nullptr) {
{{/complexType}}{{^complexType}}
else if({{name}} != NULL && *{{name}} != NULL) {
obj->insert("{{name}}", QJsonValue(*{{name}})); obj->insert("{{name}}", QJsonValue(*{{name}}));
}{{/complexType}} }{{/complexType}}{{/isContainer}}{{#isContainer}}
{{/isContainer}}{{#isContainer}}
QList<{{complexType}}*>* {{name}}List = {{name}};
QJsonArray {{name}}JsonArray; QJsonArray {{name}}JsonArray;
toJsonArray((QList<void*>*){{name}}, &{{name}}JsonArray, "{{name}}", "{{complexType}}"); toJsonArray((QList<void*>*){{name}}, &{{name}}JsonArray, "{{name}}", "{{complexType}}");
obj->insert("{{name}}", {{name}}JsonArray);{{/isContainer}}{{/complexType}}{{^complexType}}{{^isContainer}}
obj->insert("{{name}}", {{name}}JsonArray); obj->insert("{{name}}", QJsonValue({{name}}));{{/isContainer}}{{#isContainer}}
{{/isContainer}} QJsonArray {{name}}JsonArray;
{{/complexType}}{{^complexType}}obj->insert("{{name}}", QJsonValue({{name}}));{{/complexType}} toJsonArray((QList<void*>*){{name}}, &{{name}}JsonArray, "{{name}}", "{{items.baseType}}");
obj->insert("{{name}}", {{name}}JsonArray);{{/isContainer}}{{/complexType}}
{{/vars}} {{/vars}}
return obj; return obj;

View File

@ -32,12 +32,15 @@ public:
void fromJsonObject(QJsonObject &json); void fromJsonObject(QJsonObject &json);
{{classname}}* fromJson(QString &jsonString); {{classname}}* fromJson(QString &jsonString);
{{#vars}}{{{datatype}}} {{getter}}(); {{#vars}}
{{{datatype}}} {{getter}}();
void {{setter}}({{{datatype}}} {{name}}); void {{setter}}({{{datatype}}} {{name}});
{{/vars}} {{/vars}}
private: private:
{{#vars}}{{{datatype}}} {{name}}; {{#vars}}
{{{datatype}}} {{name}};
{{/vars}} {{/vars}}
}; };

View File

@ -11,19 +11,19 @@ namespace Swagger {
return new {{classname}}(); return new {{classname}}();
} }
{{/model}}{{/models}} {{/model}}{{/models}}
return NULL; return nullptr;
} }
inline void* create(QString json, QString type) { inline void* create(QString json, QString type) {
void* val = create(type); void* val = create(type);
if(val != NULL) { if(val != nullptr) {
SWGObject* obj = static_cast<SWGObject*>(val); SWGObject* obj = static_cast<SWGObject*>(val);
return obj->fromJson(json); return obj->fromJson(json);
} }
if(type.startsWith("QString")) { if(type.startsWith("QString")) {
return new QString(); return new QString();
} }
return NULL; return nullptr;
} }
} /* namespace Swagger */ } /* namespace Swagger */

View File

@ -7,12 +7,12 @@
class {{prefix}}Object { class {{prefix}}Object {
public: public:
virtual QJsonObject* asJsonObject() { virtual QJsonObject* asJsonObject() {
return NULL; return nullptr;
} }
virtual ~SWGObject() {} virtual ~SWGObject() {}
virtual SWGObject* fromJson(QString &jsonString) { virtual SWGObject* fromJson(QString &jsonString) {
Q_UNUSED(jsonString); Q_UNUSED(jsonString);
return NULL; return nullptr;
} }
virtual void fromJsonObject(QJsonObject &json) { virtual void fromJsonObject(QJsonObject &json) {
Q_UNUSED(json); Q_UNUSED(json);

View File

@ -20,9 +20,5 @@ oauth2 server [undertow-server-oauth2](https://github.com/networknt/undertow-ser
Bearer eyJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJ1cm46Y29tOm5ldHdvcmtudDpvYXV0aDI6djEiLCJhdWQiOiJ1cm46Y29tLm5ldHdvcmtudCIsImV4cCI6MTc4ODEzMjczNSwianRpIjoiNWtyM2ZWOHJaelBZNEJrSnNYZzFpQSIsImlhdCI6MTQ3Mjc3MjczNSwibmJmIjoxNDcyNzcyNjE1LCJ2ZXJzaW9uIjoiMS4wIiwidXNlcl9pZCI6InN0ZXZlIiwidXNlcl90eXBlIjoiRU1QTE9ZRUUiLCJjbGllbnRfaWQiOiJkZGNhZjBiYS0xMTMxLTIyMzItMzMxMy1kNmYyNzUzZjI1ZGMiLCJzY29wZSI6WyJhcGkuciIsImFwaS53Il19.gteJiy1uao8HLeWRljpZxHWUgQfofwmnFP-zv3EPUyXjyCOy3xclnfeTnTE39j8PgBwdFASPcDLLk1YfZJbsU6pLlmYXLtdpHDBsVmIRuch6LFPCVQ3JdqSQVci59OhSK0bBThGWqCD3UzDI_OnX4IVCAahcT9Bu94m5u_H_JNmwDf1XaP3Lt4I34buYMuRD9stchsnZi-tuIRkL13FARm1XA9aPZUMUXFdedBWDXo1zMREQ_qCJXOpaZDJM9Im0rIkq9wTEVU00pbRp_Vcdya3dfkFteBMHiwFVt6VNQaco5BXURDAIzXidwQxNEbX1ek03wra8AIani65ZK7fy_w Bearer eyJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJ1cm46Y29tOm5ldHdvcmtudDpvYXV0aDI6djEiLCJhdWQiOiJ1cm46Y29tLm5ldHdvcmtudCIsImV4cCI6MTc4ODEzMjczNSwianRpIjoiNWtyM2ZWOHJaelBZNEJrSnNYZzFpQSIsImlhdCI6MTQ3Mjc3MjczNSwibmJmIjoxNDcyNzcyNjE1LCJ2ZXJzaW9uIjoiMS4wIiwidXNlcl9pZCI6InN0ZXZlIiwidXNlcl90eXBlIjoiRU1QTE9ZRUUiLCJjbGllbnRfaWQiOiJkZGNhZjBiYS0xMTMxLTIyMzItMzMxMy1kNmYyNzUzZjI1ZGMiLCJzY29wZSI6WyJhcGkuciIsImFwaS53Il19.gteJiy1uao8HLeWRljpZxHWUgQfofwmnFP-zv3EPUyXjyCOy3xclnfeTnTE39j8PgBwdFASPcDLLk1YfZJbsU6pLlmYXLtdpHDBsVmIRuch6LFPCVQ3JdqSQVci59OhSK0bBThGWqCD3UzDI_OnX4IVCAahcT9Bu94m5u_H_JNmwDf1XaP3Lt4I34buYMuRD9stchsnZi-tuIRkL13FARm1XA9aPZUMUXFdedBWDXo1zMREQ_qCJXOpaZDJM9Im0rIkq9wTEVU00pbRp_Vcdya3dfkFteBMHiwFVt6VNQaco5BXURDAIzXidwQxNEbX1ek03wra8AIani65ZK7fy_w
``` ```
Postman is the best tool to test REST APIs
Add "Authorization" header with value as above token and a dummy message will return from the generated stub. Add "Authorization" header with value as above token and a dummy message will return from the generated stub.

View File

@ -13,6 +13,17 @@ import java.util.List;
public class CodegenTest { public class CodegenTest {
@Test(description = "test sanitizeTag")
public void sanitizeTagTest() {
final DefaultCodegen codegen = new DefaultCodegen();
Assert.assertEquals(codegen.sanitizeTag("foo"), "Foo");
Assert.assertEquals(codegen.sanitizeTag("foo bar"), "FooBar");
Assert.assertEquals(codegen.sanitizeTag("foo_bar"), "Foo_bar");
Assert.assertEquals(codegen.sanitizeTag("foo1 bar2"), "Foo1Bar2");
Assert.assertEquals(codegen.sanitizeTag("foo bar 1"), "FooBar1");
Assert.assertEquals(codegen.sanitizeTag("1foo"), "_1foo");
}
@Test(description = "read a file upload param from a 2.0 spec") @Test(description = "read a file upload param from a 2.0 spec")
public void fileUploadParamTest() { public void fileUploadParamTest() {
final Swagger model = parseAndPrepareSwagger("src/test/resources/2_0/petstore.json"); final Swagger model = parseAndPrepareSwagger("src/test/resources/2_0/petstore.json");

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.1.0, 2016-10-19T16:38:58. --> <!-- Written by QtCreator 4.1.0, 2016-10-22T23:06:06. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

View File

@ -23,7 +23,7 @@
*/ */
#include "ApiResponse.h" #include "SWGApiResponse.h"
#include "SWGHelpers.h" #include "SWGHelpers.h"
@ -35,39 +35,41 @@
namespace Swagger { namespace Swagger {
ApiResponse::ApiResponse(QString* json) { SWGApiResponse::SWGApiResponse(QString* json) {
init(); init();
this->fromJson(*json); this->fromJson(*json);
} }
ApiResponse::ApiResponse() { SWGApiResponse::SWGApiResponse() {
init(); init();
} }
ApiResponse::~ApiResponse() { SWGApiResponse::~SWGApiResponse() {
this->cleanup(); this->cleanup();
} }
void void
ApiResponse::init() { SWGApiResponse::init() {
code = 0; code = 0;
type = new QString(""); type = new QString("");
message = new QString(""); message = new QString("");
} }
void void
ApiResponse::cleanup() { SWGApiResponse::cleanup() {
if(type != NULL) {
if(type != nullptr) {
delete type; delete type;
} }
if(message != NULL) {
if(message != nullptr) {
delete message; delete message;
} }
} }
ApiResponse* SWGApiResponse*
ApiResponse::fromJson(QString &json) { SWGApiResponse::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str()); QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object(); QJsonObject jsonObject = doc.object();
@ -76,14 +78,14 @@ ApiResponse::fromJson(QString &json) {
} }
void void
ApiResponse::fromJsonObject(QJsonObject &pJson) { SWGApiResponse::fromJsonObject(QJsonObject &pJson) {
setValue(&code, pJson["code"], "qint32", ""); ::Swagger::setValue(&code, pJson["code"], "qint32", "");
setValue(&type, pJson["type"], "QString", "QString"); ::Swagger::setValue(&type, pJson["type"], "QString", "QString");
setValue(&message, pJson["message"], "QString", "QString"); ::Swagger::setValue(&message, pJson["message"], "QString", "QString");
} }
QString QString
ApiResponse::asJson () SWGApiResponse::asJson ()
{ {
QJsonObject* obj = this->asJsonObject(); QJsonObject* obj = this->asJsonObject();
@ -93,47 +95,42 @@ ApiResponse::asJson ()
} }
QJsonObject* QJsonObject*
ApiResponse::asJsonObject() { SWGApiResponse::asJsonObject() {
QJsonObject* obj = new QJsonObject(); QJsonObject* obj = new QJsonObject();
obj->insert("code", QJsonValue(code));
obj->insert("code", QJsonValue(code));
toJsonValue(QString("type"), type, obj, QString("QString")); toJsonValue(QString("type"), type, obj, QString("QString"));
toJsonValue(QString("message"), message, obj, QString("QString")); toJsonValue(QString("message"), message, obj, QString("QString"));
return obj; return obj;
} }
qint32 qint32
ApiResponse::getCode() { SWGApiResponse::getCode() {
return code; return code;
} }
void void
ApiResponse::setCode(qint32 code) { SWGApiResponse::setCode(qint32 code) {
this->code = code; this->code = code;
} }
QString* QString*
ApiResponse::getType() { SWGApiResponse::getType() {
return type; return type;
} }
void void
ApiResponse::setType(QString* type) { SWGApiResponse::setType(QString* type) {
this->type = type; this->type = type;
} }
QString* QString*
ApiResponse::getMessage() { SWGApiResponse::getMessage() {
return message; return message;
} }
void void
ApiResponse::setMessage(QString* message) { SWGApiResponse::setMessage(QString* message) {
this->message = message; this->message = message;
} }

View File

@ -56,11 +56,14 @@ public:
qint32 getCode(); qint32 getCode();
void setCode(qint32 code); void setCode(qint32 code);
QString* getType(); QString* getType();
void setType(QString* type); void setType(QString* type);
QString* getMessage(); QString* getMessage();
void setMessage(QString* message); void setMessage(QString* message);
private: private:
qint32 code; qint32 code;
QString* type; QString* type;

View File

@ -23,7 +23,7 @@
*/ */
#include "Category.h" #include "SWGCategory.h"
#include "SWGHelpers.h" #include "SWGHelpers.h"
@ -35,35 +35,36 @@
namespace Swagger { namespace Swagger {
Category::Category(QString* json) { SWGCategory::SWGCategory(QString* json) {
init(); init();
this->fromJson(*json); this->fromJson(*json);
} }
Category::Category() { SWGCategory::SWGCategory() {
init(); init();
} }
Category::~Category() { SWGCategory::~SWGCategory() {
this->cleanup(); this->cleanup();
} }
void void
Category::init() { SWGCategory::init() {
id = 0L; id = 0L;
name = new QString(""); name = new QString("");
} }
void void
Category::cleanup() { SWGCategory::cleanup() {
if(name != NULL) {
if(name != nullptr) {
delete name; delete name;
} }
} }
Category* SWGCategory*
Category::fromJson(QString &json) { SWGCategory::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str()); QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object(); QJsonObject jsonObject = doc.object();
@ -72,13 +73,13 @@ Category::fromJson(QString &json) {
} }
void void
Category::fromJsonObject(QJsonObject &pJson) { SWGCategory::fromJsonObject(QJsonObject &pJson) {
setValue(&id, pJson["id"], "qint64", ""); ::Swagger::setValue(&id, pJson["id"], "qint64", "");
setValue(&name, pJson["name"], "QString", "QString"); ::Swagger::setValue(&name, pJson["name"], "QString", "QString");
} }
QString QString
Category::asJson () SWGCategory::asJson ()
{ {
QJsonObject* obj = this->asJsonObject(); QJsonObject* obj = this->asJsonObject();
@ -88,33 +89,31 @@ Category::asJson ()
} }
QJsonObject* QJsonObject*
Category::asJsonObject() { SWGCategory::asJsonObject() {
QJsonObject* obj = new QJsonObject(); QJsonObject* obj = new QJsonObject();
obj->insert("id", QJsonValue(id)); obj->insert("id", QJsonValue(id));
toJsonValue(QString("name"), name, obj, QString("QString")); toJsonValue(QString("name"), name, obj, QString("QString"));
return obj; return obj;
} }
qint64 qint64
Category::getId() { SWGCategory::getId() {
return id; return id;
} }
void void
Category::setId(qint64 id) { SWGCategory::setId(qint64 id) {
this->id = id; this->id = id;
} }
QString* QString*
Category::getName() { SWGCategory::getName() {
return name; return name;
} }
void void
Category::setName(QString* name) { SWGCategory::setName(QString* name) {
this->name = name; this->name = name;
} }

View File

@ -56,9 +56,11 @@ public:
qint64 getId(); qint64 getId();
void setId(qint64 id); void setId(qint64 id);
QString* getName(); QString* getName();
void setName(QString* name); void setName(QString* name);
private: private:
qint64 id; qint64 id;
QString* name; QString* name;

View File

@ -23,7 +23,7 @@
*/ */
#include "Order.h" #include "SWGOrder.h"
#include "SWGHelpers.h" #include "SWGHelpers.h"
@ -35,45 +35,47 @@
namespace Swagger { namespace Swagger {
Order::Order(QString* json) { SWGOrder::SWGOrder(QString* json) {
init(); init();
this->fromJson(*json); this->fromJson(*json);
} }
Order::Order() { SWGOrder::SWGOrder() {
init(); init();
} }
Order::~Order() { SWGOrder::~SWGOrder() {
this->cleanup(); this->cleanup();
} }
void void
Order::init() { SWGOrder::init() {
id = 0L; id = 0L;
petId = 0L; pet_id = 0L;
quantity = 0; quantity = 0;
shipDate = NULL; ship_date = NULL;
status = new QString(""); status = new QString("");
complete = false; complete = false;
} }
void void
Order::cleanup() { SWGOrder::cleanup() {
if(shipDate != NULL) {
delete shipDate; if(ship_date != nullptr) {
delete ship_date;
} }
if(status != NULL) {
if(status != nullptr) {
delete status; delete status;
} }
} }
Order* SWGOrder*
Order::fromJson(QString &json) { SWGOrder::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str()); QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object(); QJsonObject jsonObject = doc.object();
@ -82,17 +84,17 @@ Order::fromJson(QString &json) {
} }
void void
Order::fromJsonObject(QJsonObject &pJson) { SWGOrder::fromJsonObject(QJsonObject &pJson) {
setValue(&id, pJson["id"], "qint64", ""); ::Swagger::setValue(&id, pJson["id"], "qint64", "");
setValue(&petId, pJson["petId"], "qint64", ""); ::Swagger::setValue(&pet_id, pJson["pet_id"], "qint64", "");
setValue(&quantity, pJson["quantity"], "qint32", ""); ::Swagger::setValue(&quantity, pJson["quantity"], "qint32", "");
setValue(&shipDate, pJson["shipDate"], "QDateTime", "QDateTime"); ::Swagger::setValue(&ship_date, pJson["ship_date"], "QDateTime", "QDateTime");
setValue(&status, pJson["status"], "QString", "QString"); ::Swagger::setValue(&status, pJson["status"], "QString", "QString");
setValue(&complete, pJson["complete"], "bool", ""); ::Swagger::setValue(&complete, pJson["complete"], "bool", "");
} }
QString QString
Order::asJson () SWGOrder::asJson ()
{ {
QJsonObject* obj = this->asJsonObject(); QJsonObject* obj = this->asJsonObject();
@ -102,77 +104,75 @@ Order::asJson ()
} }
QJsonObject* QJsonObject*
Order::asJsonObject() { SWGOrder::asJsonObject() {
QJsonObject* obj = new QJsonObject(); QJsonObject* obj = new QJsonObject();
obj->insert("id", QJsonValue(id)); obj->insert("id", QJsonValue(id));
obj->insert("petId", QJsonValue(petId));
obj->insert("pet_id", QJsonValue(pet_id));
obj->insert("quantity", QJsonValue(quantity)); obj->insert("quantity", QJsonValue(quantity));
toJsonValue(QString("ship_date"), ship_date, obj, QString("QDateTime"));
toJsonValue(QString("shipDate"), shipDate, obj, QString("QDateTime"));
toJsonValue(QString("status"), status, obj, QString("QString")); toJsonValue(QString("status"), status, obj, QString("QString"));
obj->insert("complete", QJsonValue(complete)); obj->insert("complete", QJsonValue(complete));
return obj; return obj;
} }
qint64 qint64
Order::getId() { SWGOrder::getId() {
return id; return id;
} }
void void
Order::setId(qint64 id) { SWGOrder::setId(qint64 id) {
this->id = id; this->id = id;
} }
qint64 qint64
Order::getPetId() { SWGOrder::getPetId() {
return petId; return pet_id;
} }
void void
Order::setPetId(qint64 petId) { SWGOrder::setPetId(qint64 pet_id) {
this->petId = petId; this->pet_id = pet_id;
} }
qint32 qint32
Order::getQuantity() { SWGOrder::getQuantity() {
return quantity; return quantity;
} }
void void
Order::setQuantity(qint32 quantity) { SWGOrder::setQuantity(qint32 quantity) {
this->quantity = quantity; this->quantity = quantity;
} }
QDateTime* QDateTime*
Order::getShipDate() { SWGOrder::getShipDate() {
return shipDate; return ship_date;
} }
void void
Order::setShipDate(QDateTime* shipDate) { SWGOrder::setShipDate(QDateTime* ship_date) {
this->shipDate = shipDate; this->ship_date = ship_date;
} }
QString* QString*
Order::getStatus() { SWGOrder::getStatus() {
return status; return status;
} }
void void
Order::setStatus(QString* status) { SWGOrder::setStatus(QString* status) {
this->status = status; this->status = status;
} }
bool bool
Order::getComplete() { SWGOrder::getComplete() {
return complete; return complete;
} }
void void
Order::setComplete(bool complete) { SWGOrder::setComplete(bool complete) {
this->complete = complete; this->complete = complete;
} }

View File

@ -23,13 +23,13 @@
*/ */
/* /*
* Order.h * SWGOrder.h
* *
* An order for a pets from the pet store * An order for a pets from the pet store
*/ */
#ifndef Order_H_ #ifndef SWGOrder_H_
#define Order_H_ #define SWGOrder_H_
#include <QJsonObject> #include <QJsonObject>
@ -42,41 +42,47 @@
namespace Swagger { namespace Swagger {
class Order: public SWGObject { class SWGOrder: public SWGObject {
public: public:
Order(); SWGOrder();
Order(QString* json); SWGOrder(QString* json);
virtual ~Order(); virtual ~SWGOrder();
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); QString asJson ();
QJsonObject* asJsonObject(); QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json); void fromJsonObject(QJsonObject &json);
Order* fromJson(QString &jsonString); SWGOrder* fromJson(QString &jsonString);
qint64 getId(); qint64 getId();
void setId(qint64 id); void setId(qint64 id);
qint64 getPetId(); qint64 getPetId();
void setPetId(qint64 petId); void setPetId(qint64 pet_id);
qint32 getQuantity(); qint32 getQuantity();
void setQuantity(qint32 quantity); void setQuantity(qint32 quantity);
QDateTime* getShipDate(); QDateTime* getShipDate();
void setShipDate(QDateTime* shipDate); void setShipDate(QDateTime* ship_date);
QString* getStatus(); QString* getStatus();
void setStatus(QString* status); void setStatus(QString* status);
bool getComplete(); bool getComplete();
void setComplete(bool complete); void setComplete(bool complete);
private: private:
qint64 id; qint64 id;
qint64 petId; qint64 pet_id;
qint32 quantity; qint32 quantity;
QDateTime* shipDate; QDateTime* ship_date;
QString* status; QString* status;
bool complete; bool complete;
}; };
} /* namespace Swagger */ } /* namespace Swagger */
#endif /* Order_H_ */ #endif /* SWGOrder_H_ */

View File

@ -23,7 +23,7 @@
*/ */
#include "Pet.h" #include "SWGPet.h"
#include "SWGHelpers.h" #include "SWGHelpers.h"
@ -35,59 +35,64 @@
namespace Swagger { namespace Swagger {
Pet::Pet(QString* json) { SWGPet::SWGPet(QString* json) {
init(); init();
this->fromJson(*json); this->fromJson(*json);
} }
Pet::Pet() { SWGPet::SWGPet() {
init(); init();
} }
Pet::~Pet() { SWGPet::~SWGPet() {
this->cleanup(); this->cleanup();
} }
void void
Pet::init() { SWGPet::init() {
id = 0L; id = 0L;
category = new Category(); category = new SWGCategory();
name = new QString(""); name = new QString("");
photoUrls = new QList<QString*>(); photo_urls = new QList<QString*>();
tags = new QList<Tag*>(); tags = new QList<SWGTag*>();
status = new QString(""); status = new QString("");
} }
void void
Pet::cleanup() { SWGPet::cleanup() {
if(category != NULL) {
if(category != nullptr) {
delete category; delete category;
} }
if(name != NULL) {
if(name != nullptr) {
delete name; delete name;
} }
if(photoUrls != NULL) {
QList<QString*>* arr = photoUrls; if(photo_urls != nullptr) {
QList<QString*>* arr = photo_urls;
foreach(QString* o, *arr) { foreach(QString* o, *arr) {
delete o; delete o;
} }
delete photoUrls; delete photo_urls;
} }
if(tags != NULL) {
QList<Tag*>* arr = tags; if(tags != nullptr) {
foreach(Tag* o, *arr) { QList<SWGTag*>* arr = tags;
foreach(SWGTag* o, *arr) {
delete o; delete o;
} }
delete tags; delete tags;
} }
if(status != NULL) {
if(status != nullptr) {
delete status; delete status;
} }
} }
Pet* SWGPet*
Pet::fromJson(QString &json) { SWGPet::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str()); QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object(); QJsonObject jsonObject = doc.object();
@ -96,17 +101,21 @@ Pet::fromJson(QString &json) {
} }
void void
Pet::fromJsonObject(QJsonObject &pJson) { SWGPet::fromJsonObject(QJsonObject &pJson) {
setValue(&id, pJson["id"], "qint64", ""); ::Swagger::setValue(&id, pJson["id"], "qint64", "");
setValue(&category, pJson["category"], "Category", "Category"); ::Swagger::setValue(&category, pJson["category"], "SWGCategory", "SWGCategory");
setValue(&name, pJson["name"], "QString", "QString"); ::Swagger::setValue(&name, pJson["name"], "QString", "QString");
setValue(&photoUrls, pJson["photoUrls"], "QList", "QString");
setValue(&tags, pJson["tags"], "QList", "Tag"); ::Swagger::setValue(&photo_urls, pJson["photo_urls"], "QList", "QString");
setValue(&status, pJson["status"], "QString", "QString");
::Swagger::setValue(&tags, pJson["tags"], "QList", "SWGTag");
::Swagger::setValue(&status, pJson["status"], "QString", "QString");
} }
QString QString
Pet::asJson () SWGPet::asJson ()
{ {
QJsonObject* obj = this->asJsonObject(); QJsonObject* obj = this->asJsonObject();
@ -116,95 +125,79 @@ Pet::asJson ()
} }
QJsonObject* QJsonObject*
Pet::asJsonObject() { SWGPet::asJsonObject() {
QJsonObject* obj = new QJsonObject(); QJsonObject* obj = new QJsonObject();
obj->insert("id", QJsonValue(id)); obj->insert("id", QJsonValue(id));
toJsonValue(QString("category"), category, obj, QString("SWGCategory"));
toJsonValue(QString("category"), category, obj, QString("Category"));
toJsonValue(QString("name"), name, obj, QString("QString")); toJsonValue(QString("name"), name, obj, QString("QString"));
QJsonArray photo_urlsJsonArray;
toJsonArray((QList<void*>*)photo_urls, &photo_urlsJsonArray, "photo_urls", "QString");
obj->insert("photo_urls", photo_urlsJsonArray);
QList<QString*>* photoUrlsList = photoUrls;
QJsonArray photoUrlsJsonArray;
toJsonArray((QList<void*>*)photoUrls, &photoUrlsJsonArray, "photoUrls", "QString");
obj->insert("photoUrls", photoUrlsJsonArray);
QList<Tag*>* tagsList = tags;
QJsonArray tagsJsonArray; QJsonArray tagsJsonArray;
toJsonArray((QList<void*>*)tags, &tagsJsonArray, "tags", "Tag"); toJsonArray((QList<void*>*)tags, &tagsJsonArray, "tags", "SWGTag");
obj->insert("tags", tagsJsonArray); obj->insert("tags", tagsJsonArray);
toJsonValue(QString("status"), status, obj, QString("QString")); toJsonValue(QString("status"), status, obj, QString("QString"));
return obj; return obj;
} }
qint64 qint64
Pet::getId() { SWGPet::getId() {
return id; return id;
} }
void void
Pet::setId(qint64 id) { SWGPet::setId(qint64 id) {
this->id = id; this->id = id;
} }
Category* SWGCategory*
Pet::getCategory() { SWGPet::getCategory() {
return category; return category;
} }
void void
Pet::setCategory(Category* category) { SWGPet::setCategory(SWGCategory* category) {
this->category = category; this->category = category;
} }
QString* QString*
Pet::getName() { SWGPet::getName() {
return name; return name;
} }
void void
Pet::setName(QString* name) { SWGPet::setName(QString* name) {
this->name = name; this->name = name;
} }
QList<QString*>* QList<QString*>*
Pet::getPhotoUrls() { SWGPet::getPhotoUrls() {
return photoUrls; return photo_urls;
} }
void void
Pet::setPhotoUrls(QList<QString*>* photoUrls) { SWGPet::setPhotoUrls(QList<QString*>* photo_urls) {
this->photoUrls = photoUrls; this->photo_urls = photo_urls;
} }
QList<Tag*>* QList<SWGTag*>*
Pet::getTags() { SWGPet::getTags() {
return tags; return tags;
} }
void void
Pet::setTags(QList<Tag*>* tags) { SWGPet::setTags(QList<SWGTag*>* tags) {
this->tags = tags; this->tags = tags;
} }
QString* QString*
Pet::getStatus() { SWGPet::getStatus() {
return status; return status;
} }
void void
Pet::setStatus(QString* status) { SWGPet::setStatus(QString* status) {
this->status = status; this->status = status;
} }

View File

@ -23,19 +23,19 @@
*/ */
/* /*
* Pet.h * SWGPet.h
* *
* A pet for sale in the pet store * A pet for sale in the pet store
*/ */
#ifndef Pet_H_ #ifndef SWGPet_H_
#define Pet_H_ #define SWGPet_H_
#include <QJsonObject> #include <QJsonObject>
#include "Category.h" #include "SWGCategory.h"
#include "Tag.h" #include "SWGTag.h"
#include <QList> #include <QList>
#include <QString> #include <QString>
@ -44,41 +44,47 @@
namespace Swagger { namespace Swagger {
class Pet: public SWGObject { class SWGPet: public SWGObject {
public: public:
Pet(); SWGPet();
Pet(QString* json); SWGPet(QString* json);
virtual ~Pet(); virtual ~SWGPet();
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); QString asJson ();
QJsonObject* asJsonObject(); QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json); void fromJsonObject(QJsonObject &json);
Pet* fromJson(QString &jsonString); SWGPet* fromJson(QString &jsonString);
qint64 getId(); qint64 getId();
void setId(qint64 id); void setId(qint64 id);
Category* getCategory();
void setCategory(Category* category); SWGCategory* getCategory();
void setCategory(SWGCategory* category);
QString* getName(); QString* getName();
void setName(QString* name); void setName(QString* name);
QList<QString*>* getPhotoUrls(); QList<QString*>* getPhotoUrls();
void setPhotoUrls(QList<QString*>* photoUrls); void setPhotoUrls(QList<QString*>* photo_urls);
QList<Tag*>* getTags();
void setTags(QList<Tag*>* tags); QList<SWGTag*>* getTags();
void setTags(QList<SWGTag*>* tags);
QString* getStatus(); QString* getStatus();
void setStatus(QString* status); void setStatus(QString* status);
private: private:
qint64 id; qint64 id;
Category* category; SWGCategory* category;
QString* name; QString* name;
QList<QString*>* photoUrls; QList<QString*>* photo_urls;
QList<Tag*>* tags; QList<SWGTag*>* tags;
QString* status; QString* status;
}; };
} /* namespace Swagger */ } /* namespace Swagger */
#endif /* Pet_H_ */ #endif /* SWGPet_H_ */

View File

@ -33,7 +33,7 @@ namespace Swagger {
void void
setValue(void* value, QJsonValue obj, QString type, QString complexType) { setValue(void* value, QJsonValue obj, QString type, QString complexType) {
if(value == NULL) { if(value == nullptr) {
// can't set value with a null pointer // can't set value with a null pointer
return; return;
} }
@ -60,7 +60,7 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
else if (QStringLiteral("QString").compare(type) == 0) { else if (QStringLiteral("QString").compare(type) == 0) {
QString **val = static_cast<QString**>(value); QString **val = static_cast<QString**>(value);
if(val != NULL) { if(val != nullptr) {
if(!obj.isNull()) { if(!obj.isNull()) {
// create a new value and return // create a new value and return
delete *val; delete *val;
@ -68,19 +68,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
return; return;
} }
else { else {
// set target to NULL // set target to nullptr
delete *val; delete *val;
*val = NULL; *val = nullptr;
} }
} }
else { else {
qDebug() << "Can't set value because the target pointer is NULL"; qDebug() << "Can't set value because the target pointer is nullptr";
} }
} }
else if (QStringLiteral("QDateTime").compare(type) == 0) { else if (QStringLiteral("QDateTime").compare(type) == 0) {
QDateTime **val = static_cast<QDateTime**>(value); QDateTime **val = static_cast<QDateTime**>(value);
if(val != NULL) { if(val != nullptr) {
if(!obj.isNull()) { if(!obj.isNull()) {
// create a new value and return // create a new value and return
delete *val; delete *val;
@ -88,19 +88,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
return; return;
} }
else { else {
// set target to NULL // set target to nullptr
delete *val; delete *val;
*val = NULL; *val = nullptr;
} }
} }
else { else {
qDebug() << "Can't set value because the target pointer is NULL"; qDebug() << "Can't set value because the target pointer is nullptr";
} }
} }
else if (QStringLiteral("QDate").compare(type) == 0) { else if (QStringLiteral("QDate").compare(type) == 0) {
QDate **val = static_cast<QDate**>(value); QDate **val = static_cast<QDate**>(value);
if(val != NULL) { if(val != nullptr) {
if(!obj.isNull()) { if(!obj.isNull()) {
// create a new value and return // create a new value and return
delete *val; delete *val;
@ -108,19 +108,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
return; return;
} }
else { else {
// set target to NULL // set target to nullptr
delete *val; delete *val;
*val = NULL; *val = nullptr;
} }
} }
else { else {
qDebug() << "Can't set value because the target pointer is NULL"; qDebug() << "Can't set value because the target pointer is nullptr";
} }
} }
else if (QStringLiteral("QByteArray").compare(type) == 0) { else if (QStringLiteral("QByteArray").compare(type) == 0) {
QByteArray **val = static_cast<QByteArray**>(value); QByteArray **val = static_cast<QByteArray**>(value);
if(val != NULL) { if(val != nullptr) {
if(!obj.isNull()) { if(!obj.isNull()) {
// create a new value and return // create a new value and return
delete *val; delete *val;
@ -129,20 +129,20 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
return; return;
} }
else { else {
// set target to NULL // set target to nullptr
delete *val; delete *val;
*val = NULL; *val = nullptr;
} }
} }
else { else {
qDebug() << "Can't set value because the target pointer is NULL"; qDebug() << "Can't set value because the target pointer is nullptr";
} }
} }
else if(type.startsWith("SWG") && obj.isObject()) { else if(type.startsWith("SWG") && obj.isObject()) {
// complex type // complex type
QJsonObject jsonObj = obj.toObject(); QJsonObject jsonObj = obj.toObject();
SWGObject * so = (SWGObject*)Swagger::create(type); SWGObject * so = (SWGObject*)Swagger::create(type);
if(so != NULL) { if(so != nullptr) {
so->fromJsonObject(jsonObj); so->fromJsonObject(jsonObj);
SWGObject **val = static_cast<SWGObject**>(value); SWGObject **val = static_cast<SWGObject**>(value);
delete *val; delete *val;
@ -190,19 +190,19 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
output->append((void*)&val); output->append((void*)&val);
} }
else if(QStringLiteral("QString").compare(complexType) == 0) { else if(QStringLiteral("QString").compare(complexType) == 0) {
QString val; QString * val = new QString();
setValue(&val, jval, QStringLiteral("QString"), QStringLiteral("")); setValue(&val, jval, QStringLiteral("QString"), QStringLiteral(""));
output->append((void*)&val); output->append((void*)val);
} }
else if(QStringLiteral("QDate").compare(complexType) == 0) { else if(QStringLiteral("QDate").compare(complexType) == 0) {
QDate val; QDate * val = new QDate();
setValue(&val, jval, QStringLiteral("QDate"), QStringLiteral("")); setValue(&val, jval, QStringLiteral("QDate"), QStringLiteral(""));
output->append((void*)&val); output->append((void*)val);
} }
else if(QStringLiteral("QDateTime").compare(complexType) == 0) { else if(QStringLiteral("QDateTime").compare(complexType) == 0) {
QDateTime val; QDateTime * val = new QDateTime();
setValue(&val, jval, QStringLiteral("QDateTime"), QStringLiteral("")); setValue(&val, jval, QStringLiteral("QDateTime"), QStringLiteral(""));
output->append((void*)&val); output->append((void*)val);
} }
} }
} }
@ -214,14 +214,14 @@ setValue(void* value, QJsonValue obj, QString type, QString complexType) {
void void
toJsonValue(QString name, void* value, QJsonObject* output, QString type) { toJsonValue(QString name, void* value, QJsonObject* output, QString type) {
if(value == NULL) { if(value == nullptr) {
return; return;
} }
if(type.startsWith("SWG")) { if(type.startsWith("SWG")) {
SWGObject *swgObject = reinterpret_cast<SWGObject *>(value); SWGObject *swgObject = reinterpret_cast<SWGObject *>(value);
if(swgObject != NULL) { if(swgObject != nullptr) {
QJsonObject* o = (*swgObject).asJsonObject(); QJsonObject* o = (*swgObject).asJsonObject();
if(name != NULL) { if(name != nullptr) {
output->insert(name, *o); output->insert(name, *o);
delete o; delete o;
} }
@ -276,7 +276,7 @@ toJsonArray(QList<void*>* value, QJsonArray* output, QString innerName, QString
foreach(void* obj, *value) { foreach(void* obj, *value) {
QJsonObject element; QJsonObject element;
toJsonValue(NULL, obj, &element, innerType); toJsonValue(nullptr, obj, &element, innerType);
output->append(element); output->append(element);
} }
} }

View File

@ -60,7 +60,7 @@ void HttpRequestInput::add_file(QString variable_name, QString local_filename, Q
HttpRequestWorker::HttpRequestWorker(QObject *parent) HttpRequestWorker::HttpRequestWorker(QObject *parent)
: QObject(parent), manager(NULL) : QObject(parent), manager(nullptr)
{ {
qsrand(QDateTime::currentDateTime().toTime_t()); qsrand(QDateTime::currentDateTime().toTime_t());
@ -204,8 +204,8 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
// ensure necessary variables are available // ensure necessary variables are available
if ( if (
file_info->local_filename == NULL || file_info->local_filename.isEmpty() file_info->local_filename == nullptr || file_info->local_filename.isEmpty()
|| file_info->variable_name == NULL || file_info->variable_name.isEmpty() || file_info->variable_name == nullptr || file_info->variable_name.isEmpty()
|| !fi.exists() || !fi.isFile() || !fi.isReadable() || !fi.exists() || !fi.isFile() || !fi.isReadable()
) { ) {
// silent abort for the current file // silent abort for the current file
@ -219,7 +219,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
} }
// ensure filename for the request // ensure filename for the request
if (file_info->request_filename == NULL || file_info->request_filename.isEmpty()) { if (file_info->request_filename == nullptr || file_info->request_filename.isEmpty()) {
file_info->request_filename = fi.fileName(); file_info->request_filename = fi.fileName();
if (file_info->request_filename.isEmpty()) { if (file_info->request_filename.isEmpty()) {
file_info->request_filename = "file"; file_info->request_filename = "file";
@ -238,7 +238,7 @@ void HttpRequestWorker::execute(HttpRequestInput *input) {
)); ));
request_content.append(new_line); request_content.append(new_line);
if (file_info->mime_type != NULL && !file_info->mime_type.isEmpty()) { if (file_info->mime_type != nullptr && !file_info->mime_type.isEmpty()) {
request_content.append("Content-Type: "); request_content.append("Content-Type: ");
request_content.append(file_info->mime_type); request_content.append(file_info->mime_type);
request_content.append(new_line); request_content.append(new_line);

View File

@ -54,19 +54,19 @@ namespace Swagger {
return new User(); return new User();
} }
return NULL; return nullptr;
} }
inline void* create(QString json, QString type) { inline void* create(QString json, QString type) {
void* val = create(type); void* val = create(type);
if(val != NULL) { if(val != nullptr) {
SWGObject* obj = static_cast<SWGObject*>(val); SWGObject* obj = static_cast<SWGObject*>(val);
return obj->fromJson(json); return obj->fromJson(json);
} }
if(type.startsWith("QString")) { if(type.startsWith("QString")) {
return new QString(); return new QString();
} }
return NULL; return nullptr;
} }
} /* namespace Swagger */ } /* namespace Swagger */

View File

@ -30,12 +30,12 @@
class SWGObject { class SWGObject {
public: public:
virtual QJsonObject* asJsonObject() { virtual QJsonObject* asJsonObject() {
return NULL; return nullptr;
} }
virtual ~SWGObject() {} virtual ~SWGObject() {}
virtual SWGObject* fromJson(QString &jsonString) { virtual SWGObject* fromJson(QString &jsonString) {
Q_UNUSED(jsonString); Q_UNUSED(jsonString);
return NULL; return nullptr;
} }
virtual void fromJsonObject(QJsonObject &json) { virtual void fromJsonObject(QJsonObject &json) {
Q_UNUSED(json); Q_UNUSED(json);

View File

@ -40,7 +40,7 @@ SWGPetApi::SWGPetApi(QString host, QString basePath) {
} }
void void
SWGPetApi::addPet(Pet body) { SWGPetApi::addPet(SWGPet body) {
QString fullPath; QString fullPath;
fullPath.append(this->host).append(this->basePath).append("/pet"); fullPath.append(this->host).append(this->basePath).append("/pet");
@ -81,12 +81,12 @@ SWGPetApi::addPetCallback(HttpRequestWorker * worker) {
emit addPetSignal(); emit addPetSignal();
} }
void void
SWGPetApi::deletePet(qint64 petId, QString* apiKey) { SWGPetApi::deletePet(qint64 pet_id, QString* api_key) {
QString fullPath; QString fullPath;
fullPath.append(this->host).append(this->basePath).append("/pet/{petId}"); fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); QString pet_idPathParam("{"); pet_idPathParam.append("petId").append("}");
fullPath.replace(petIdPathParam, stringValue(petId)); fullPath.replace(pet_idPathParam, stringValue(pet_id));
HttpRequestWorker *worker = new HttpRequestWorker(); HttpRequestWorker *worker = new HttpRequestWorker();
@ -197,14 +197,14 @@ SWGPetApi::findPetsByStatusCallback(HttpRequestWorker * worker) {
} }
QList<Pet*>* output = new QList<Pet*>(); QList<SWGPet*>* output = new QList<SWGPet*>();
QString json(worker->response); QString json(worker->response);
QByteArray array (json.toStdString().c_str()); QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonArray jsonArray = doc.array(); QJsonArray jsonArray = doc.array();
foreach(QJsonValue obj, jsonArray) { foreach(QJsonValue obj, jsonArray) {
Pet* o = new Pet(); SWGPet* o = new SWGPet();
QJsonObject jv = obj.toObject(); QJsonObject jv = obj.toObject();
QJsonObject * ptr = (QJsonObject*)&jv; QJsonObject * ptr = (QJsonObject*)&jv;
o->fromJsonObject(*ptr); o->fromJsonObject(*ptr);
@ -293,14 +293,14 @@ SWGPetApi::findPetsByTagsCallback(HttpRequestWorker * worker) {
} }
QList<Pet*>* output = new QList<Pet*>(); QList<SWGPet*>* output = new QList<SWGPet*>();
QString json(worker->response); QString json(worker->response);
QByteArray array (json.toStdString().c_str()); QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonArray jsonArray = doc.array(); QJsonArray jsonArray = doc.array();
foreach(QJsonValue obj, jsonArray) { foreach(QJsonValue obj, jsonArray) {
Pet* o = new Pet(); SWGPet* o = new SWGPet();
QJsonObject jv = obj.toObject(); QJsonObject jv = obj.toObject();
QJsonObject * ptr = (QJsonObject*)&jv; QJsonObject * ptr = (QJsonObject*)&jv;
o->fromJsonObject(*ptr); o->fromJsonObject(*ptr);
@ -315,12 +315,12 @@ SWGPetApi::findPetsByTagsCallback(HttpRequestWorker * worker) {
} }
void void
SWGPetApi::getPetById(qint64 petId) { SWGPetApi::getPetById(qint64 pet_id) {
QString fullPath; QString fullPath;
fullPath.append(this->host).append(this->basePath).append("/pet/{petId}"); fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); QString pet_idPathParam("{"); pet_idPathParam.append("petId").append("}");
fullPath.replace(petIdPathParam, stringValue(petId)); fullPath.replace(pet_idPathParam, stringValue(pet_id));
HttpRequestWorker *worker = new HttpRequestWorker(); HttpRequestWorker *worker = new HttpRequestWorker();
@ -350,7 +350,7 @@ SWGPetApi::getPetByIdCallback(HttpRequestWorker * worker) {
QString json(worker->response); QString json(worker->response);
Pet* output = static_cast<Pet*>(create(json, QString("Pet"))); SWGPet* output = static_cast<SWGPet*>(create(json, QString("SWGPet")));
worker->deleteLater(); worker->deleteLater();
@ -359,7 +359,7 @@ SWGPetApi::getPetByIdCallback(HttpRequestWorker * worker) {
} }
void void
SWGPetApi::updatePet(Pet body) { SWGPetApi::updatePet(SWGPet body) {
QString fullPath; QString fullPath;
fullPath.append(this->host).append(this->basePath).append("/pet"); fullPath.append(this->host).append(this->basePath).append("/pet");
@ -400,21 +400,21 @@ SWGPetApi::updatePetCallback(HttpRequestWorker * worker) {
emit updatePetSignal(); emit updatePetSignal();
} }
void void
SWGPetApi::updatePetWithForm(qint64 petId, QString* name, QString* status) { SWGPetApi::updatePetWithForm(qint64 pet_id, QString* name, QString* status) {
QString fullPath; QString fullPath;
fullPath.append(this->host).append(this->basePath).append("/pet/{petId}"); fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); QString pet_idPathParam("{"); pet_idPathParam.append("petId").append("}");
fullPath.replace(petIdPathParam, stringValue(petId)); fullPath.replace(pet_idPathParam, stringValue(pet_id));
HttpRequestWorker *worker = new HttpRequestWorker(); HttpRequestWorker *worker = new HttpRequestWorker();
HttpRequestInput input(fullPath, "POST"); HttpRequestInput input(fullPath, "POST");
if (name != NULL) { if (name != nullptr) {
input.add_var("name", *name); input.add_var("name", *name);
} }
if (status != NULL) { if (status != nullptr) {
input.add_var("status", *status); input.add_var("status", *status);
} }
@ -447,21 +447,21 @@ SWGPetApi::updatePetWithFormCallback(HttpRequestWorker * worker) {
emit updatePetWithFormSignal(); emit updatePetWithFormSignal();
} }
void void
SWGPetApi::uploadFile(qint64 petId, QString* additionalMetadata, SWGHttpRequestInputFileElement* file) { SWGPetApi::uploadFile(qint64 pet_id, QString* additional_metadata, SWGHttpRequestInputFileElement* file) {
QString fullPath; QString fullPath;
fullPath.append(this->host).append(this->basePath).append("/pet/{petId}/uploadImage"); fullPath.append(this->host).append(this->basePath).append("/pet/{petId}/uploadImage");
QString petIdPathParam("{"); petIdPathParam.append("petId").append("}"); QString pet_idPathParam("{"); pet_idPathParam.append("petId").append("}");
fullPath.replace(petIdPathParam, stringValue(petId)); fullPath.replace(pet_idPathParam, stringValue(pet_id));
HttpRequestWorker *worker = new HttpRequestWorker(); HttpRequestWorker *worker = new HttpRequestWorker();
HttpRequestInput input(fullPath, "POST"); HttpRequestInput input(fullPath, "POST");
if (additionalMetadata != NULL) { if (additional_metadata != nullptr) {
input.add_var("additionalMetadata", *additionalMetadata); input.add_var("additionalMetadata", *additional_metadata);
} }
if (file != NULL) { if (file != nullptr) {
input.add_file("file", (*file).local_filename, (*file).request_filename, (*file).mime_type); input.add_file("file", (*file).local_filename, (*file).request_filename, (*file).mime_type);
} }
@ -488,7 +488,7 @@ SWGPetApi::uploadFileCallback(HttpRequestWorker * worker) {
QString json(worker->response); QString json(worker->response);
ApiResponse* output = static_cast<ApiResponse*>(create(json, QString("ApiResponse"))); SWGApiResponse* output = static_cast<SWGApiResponse*>(create(json, QString("SWGApiResponse")));
worker->deleteLater(); worker->deleteLater();

View File

@ -23,7 +23,7 @@
*/ */
#include "Tag.h" #include "SWGTag.h"
#include "SWGHelpers.h" #include "SWGHelpers.h"
@ -35,35 +35,36 @@
namespace Swagger { namespace Swagger {
Tag::Tag(QString* json) { SWGTag::SWGTag(QString* json) {
init(); init();
this->fromJson(*json); this->fromJson(*json);
} }
Tag::Tag() { SWGTag::SWGTag() {
init(); init();
} }
Tag::~Tag() { SWGTag::~SWGTag() {
this->cleanup(); this->cleanup();
} }
void void
Tag::init() { SWGTag::init() {
id = 0L; id = 0L;
name = new QString(""); name = new QString("");
} }
void void
Tag::cleanup() { SWGTag::cleanup() {
if(name != NULL) {
if(name != nullptr) {
delete name; delete name;
} }
} }
Tag* SWGTag*
Tag::fromJson(QString &json) { SWGTag::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str()); QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object(); QJsonObject jsonObject = doc.object();
@ -72,13 +73,13 @@ Tag::fromJson(QString &json) {
} }
void void
Tag::fromJsonObject(QJsonObject &pJson) { SWGTag::fromJsonObject(QJsonObject &pJson) {
setValue(&id, pJson["id"], "qint64", ""); ::Swagger::setValue(&id, pJson["id"], "qint64", "");
setValue(&name, pJson["name"], "QString", "QString"); ::Swagger::setValue(&name, pJson["name"], "QString", "QString");
} }
QString QString
Tag::asJson () SWGTag::asJson ()
{ {
QJsonObject* obj = this->asJsonObject(); QJsonObject* obj = this->asJsonObject();
@ -88,33 +89,31 @@ Tag::asJson ()
} }
QJsonObject* QJsonObject*
Tag::asJsonObject() { SWGTag::asJsonObject() {
QJsonObject* obj = new QJsonObject(); QJsonObject* obj = new QJsonObject();
obj->insert("id", QJsonValue(id)); obj->insert("id", QJsonValue(id));
toJsonValue(QString("name"), name, obj, QString("QString")); toJsonValue(QString("name"), name, obj, QString("QString"));
return obj; return obj;
} }
qint64 qint64
Tag::getId() { SWGTag::getId() {
return id; return id;
} }
void void
Tag::setId(qint64 id) { SWGTag::setId(qint64 id) {
this->id = id; this->id = id;
} }
QString* QString*
Tag::getName() { SWGTag::getName() {
return name; return name;
} }
void void
Tag::setName(QString* name) { SWGTag::setName(QString* name) {
this->name = name; this->name = name;
} }

View File

@ -56,9 +56,11 @@ public:
qint64 getId(); qint64 getId();
void setId(qint64 id); void setId(qint64 id);
QString* getName(); QString* getName();
void setName(QString* name); void setName(QString* name);
private: private:
qint64 id; qint64 id;
QString* name; QString* name;

View File

@ -23,7 +23,7 @@
*/ */
#include "User.h" #include "SWGUser.h"
#include "SWGHelpers.h" #include "SWGHelpers.h"
@ -35,57 +35,63 @@
namespace Swagger { namespace Swagger {
User::User(QString* json) { SWGUser::SWGUser(QString* json) {
init(); init();
this->fromJson(*json); this->fromJson(*json);
} }
User::User() { SWGUser::SWGUser() {
init(); init();
} }
User::~User() { SWGUser::~SWGUser() {
this->cleanup(); this->cleanup();
} }
void void
User::init() { SWGUser::init() {
id = 0L; id = 0L;
username = new QString(""); username = new QString("");
firstName = new QString(""); first_name = new QString("");
lastName = new QString(""); last_name = new QString("");
email = new QString(""); email = new QString("");
password = new QString(""); password = new QString("");
phone = new QString(""); phone = new QString("");
userStatus = 0; user_status = 0;
} }
void void
User::cleanup() { SWGUser::cleanup() {
if(username != NULL) {
if(username != nullptr) {
delete username; delete username;
} }
if(firstName != NULL) {
delete firstName; if(first_name != nullptr) {
delete first_name;
} }
if(lastName != NULL) {
delete lastName; if(last_name != nullptr) {
delete last_name;
} }
if(email != NULL) {
if(email != nullptr) {
delete email; delete email;
} }
if(password != NULL) {
if(password != nullptr) {
delete password; delete password;
} }
if(phone != NULL) {
if(phone != nullptr) {
delete phone; delete phone;
} }
} }
User* SWGUser*
User::fromJson(QString &json) { SWGUser::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str()); QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array); QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object(); QJsonObject jsonObject = doc.object();
@ -94,19 +100,19 @@ User::fromJson(QString &json) {
} }
void void
User::fromJsonObject(QJsonObject &pJson) { SWGUser::fromJsonObject(QJsonObject &pJson) {
setValue(&id, pJson["id"], "qint64", ""); ::Swagger::setValue(&id, pJson["id"], "qint64", "");
setValue(&username, pJson["username"], "QString", "QString"); ::Swagger::setValue(&username, pJson["username"], "QString", "QString");
setValue(&firstName, pJson["firstName"], "QString", "QString"); ::Swagger::setValue(&first_name, pJson["first_name"], "QString", "QString");
setValue(&lastName, pJson["lastName"], "QString", "QString"); ::Swagger::setValue(&last_name, pJson["last_name"], "QString", "QString");
setValue(&email, pJson["email"], "QString", "QString"); ::Swagger::setValue(&email, pJson["email"], "QString", "QString");
setValue(&password, pJson["password"], "QString", "QString"); ::Swagger::setValue(&password, pJson["password"], "QString", "QString");
setValue(&phone, pJson["phone"], "QString", "QString"); ::Swagger::setValue(&phone, pJson["phone"], "QString", "QString");
setValue(&userStatus, pJson["userStatus"], "qint32", ""); ::Swagger::setValue(&user_status, pJson["user_status"], "qint32", "");
} }
QString QString
User::asJson () SWGUser::asJson ()
{ {
QJsonObject* obj = this->asJsonObject(); QJsonObject* obj = this->asJsonObject();
@ -116,114 +122,98 @@ User::asJson ()
} }
QJsonObject* QJsonObject*
User::asJsonObject() { SWGUser::asJsonObject() {
QJsonObject* obj = new QJsonObject(); QJsonObject* obj = new QJsonObject();
obj->insert("id", QJsonValue(id));
obj->insert("id", QJsonValue(id));
toJsonValue(QString("username"), username, obj, QString("QString")); toJsonValue(QString("username"), username, obj, QString("QString"));
toJsonValue(QString("first_name"), first_name, obj, QString("QString"));
toJsonValue(QString("last_name"), last_name, obj, QString("QString"));
toJsonValue(QString("firstName"), firstName, obj, QString("QString"));
toJsonValue(QString("lastName"), lastName, obj, QString("QString"));
toJsonValue(QString("email"), email, obj, QString("QString")); toJsonValue(QString("email"), email, obj, QString("QString"));
toJsonValue(QString("password"), password, obj, QString("QString")); toJsonValue(QString("password"), password, obj, QString("QString"));
toJsonValue(QString("phone"), phone, obj, QString("QString")); toJsonValue(QString("phone"), phone, obj, QString("QString"));
obj->insert("user_status", QJsonValue(user_status));
obj->insert("userStatus", QJsonValue(userStatus));
return obj; return obj;
} }
qint64 qint64
User::getId() { SWGUser::getId() {
return id; return id;
} }
void void
User::setId(qint64 id) { SWGUser::setId(qint64 id) {
this->id = id; this->id = id;
} }
QString* QString*
User::getUsername() { SWGUser::getUsername() {
return username; return username;
} }
void void
User::setUsername(QString* username) { SWGUser::setUsername(QString* username) {
this->username = username; this->username = username;
} }
QString* QString*
User::getFirstName() { SWGUser::getFirstName() {
return firstName; return first_name;
} }
void void
User::setFirstName(QString* firstName) { SWGUser::setFirstName(QString* first_name) {
this->firstName = firstName; this->first_name = first_name;
} }
QString* QString*
User::getLastName() { SWGUser::getLastName() {
return lastName; return last_name;
} }
void void
User::setLastName(QString* lastName) { SWGUser::setLastName(QString* last_name) {
this->lastName = lastName; this->last_name = last_name;
} }
QString* QString*
User::getEmail() { SWGUser::getEmail() {
return email; return email;
} }
void void
User::setEmail(QString* email) { SWGUser::setEmail(QString* email) {
this->email = email; this->email = email;
} }
QString* QString*
User::getPassword() { SWGUser::getPassword() {
return password; return password;
} }
void void
User::setPassword(QString* password) { SWGUser::setPassword(QString* password) {
this->password = password; this->password = password;
} }
QString* QString*
User::getPhone() { SWGUser::getPhone() {
return phone; return phone;
} }
void void
User::setPhone(QString* phone) { SWGUser::setPhone(QString* phone) {
this->phone = phone; this->phone = phone;
} }
qint32 qint32
User::getUserStatus() { SWGUser::getUserStatus() {
return userStatus; return user_status;
} }
void void
User::setUserStatus(qint32 userStatus) { SWGUser::setUserStatus(qint32 user_status) {
this->userStatus = userStatus; this->user_status = user_status;
} }

View File

@ -23,13 +23,13 @@
*/ */
/* /*
* User.h * SWGUser.h
* *
* A User who is purchasing from the pet store * A User who is purchasing from the pet store
*/ */
#ifndef User_H_ #ifndef SWGUser_H_
#define User_H_ #define SWGUser_H_
#include <QJsonObject> #include <QJsonObject>
@ -41,47 +41,55 @@
namespace Swagger { namespace Swagger {
class User: public SWGObject { class SWGUser: public SWGObject {
public: public:
User(); SWGUser();
User(QString* json); SWGUser(QString* json);
virtual ~User(); virtual ~SWGUser();
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); QString asJson ();
QJsonObject* asJsonObject(); QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json); void fromJsonObject(QJsonObject &json);
User* fromJson(QString &jsonString); SWGUser* fromJson(QString &jsonString);
qint64 getId(); qint64 getId();
void setId(qint64 id); void setId(qint64 id);
QString* getUsername(); QString* getUsername();
void setUsername(QString* username); void setUsername(QString* username);
QString* getFirstName(); QString* getFirstName();
void setFirstName(QString* firstName); void setFirstName(QString* first_name);
QString* getLastName(); QString* getLastName();
void setLastName(QString* lastName); void setLastName(QString* last_name);
QString* getEmail(); QString* getEmail();
void setEmail(QString* email); void setEmail(QString* email);
QString* getPassword(); QString* getPassword();
void setPassword(QString* password); void setPassword(QString* password);
QString* getPhone(); QString* getPhone();
void setPhone(QString* phone); void setPhone(QString* phone);
qint32 getUserStatus(); qint32 getUserStatus();
void setUserStatus(qint32 userStatus); void setUserStatus(qint32 user_status);
private: private:
qint64 id; qint64 id;
QString* username; QString* username;
QString* firstName; QString* first_name;
QString* lastName; QString* last_name;
QString* email; QString* email;
QString* password; QString* password;
QString* phone; QString* phone;
qint32 userStatus; qint32 user_status;
}; };
} /* namespace Swagger */ } /* namespace Swagger */
#endif /* User_H_ */ #endif /* SWGUser_H_ */

View File

@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012 # Visual Studio 2012
VisualStudioVersion = 12.0.0.0 VisualStudioVersion = 12.0.0.0
MinimumVisualStudioVersion = 10.0.0.1 MinimumVisualStudioVersion = 10.0.0.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{D198220E-91F6-402F-966F-8EF6105B1B75}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{1CE943E7-586D-4D9C-BE8B-3E005FDC39D1}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -10,10 +10,10 @@ Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D198220E-91F6-402F-966F-8EF6105B1B75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1CE943E7-586D-4D9C-BE8B-3E005FDC39D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D198220E-91F6-402F-966F-8EF6105B1B75}.Debug|Any CPU.Build.0 = Debug|Any CPU {1CE943E7-586D-4D9C-BE8B-3E005FDC39D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D198220E-91F6-402F-966F-8EF6105B1B75}.Release|Any CPU.ActiveCfg = Release|Any CPU {1CE943E7-586D-4D9C-BE8B-3E005FDC39D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D198220E-91F6-402F-966F-8EF6105B1B75}.Release|Any CPU.Build.0 = Release|Any CPU {1CE943E7-586D-4D9C-BE8B-3E005FDC39D1}.Release|Any CPU.Build.0 = Release|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU

View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D198220E-91F6-402F-966F-8EF6105B1B75}</ProjectGuid> <ProjectGuid>{1CE943E7-586D-4D9C-BE8B-3E005FDC39D1}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IO.Swagger.v2</RootNamespace> <RootNamespace>IO.Swagger.v2</RootNamespace>

View File

@ -8,7 +8,7 @@ using NodaTime;
namespace IO.Swagger.v2.Models namespace IO.Swagger.v2.Models
{ {
/// <summary> /// <summary>
/// ApiResponse /// Describes the result of uploading an image resource
/// </summary> /// </summary>
public sealed class ApiResponse: IEquatable<ApiResponse> public sealed class ApiResponse: IEquatable<ApiResponse>
{ {

View File

@ -8,7 +8,7 @@ using NodaTime;
namespace IO.Swagger.v2.Models namespace IO.Swagger.v2.Models
{ {
/// <summary> /// <summary>
/// Category /// A category for a pet
/// </summary> /// </summary>
public sealed class Category: IEquatable<Category> public sealed class Category: IEquatable<Category>
{ {

View File

@ -8,7 +8,7 @@ using NodaTime;
namespace IO.Swagger.v2.Models namespace IO.Swagger.v2.Models
{ {
/// <summary> /// <summary>
/// Order /// An order for a pets from the pet store
/// </summary> /// </summary>
public sealed class Order: IEquatable<Order> public sealed class Order: IEquatable<Order>
{ {

View File

@ -8,7 +8,7 @@ using NodaTime;
namespace IO.Swagger.v2.Models namespace IO.Swagger.v2.Models
{ {
/// <summary> /// <summary>
/// Pet /// A pet for sale in the pet store
/// </summary> /// </summary>
public sealed class Pet: IEquatable<Pet> public sealed class Pet: IEquatable<Pet>
{ {

View File

@ -8,7 +8,7 @@ using NodaTime;
namespace IO.Swagger.v2.Models namespace IO.Swagger.v2.Models
{ {
/// <summary> /// <summary>
/// Tag /// A tag for a pet
/// </summary> /// </summary>
public sealed class Tag: IEquatable<Tag> public sealed class Tag: IEquatable<Tag>
{ {

View File

@ -8,7 +8,7 @@ using NodaTime;
namespace IO.Swagger.v2.Models namespace IO.Swagger.v2.Models
{ {
/// <summary> /// <summary>
/// User /// A User who is purchasing from the pet store
/// </summary> /// </summary>
public sealed class User: IEquatable<User> public sealed class User: IEquatable<User>
{ {

View File

@ -134,7 +134,7 @@ namespace IO.Swagger.v2.Utils
private static IDictionary<Type, Func<Parameter, object>> CreateParsers() private static IDictionary<Type, Func<Parameter, object>> CreateParsers()
{ {
var parsers = ImmutableDictionary.CreateBuilder<Type, Func<Parameter, object>>(); var parsers = ImmutableDictionary.CreateBuilder<Type, Func<Parameter, object>>();
parsers.Put(typeof(string), value => value); parsers.Put(typeof(string), value => value.Value);
parsers.Put(typeof(bool), SafeParse(bool.Parse)); parsers.Put(typeof(bool), SafeParse(bool.Parse));
parsers.Put(typeof(bool?), SafeParse(bool.Parse)); parsers.Put(typeof(bool?), SafeParse(bool.Parse));
parsers.Put(typeof(byte), SafeParse(byte.Parse)); parsers.Put(typeof(byte), SafeParse(byte.Parse));

View File

@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
**/ **/
@ApiModel(description = "A category for a pet") @ApiModel(description = "A category for a pet")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00")
public class Category { public class Category {
private Long id = null; private Long id = null;

View File

@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
**/ **/
@ApiModel(description = "Describes the result of uploading an image resource") @ApiModel(description = "Describes the result of uploading an image resource")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00")
public class ModelApiResponse { public class ModelApiResponse {
private Integer code = null; private Integer code = null;

View File

@ -15,7 +15,7 @@ import java.util.Date;
**/ **/
@ApiModel(description = "An order for a pets from the pet store") @ApiModel(description = "An order for a pets from the pet store")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00")
public class Order { public class Order {
private Long id = null; private Long id = null;

View File

@ -18,7 +18,7 @@ import java.util.List;
**/ **/
@ApiModel(description = "A pet for sale in the pet store") @ApiModel(description = "A pet for sale in the pet store")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00")
public class Pet { public class Pet {
private Long id = null; private Long id = null;

View File

@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
**/ **/
@ApiModel(description = "A tag for a pet") @ApiModel(description = "A tag for a pet")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00")
public class Tag { public class Tag {
private Long id = null; private Long id = null;

View File

@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
**/ **/
@ApiModel(description = "A User who is purchasing from the pet store") @ApiModel(description = "A User who is purchasing from the pet store")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-09-26T16:15:27.984+08:00") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00")
public class User { public class User {
private Long id = null; private Long id = null;