From 28daa689432b5a16e15194d5ea41b40e6dde4ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai-Uwe=20H=C3=BCber?= Date: Wed, 23 Apr 2025 10:26:41 +0200 Subject: [PATCH] Check if enum_values exists in the serverUrl [csharp] (#21122) * check if enum_values are existing If no enum_values are given for in a serverUrl, the check must be ignored. * update samples --------- Co-authored-by: William Cheng --- .../src/main/resources/csharp/Configuration.mustache | 2 +- .../net8/EchoApi/src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../net9/Petstore/src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../Petstore/src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../Petstore/src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../Petstore/src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../EnumMappings/src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../net8/Petstore/src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../EnumMappings/src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../Petstore/src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../net9/Petstore/src/Org.OpenAPITools/Client/Configuration.cs | 2 +- .../Petstore/src/Org.OpenAPITools/Client/Configuration.cs | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/Configuration.mustache b/modules/openapi-generator/src/main/resources/csharp/Configuration.mustache index 06975803363..39dbd9c0394 100644 --- a/modules/openapi-generator/src/main/resources/csharp/Configuration.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/Configuration.mustache @@ -603,7 +603,7 @@ namespace {{packageName}}.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/Configuration.cs index 5c8abc6ea70..13e61760f2b 100644 --- a/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/Configuration.cs @@ -503,7 +503,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/Configuration.cs index ffddac249d0..9a4b99cd812 100644 --- a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/Configuration.cs @@ -497,7 +497,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/Configuration.cs index 02aefa69e18..601dfdb2f3e 100644 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/Configuration.cs @@ -602,7 +602,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs index 08960c8389e..ed3aecacd92 100644 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs @@ -597,7 +597,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/Configuration.cs index d4177aa1d04..1176107c56f 100644 --- a/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/Configuration.cs @@ -528,7 +528,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/Configuration.cs index e104bdcf277..e254dd2413a 100644 --- a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/Configuration.cs @@ -633,7 +633,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/Configuration.cs index e104bdcf277..e254dd2413a 100644 --- a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/Configuration.cs @@ -633,7 +633,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/Configuration.cs index 76aaeace670..ccbe7606085 100644 --- a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/Configuration.cs @@ -633,7 +633,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/restsharp/net8/ParameterMappings/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net8/ParameterMappings/src/Org.OpenAPITools/Client/Configuration.cs index edbaddee9a0..d7146853e0f 100644 --- a/samples/client/petstore/csharp/restsharp/net8/ParameterMappings/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/restsharp/net8/ParameterMappings/src/Org.OpenAPITools/Client/Configuration.cs @@ -502,7 +502,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/Configuration.cs index 76aaeace670..ccbe7606085 100644 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/Configuration.cs @@ -633,7 +633,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs index 488b3d832e4..5a7f7e94823 100644 --- a/samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs @@ -502,7 +502,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Configuration.cs index 35b89b430a8..c89eee968ec 100644 --- a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Configuration.cs @@ -533,7 +533,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/Configuration.cs index 76aaeace670..ccbe7606085 100644 --- a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/Configuration.cs @@ -633,7 +633,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs index 18e94ac0845..3ea2a481c16 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs @@ -628,7 +628,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs index 18e94ac0845..3ea2a481c16 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs @@ -628,7 +628,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Client/Configuration.cs index 02aefa69e18..601dfdb2f3e 100644 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/src/Org.OpenAPITools/Client/Configuration.cs @@ -602,7 +602,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); } diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs index 08960c8389e..ed3aecacd92 100644 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs @@ -597,7 +597,7 @@ namespace Org.OpenAPITools.Client if (inputVariables.ContainsKey(variable.Key)) { - if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + if (!serverVariables.ContainsKey("enum_values") || ((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) { url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); }