From e84c59f4cc7043f3bdb98909d4ffebdc7c21a3a0 Mon Sep 17 00:00:00 2001 From: Juan Eugenio Abadie Date: Tue, 4 Dec 2018 07:35:39 -0300 Subject: [PATCH] [cpp rest-sdk] Add status code to response handler (#1541) * Add status code parameter to the response handler * Update PetStore --- .../cpp-rest-sdk-client/api-source.mustache | 4 +-- .../apiclient-header.mustache | 8 ++--- .../apiclient-source.mustache | 8 ++--- .../client/petstore/cpp-restsdk/ApiClient.cpp | 8 ++--- .../client/petstore/cpp-restsdk/ApiClient.h | 8 ++--- .../petstore/cpp-restsdk/api/PetApi.cpp | 32 +++++++++---------- .../petstore/cpp-restsdk/api/StoreApi.cpp | 16 +++++----- .../petstore/cpp-restsdk/api/UserApi.cpp | 32 +++++++++---------- 8 files changed, 58 insertions(+), 58 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache index fd0544f89f78..24141b73c6f0 100644 --- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache @@ -260,9 +260,9 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("{{httpMethod}}"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-header.mustache index be60eb431e5f..caa67d3509b3 100644 --- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-header.mustache @@ -33,10 +33,10 @@ public: ApiClient( std::shared_ptr configuration = nullptr ); virtual ~ApiClient(); - typedef std::function ResponseHeadersHandlerType; + typedef std::function ResponseHandlerType; - const ResponseHeadersHandlerType& getResponseHeadersHandler() const; - void setResponseHeadersHandler(const ResponseHeadersHandlerType& responseHeadersHandler); + const ResponseHandlerType& getResponseHandler() const; + void setResponseHandler(const ResponseHandlerType& responseHandler); std::shared_ptr getConfiguration() const; void setConfiguration(std::shared_ptr configuration); @@ -63,7 +63,7 @@ public: protected: - ResponseHeadersHandlerType m_ResponseHeadersHandler; + ResponseHandlerType m_ResponseHandler; std::shared_ptr m_Configuration; }; diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-source.mustache index e4e6f004c3dd..e363b394f671 100644 --- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-source.mustache @@ -29,12 +29,12 @@ ApiClient::~ApiClient() { } -const ApiClient::ResponseHeadersHandlerType& ApiClient::getResponseHeadersHandler() const { - return m_ResponseHeadersHandler; +const ApiClient::ResponseHandlerType& ApiClient::getResponseHandler() const { + return m_ResponseHandler; } -void ApiClient::setResponseHeadersHandler(const ResponseHeadersHandlerType& responseHeadersHandler) { - m_ResponseHeadersHandler = responseHeadersHandler; +void ApiClient::setResponseHandler(const ResponseHandlerType& responseHandler) { + m_ResponseHandler = responseHandler; } std::shared_ptr ApiClient::getConfiguration() const diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/ApiClient.cpp index 40243cd83360..ed6201c95d20 100644 --- a/samples/client/petstore/cpp-restsdk/ApiClient.cpp +++ b/samples/client/petstore/cpp-restsdk/ApiClient.cpp @@ -40,12 +40,12 @@ ApiClient::~ApiClient() { } -const ApiClient::ResponseHeadersHandlerType& ApiClient::getResponseHeadersHandler() const { - return m_ResponseHeadersHandler; +const ApiClient::ResponseHandlerType& ApiClient::getResponseHandler() const { + return m_ResponseHandler; } -void ApiClient::setResponseHeadersHandler(const ResponseHeadersHandlerType& responseHeadersHandler) { - m_ResponseHeadersHandler = responseHeadersHandler; +void ApiClient::setResponseHandler(const ResponseHandlerType& responseHandler) { + m_ResponseHandler = responseHandler; } std::shared_ptr ApiClient::getConfiguration() const diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.h b/samples/client/petstore/cpp-restsdk/ApiClient.h index 50b1cbffd942..2802a7a81c63 100644 --- a/samples/client/petstore/cpp-restsdk/ApiClient.h +++ b/samples/client/petstore/cpp-restsdk/ApiClient.h @@ -44,10 +44,10 @@ public: ApiClient( std::shared_ptr configuration = nullptr ); virtual ~ApiClient(); - typedef std::function ResponseHeadersHandlerType; + typedef std::function ResponseHandlerType; - const ResponseHeadersHandlerType& getResponseHeadersHandler() const; - void setResponseHeadersHandler(const ResponseHeadersHandlerType& responseHeadersHandler); + const ResponseHandlerType& getResponseHandler() const; + void setResponseHandler(const ResponseHandlerType& responseHandler); std::shared_ptr getConfiguration() const; void setConfiguration(std::shared_ptr configuration); @@ -74,7 +74,7 @@ public: protected: - ResponseHeadersHandlerType m_ResponseHeadersHandler; + ResponseHandlerType m_ResponseHandler; std::shared_ptr m_Configuration; }; diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp index f160df54db71..40c6d2866b0c 100644 --- a/samples/client/petstore/cpp-restsdk/api/PetApi.cpp +++ b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp @@ -123,9 +123,9 @@ pplx::task PetApi::addPet(std::shared_ptr pet) return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -229,9 +229,9 @@ pplx::task PetApi::deletePet(int64_t petId, boost::optionalcallApi(localVarPath, utility::conversions::to_string_t("DELETE"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -335,9 +335,9 @@ pplx::task>> PetApi::findPetsByStatus(std::vect return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -466,9 +466,9 @@ pplx::task>> PetApi::findPetsByTags(std::vector return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -601,9 +601,9 @@ pplx::task> PetApi::getPetById(int64_t petId) return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -743,9 +743,9 @@ pplx::task PetApi::updatePet(std::shared_ptr pet) return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("PUT"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -854,9 +854,9 @@ pplx::task PetApi::updatePetWithForm(int64_t petId, boost::optionalcallApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -966,9 +966,9 @@ pplx::task> PetApi::uploadFile(int64_t petId, boost return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp index 31bd5ccd88a6..40d3df838715 100644 --- a/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp +++ b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp @@ -99,9 +99,9 @@ pplx::task StoreApi::deleteOrder(utility::string_t orderId) return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("DELETE"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -207,9 +207,9 @@ pplx::task> StoreApi::getInventory() return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -332,9 +332,9 @@ pplx::task> StoreApi::getOrderById(int64_t orderId) return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -472,9 +472,9 @@ pplx::task> StoreApi::placeOrder(std::shared_ptr o return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp index 64600cfcaead..e9c3ff72a2c2 100644 --- a/samples/client/petstore/cpp-restsdk/api/UserApi.cpp +++ b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp @@ -119,9 +119,9 @@ pplx::task UserApi::createUser(std::shared_ptr user) return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -244,9 +244,9 @@ pplx::task UserApi::createUsersWithArrayInput(std::vectorcallApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -369,9 +369,9 @@ pplx::task UserApi::createUsersWithListInput(std::vectorcallApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -469,9 +469,9 @@ pplx::task UserApi::deleteUser(utility::string_t username) return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("DELETE"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -571,9 +571,9 @@ pplx::task> UserApi::getUserByName(utility::string_t usern return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -701,9 +701,9 @@ pplx::task UserApi::loginUser(utility::string_t username, uti return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -823,9 +823,9 @@ pplx::task UserApi::logoutUser() return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK @@ -944,9 +944,9 @@ pplx::task UserApi::updateUser(utility::string_t username, std::shared_ptr return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("PUT"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType) .then([=](web::http::http_response localVarResponse) { - if (m_ApiClient->getResponseHeadersHandler()) + if (m_ApiClient->getResponseHandler()) { - m_ApiClient->getResponseHeadersHandler()(localVarResponse.headers()); + m_ApiClient->getResponseHandler()(localVarResponse.status_code(), localVarResponse.headers()); } // 1xx - informational : OK