Merge pull request #10275 from Kahncode/ue4cpp-fix

Ue4cpp fix

Author: HugoMario

modules/swagger-codegen/src/main/resources/ue4cpp/api-operations-source.mustache

@@ -139,19 +139,17 @@ void {{classname}}::{{operationIdCamelCase}}Request::SetupHttpRequest(const TSha
 		FString JsonBody;
 		JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody);
 
-		Writer->WriteObjectStart();
 		{{#bodyParams}}
 		{{#required}}
-		Writer->WriteIdentifierPrefix(TEXT("{{baseName}}")); WriteJsonValue(Writer, {{paramName}});
+		WriteJsonValue(Writer, {{paramName}});
 		{{/required}}
 		{{^required}}
 		if ({{paramName}}.IsSet())
 		{
-			Writer->WriteIdentifierPrefix(TEXT("{{baseName}}")); WriteJsonValue(Writer, {{paramName}}.GetValue());
+			WriteJsonValue(Writer, {{paramName}}.GetValue());
 		}
 		{{/required}}
 		{{/bodyParams}}
-		Writer->WriteObjectEnd();
 		Writer->Close();
 
 		HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8"));
@@ -176,29 +174,29 @@ void {{classname}}::{{operationIdCamelCase}}Request::SetupHttpRequest(const TSha
 		{{#isFile}}
 		FormData.AddFilePart(TEXT("{{baseName}}"), {{paramName}});
 		{{/isFile}}
+		{{^isFile}}
 		{{#isBinary}}
 		FormData.AddBinaryPart(TEXT("{{baseName}}"), {{paramName}});
 		{{/isBinary}}
-		{{#isBinary}}
-		{{^isFile}}
+		{{^isBinary}}
 		FormData.AddStringPart(TEXT("{{baseName}}"), *ToUrlString({{paramName}}));
-		{{/isFile}}
 		{{/isBinary}}
+		{{/isFile}}
 		{{/required}}
 		{{^required}}
 		if({{paramName}}.IsSet())
 		{
 			{{#isFile}}
 			FormData.AddFilePart(TEXT("{{baseName}}"), {{paramName}}.GetValue());
 			{{/isFile}}
+			{{^isFile}}
 			{{#isBinary}}
 			FormData.AddBinaryPart(TEXT("{{baseName}}"), {{paramName}}.GetValue());
 			{{/isBinary}}
 			{{^isBinary}}
-			{{^isFile}}
 			FormData.AddStringPart(TEXT("{{baseName}}"), *ToUrlString({{paramName}}.GetValue()));
-			{{/isFile}}
 			{{/isBinary}}
+			{{/isFile}}
 		}
 		{{/required}}
 		{{/isContainer}}

samples/client/petstore/ue4cpp/Private/SwaggerPetApiOperations.cpp

@@ -42,9 +42,7 @@ void SwaggerPetApi::AddPetRequest::SetupHttpRequest(const TSharedRef<IHttpReques
 		FString JsonBody;
 		JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody);
 
-		Writer->WriteObjectStart();
-		Writer->WriteIdentifierPrefix(TEXT("body")); WriteJsonValue(Writer, Body);
-		Writer->WriteObjectEnd();
+		WriteJsonValue(Writer, Body);
 		Writer->Close();
 
 		HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8"));
@@ -365,9 +363,7 @@ void SwaggerPetApi::UpdatePetRequest::SetupHttpRequest(const TSharedRef<IHttpReq
 		FString JsonBody;
 		JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody);
 
-		Writer->WriteObjectStart();
-		Writer->WriteIdentifierPrefix(TEXT("body")); WriteJsonValue(Writer, Body);
-		Writer->WriteObjectEnd();
+		WriteJsonValue(Writer, Body);
 		Writer->Close();
 
 		HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8"));

samples/client/petstore/ue4cpp/Private/SwaggerStoreApiOperations.cpp

@@ -196,9 +196,7 @@ void SwaggerStoreApi::PlaceOrderRequest::SetupHttpRequest(const TSharedRef<IHttp
 		FString JsonBody;
 		JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody);
 
-		Writer->WriteObjectStart();
-		Writer->WriteIdentifierPrefix(TEXT("body")); WriteJsonValue(Writer, Body);
-		Writer->WriteObjectEnd();
+		WriteJsonValue(Writer, Body);
 		Writer->Close();
 
 		HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8"));

samples/client/petstore/ue4cpp/Private/SwaggerUserApiOperations.cpp

@@ -42,9 +42,7 @@ void SwaggerUserApi::CreateUserRequest::SetupHttpRequest(const TSharedRef<IHttpR
 		FString JsonBody;
 		JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody);
 
-		Writer->WriteObjectStart();
-		Writer->WriteIdentifierPrefix(TEXT("body")); WriteJsonValue(Writer, Body);
-		Writer->WriteObjectEnd();
+		WriteJsonValue(Writer, Body);
 		Writer->Close();
 
 		HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8"));
@@ -101,9 +99,7 @@ void SwaggerUserApi::CreateUsersWithArrayInputRequest::SetupHttpRequest(const TS
 		FString JsonBody;
 		JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody);
 
-		Writer->WriteObjectStart();
-		Writer->WriteIdentifierPrefix(TEXT("body")); WriteJsonValue(Writer, Body);
-		Writer->WriteObjectEnd();
+		WriteJsonValue(Writer, Body);
 		Writer->Close();
 
 		HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8"));
@@ -160,9 +156,7 @@ void SwaggerUserApi::CreateUsersWithListInputRequest::SetupHttpRequest(const TSh
 		FString JsonBody;
 		JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody);
 
-		Writer->WriteObjectStart();
-		Writer->WriteIdentifierPrefix(TEXT("body")); WriteJsonValue(Writer, Body);
-		Writer->WriteObjectEnd();
+		WriteJsonValue(Writer, Body);
 		Writer->Close();
 
 		HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8"));
@@ -432,9 +426,7 @@ void SwaggerUserApi::UpdateUserRequest::SetupHttpRequest(const TSharedRef<IHttpR
 		FString JsonBody;
 		JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody);
 
-		Writer->WriteObjectStart();
-		Writer->WriteIdentifierPrefix(TEXT("body")); WriteJsonValue(Writer, Body);
-		Writer->WriteObjectEnd();
+		WriteJsonValue(Writer, Body);
 		Writer->Close();
 
 		HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8"));