loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-12 12:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ci again (#10388)

Browse Source 
* Fix ci again

* Improve .gitignore
This commit is contained in:
Martin Delille 2021-09-14 05:23:18 +02:00 committed by GitHub
parent 2732c45cc1
commit dd6e399ff5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 62 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.gitignore vendored
View File

@ -62,14 +62,17 @@ samples/server-generator/node/output/node_modules
samples/server/petstore/nodejs/node_modules
samples/server/petstore/nodejs-server/node_modules
# qt5 cpp
*.pro.user
samples/client/petstore/qt5cpp/PetStore/moc_*
samples/client/petstore/qt5cpp/PetStore/*.o
samples/client/petstore/qt5cpp/build-*
samples/client/petstore/qt5cpp/PetStore/PetStore
samples/client/petstore/qt5cpp/PetStore/Makefile
samples/client/petstore/qt5cpp/PetStore/PetStore.pro.user
# qt cpp
samples/client/build
samples/client/petstore/build
samples/client/petstore/cpp-qt/PetStore/moc_*
samples/client/petstore/cpp-qt/PetStore/*.o
samples/client/petstore/cpp-qt/build-*
samples/client/petstore/cpp-qt/build-*
samples/client/petstore/cpp-qt/PetStore/PetStore
samples/client/petstore/cpp-qt/PetStore/Makefile
samples/client/petstore/cpp-qt/PetStore/PetStore.pro.user
samples/client/petstore/cpp-qt/CMakeLists.txt.user
# cpprestsdk
samples/client/petstore/cpp-restsdk/CMakeCache.txt

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

@ -4,9 +4,11 @@
*/
#ifndef {{prefix}}_SERVERVCONFIGURATION_H
#define {{prefix}}_SERVERVCONFIGURATION_H
#include <QString>
#include <QMap>
#include <QRegularExpression>
#include <QUrl>
#include <stdexcept>
#include "{{prefix}}ServerVariable.h"

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

@ -129,9 +129,15 @@ int {{classname}}::addServerConfiguration(const QString &operation, const QUrl &
* @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template.
*/
void {{classname}}::setNewServerForAllOperations(const QUrl &url, const QString &description, const QMap<QString, {{prefix}}ServerVariable> &variables) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
for (auto keyIt = _serverIndices.keyBegin(); keyIt != _serverIndices.keyEnd(); keyIt++) {
setServerIndex(*keyIt, addServerConfiguration(*keyIt, url, description, variables));
}
#else
for (auto &e : _serverIndices.keys()) {
setServerIndex(e, addServerConfiguration(e, url, description, variables));
}
#endif
}
/**
@ -661,7 +667,7 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif

1
samples/client/petstore/cpp-qt/.gitignore vendored
View File

@ -1 +0,0 @@
build

2
samples/client/petstore/cpp-qt/PetStore/PetStore.pro
View File

@ -18,6 +18,8 @@ TEMPLATE = app
include(../client/PFXclient.pri)
INCLUDEPATH += ../client
SOURCES += main.cpp \
PetApiTests.cpp \
StoreApiTests.cpp \

22
samples/client/petstore/cpp-qt/client/PFXPetApi.cpp
View File

@ -126,9 +126,15 @@ int PFXPetApi::addServerConfiguration(const QString &operation, const QUrl &url,
* @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template.
*/
void PFXPetApi::setNewServerForAllOperations(const QUrl &url, const QString &description, const QMap<QString, PFXServerVariable> &variables) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
for (auto keyIt = _serverIndices.keyBegin(); keyIt != _serverIndices.keyEnd(); keyIt++) {
setServerIndex(*keyIt, addServerConfiguration(*keyIt, url, description, variables));
}
#else
for (auto &e : _serverIndices.keys()) {
setServerIndex(e, addServerConfiguration(e, url, description, variables));
}
#endif
}
/**
@ -238,7 +244,7 @@ void PFXPetApi::addPet(const PFXPet &body) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -306,7 +312,7 @@ void PFXPetApi::deletePet(const qint64 &pet_id, const ::test_namespace::Optional
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -440,7 +446,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -584,7 +590,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -660,7 +666,7 @@ void PFXPetApi::getPetById(const qint64 &pet_id) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -713,7 +719,7 @@ void PFXPetApi::updatePet(const PFXPet &body) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -783,7 +789,7 @@ void PFXPetApi::updatePetWithForm(const qint64 &pet_id, const ::test_namespace::
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -853,7 +859,7 @@ void PFXPetApi::uploadFile(const qint64 &pet_id, const ::test_namespace::Optiona
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif

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

@ -14,9 +14,11 @@
*/
#ifndef PFX_SERVERVCONFIGURATION_H
#define PFX_SERVERVCONFIGURATION_H
#include <QString>
#include <QMap>
#include <QRegularExpression>
#include <QUrl>
#include <stdexcept>
#include "PFXServerVariable.h"

