diff --git a/bin/configs/other/cpp-ue4.yaml b/bin/configs/cpp-ue4.yaml similarity index 100% rename from bin/configs/other/cpp-ue4.yaml rename to bin/configs/cpp-ue4.yaml diff --git a/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION b/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION index 862529f8cac..4b448de535c 100644 --- a/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-ue4/.openapi-generator/VERSION @@ -1 +1 @@ -5.2.1-SNAPSHOT \ No newline at end of file +5.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIApiResponse.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIApiResponse.cpp index bd248608e46..9e2f039a1f8 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIApiResponse.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIApiResponse.cpp @@ -17,7 +17,7 @@ #include "Templates/SharedPointer.h" -namespace OpenAPI +namespace OpenAPI { void OpenAPIApiResponse::WriteJson(JsonWriter& Writer) const @@ -25,15 +25,15 @@ void OpenAPIApiResponse::WriteJson(JsonWriter& Writer) const Writer->WriteObjectStart(); if (Code.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("code")); WriteJsonValue(Writer, Code.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("code")); WriteJsonValue(Writer, Code.GetValue()); } if (Type.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("type")); WriteJsonValue(Writer, Type.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("type")); WriteJsonValue(Writer, Type.GetValue()); } if (Message.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("message")); WriteJsonValue(Writer, Message.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("message")); WriteJsonValue(Writer, Message.GetValue()); } Writer->WriteObjectEnd(); } diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIBaseModel.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIBaseModel.cpp index f8552ac0b7d..a119a85b5c4 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIBaseModel.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIBaseModel.cpp @@ -12,7 +12,7 @@ #include "OpenAPIBaseModel.h" -namespace OpenAPI +namespace OpenAPI { bool HttpRetryManager::Tick(float DeltaTime) @@ -21,10 +21,10 @@ bool HttpRetryManager::Tick(float DeltaTime) return true; } -HttpRetryParams::HttpRetryParams(const FRetryLimitCountSetting& InRetryLimitCountOverride /*= FRetryLimitCountSetting()*/, - const FRetryTimeoutRelativeSecondsSetting& InRetryTimeoutRelativeSecondsOverride /*= FRetryTimeoutRelativeSecondsSetting()*/, - const FRetryResponseCodes& InRetryResponseCodes /*= FRetryResponseCodes()*/, - const FRetryVerbs& InRetryVerbs /*= FRetryVerbs()*/, +HttpRetryParams::HttpRetryParams(const FRetryLimitCountSetting& InRetryLimitCountOverride /*= FRetryLimitCountSetting()*/, + const FRetryTimeoutRelativeSecondsSetting& InRetryTimeoutRelativeSecondsOverride /*= FRetryTimeoutRelativeSecondsSetting()*/, + const FRetryResponseCodes& InRetryResponseCodes /*= FRetryResponseCodes()*/, + const FRetryVerbs& InRetryVerbs /*= FRetryVerbs()*/, const FRetryDomainsPtr& InRetryDomains /*= FRetryDomainsPtr() */) : RetryLimitCountOverride(InRetryLimitCountOverride) , RetryTimeoutRelativeSecondsOverride(InRetryTimeoutRelativeSecondsOverride) diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPICategory.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPICategory.cpp index 109decaa0df..9f0500ab223 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPICategory.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPICategory.cpp @@ -17,7 +17,7 @@ #include "Templates/SharedPointer.h" -namespace OpenAPI +namespace OpenAPI { void OpenAPICategory::WriteJson(JsonWriter& Writer) const @@ -25,11 +25,11 @@ void OpenAPICategory::WriteJson(JsonWriter& Writer) const Writer->WriteObjectStart(); if (Id.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("id")); WriteJsonValue(Writer, Id.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("id")); WriteJsonValue(Writer, Id.GetValue()); } if (Name.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("name")); WriteJsonValue(Writer, Name.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("name")); WriteJsonValue(Writer, Name.GetValue()); } Writer->WriteObjectEnd(); } diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIHelpers.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIHelpers.cpp index 4b6e1627c14..2542e0e236b 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIHelpers.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIHelpers.cpp @@ -19,7 +19,7 @@ #include "Misc/FileHelper.h" #include "Misc/Paths.h" -namespace OpenAPI +namespace OpenAPI { HttpFileInput::HttpFileInput(const TCHAR* InFilePath) diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIModule.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIModule.cpp index cdadfc281f4..1babda37a99 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIModule.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIModule.cpp @@ -22,4 +22,3 @@ void OpenAPIModule::StartupModule() void OpenAPIModule::ShutdownModule() { } - diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIOrder.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIOrder.cpp index e8be30d17e9..ea8f76ff56b 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIOrder.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIOrder.cpp @@ -17,7 +17,7 @@ #include "Templates/SharedPointer.h" -namespace OpenAPI +namespace OpenAPI { inline FString ToString(const OpenAPIOrder::StatusEnum& Value) @@ -32,7 +32,7 @@ inline FString ToString(const OpenAPIOrder::StatusEnum& Value) return TEXT("delivered"); } - UE_LOG(LogOpenAPI, Error, TEXT("Invalid OpenAPIOrder::StatusEnum Value (%d)"), (int)Value); + UE_LOG(LogOpenAPI, Error, TEXT("Invalid OpenAPIOrder::StatusEnum Value (%d)"), (int)Value); return TEXT(""); } @@ -86,27 +86,27 @@ void OpenAPIOrder::WriteJson(JsonWriter& Writer) const Writer->WriteObjectStart(); if (Id.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("id")); WriteJsonValue(Writer, Id.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("id")); WriteJsonValue(Writer, Id.GetValue()); } if (PetId.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("petId")); WriteJsonValue(Writer, PetId.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("petId")); WriteJsonValue(Writer, PetId.GetValue()); } if (Quantity.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("quantity")); WriteJsonValue(Writer, Quantity.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("quantity")); WriteJsonValue(Writer, Quantity.GetValue()); } if (ShipDate.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("shipDate")); WriteJsonValue(Writer, ShipDate.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("shipDate")); WriteJsonValue(Writer, ShipDate.GetValue()); } if (Status.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("status")); WriteJsonValue(Writer, Status.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("status")); WriteJsonValue(Writer, Status.GetValue()); } if (Complete.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("complete")); WriteJsonValue(Writer, Complete.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("complete")); WriteJsonValue(Writer, Complete.GetValue()); } Writer->WriteObjectEnd(); } diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIPet.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIPet.cpp index 1843dff1449..001262f94ac 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIPet.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIPet.cpp @@ -17,7 +17,7 @@ #include "Templates/SharedPointer.h" -namespace OpenAPI +namespace OpenAPI { inline FString ToString(const OpenAPIPet::StatusEnum& Value) @@ -32,7 +32,7 @@ inline FString ToString(const OpenAPIPet::StatusEnum& Value) return TEXT("sold"); } - UE_LOG(LogOpenAPI, Error, TEXT("Invalid OpenAPIPet::StatusEnum Value (%d)"), (int)Value); + UE_LOG(LogOpenAPI, Error, TEXT("Invalid OpenAPIPet::StatusEnum Value (%d)"), (int)Value); return TEXT(""); } @@ -86,21 +86,21 @@ void OpenAPIPet::WriteJson(JsonWriter& Writer) const Writer->WriteObjectStart(); if (Id.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("id")); WriteJsonValue(Writer, Id.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("id")); WriteJsonValue(Writer, Id.GetValue()); } if (Category.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("category")); WriteJsonValue(Writer, Category.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("category")); WriteJsonValue(Writer, Category.GetValue()); } Writer->WriteIdentifierPrefix(TEXT("name")); WriteJsonValue(Writer, Name); Writer->WriteIdentifierPrefix(TEXT("photoUrls")); WriteJsonValue(Writer, PhotoUrls); if (Tags.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("tags")); WriteJsonValue(Writer, Tags.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("tags")); WriteJsonValue(Writer, Tags.GetValue()); } if (Status.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("status")); WriteJsonValue(Writer, Status.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("status")); WriteJsonValue(Writer, Status.GetValue()); } Writer->WriteObjectEnd(); } diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApi.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApi.cpp index 3d235caae40..ec0444e643c 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApi.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApi.cpp @@ -18,10 +18,10 @@ #include "HttpModule.h" #include "Serialization/JsonSerializer.h" -namespace OpenAPI +namespace OpenAPI { -OpenAPIPetApi::OpenAPIPetApi() +OpenAPIPetApi::OpenAPIPetApi() : Url(TEXT("http://petstore.swagger.io/v2")) { } @@ -146,7 +146,7 @@ FHttpRequestPtr OpenAPIPetApi::AddPet(const AddPetRequest& Request, const FAddPe } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIPetApi::OnAddPetResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -173,7 +173,7 @@ FHttpRequestPtr OpenAPIPetApi::DeletePet(const DeletePetRequest& Request, const } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIPetApi::OnDeletePetResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -200,7 +200,7 @@ FHttpRequestPtr OpenAPIPetApi::FindPetsByStatus(const FindPetsByStatusRequest& R } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIPetApi::OnFindPetsByStatusResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -227,7 +227,7 @@ FHttpRequestPtr OpenAPIPetApi::FindPetsByTags(const FindPetsByTagsRequest& Reque } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIPetApi::OnFindPetsByTagsResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -254,7 +254,7 @@ FHttpRequestPtr OpenAPIPetApi::GetPetById(const GetPetByIdRequest& Request, cons } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIPetApi::OnGetPetByIdResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -281,7 +281,7 @@ FHttpRequestPtr OpenAPIPetApi::UpdatePet(const UpdatePetRequest& Request, const } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIPetApi::OnUpdatePetResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -308,7 +308,7 @@ FHttpRequestPtr OpenAPIPetApi::UpdatePetWithForm(const UpdatePetWithFormRequest& } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIPetApi::OnUpdatePetWithFormResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -335,7 +335,7 @@ FHttpRequestPtr OpenAPIPetApi::UploadFile(const UploadFileRequest& Request, cons } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIPetApi::OnUploadFileResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp index 8104fdad5c6..c9c28c098f5 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp @@ -20,7 +20,7 @@ #include "HttpModule.h" #include "PlatformHttp.h" -namespace OpenAPI +namespace OpenAPI { FString OpenAPIPetApi::AddPetRequest::ComputePath() const @@ -85,7 +85,7 @@ FString OpenAPIPetApi::DeletePetRequest::ComputePath() const { TEXT("petId"), ToStringFormatArg(PetId) } }; FString Path = FString::Format(TEXT("/pet/{petId}"), PathParams); - + return Path; } @@ -105,6 +105,14 @@ void OpenAPIPetApi::DeletePetRequest::SetupHttpRequest(const FHttpRequestRef& Ht // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -146,7 +154,7 @@ inline FString ToString(const OpenAPIPetApi::FindPetsByStatusRequest::StatusEnum return TEXT("sold"); } - UE_LOG(LogOpenAPI, Error, TEXT("Invalid OpenAPIPetApi::FindPetsByStatusRequest::StatusEnum Value (%d)"), (int)Value); + UE_LOG(LogOpenAPI, Error, TEXT("Invalid OpenAPIPetApi::FindPetsByStatusRequest::StatusEnum Value (%d)"), (int)Value); return TEXT(""); } @@ -166,7 +174,7 @@ inline bool FromString(const FString& EnumAsString, OpenAPIPetApi::FindPetsBySta if(Found) Value = *Found; - return Found != nullptr; + return Found != nullptr; } bool OpenAPIPetApi::FindPetsByStatusRequest::EnumFromString(const FString& EnumAsString, OpenAPIPetApi::FindPetsByStatusRequest::StatusEnum& EnumValue) @@ -216,6 +224,14 @@ void OpenAPIPetApi::FindPetsByStatusRequest::SetupHttpRequest(const FHttpRequest // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -269,6 +285,14 @@ void OpenAPIPetApi::FindPetsByTagsRequest::SetupHttpRequest(const FHttpRequestRe // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -307,7 +331,7 @@ FString OpenAPIPetApi::GetPetByIdRequest::ComputePath() const { TEXT("petId"), ToStringFormatArg(PetId) } }; FString Path = FString::Format(TEXT("/pet/{petId}"), PathParams); - + return Path; } @@ -321,6 +345,14 @@ void OpenAPIPetApi::GetPetByIdRequest::SetupHttpRequest(const FHttpRequestRef& H // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -424,7 +456,7 @@ FString OpenAPIPetApi::UpdatePetWithFormRequest::ComputePath() const { TEXT("petId"), ToStringFormatArg(PetId) } }; FString Path = FString::Format(TEXT("/pet/{petId}"), PathParams); - + return Path; } @@ -438,8 +470,22 @@ void OpenAPIPetApi::UpdatePetWithFormRequest::SetupHttpRequest(const FHttpReques // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { - UE_LOG(LogOpenAPI, Error, TEXT("Form parameter (name) was ignored, cannot be used in JsonBody")); - UE_LOG(LogOpenAPI, Error, TEXT("Form parameter (status) was ignored, cannot be used in JsonBody")); + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + if (Name.IsSet()){ + Writer->WriteIdentifierPrefix(TEXT("name")); + WriteJsonValue(Writer, Name.GetValue()); + } + if (Status.IsSet()){ + Writer->WriteIdentifierPrefix(TEXT("status")); + WriteJsonValue(Writer, Status.GetValue()); + } + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -466,7 +512,7 @@ void OpenAPIPetApi::UpdatePetWithFormRequest::SetupHttpRequest(const FHttpReques { FormParams.Add(FString(TEXT("status=")) + ToUrlString(Status.GetValue())); } - + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/x-www-form-urlencoded; charset=utf-8")); HttpRequest->SetContentAsString(FString::Join(FormParams, TEXT("&"))); } @@ -498,7 +544,7 @@ FString OpenAPIPetApi::UploadFileRequest::ComputePath() const { TEXT("petId"), ToStringFormatArg(PetId) } }; FString Path = FString::Format(TEXT("/pet/{petId}/uploadImage"), PathParams); - + return Path; } @@ -512,8 +558,22 @@ void OpenAPIPetApi::UploadFileRequest::SetupHttpRequest(const FHttpRequestRef& H // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { - UE_LOG(LogOpenAPI, Error, TEXT("Form parameter (additionalMetadata) was ignored, cannot be used in JsonBody")); - UE_LOG(LogOpenAPI, Error, TEXT("Form parameter (file) was ignored, cannot be used in JsonBody")); + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + if (AdditionalMetadata.IsSet()){ + Writer->WriteIdentifierPrefix(TEXT("additionalMetadata")); + WriteJsonValue(Writer, AdditionalMetadata.GetValue()); + } + if (File.IsSet()){ + Writer->WriteIdentifierPrefix(TEXT("file")); + WriteJsonValue(Writer, File.GetValue()); + } + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -537,7 +597,7 @@ void OpenAPIPetApi::UploadFileRequest::SetupHttpRequest(const FHttpRequestRef& H FormParams.Add(FString(TEXT("additionalMetadata=")) + ToUrlString(AdditionalMetadata.GetValue())); } UE_LOG(LogOpenAPI, Error, TEXT("Form parameter (file) was ignored, Files are not supported in urlencoded requests")); - + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/x-www-form-urlencoded; charset=utf-8")); HttpRequest->SetContentAsString(FString::Join(FormParams, TEXT("&"))); } diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApi.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApi.cpp index 898dd0c6d5a..1c5935b0867 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApi.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApi.cpp @@ -18,10 +18,10 @@ #include "HttpModule.h" #include "Serialization/JsonSerializer.h" -namespace OpenAPI +namespace OpenAPI { -OpenAPIStoreApi::OpenAPIStoreApi() +OpenAPIStoreApi::OpenAPIStoreApi() : Url(TEXT("http://petstore.swagger.io/v2")) { } @@ -146,7 +146,7 @@ FHttpRequestPtr OpenAPIStoreApi::DeleteOrder(const DeleteOrderRequest& Request, } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIStoreApi::OnDeleteOrderResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -173,7 +173,7 @@ FHttpRequestPtr OpenAPIStoreApi::GetInventory(const GetInventoryRequest& Request } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIStoreApi::OnGetInventoryResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -200,7 +200,7 @@ FHttpRequestPtr OpenAPIStoreApi::GetOrderById(const GetOrderByIdRequest& Request } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIStoreApi::OnGetOrderByIdResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -227,7 +227,7 @@ FHttpRequestPtr OpenAPIStoreApi::PlaceOrder(const PlaceOrderRequest& Request, co } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIStoreApi::OnPlaceOrderResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApiOperations.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApiOperations.cpp index 1c5efb37559..d972f349a62 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApiOperations.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApiOperations.cpp @@ -20,7 +20,7 @@ #include "HttpModule.h" #include "PlatformHttp.h" -namespace OpenAPI +namespace OpenAPI { FString OpenAPIStoreApi::DeleteOrderRequest::ComputePath() const @@ -29,7 +29,7 @@ FString OpenAPIStoreApi::DeleteOrderRequest::ComputePath() const { TEXT("orderId"), ToStringFormatArg(OrderId) } }; FString Path = FString::Format(TEXT("/store/order/{orderId}"), PathParams); - + return Path; } @@ -43,6 +43,14 @@ void OpenAPIStoreApi::DeleteOrderRequest::SetupHttpRequest(const FHttpRequestRef // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -91,6 +99,14 @@ void OpenAPIStoreApi::GetInventoryRequest::SetupHttpRequest(const FHttpRequestRe // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -126,7 +142,7 @@ FString OpenAPIStoreApi::GetOrderByIdRequest::ComputePath() const { TEXT("orderId"), ToStringFormatArg(OrderId) } }; FString Path = FString::Format(TEXT("/store/order/{orderId}"), PathParams); - + return Path; } @@ -140,6 +156,14 @@ void OpenAPIStoreApi::GetOrderByIdRequest::SetupHttpRequest(const FHttpRequestRe // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPITag.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPITag.cpp index 4714f75bf53..e27752f7393 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPITag.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPITag.cpp @@ -17,7 +17,7 @@ #include "Templates/SharedPointer.h" -namespace OpenAPI +namespace OpenAPI { void OpenAPITag::WriteJson(JsonWriter& Writer) const @@ -25,11 +25,11 @@ void OpenAPITag::WriteJson(JsonWriter& Writer) const Writer->WriteObjectStart(); if (Id.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("id")); WriteJsonValue(Writer, Id.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("id")); WriteJsonValue(Writer, Id.GetValue()); } if (Name.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("name")); WriteJsonValue(Writer, Name.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("name")); WriteJsonValue(Writer, Name.GetValue()); } Writer->WriteObjectEnd(); } diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIUser.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIUser.cpp index 90eb9fc9b43..6ffd4e5be9f 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIUser.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIUser.cpp @@ -17,7 +17,7 @@ #include "Templates/SharedPointer.h" -namespace OpenAPI +namespace OpenAPI { void OpenAPIUser::WriteJson(JsonWriter& Writer) const @@ -25,35 +25,35 @@ void OpenAPIUser::WriteJson(JsonWriter& Writer) const Writer->WriteObjectStart(); if (Id.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("id")); WriteJsonValue(Writer, Id.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("id")); WriteJsonValue(Writer, Id.GetValue()); } if (Username.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("username")); WriteJsonValue(Writer, Username.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("username")); WriteJsonValue(Writer, Username.GetValue()); } if (FirstName.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("firstName")); WriteJsonValue(Writer, FirstName.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("firstName")); WriteJsonValue(Writer, FirstName.GetValue()); } if (LastName.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("lastName")); WriteJsonValue(Writer, LastName.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("lastName")); WriteJsonValue(Writer, LastName.GetValue()); } if (Email.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("email")); WriteJsonValue(Writer, Email.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("email")); WriteJsonValue(Writer, Email.GetValue()); } if (Password.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("password")); WriteJsonValue(Writer, Password.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("password")); WriteJsonValue(Writer, Password.GetValue()); } if (Phone.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("phone")); WriteJsonValue(Writer, Phone.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("phone")); WriteJsonValue(Writer, Phone.GetValue()); } if (UserStatus.IsSet()) { - Writer->WriteIdentifierPrefix(TEXT("userStatus")); WriteJsonValue(Writer, UserStatus.GetValue()); + Writer->WriteIdentifierPrefix(TEXT("userStatus")); WriteJsonValue(Writer, UserStatus.GetValue()); } Writer->WriteObjectEnd(); } diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApi.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApi.cpp index 9cae2ee4898..55b34981cb5 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApi.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApi.cpp @@ -18,10 +18,10 @@ #include "HttpModule.h" #include "Serialization/JsonSerializer.h" -namespace OpenAPI +namespace OpenAPI { -OpenAPIUserApi::OpenAPIUserApi() +OpenAPIUserApi::OpenAPIUserApi() : Url(TEXT("http://petstore.swagger.io/v2")) { } @@ -146,7 +146,7 @@ FHttpRequestPtr OpenAPIUserApi::CreateUser(const CreateUserRequest& Request, con } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIUserApi::OnCreateUserResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -173,7 +173,7 @@ FHttpRequestPtr OpenAPIUserApi::CreateUsersWithArrayInput(const CreateUsersWithA } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIUserApi::OnCreateUsersWithArrayInputResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -200,7 +200,7 @@ FHttpRequestPtr OpenAPIUserApi::CreateUsersWithListInput(const CreateUsersWithLi } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIUserApi::OnCreateUsersWithListInputResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -227,7 +227,7 @@ FHttpRequestPtr OpenAPIUserApi::DeleteUser(const DeleteUserRequest& Request, con } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIUserApi::OnDeleteUserResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -254,7 +254,7 @@ FHttpRequestPtr OpenAPIUserApi::GetUserByName(const GetUserByNameRequest& Reques } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIUserApi::OnGetUserByNameResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -281,7 +281,7 @@ FHttpRequestPtr OpenAPIUserApi::LoginUser(const LoginUserRequest& Request, const } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIUserApi::OnLoginUserResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -308,7 +308,7 @@ FHttpRequestPtr OpenAPIUserApi::LogoutUser(const LogoutUserRequest& Request, con } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIUserApi::OnLogoutUserResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; @@ -335,7 +335,7 @@ FHttpRequestPtr OpenAPIUserApi::UpdateUser(const UpdateUserRequest& Request, con } Request.SetupHttpRequest(HttpRequest); - + HttpRequest->OnProcessRequestComplete().BindRaw(this, &OpenAPIUserApi::OnUpdateUserResponse, Delegate); HttpRequest->ProcessRequest(); return HttpRequest; diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApiOperations.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApiOperations.cpp index 7352577a79e..c0d6c05b7d9 100644 --- a/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApiOperations.cpp +++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApiOperations.cpp @@ -20,7 +20,7 @@ #include "HttpModule.h" #include "PlatformHttp.h" -namespace OpenAPI +namespace OpenAPI { FString OpenAPIUserApi::CreateUserRequest::ComputePath() const @@ -200,7 +200,7 @@ FString OpenAPIUserApi::DeleteUserRequest::ComputePath() const { TEXT("username"), ToStringFormatArg(Username) } }; FString Path = FString::Format(TEXT("/user/{username}"), PathParams); - + return Path; } @@ -214,6 +214,14 @@ void OpenAPIUserApi::DeleteUserRequest::SetupHttpRequest(const FHttpRequestRef& // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -252,7 +260,7 @@ FString OpenAPIUserApi::GetUserByNameRequest::ComputePath() const { TEXT("username"), ToStringFormatArg(Username) } }; FString Path = FString::Format(TEXT("/user/{username}"), PathParams); - + return Path; } @@ -266,6 +274,14 @@ void OpenAPIUserApi::GetUserByNameRequest::SetupHttpRequest(const FHttpRequestRe // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -323,6 +339,14 @@ void OpenAPIUserApi::LoginUserRequest::SetupHttpRequest(const FHttpRequestRef& H // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -371,6 +395,14 @@ void OpenAPIUserApi::LogoutUserRequest::SetupHttpRequest(const FHttpRequestRef& // Default to Json Body request if (Consumes.Num() == 0 || Consumes.Contains(TEXT("application/json"))) { + // Form parameters + FString JsonBody; + JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody); + Writer->WriteObjectStart(); + Writer->WriteObjectEnd(); + Writer->Close(); + HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8")); + HttpRequest->SetContentAsString(JsonBody); } else if (Consumes.Contains(TEXT("multipart/form-data"))) { @@ -407,7 +439,7 @@ FString OpenAPIUserApi::UpdateUserRequest::ComputePath() const { TEXT("username"), ToStringFormatArg(Username) } }; FString Path = FString::Format(TEXT("/user/{username}"), PathParams); - + return Path; } diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIApiResponse.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIApiResponse.h index 2924d49d26e..5abae113d30 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIApiResponse.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIApiResponse.h @@ -14,7 +14,7 @@ #include "OpenAPIBaseModel.h" -namespace OpenAPI +namespace OpenAPI { /* diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIBaseModel.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIBaseModel.h index 53858975245..4c885c815a9 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIBaseModel.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIBaseModel.h @@ -19,7 +19,7 @@ #include "HttpRetrySystem.h" #include "Containers/Ticker.h" -namespace OpenAPI +namespace OpenAPI { typedef TSharedRef> JsonWriter; @@ -50,7 +50,7 @@ struct OPENAPI_API HttpRetryParams }; class OPENAPI_API Model -{ +{ public: virtual ~Model() {} virtual void WriteJson(JsonWriter& Writer) const = 0; diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPICategory.h b/samples/client/petstore/cpp-ue4/Public/OpenAPICategory.h index a38dd8a632d..4b5721f9663 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPICategory.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPICategory.h @@ -14,7 +14,7 @@ #include "OpenAPIBaseModel.h" -namespace OpenAPI +namespace OpenAPI { /* diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h index c7efb1b0a3b..606e1e9851c 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h @@ -21,7 +21,7 @@ class IHttpRequest; -namespace OpenAPI +namespace OpenAPI { typedef TSharedRef> JsonWriter; diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIOrder.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIOrder.h index d0adcb54cca..9abc0bce3f6 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIOrder.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIOrder.h @@ -14,7 +14,7 @@ #include "OpenAPIBaseModel.h" -namespace OpenAPI +namespace OpenAPI { /* @@ -39,7 +39,7 @@ public: Approved, Delivered, }; - + static FString EnumToString(const StatusEnum& EnumValue); static bool EnumFromString(const FString& EnumAsString, StatusEnum& EnumValue); /* Order Status */ diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIPet.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIPet.h index 279f29725a4..c5b31adc62f 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIPet.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIPet.h @@ -16,7 +16,7 @@ #include "OpenAPICategory.h" #include "OpenAPITag.h" -namespace OpenAPI +namespace OpenAPI { /* @@ -42,7 +42,7 @@ public: Pending, Sold, }; - + static FString EnumToString(const StatusEnum& EnumValue); static bool EnumFromString(const FString& EnumAsString, StatusEnum& EnumValue); /* pet status in the store */ diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApi.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApi.h index 737595cc276..ea574b9fd50 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApi.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApi.h @@ -15,7 +15,7 @@ #include "CoreMinimal.h" #include "OpenAPIBaseModel.h" -namespace OpenAPI +namespace OpenAPI { class OPENAPI_API OpenAPIPetApi @@ -24,16 +24,16 @@ public: OpenAPIPetApi(); ~OpenAPIPetApi(); - /* Sets the URL Endpoint. + /* Sets the URL Endpoint. * Note: several fallback endpoints can be configured in request retry policies, see Request::SetShouldRetry */ void SetURL(const FString& Url); /* Adds global header params to all requests */ void AddHeaderParam(const FString& Key, const FString& Value); void ClearHeaderParams(); - + /* Sets the retry manager to the user-defined retry manager. User must manage the lifetime of the retry manager. - * If no retry manager is specified and a request needs retries, a default retry manager will be used. + * If no retry manager is specified and a request needs retries, a default retry manager will be used. * See also: Request::SetShouldRetry */ void SetHttpRetryManager(FHttpRetrySystem::FManager& RetryManager); FHttpRetrySystem::FManager& GetHttpRetryManager(); @@ -92,5 +92,5 @@ private: mutable FHttpRetrySystem::FManager* RetryManager = nullptr; mutable TUniquePtr DefaultRetryManager; }; - + } diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApiOperations.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApiOperations.h index afd325898e2..d3bb135a050 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApiOperations.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApiOperations.h @@ -19,7 +19,7 @@ #include "OpenAPIApiResponse.h" #include "OpenAPIPet.h" -namespace OpenAPI +namespace OpenAPI { /* Add a new pet to the store @@ -31,7 +31,7 @@ public: virtual ~AddPetRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* Pet object that needs to be added to the store */ OpenAPIPet Body; }; @@ -42,7 +42,7 @@ public: virtual ~AddPetResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + }; @@ -55,7 +55,7 @@ public: virtual ~DeletePetRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* Pet id to delete */ int64 PetId = 0; TOptional ApiKey; @@ -67,7 +67,7 @@ public: virtual ~DeletePetResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + }; @@ -81,7 +81,7 @@ public: virtual ~FindPetsByStatusRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + enum class StatusEnum { Available, @@ -101,7 +101,7 @@ public: virtual ~FindPetsByStatusResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + TArray Content; }; @@ -115,7 +115,7 @@ public: virtual ~FindPetsByTagsRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* Tags to filter by */ TArray Tags; }; @@ -126,7 +126,7 @@ public: virtual ~FindPetsByTagsResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + TArray Content; }; @@ -140,7 +140,7 @@ public: virtual ~GetPetByIdRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* ID of pet to return */ int64 PetId = 0; }; @@ -151,7 +151,7 @@ public: virtual ~GetPetByIdResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + OpenAPIPet Content; }; @@ -164,7 +164,7 @@ public: virtual ~UpdatePetRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* Pet object that needs to be added to the store */ OpenAPIPet Body; }; @@ -175,7 +175,7 @@ public: virtual ~UpdatePetResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + }; @@ -188,7 +188,7 @@ public: virtual ~UpdatePetWithFormRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* ID of pet that needs to be updated */ int64 PetId = 0; /* Updated name of the pet */ @@ -203,7 +203,7 @@ public: virtual ~UpdatePetWithFormResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + }; @@ -216,7 +216,7 @@ public: virtual ~UploadFileRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* ID of pet to update */ int64 PetId = 0; /* Additional data to pass to server */ @@ -231,7 +231,7 @@ public: virtual ~UploadFileResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + OpenAPIApiResponse Content; }; diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApi.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApi.h index 0833edc9eda..25e8a63806f 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApi.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApi.h @@ -15,7 +15,7 @@ #include "CoreMinimal.h" #include "OpenAPIBaseModel.h" -namespace OpenAPI +namespace OpenAPI { class OPENAPI_API OpenAPIStoreApi @@ -24,16 +24,16 @@ public: OpenAPIStoreApi(); ~OpenAPIStoreApi(); - /* Sets the URL Endpoint. + /* Sets the URL Endpoint. * Note: several fallback endpoints can be configured in request retry policies, see Request::SetShouldRetry */ void SetURL(const FString& Url); /* Adds global header params to all requests */ void AddHeaderParam(const FString& Key, const FString& Value); void ClearHeaderParams(); - + /* Sets the retry manager to the user-defined retry manager. User must manage the lifetime of the retry manager. - * If no retry manager is specified and a request needs retries, a default retry manager will be used. + * If no retry manager is specified and a request needs retries, a default retry manager will be used. * See also: Request::SetShouldRetry */ void SetHttpRetryManager(FHttpRetrySystem::FManager& RetryManager); FHttpRetrySystem::FManager& GetHttpRetryManager(); @@ -72,5 +72,5 @@ private: mutable FHttpRetrySystem::FManager* RetryManager = nullptr; mutable TUniquePtr DefaultRetryManager; }; - + } diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h index ef7d6653663..e0703baa3af 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h @@ -17,7 +17,7 @@ #include "OpenAPIOrder.h" -namespace OpenAPI +namespace OpenAPI { /* Delete purchase order by ID @@ -30,7 +30,7 @@ public: virtual ~DeleteOrderRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* ID of the order that needs to be deleted */ FString OrderId; }; @@ -41,7 +41,7 @@ public: virtual ~DeleteOrderResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + }; @@ -55,7 +55,7 @@ public: virtual ~GetInventoryRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + }; class OPENAPI_API OpenAPIStoreApi::GetInventoryResponse : public Response @@ -64,7 +64,7 @@ public: virtual ~GetInventoryResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + TMap Content; }; @@ -78,7 +78,7 @@ public: virtual ~GetOrderByIdRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* ID of pet that needs to be fetched */ int64 OrderId = 0; }; @@ -89,7 +89,7 @@ public: virtual ~GetOrderByIdResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + OpenAPIOrder Content; }; @@ -102,7 +102,7 @@ public: virtual ~PlaceOrderRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* order placed for purchasing the pet */ OpenAPIOrder Body; }; @@ -113,7 +113,7 @@ public: virtual ~PlaceOrderResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + OpenAPIOrder Content; }; diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPITag.h b/samples/client/petstore/cpp-ue4/Public/OpenAPITag.h index ab8a2646beb..0fe7ee847dd 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPITag.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPITag.h @@ -14,7 +14,7 @@ #include "OpenAPIBaseModel.h" -namespace OpenAPI +namespace OpenAPI { /* diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIUser.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIUser.h index fe4e1affa9f..9426d3dd764 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIUser.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIUser.h @@ -14,7 +14,7 @@ #include "OpenAPIBaseModel.h" -namespace OpenAPI +namespace OpenAPI { /* diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApi.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApi.h index 051e7bde488..fb9c7d01236 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApi.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApi.h @@ -15,7 +15,7 @@ #include "CoreMinimal.h" #include "OpenAPIBaseModel.h" -namespace OpenAPI +namespace OpenAPI { class OPENAPI_API OpenAPIUserApi @@ -24,16 +24,16 @@ public: OpenAPIUserApi(); ~OpenAPIUserApi(); - /* Sets the URL Endpoint. + /* Sets the URL Endpoint. * Note: several fallback endpoints can be configured in request retry policies, see Request::SetShouldRetry */ void SetURL(const FString& Url); /* Adds global header params to all requests */ void AddHeaderParam(const FString& Key, const FString& Value); void ClearHeaderParams(); - + /* Sets the retry manager to the user-defined retry manager. User must manage the lifetime of the retry manager. - * If no retry manager is specified and a request needs retries, a default retry manager will be used. + * If no retry manager is specified and a request needs retries, a default retry manager will be used. * See also: Request::SetShouldRetry */ void SetHttpRetryManager(FHttpRetrySystem::FManager& RetryManager); FHttpRetrySystem::FManager& GetHttpRetryManager(); @@ -92,5 +92,5 @@ private: mutable FHttpRetrySystem::FManager* RetryManager = nullptr; mutable TUniquePtr DefaultRetryManager; }; - + } diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApiOperations.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApiOperations.h index 7c08074dc57..4b58b2d4067 100644 --- a/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApiOperations.h +++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApiOperations.h @@ -17,7 +17,7 @@ #include "OpenAPIUser.h" -namespace OpenAPI +namespace OpenAPI { /* Create user @@ -30,7 +30,7 @@ public: virtual ~CreateUserRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* Created user object */ OpenAPIUser Body; }; @@ -41,7 +41,7 @@ public: virtual ~CreateUserResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + }; @@ -54,7 +54,7 @@ public: virtual ~CreateUsersWithArrayInputRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* List of user object */ TArray Body; }; @@ -65,7 +65,7 @@ public: virtual ~CreateUsersWithArrayInputResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + }; @@ -78,7 +78,7 @@ public: virtual ~CreateUsersWithListInputRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* List of user object */ TArray Body; }; @@ -89,7 +89,7 @@ public: virtual ~CreateUsersWithListInputResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + }; @@ -103,7 +103,7 @@ public: virtual ~DeleteUserRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* The name that needs to be deleted */ FString Username; }; @@ -114,7 +114,7 @@ public: virtual ~DeleteUserResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + }; @@ -127,7 +127,7 @@ public: virtual ~GetUserByNameRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* The name that needs to be fetched. Use user1 for testing. */ FString Username; }; @@ -138,7 +138,7 @@ public: virtual ~GetUserByNameResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + OpenAPIUser Content; }; @@ -151,7 +151,7 @@ public: virtual ~LoginUserRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* The user name for login */ FString Username; /* The password for login in clear text */ @@ -164,7 +164,7 @@ public: virtual ~LoginUserResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + FString Content; }; @@ -177,7 +177,7 @@ public: virtual ~LogoutUserRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + }; class OPENAPI_API OpenAPIUserApi::LogoutUserResponse : public Response @@ -186,7 +186,7 @@ public: virtual ~LogoutUserResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + }; @@ -200,7 +200,7 @@ public: virtual ~UpdateUserRequest() {} void SetupHttpRequest(const FHttpRequestRef& HttpRequest) const final; FString ComputePath() const final; - + /* name that need to be deleted */ FString Username; /* Updated user object */ @@ -213,7 +213,7 @@ public: virtual ~UpdateUserResponse() {} void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final; bool FromJson(const TSharedPtr& JsonValue) final; - + };