1.4.27

* Support RequestBody

* SerializeObject in the request matcher and apply JsonMatcher

* Refactor names

* Call to method TryGetContent

* Applied comments

* Changes applied!

* Comments applied V2!

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.4.27 (17 November 2021)
+- [#678](https://github.com/WireMock-Net/WireMock.Net/pull/678) - Support RequestBody [feature] contributed by [leolplex](https://github.com/leolplex)
+- [#680](https://github.com/WireMock-Net/WireMock.Net/pull/680) - Support examples in properties [feature] contributed by [leolplex](https://github.com/leolplex)
+- [#681](https://github.com/WireMock-Net/WireMock.Net/pull/681) - Support enums in properties [feature] contributed by [leolplex](https://github.com/leolplex)
+
 # 1.4.26 (04 November 2021)
 - [#670](https://github.com/WireMock-Net/WireMock.Net/pull/670) - Improve method MapSchemaToObject to support array and object [feature] contributed by [leolplex](https://github.com/leolplex)
 - [#673](https://github.com/WireMock-Net/WireMock.Net/pull/673) - Support examples random data generation contributed by [leolplex](https://github.com/leolplex)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.4.26</VersionPrefix>
+        <VersionPrefix>1.4.27</VersionPrefix>
         <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>

Generate-ReleaseNotes.cmd

@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.4.26
+SET version=1.4.27
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,7 +1,6 @@
-# 1.4.26 (04 November 2021)
-- #670 Improve method MapSchemaToObject to support array and object [feature]
-- #673 Support examples random data generation
-- #675 Support basepath from servers
-- #676 Fix random generate data in url no spaces [feature]
+# 1.4.27 (17 November 2021)
+- #678 Support RequestBody [feature]
+- #680 Support examples in properties [feature]
+- #681 Support enums in properties [feature]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs

@@ -6,6 +6,7 @@ using Microsoft.OpenApi;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Writers;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using WireMock.Admin.Mappings;
 using WireMock.Net.OpenApiParser.Extensions;
@@ -58,6 +59,23 @@ namespace WireMock.Net.OpenApiParser.Mappers
                                    responseSchemaExample != null ? MapOpenApiAnyToJToken(responseSchemaExample) :
                                    MapSchemaToObject(responseSchema);
 
+            var requestBodyModel = new BodyModel();
+            if (operation.RequestBody != null && operation.RequestBody.Content != null)
+            {
+                var request = operation.RequestBody.Content;
+                TryGetContent(request, out OpenApiMediaType requestContent, out string requestContentType);
+
+                var requestBodySchema = operation.RequestBody.Content.First().Value?.Schema;
+                var requestBodyExample = requestContent.Example;
+                var requestBodySchemaExample = requestContent.Schema?.Example;
+
+                var requestBodyMapped = requestBodyExample != null ? MapOpenApiAnyToJToken(requestBodyExample) :
+                                   requestBodySchemaExample != null ? MapOpenApiAnyToJToken(requestBodySchemaExample) :
+                                   MapSchemaToObject(requestBodySchema);
+
+                requestBodyModel = MapRequestBody(requestBodyMapped);
+            }
+
             if (!int.TryParse(response.Key, out var httpStatusCode))
             {
                 httpStatusCode = 200;
@@ -71,7 +89,8 @@ namespace WireMock.Net.OpenApiParser.Mappers
                     Methods = new[] { httpMethod },
                     Path = MapBasePath(servers) + MapPathWithParameters(path, pathParameters),
                     Params = MapQueryParameters(queryParameters),
-                    Headers = MapRequestHeaders(headers)
+                    Headers = MapRequestHeaders(headers),
+                    Body = requestBodyModel
                 },
                 Response = new ResponseModel
                 {
@@ -82,6 +101,20 @@ namespace WireMock.Net.OpenApiParser.Mappers
             };
         }
 
+        private BodyModel MapRequestBody(object requestBody)
+        {
+            if (requestBody == null)
+            {
+                return null;
+            }
+
+            var requestBodyModel = new BodyModel();
+            requestBodyModel.Matcher = new MatcherModel();
+            requestBodyModel.Matcher.Name = "JsonMatcher";
+            requestBodyModel.Matcher.Pattern = JsonConvert.SerializeObject(requestBody, Formatting.Indented);
+            return requestBodyModel;
+        }
+
         private bool TryGetContent(IDictionary<string, OpenApiMediaType> contents, out OpenApiMediaType openApiMediaType, out string contentType)
         {
             openApiMediaType = null;

src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs

@@ -1,5 +1,8 @@
-using System;
+using System;
+using System.Collections.Generic;
+using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
+using Stef.Validation;
 using WireMock.Net.OpenApiParser.Extensions;
 using WireMock.Net.OpenApiParser.Settings;
 using WireMock.Net.OpenApiParser.Types;
@@ -12,7 +15,8 @@ namespace WireMock.Net.OpenApiParser.Utils
 
         public ExampleValueGenerator(WireMockOpenApiParserSettings settings)
         {
-            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            _settings = Guard.NotNull(settings, nameof(settings));
+
             if (_settings.DynamicExamples)
             {
                 _settings.ExampleValues = new WireMockOpenApiParserDynamicExampleValues();
@@ -25,43 +29,91 @@ namespace WireMock.Net.OpenApiParser.Utils
 
         public object GetExampleValue(OpenApiSchema schema)
         {
+            var schemaExample = schema?.Example;
+            var schemaEnum = GetRandomEnumValue(schema?.Enum);
+
             switch (schema?.GetSchemaType())
             {
                 case SchemaType.Boolean:
-                    return _settings.ExampleValues.Boolean;
+                    var exampleBoolean = (OpenApiBoolean)schemaExample;
+                    return exampleBoolean is null ? _settings.ExampleValues.Boolean : exampleBoolean.Value;
 
                 case SchemaType.Integer:
-                    return _settings.ExampleValues.Integer;
+                    switch (schema?.GetSchemaFormat())
+                    {
+                        case SchemaFormat.Int64:
+                            var exampleLong = (OpenApiLong)schemaExample;
+                            var enumLong = (OpenApiLong)schemaEnum;
+                            var valueLongEnumOrExample = enumLong is null ? exampleLong?.Value : enumLong?.Value;
+                            return valueLongEnumOrExample ?? _settings.ExampleValues.Integer;
+
+                        default:
+                            var exampleInteger = (OpenApiInteger)schemaExample;
+                            var enumInteger = (OpenApiInteger)schemaEnum;
+                            var valueIntegerEnumOrExample = enumInteger is null ? exampleInteger?.Value : enumInteger?.Value;
+                            return valueIntegerEnumOrExample ?? _settings.ExampleValues.Integer;
+                    }
 
                 case SchemaType.Number:
                     switch (schema?.GetSchemaFormat())
                     {
                         case SchemaFormat.Float:
-                            return _settings.ExampleValues.Float;
+                            var exampleFloat = (OpenApiFloat)schemaExample;
+                            var enumFloat = (OpenApiFloat)schemaEnum;
+                            var valueFloatEnumOrExample = enumFloat is null ? exampleFloat?.Value : enumFloat?.Value;
+                            return valueFloatEnumOrExample ?? _settings.ExampleValues.Float;
 
                         default:
-                            return _settings.ExampleValues.Double;
+                            var exampleDouble = (OpenApiDouble)schemaExample;
+                            var enumDouble = (OpenApiDouble)schemaEnum;
+                            var valueDoubleEnumOrExample = enumDouble is null ? exampleDouble?.Value : enumDouble?.Value;
+                            return valueDoubleEnumOrExample ?? _settings.ExampleValues.Double;
                     }
 
                 default:
                     switch (schema?.GetSchemaFormat())
                     {
                         case SchemaFormat.Date:
-                            return DateTimeUtils.ToRfc3339Date(_settings.ExampleValues.Date());
+                            var exampleDate = (OpenApiDate)schemaExample;
+                            var enumDate = (OpenApiDate)schemaEnum;
+                            var valueDateEnumOrExample = enumDate is null ? exampleDate?.Value : enumDate?.Value;
+                            return DateTimeUtils.ToRfc3339Date(valueDateEnumOrExample ?? _settings.ExampleValues.Date());
 
                         case SchemaFormat.DateTime:
-                            return DateTimeUtils.ToRfc3339DateTime(_settings.ExampleValues.DateTime());
+                            var exampleDateTime = (OpenApiDateTime)schemaExample;
+                            var enumDateTime = (OpenApiDateTime)schemaEnum;
+                            var valueDateTimeEnumOrExample = enumDateTime is null ? exampleDateTime?.Value : enumDateTime?.Value;
+                            return DateTimeUtils.ToRfc3339DateTime(valueDateTimeEnumOrExample?.DateTime ?? _settings.ExampleValues.DateTime());
 
                         case SchemaFormat.Byte:
-                            return _settings.ExampleValues.Bytes;
+                            var exampleByte = (OpenApiByte)schemaExample;
+                            var enumByte = (OpenApiByte)schemaEnum;
+                            var valueByteEnumOrExample = enumByte is null ? exampleByte?.Value : enumByte?.Value;
+                            return valueByteEnumOrExample ?? _settings.ExampleValues.Bytes;
 
                         case SchemaFormat.Binary:
-                            return _settings.ExampleValues.Object;
+                            var exampleBinary = (OpenApiBinary)schemaExample;
+                            var enumBinary = (OpenApiBinary)schemaEnum;
+                            var valueBinaryEnumOrExample = enumBinary is null ? exampleBinary?.Value : enumBinary?.Value;
+                            return valueBinaryEnumOrExample ?? _settings.ExampleValues.Object;
 
                         default:
-                            return _settings.ExampleValues.String;
+                            var exampleString = (OpenApiString)schemaExample;
+                            var enumString = (OpenApiString)schemaEnum;
+                            var valueStringEnumOrExample = enumString is null ? exampleString?.Value : enumString?.Value;
+                            return valueStringEnumOrExample ?? _settings.ExampleValues.String;
                     }
             }
         }
+        private static IOpenApiAny GetRandomEnumValue(IList<IOpenApiAny> schemaEnum)
+        {
+            if (schemaEnum?.Count > 0)
+            {
+                int maxValue = schemaEnum.Count - 1;
+                int randomEnum = new Random().Next(0, maxValue);
+                return schemaEnum[randomEnum];
+            }
+            return null;
+        }
     }
-}
+}

src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj

@@ -22,11 +22,11 @@
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
 		<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
-		<PackageReference Include="RamlToOpenApiConverter" Version="0.1.1" />
+		<PackageReference Include="RamlToOpenApiConverter" Version="0.4.3" />
 		<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
 		<PackageReference Include="RandomDataGenerator.Net" Version="1.0.13" />
-		<PackageReference Include="Stef.Validation" Version="0.0.3" />
+		<PackageReference Include="Stef.Validation" Version="0.0.4" />
 	</ItemGroup>
 
 	<ItemGroup>

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsHumanizerTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Moq;
 using Newtonsoft.Json.Linq;
@@ -35,7 +35,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create()
                 .WithBodyAsJson(new
                 {
-                    DateTime = string.Format("{{{{[Humanizer.Humanize] \"{0}\" }}}}", DateTime.UtcNow.AddHours(-30).ToString("O"))
+                    Text = string.Format("{{{{[Humanizer.Humanize] \"{0}\" }}}}", "PascalCaseInputStringIsTurnedIntoSentence")
                 })
                 .WithTransformer();
 
@@ -44,7 +44,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
-            Check.That(j["DateTime"].Value<string>()).IsEqualTo("yesterday");
+            Check.That(j["Text"].Value<string>()).IsEqualTo("Pascal case input string is turned into sentence");
         }
     }
 }