14
samples/client/petstore/cpp-qt/client/PFXStoreApi.cpp
View File

@ -118,9 +118,15 @@ int PFXStoreApi::addServerConfiguration(const QString &operation, const QUrl &ur
* @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template.
*/
void PFXStoreApi::setNewServerForAllOperations(const QUrl &url, const QString &description, const QMap<QString, PFXServerVariable> &variables) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
for (auto keyIt = _serverIndices.keyBegin(); keyIt != _serverIndices.keyEnd(); keyIt++) {
setServerIndex(*keyIt, addServerConfiguration(*keyIt, url, description, variables));
}
#else
for (auto &e : _serverIndices.keys()) {
setServerIndex(e, addServerConfiguration(e, url, description, variables));
}
#endif
}
/**
@ -240,7 +246,7 @@ void PFXStoreApi::deleteOrder(const QString &order_id) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -292,7 +298,7 @@ void PFXStoreApi::getInventory() {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -364,7 +370,7 @@ void PFXStoreApi::getOrderById(const qint64 &order_id) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -417,7 +423,7 @@ void PFXStoreApi::placeOrder(const PFXOrder &body) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif

22
samples/client/petstore/cpp-qt/client/PFXUserApi.cpp
View File

@ -126,9 +126,15 @@ int PFXUserApi::addServerConfiguration(const QString &operation, const QUrl &url
* @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template.
*/
void PFXUserApi::setNewServerForAllOperations(const QUrl &url, const QString &description, const QMap<QString, PFXServerVariable> &variables) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
for (auto keyIt = _serverIndices.keyBegin(); keyIt != _serverIndices.keyEnd(); keyIt++) {
setServerIndex(*keyIt, addServerConfiguration(*keyIt, url, description, variables));
}
#else
for (auto &e : _serverIndices.keys()) {
setServerIndex(e, addServerConfiguration(e, url, description, variables));
}
#endif
}
/**
@ -238,7 +244,7 @@ void PFXUserApi::createUser(const PFXUser &body) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -290,7 +296,7 @@ void PFXUserApi::createUsersWithArrayInput(const QList<PFXUser> &body) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -342,7 +348,7 @@ void PFXUserApi::createUsersWithListInput(const QList<PFXUser> &body) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -404,7 +410,7 @@ void PFXUserApi::deleteUser(const QString &username) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -466,7 +472,7 @@ void PFXUserApi::getUserByName(const QString &username) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -546,7 +552,7 @@ void PFXUserApi::loginUser(const QString &username, const QString &password) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -596,7 +602,7 @@ void PFXUserApi::logoutUser() {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif
@ -662,7 +668,7 @@ void PFXUserApi::updateUser(const QString &username, const PFXUser &body) {
input.headers.insert(keyValueIt->first, keyValueIt->second);
}
#else
for (auto key = _defaultHeaders.keys()) {
for (auto key : _defaultHeaders.keys()) {
input.headers.insert(key, _defaultHeaders[key]);
}
#endif