Skip to content

Commit b9f531f

Browse files
author
Olivier Leonard
committed
Fix api.mustache
1 parent 24b314a commit b9f531f

3 files changed

Lines changed: 49 additions & 10 deletions

File tree

‎modules/openapi-generator/src/main/resources/csharp/api.mustache‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,15 @@ namespace {{packageName}}.{{apiPackage}}
314314
{{#required}}
315315
{{#isDeepObject}}
316316
{{#items.vars}}
317+
{{#required}}
317318
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.{{name}}));
319+
{{/required}}
320+
{{^required}}
321+
if ({{paramName}}.{{name}}.IsSet)
322+
{
323+
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.{{name}}.Value));
324+
}
325+
{{/required}}
318326
{{/items.vars}}
319327
{{^items}}
320328
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("deepObject", "{{baseName}}", {{paramName}}));
@@ -329,10 +337,15 @@ namespace {{packageName}}.{{apiPackage}}
329337
{
330338
{{#isDeepObject}}
331339
{{#items.vars}}
332-
if ({{paramName}}.Value.{{name}} != null)
340+
{{#required}}
341+
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{paramName}}[{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}]", {{paramName}}.Value.{{name}}));
342+
{{/required}}
343+
{{^required}}
344+
if ({{paramName}}.Value.{{name}}.IsSet)
333345
{
334-
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{paramName}}[{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}]", {{paramName}}.Value.{{name}}));
346+
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{paramName}}[{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}]", {{paramName}}.Value.{{name}}.Value));
335347
}
348+
{{/required}}
336349
{{/items.vars}}
337350
{{^items}}
338351
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("deepObject", "{{baseName}}", {{paramName}}.Value));

‎modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/api.mustache‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,15 @@ namespace {{packageName}}.{{apiPackage}}
398398
{{#required}}
399399
{{#isDeepObject}}
400400
{{#items.vars}}
401+
{{#required}}
401402
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.{{name}}));
403+
{{/required}}
404+
{{^required}}
405+
if ({{paramName}}.{{name}}.IsSet)
406+
{
407+
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.{{name}}.Value));
408+
}
409+
{{/required}}
402410
{{/items.vars}}
403411
{{^items}}
404412
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("deepObject", "{{baseName}}", {{paramName}}));
@@ -412,12 +420,17 @@ namespace {{packageName}}.{{apiPackage}}
412420
if ({{paramName}}.IsSet)
413421
{
414422
{{#isDeepObject}}
415-
{{#items.vars}}
416-
if ({{paramName}}.Value.{{name}} != null)
423+
{{#items.vars}}
424+
{{#required}}
425+
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.Value.{{name}}));
426+
{{/required}}
427+
{{^required}}
428+
if ({{paramName}}.Value.{{name}}.IsSet)
417429
{
418-
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.Value.{{name}}));
430+
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.Value.{{name}}.Value));
419431
}
420-
{{/items.vars}}
432+
{{/required}}
433+
{{/items.vars}}
421434
{{^items}}
422435
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("deepObject", "{{baseName}}", {{paramName}}.Value));
423436
{{/items}}

‎modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/api.mustache‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,15 @@ namespace {{packageName}}.{{apiPackage}}
324324
{{#required}}
325325
{{#isDeepObject}}
326326
{{#items.vars}}
327+
{{#required}}
327328
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.{{name}}));
329+
{{/required}}
330+
{{^required}}
331+
if ({{paramName}}.{{name}}.IsSet)
332+
{
333+
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.{{name}}.Value));
334+
}
335+
{{/required}}
328336
{{/items.vars}}
329337
{{^items}}
330338
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("deepObject", "{{baseName}}", {{paramName}}));
@@ -338,12 +346,17 @@ namespace {{packageName}}.{{apiPackage}}
338346
if ({{paramName}}.IsSet)
339347
{
340348
{{#isDeepObject}}
341-
{{#items.vars}}
342-
if ({{paramName}}.Value.{{name}} != null)
349+
{{#items.vars}}
350+
{{#required}}
351+
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.Value.{{name}}));
352+
{{/required}}
353+
{{^required}}
354+
if ({{paramName}}.Value.{{name}}.IsSet)
343355
{
344-
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.Value.{{name}}));
356+
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("{{collectionFormat}}", "{{baseName}}", {{paramName}}.Value.{{name}}.Value));
345357
}
346-
{{/items.vars}}
358+
{{/required}}
359+
{{/items.vars}}
347360
{{^items}}
348361
localVarRequestOptions.QueryParameters.Add({{packageName}}.Client.ClientUtils.ParameterToMultiMap("deepObject", "{{baseName}}", {{paramName}}.Value));
349362
{{/items}}

0 commit comments

Comments
 (0)