Merge remote-tracking branch 'origin/master' into native-gradle-properties

wing328 · wing328 · commit 4ab5433a29cf · 2025-04-23T16:43:08.000+08:00
diff --git 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<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -503,7 +503,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -497,7 +497,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -602,7 +602,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -597,7 +597,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -528,7 +528,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -633,7 +633,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -633,7 +633,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -633,7 +633,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -502,7 +502,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -633,7 +633,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -502,7 +502,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -533,7 +533,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -633,7 +633,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -628,7 +628,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -628,7 +628,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -602,7 +602,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)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
@@ -597,7 +597,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
                         {
                             url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]);
                         }

Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,7 @@ namespace {{packageName}}.Client`
`603`	`603`
`604`	`604`	`if (inputVariables.ContainsKey(variable.Key))`
`605`	`605`	`{`
`606`		`- if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
	`606`	`+ if (!serverVariables.ContainsKey("enum_values") \|\| ((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
`607`	`607`	`{`
`608`	`608`	`url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]);`
`609`	`609`	`}`
Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,`
`503`	`503`
`504`	`504`	`if (inputVariables.ContainsKey(variable.Key))`
`505`	`505`	`{`
`506`		`- if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
	`506`	`+ if (!serverVariables.ContainsKey("enum_values") \|\| ((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
`507`	`507`	`{`
`508`	`508`	`url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]);`
`509`	`509`	`}`
Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,`
`497`	`497`
`498`	`498`	`if (inputVariables.ContainsKey(variable.Key))`
`499`	`499`	`{`
`500`		`- if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
	`500`	`+ if (!serverVariables.ContainsKey("enum_values") \|\| ((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
`501`	`501`	`{`
`502`	`502`	`url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]);`
`503`	`503`	`}`
Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,`
`602`	`602`
`603`	`603`	`if (inputVariables.ContainsKey(variable.Key))`
`604`	`604`	`{`
`605`		`- if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
	`605`	`+ if (!serverVariables.ContainsKey("enum_values") \|\| ((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
`606`	`606`	`{`
`607`	`607`	`url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]);`
`608`	`608`	`}`
Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,`
`597`	`597`
`598`	`598`	`if (inputVariables.ContainsKey(variable.Key))`
`599`	`599`	`{`
`600`		`- if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
	`600`	`+ if (!serverVariables.ContainsKey("enum_values") \|\| ((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
`601`	`601`	`{`
`602`	`602`	`url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]);`
`603`	`603`	`}`
Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,`
`528`	`528`
`529`	`529`	`if (inputVariables.ContainsKey(variable.Key))`
`530`	`530`	`{`
`531`		`- if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
	`531`	`+ if (!serverVariables.ContainsKey("enum_values") \|\| ((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
`532`	`532`	`{`
`533`	`533`	`url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]);`
`534`	`534`	`}`
Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,`
`633`	`633`
`634`	`634`	`if (inputVariables.ContainsKey(variable.Key))`
`635`	`635`	`{`
`636`		`- if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
	`636`	`+ if (!serverVariables.ContainsKey("enum_values") \|\| ((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
`637`	`637`	`{`
`638`	`638`	`url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]);`
`639`	`639`	`}`
Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,`
`502`	`502`
`503`	`503`	`if (inputVariables.ContainsKey(variable.Key))`
`504`	`504`	`{`
`505`		`- if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
	`505`	`+ if (!serverVariables.ContainsKey("enum_values") \|\| ((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))`
`506`	`506`	`{`
`507`	`507`	`url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]);`
`508`	`508`	`}`