- fixes a bug where quotes were added to boool/number parameters

Signed-off-by: Vincent Biret <[email protected]>

Author: baywet

src/Microsoft.OpenApi.OData.Reader/Edm/EdmTypeExtensions.cs

@@ -0,0 +1,35 @@
+// ------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// ------------------------------------------------------------
+
+using Microsoft.OData.Edm;
+
+namespace Microsoft.OpenApi.OData.Edm
+{
+	/// <summary>
+    /// Extension methods for <see cref="IEdmType"/>
+    /// </summary>
+    public static class EdmTypeExtensions
+	{
+		/// <summary>
+		/// Determines wether a path parameter should be wrapped in quotes based on the type of the parameter.
+		/// </summary>
+		/// <param name="edmType">The type of the parameter.</param>
+		public static bool ShouldPathParameterBeQuoted(this IEdmType edmType)
+		{
+			if (edmType == null)
+			{
+				return false;
+			}
+
+			return edmType.TypeKind switch
+			{
+				EdmTypeKind.Enum => true,
+				EdmTypeKind.Primitive when edmType.IsString() || edmType.IsTemporal() => true,
+				_ => false,
+			};
+		}
+	}
+
+}

src/Microsoft.OpenApi.OData.Reader/Edm/ODataKeySegment.cs

@@ -103,7 +103,8 @@ public override string GetPathItemName(OpenApiConvertSettings settings, HashSet<
                 foreach (var keyProperty in keys)
                 {
                     string name = Utils.GetUniqueName(keyProperty.Name, parameters);
-                    keyStrings.Add(keyProperty.Name + "='{" + name + "}'");
+                    var quote = keyProperty.Type.Definition.ShouldPathParameterBeQuoted() ? "'" : string.Empty;
+                    keyStrings.Add($"{keyProperty.Name}={quote}{{{name}}}{quote}");
                 }
 
                 return String.Join(",", keyStrings);

src/Microsoft.OpenApi.OData.Reader/Edm/ODataOperationImportSegment.cs

@@ -83,7 +83,8 @@ private string FunctionImportName(IEdmFunctionImport functionImport, OpenApiConv
                 }
                 else
                 {
-                    return p.Name + "='{" + uniqueName + "}'";
+                    var quote = p.Type.Definition.ShouldPathParameterBeQuoted() ? "'" : string.Empty;
+                    return $"{p.Name}={quote}{{{uniqueName}}}{quote}";
                 }
             })));
 

src/Microsoft.OpenApi.OData.Reader/Edm/ODataOperationSegment.cs

@@ -148,7 +148,8 @@ private string FunctionName(IEdmFunction function, OpenApiConvertSettings settin
                 }
                 else
                 {
-                    return p.Name + "='{" + uniqueName + "}'";
+                    var quote = p.Type.Definition.ShouldPathParameterBeQuoted() ? "'" : string.Empty;
+                    return p.Name + $"={quote}{{{uniqueName}}}{quote}";
                 }
             })));
 

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiParameterGenerator.cs

@@ -136,7 +136,8 @@ public static IList<OpenApiParameter> CreateParameters(this ODataContext context
 
                 if (parameterNameMapping != null)
                 {
-                    parameter.Description = $"Usage: {edmParameter.Name}='{{{parameterNameMapping[edmParameter.Name]}}}'";
+                    var quote = edmParameter.Type.Definition.ShouldPathParameterBeQuoted() ? "'" : string.Empty;
+                    parameter.Description = $"Usage: {edmParameter.Name}={quote}{{{parameterNameMapping[edmParameter.Name]}}}{quote}";
                 }
 
                 parameters.Add(parameter);
@@ -203,7 +204,8 @@ public static IList<OpenApiParameter> CreateKeyParameters(this ODataContext cont
 
                     if (keySegment.KeyMappings != null)
                     {
-                        parameter.Description += $", {keyProperty.Name}='{{{parameter.Name}}}'";
+                        var quote = keyProperty.Type.Definition.ShouldPathParameterBeQuoted() ? "'" : string.Empty;
+                        parameter.Description += $", {keyProperty.Name}={quote}{{{parameter.Name}}}{quote}";
                     }
 
                     parameter.Extensions.Add(Constants.xMsKeyType, new OpenApiString(entityType.Name));