Skip to content

Commit 2065f1a

Browse files
committed
Fixed handling of body parameter, now correctly outputs json without creating an additional enclosing "body" object.
Fixed cases where a file parameter is also marked isBinary.
1 parent 5abc6ad commit 2065f1a

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,19 +139,17 @@ void {{classname}}::{{operationIdCamelCase}}Request::SetupHttpRequest(const TSha
139139
FString JsonBody;
140140
JsonWriter Writer = TJsonWriterFactory<>::Create(&JsonBody);
141141

142-
Writer->WriteObjectStart();
143142
{{#bodyParams}}
144143
{{#required}}
145-
Writer->WriteIdentifierPrefix(TEXT("{{baseName}}")); WriteJsonValue(Writer, {{paramName}});
144+
WriteJsonValue(Writer, {{paramName}});
146145
{{/required}}
147146
{{^required}}
148147
if ({{paramName}}.IsSet())
149148
{
150-
Writer->WriteIdentifierPrefix(TEXT("{{baseName}}")); WriteJsonValue(Writer, {{paramName}}.GetValue());
149+
WriteJsonValue(Writer, {{paramName}}.GetValue());
151150
}
152151
{{/required}}
153152
{{/bodyParams}}
154-
Writer->WriteObjectEnd();
155153
Writer->Close();
156154

157155
HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/json; charset=utf-8"));
@@ -176,29 +174,29 @@ void {{classname}}::{{operationIdCamelCase}}Request::SetupHttpRequest(const TSha
176174
{{#isFile}}
177175
FormData.AddFilePart(TEXT("{{baseName}}"), {{paramName}});
178176
{{/isFile}}
177+
{{^isFile}}
179178
{{#isBinary}}
180179
FormData.AddBinaryPart(TEXT("{{baseName}}"), {{paramName}});
181180
{{/isBinary}}
182-
{{#isBinary}}
183-
{{^isFile}}
181+
{{^isBinary}}
184182
FormData.AddStringPart(TEXT("{{baseName}}"), *ToUrlString({{paramName}}));
185-
{{/isFile}}
186183
{{/isBinary}}
184+
{{/isFile}}
187185
{{/required}}
188186
{{^required}}
189187
if({{paramName}}.IsSet())
190188
{
191189
{{#isFile}}
192190
FormData.AddFilePart(TEXT("{{baseName}}"), {{paramName}}.GetValue());
193191
{{/isFile}}
192+
{{^isFile}}
194193
{{#isBinary}}
195194
FormData.AddBinaryPart(TEXT("{{baseName}}"), {{paramName}}.GetValue());
196195
{{/isBinary}}
197196
{{^isBinary}}
198-
{{^isFile}}
199197
FormData.AddStringPart(TEXT("{{baseName}}"), *ToUrlString({{paramName}}.GetValue()));
200-
{{/isFile}}
201198
{{/isBinary}}
199+
{{/isFile}}
202200
}
203201
{{/required}}
204202
{{/isContainer}}

0 commit comments

Comments
 (0)