Skip to content

Commit 8d62598

Browse files
devhl-labsdevhl-labs
authored
used list instead of set (#16015)
1 parent 5479e57 commit 8d62598

9 files changed

Lines changed: 140 additions & 140 deletions

File tree

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
836836
}
837837
}
838838

839-
Set<CodegenParameter> referenceTypes = operation.allParams.stream().filter(p -> p.vendorExtensions.get("x-is-value-type") == null && !p.isNullable).collect(Collectors.toSet());
839+
List<CodegenParameter> referenceTypes = operation.allParams.stream().filter(p -> p.vendorExtensions.get("x-is-value-type") == null && !p.isNullable).collect(Collectors.toList());
840840
operation.vendorExtensions.put("x-not-nullable-reference-types", referenceTypes);
841841
operation.vendorExtensions.put("x-has-not-nullable-reference-types", referenceTypes.size() > 0);
842842
processOperation(operation);

‎samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1736,31 +1736,31 @@ public async Task<ApiResponse<ModelClient>> TestClientModelAsync(ModelClient mod
17361736
/// Validates the request parameters
17371737
/// </summary>
17381738
/// <param name="varByte"></param>
1739-
/// <param name="callback"></param>
1740-
/// <param name="binary"></param>
1741-
/// <param name="password"></param>
17421739
/// <param name="patternWithoutDelimiter"></param>
1740+
/// <param name="binary"></param>
17431741
/// <param name="varString"></param>
1742+
/// <param name="password"></param>
1743+
/// <param name="callback"></param>
17441744
/// <returns></returns>
1745-
private void ValidateTestEndpointParameters(byte[] varByte, Option<string> callback, Option<System.IO.Stream> binary, Option<string> password, string patternWithoutDelimiter, Option<string> varString)
1745+
private void ValidateTestEndpointParameters(byte[] varByte, string patternWithoutDelimiter, Option<System.IO.Stream> binary, Option<string> varString, Option<string> password, Option<string> callback)
17461746
{
17471747
if (varByte == null)
17481748
throw new ArgumentNullException(nameof(varByte));
17491749

1750-
if (callback.IsSet && callback.Value == null)
1751-
throw new ArgumentNullException(nameof(callback));
1750+
if (patternWithoutDelimiter == null)
1751+
throw new ArgumentNullException(nameof(patternWithoutDelimiter));
17521752

17531753
if (binary.IsSet && binary.Value == null)
17541754
throw new ArgumentNullException(nameof(binary));
17551755

1756+
if (varString.IsSet && varString.Value == null)
1757+
throw new ArgumentNullException(nameof(varString));
1758+
17561759
if (password.IsSet && password.Value == null)
17571760
throw new ArgumentNullException(nameof(password));
17581761

1759-
if (patternWithoutDelimiter == null)
1760-
throw new ArgumentNullException(nameof(patternWithoutDelimiter));
1761-
1762-
if (varString.IsSet && varString.Value == null)
1763-
throw new ArgumentNullException(nameof(varString));
1762+
if (callback.IsSet && callback.Value == null)
1763+
throw new ArgumentNullException(nameof(callback));
17641764
}
17651765

17661766
/// <summary>
@@ -1915,7 +1915,7 @@ public async Task<ApiResponse<object>> TestEndpointParametersAsync(byte[] varByt
19151915

19161916
try
19171917
{
1918-
ValidateTestEndpointParameters(varByte, callback, binary, password, patternWithoutDelimiter, varString);
1918+
ValidateTestEndpointParameters(varByte, patternWithoutDelimiter, binary, varString, password, callback);
19191919

19201920
FormatTestEndpointParameters(ref varByte, ref number, ref varDouble, ref patternWithoutDelimiter, ref date, ref binary, ref varFloat, ref integer, ref int32, ref int64, ref varString, ref password, ref callback, ref dateTime);
19211921

@@ -2026,11 +2026,11 @@ public async Task<ApiResponse<object>> TestEndpointParametersAsync(byte[] varByt
20262026
/// <param name="enumHeaderStringArray"></param>
20272027
/// <param name="enumQueryStringArray"></param>
20282028
/// <param name="enumFormStringArray"></param>
2029-
/// <param name="enumQueryString"></param>
20302029
/// <param name="enumHeaderString"></param>
2030+
/// <param name="enumQueryString"></param>
20312031
/// <param name="enumFormString"></param>
20322032
/// <returns></returns>
2033-
private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<List<string>> enumFormStringArray, Option<string> enumQueryString, Option<string> enumHeaderString, Option<string> enumFormString)
2033+
private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArray, Option<List<string>> enumQueryStringArray, Option<List<string>> enumFormStringArray, Option<string> enumHeaderString, Option<string> enumQueryString, Option<string> enumFormString)
20342034
{
20352035
if (enumHeaderStringArray.IsSet && enumHeaderStringArray.Value == null)
20362036
throw new ArgumentNullException(nameof(enumHeaderStringArray));
@@ -2041,12 +2041,12 @@ private void ValidateTestEnumParameters(Option<List<string>> enumHeaderStringArr
20412041
if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
20422042
throw new ArgumentNullException(nameof(enumFormStringArray));
20432043

2044-
if (enumQueryString.IsSet && enumQueryString.Value == null)
2045-
throw new ArgumentNullException(nameof(enumQueryString));
2046-
20472044
if (enumHeaderString.IsSet && enumHeaderString.Value == null)
20482045
throw new ArgumentNullException(nameof(enumHeaderString));
20492046

2047+
if (enumQueryString.IsSet && enumQueryString.Value == null)
2048+
throw new ArgumentNullException(nameof(enumQueryString));
2049+
20502050
if (enumFormString.IsSet && enumFormString.Value == null)
20512051
throw new ArgumentNullException(nameof(enumFormString));
20522052
}
@@ -2167,7 +2167,7 @@ public async Task<ApiResponse<object>> TestEnumParametersAsync(Option<List<strin
21672167

21682168
try
21692169
{
2170-
ValidateTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumQueryString, enumHeaderString, enumFormString);
2170+
ValidateTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
21712171

21722172
FormatTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, ref enumQueryDouble, ref enumQueryInteger, enumFormStringArray, ref enumHeaderString, ref enumQueryString, ref enumFormString);
21732173

@@ -2711,36 +2711,36 @@ public async Task<ApiResponse<object>> TestJsonFormDataAsync(string param, strin
27112711
/// <summary>
27122712
/// Validates the request parameters
27132713
/// </summary>
2714-
/// <param name="context"></param>
2715-
/// <param name="requiredNotNullable"></param>
2716-
/// <param name="notRequiredNotNullable"></param>
27172714
/// <param name="pipe"></param>
27182715
/// <param name="ioutil"></param>
2719-
/// <param name="url"></param>
27202716
/// <param name="http"></param>
2717+
/// <param name="url"></param>
2718+
/// <param name="context"></param>
2719+
/// <param name="requiredNotNullable"></param>
2720+
/// <param name="notRequiredNotNullable"></param>
27212721
/// <returns></returns>
2722-
private void ValidateTestQueryParameterCollectionFormat(List<string> context, string requiredNotNullable, Option<string> notRequiredNotNullable, List<string> pipe, List<string> ioutil, List<string> url, List<string> http)
2722+
private void ValidateTestQueryParameterCollectionFormat(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, string requiredNotNullable, Option<string> notRequiredNotNullable)
27232723
{
2724-
if (context == null)
2725-
throw new ArgumentNullException(nameof(context));
2726-
2727-
if (requiredNotNullable == null)
2728-
throw new ArgumentNullException(nameof(requiredNotNullable));
2729-
2730-
if (notRequiredNotNullable.IsSet && notRequiredNotNullable.Value == null)
2731-
throw new ArgumentNullException(nameof(notRequiredNotNullable));
2732-
27332724
if (pipe == null)
27342725
throw new ArgumentNullException(nameof(pipe));
27352726

27362727
if (ioutil == null)
27372728
throw new ArgumentNullException(nameof(ioutil));
27382729

2730+
if (http == null)
2731+
throw new ArgumentNullException(nameof(http));
2732+
27392733
if (url == null)
27402734
throw new ArgumentNullException(nameof(url));
27412735

2742-
if (http == null)
2743-
throw new ArgumentNullException(nameof(http));
2736+
if (context == null)
2737+
throw new ArgumentNullException(nameof(context));
2738+
2739+
if (requiredNotNullable == null)
2740+
throw new ArgumentNullException(nameof(requiredNotNullable));
2741+
2742+
if (notRequiredNotNullable.IsSet && notRequiredNotNullable.Value == null)
2743+
throw new ArgumentNullException(nameof(notRequiredNotNullable));
27442744
}
27452745

27462746
/// <summary>
@@ -2865,7 +2865,7 @@ public async Task<ApiResponse<object>> TestQueryParameterCollectionFormatAsync(L
28652865

28662866
try
28672867
{
2868-
ValidateTestQueryParameterCollectionFormat(context, requiredNotNullable, notRequiredNotNullable, pipe, ioutil, url, http);
2868+
ValidateTestQueryParameterCollectionFormat(pipe, ioutil, http, url, context, requiredNotNullable, notRequiredNotNullable);
28692869

28702870
FormatTestQueryParameterCollectionFormat(pipe, ioutil, http, url, context, ref requiredNotNullable, ref requiredNullable, ref notRequiredNotNullable, ref notRequiredNullable);
28712871

‎samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,16 +1429,16 @@ public async Task<ApiResponse<object>> UpdatePetWithFormAsync(long petId, Option
14291429
/// <summary>
14301430
/// Validates the request parameters
14311431
/// </summary>
1432-
/// <param name="additionalMetadata"></param>
14331432
/// <param name="file"></param>
1433+
/// <param name="additionalMetadata"></param>
14341434
/// <returns></returns>
1435-
private void ValidateUploadFile(Option<string> additionalMetadata, Option<System.IO.Stream> file)
1435+
private void ValidateUploadFile(Option<System.IO.Stream> file, Option<string> additionalMetadata)
14361436
{
1437-
if (additionalMetadata.IsSet && additionalMetadata.Value == null)
1438-
throw new ArgumentNullException(nameof(additionalMetadata));
1439-
14401437
if (file.IsSet && file.Value == null)
14411438
throw new ArgumentNullException(nameof(file));
1439+
1440+
if (additionalMetadata.IsSet && additionalMetadata.Value == null)
1441+
throw new ArgumentNullException(nameof(additionalMetadata));
14421442
}
14431443

14441444
/// <summary>
@@ -1527,7 +1527,7 @@ public async Task<ApiResponse<ApiResponse>> UploadFileAsync(long petId, Option<S
15271527

15281528
try
15291529
{
1530-
ValidateUploadFile(additionalMetadata, file);
1530+
ValidateUploadFile(file, additionalMetadata);
15311531

15321532
FormatUploadFile(ref petId, ref file, ref additionalMetadata);
15331533

0 commit comments

Comments
 (0)