Fix OpenApiPathsMapper (#1122)

* Fix OpenApiPathsMapper * utc * s
WireMock-Net · Jul 22, 2024 · d79f6f1 · d79f6f1
1 parent 422e7c9
commit d79f6f1
Show file tree

Hide file tree

Showing 7 changed files with 38,777 additions and 36 deletions.
diff --git a/src/WireMock.Net.OpenApiParser/Extensions/OpenApiSchemaExtensions.cs b/src/WireMock.Net.OpenApiParser/Extensions/OpenApiSchemaExtensions.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using System.Linq;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
@@ -16,7 +17,7 @@ public static bool TryGetXNullable(this OpenApiSchema schema, out bool value)
     {
         value = false;
 
-        if (schema.Extensions.TryGetValue("x-nullable", out IOpenApiExtension e) && e is OpenApiBoolean openApiBoolean)
+        if (schema.Extensions.TryGetValue("x-nullable", out var e) && e is OpenApiBoolean openApiBoolean)
         {
             value = openApiBoolean.Value;
             return true;
@@ -27,32 +28,30 @@ public static bool TryGetXNullable(this OpenApiSchema schema, out bool value)
 
     public static SchemaType GetSchemaType(this OpenApiSchema? schema)
     {
-        switch (schema?.Type)
+        if (schema == null)
         {
-            case "object":
-                return SchemaType.Object;
-
-            case "array":
-                return SchemaType.Array;
-
-            case "integer":
-                return SchemaType.Integer;
-
-            case "number":
-                return SchemaType.Number;
-
-            case "boolean":
-                return SchemaType.Boolean;
-
-            case "string":
-                return SchemaType.String;
-
-            case "file":
-                return SchemaType.File;
+            return SchemaType.Unknown;
+        }
 
-            default:
-                return SchemaType.Unknown;
+        if (schema.Type == null)
+        {
+            if (schema.AllOf.Any() || schema.AnyOf.Any())
+            {
+                return SchemaType.Object;
+            }
         }
+
+        return schema.Type switch
+        {
+            "object" => SchemaType.Object,
+            "array" => SchemaType.Array,
+            "integer" => SchemaType.Integer,
+            "number" => SchemaType.Number,
+            "boolean" => SchemaType.Boolean,
+            "string" => SchemaType.String,
+            "file" => SchemaType.File,
+            _ => SchemaType.Unknown
+        };
     }
 
     public static SchemaFormat GetSchemaFormat(this OpenApiSchema? schema)

diff --git a/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs b/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
@@ -193,7 +193,8 @@ private static bool TryGetContent(IDictionary<string, OpenApiMediaType>? content
                     }
                     else
                     {
-                        jArray.Add(MapSchemaToObject(schema.Items, name));
+                        var arrayItem = MapSchemaToObject(schema.Items, name: null); // Set name to null to force JObject instead of JProperty
+                        jArray.Add(arrayItem);
                     }
                 }
 
@@ -219,12 +220,9 @@ private static bool TryGetContent(IDictionary<string, OpenApiMediaType>? content
 
                 if (schema.AllOf.Count > 0)
                 {
-                    foreach (var property in schema.AllOf)
+                    foreach (var group in schema.AllOf.SelectMany(p => p.Properties).GroupBy(x => x.Key))
                     {
-                        foreach (var item in property.Properties)
-                        {
-                            propertyAsJObject.Add(MapPropertyAsJObject(item.Value, item.Key));
-                        }
+                        propertyAsJObject.Add(MapPropertyAsJObject(group.First().Value, group.Key));
                     }
                 }
 

diff --git a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserSettings.cs b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserSettings.cs
@@ -39,27 +39,35 @@ public class WireMockOpenApiParserSettings
     public IWireMockOpenApiParserExampleValues? ExampleValues { get; set; }
 
     /// <summary>
-    /// Is a Header match case insensitive? (default is true).
+    /// Is a Header match case-insensitive?
+    /// 
+    /// Default is <c>true</c>.
     /// </summary>
     public bool HeaderPatternIgnoreCase { get; set; } = true;
 
     /// <summary>
-    /// Is a Query Parameter match case insensitive? (default is true).
+    /// Is a Query Parameter match case-insensitive?
+    ///
+    /// Default is <c>true</c>.
     /// </summary>
     public bool QueryParameterPatternIgnoreCase { get; set; } = true;
 
     /// <summary>
-    /// Is a Request Body match case insensitive? (default is true).
+    /// Is a Request Body match case-insensitive?
+    ///
+    /// Default is <c>true</c>.
     /// </summary>
     public bool RequestBodyIgnoreCase { get; set; } = true;
 
     /// <summary>
-    /// Is a ExampleValue match case insensitive? (default is true).
+    /// Is a ExampleValue match case-insensitive?
+    ///
+    /// Default is <c>true</c>.
     /// </summary>
     public bool IgnoreCaseExampleValues { get; set; } = true;
 
     /// <summary>
-    /// Are examples generated dynamically? (default is false).
+    /// Are examples generated dynamically?
     /// </summary>
-    public bool DynamicExamples { get; set; } = false;
+    public bool DynamicExamples { get; set; }
 }