1.4.26

* Support basepath from servers

* Refactor BasePath

* Comments applied

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 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)
+- [#675](https://github.com/WireMock-Net/WireMock.Net/pull/675) - Support basepath from servers contributed by [leolplex](https://github.com/leolplex)
+- [#676](https://github.com/WireMock-Net/WireMock.Net/pull/676) - Fix random generate data in url no spaces [feature] contributed by [leolplex](https://github.com/leolplex)
+
 # 1.4.25 (27 October 2021)
 - [#661](https://github.com/WireMock-Net/WireMock.Net/pull/661) - Add TimeSettings (Start, End and TTL) [feature] contributed by [StefH](https://github.com/StefH)
 - [#664](https://github.com/WireMock-Net/WireMock.Net/pull/664) - Support Array in OpenApiParser [feature] contributed by [leolplex](https://github.com/leolplex)
@@ -125,7 +131,6 @@
 - [#549](https://github.com/WireMock-Net/WireMock.Net/issues/549) - WithProxy(...) does not save the mappings to file [bug]
 
 # 1.3.8 (03 December 2020)
-- [#539](https://github.com/WireMock-Net/WireMock.Net/pull/539) - Support for partial JSON matching contributed by [gleb-osokin](https://github.com/gleb-osokin)
 - [#542](https://github.com/WireMock-Net/WireMock.Net/pull/542) - Create dotnet-wiremock tool [feature] contributed by [StefH](https://github.com/StefH)
 - [#543](https://github.com/WireMock-Net/WireMock.Net/pull/543) - Add support for .NET 5 [feature] contributed by [StefH](https://github.com/StefH)
 - [#544](https://github.com/WireMock-Net/WireMock.Net/pull/544) - Use Java 11 in Azure Pipelines (needed for SonarCloud) [feature] contributed by [StefH](https://github.com/StefH)
@@ -133,6 +138,9 @@
 - [#547](https://github.com/WireMock-Net/WireMock.Net/pull/547) - Fix Proxying with SSL and NetCoreApp3.1 [bug] contributed by [StefH](https://github.com/StefH)
 - [#524](https://github.com/WireMock-Net/WireMock.Net/issues/524) - Proxying with SSL Not Working in .NET Core 3.1 [bug]
 
+# 1.3.7 (17 November 2020)
+- [#539](https://github.com/WireMock-Net/WireMock.Net/pull/539) - Support for partial JSON matching contributed by [gleb-osokin](https://github.com/gleb-osokin)
+
 # 1.3.6 (10 November 2020)
 - [#529](https://github.com/WireMock-Net/WireMock.Net/pull/529) - Add assertions for ClientIP, Url and ProxyUrl [feature] contributed by [akamud](https://github.com/akamud)
 - [#535](https://github.com/WireMock-Net/WireMock.Net/pull/535) - WithCallback should use also use enum HttpStatusCode [bug] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.4.25</VersionPrefix>
+        <VersionPrefix>1.4.26</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.25
+SET version=1.4.26
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,7 +1,7 @@
-# 1.4.25 (27 October 2021)
+# 1.4.26 (04 November 2021)
-- #661 Add TimeSettings (Start, End and TTL) [feature]
+- #670 Improve method MapSchemaToObject to support array and object [feature]
-- #664 Support Array in OpenApiParser [feature]
+- #673 Support examples random data generation
-- #667 Add JsonPartialWildcardMatcher [feature]
+- #675 Support basepath from servers
-- #669 Support Schema Example and Support AllOf in definitions  [feature]
+- #676 Fix random generate data in url no spaces [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

@@ -26,22 +26,22 @@ namespace WireMock.Net.OpenApiParser.Mappers
             _exampleValueGenerator = new ExampleValueGenerator(settings);
         }
 
-        public IEnumerable<MappingModel> ToMappingModels(OpenApiPaths paths)
+        public IEnumerable<MappingModel> ToMappingModels(OpenApiPaths paths, IList<OpenApiServer> servers)
         {
-            return paths.Select(p => MapPath(p.Key, p.Value)).SelectMany(x => x);
+            return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
         }
 
-        private IEnumerable<MappingModel> MapPaths(OpenApiPaths paths)
+        private IEnumerable<MappingModel> MapPaths(OpenApiPaths paths, IList<OpenApiServer> servers)
         {
-            return paths.Select(p => MapPath(p.Key, p.Value)).SelectMany(x => x);
+            return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
         }
 
-        private IEnumerable<MappingModel> MapPath(string path, OpenApiPathItem pathItem)
+        private IEnumerable<MappingModel> MapPath(string path, OpenApiPathItem pathItem, IList<OpenApiServer> servers)
         {
-            return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value));
+            return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers));
         }
 
-        private MappingModel MapOperationToMappingModel(string path, string httpMethod, OpenApiOperation operation)
+        private MappingModel MapOperationToMappingModel(string path, string httpMethod, OpenApiOperation operation, IList<OpenApiServer> servers)
         {
             var queryParameters = operation.Parameters.Where(p => p.In == ParameterLocation.Query);
             var pathParameters = operation.Parameters.Where(p => p.In == ParameterLocation.Path);
@@ -69,7 +69,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
                 Request = new RequestModel
                 {
                     Methods = new[] { httpMethod },
-                    Path = MapPathWithParameters(path, pathParameters),
+                    Path = MapBasePath(servers) + MapPathWithParameters(path, pathParameters),
                     Params = MapQueryParameters(queryParameters),
                     Headers = MapRequestHeaders(headers)
                 },
@@ -114,11 +114,6 @@ namespace WireMock.Net.OpenApiParser.Mappers
                 return null;
             }
 
-            if (schema.AllOf.Count > 0)
-            {
-                return MapSchemaAllOfToObject(schema);
-            }
-
             switch (schema.GetSchemaType())
             {
                 case SchemaType.Array:
@@ -149,6 +144,11 @@ namespace WireMock.Net.OpenApiParser.Mappers
                         }
                     }
 
+                    if (schema.AllOf.Count > 0)
+                    {
+                        jArray.Add(MapSchemaAllOfToObject(schema));
+                    }
+
                     return jArray;
 
                 case SchemaType.Boolean:
@@ -161,10 +161,18 @@ namespace WireMock.Net.OpenApiParser.Mappers
                     var propertyAsJObject = new JObject();
                     foreach (var schemaProperty in schema.Properties)
                     {
-                        string propertyName = schemaProperty.Key;
-                        var openApiSchema = schemaProperty.Value;
                         propertyAsJObject.Add(MapPropertyAsJObject(schemaProperty.Value, schemaProperty.Key));
                     }
+                    if (schema.AllOf.Count > 0)
+                    {
+                        foreach (var property in schema.AllOf)
+                        {
+                            foreach (var item in property.Properties)
+                            {
+                                propertyAsJObject.Add(MapPropertyAsJObject(item.Value, item.Key));
+                            }
+                        }
+                    }
 
                     return name != null ? new JProperty(name, propertyAsJObject) : (JToken)propertyAsJObject;
 
@@ -222,6 +230,22 @@ namespace WireMock.Net.OpenApiParser.Mappers
             return newPath;
         }
 
+        private string MapBasePath(IList<OpenApiServer> servers)
+        {
+            if (servers == null || servers.Count == 0)
+            {
+                return string.Empty;
+            }
+
+            OpenApiServer server = servers.First();
+            Uri uriResult;
+            if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out uriResult))
+            {
+                return uriResult.IsAbsoluteUri ? uriResult.AbsolutePath : uriResult.ToString();
+            }
+            return string.Empty;
+        }
+
         private JToken MapOpenApiAnyToJToken(IOpenApiAny any)
         {
             if (any == null)

src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs

@@ -0,0 +1,52 @@
+using System;
+
+namespace WireMock.Net.OpenApiParser.Settings
+{
+    /// <summary>
+    /// A interface defining the example values to use for the different types.
+    /// </summary>
+    public interface IWireMockOpenApiParserExampleValues
+    {
+        /// <summary>
+        /// An example value for a Boolean.
+        /// </summary>
+        bool Boolean { get; set; }
+        /// <summary>
+        /// An example value for an Integer.
+        /// </summary>
+        int Integer { get; set; }
+        /// <summary>
+        /// An example value for a Float.
+        /// </summary>
+        float Float { get; set; }
+        /// <summary>
+        /// An example value for a Double.
+        /// </summary>
+        double Double { get; set; }
+
+        /// <summary>
+        /// An example value for a Date.
+        /// </summary>
+        Func<DateTime> Date { get; set; }
+
+        /// <summary>
+        /// An example value for a DateTime.
+        /// </summary>
+        Func<DateTime> DateTime { get; set; }
+
+        /// <summary>
+        /// An example value for Bytes.
+        /// </summary>
+        byte[] Bytes { get; set; }
+
+        /// <summary>
+        /// An example value for a Object.
+        /// </summary>
+        object Object { get; set; }
+
+        /// <summary>
+        /// An example value for a String.
+        /// </summary>
+        string String { get; set; }
+    }
+}

src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserDynamicExampleValues.cs

@@ -0,0 +1,31 @@
+using System;
+using RandomDataGenerator.FieldOptions;
+using RandomDataGenerator.Randomizers;
+
+namespace WireMock.Net.OpenApiParser.Settings
+{
+    /// <summary>
+    /// A class defining the random example values to use for the different types.
+    /// </summary>
+    public class WireMockOpenApiParserDynamicExampleValues : IWireMockOpenApiParserExampleValues
+    {
+        /// <inheritdoc />
+        public bool Boolean { get { return RandomizerFactory.GetRandomizer(new FieldOptionsBoolean()).Generate() ?? true; } set { } }
+        /// <inheritdoc />
+        public int Integer { get { return RandomizerFactory.GetRandomizer(new FieldOptionsInteger()).Generate() ?? 42; } set { } }
+        /// <inheritdoc />
+        public float Float { get { return RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f; } set { } }
+        /// <inheritdoc />
+        public double Double { get { return RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d; } set { } }
+        /// <inheritdoc />
+        public Func<DateTime> Date { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow.Date; } set { } }
+        /// <inheritdoc />
+        public Func<DateTime> DateTime { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow; } set { } }
+        /// <inheritdoc />
+        public byte[] Bytes { get { return RandomizerFactory.GetRandomizer(new FieldOptionsBytes()).Generate(); } set { } }
+        /// <inheritdoc />
+        public object Object { get; set; } = "example-object";
+        /// <inheritdoc />
+        public string String { get { return RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex { Pattern = @"^[0-9]{2}[A-Z]{5}[0-9]{2}" }).Generate() ?? "example-string"; } set { } }
+    }
+}

src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs

@@ -5,26 +5,25 @@ namespace WireMock.Net.OpenApiParser.Settings
     /// <summary>
     /// A class defining the example values to use for the different types.
     /// </summary>
-    public class WireMockOpenApiParserExampleValues
+    public class WireMockOpenApiParserExampleValues : IWireMockOpenApiParserExampleValues
     {
-#pragma warning disable 1591
+        /// <inheritdoc />
         public bool Boolean { get; set; } = true;
-
+        /// <inheritdoc />
         public int Integer { get; set; } = 42;
-
+        /// <inheritdoc />
         public float Float { get; set; } = 4.2f;
-
+        /// <inheritdoc />
         public double Double { get; set; } = 4.2d;
-
+        /// <inheritdoc />
         public Func<DateTime> Date { get; set; } = () => System.DateTime.UtcNow.Date;
-
+        /// <inheritdoc />
         public Func<DateTime> DateTime { get; set; } = () => System.DateTime.UtcNow;
-
+        /// <inheritdoc />
         public byte[] Bytes { get; set; } = { 48, 49, 50 };
-
+        /// <inheritdoc />
         public object Object { get; set; } = "example-object";
-
+        /// <inheritdoc />
         public string String { get; set; } = "example-string";
-#pragma warning restore 1591
     }
 }

src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserSettings.cs

@@ -25,6 +25,11 @@ namespace WireMock.Net.OpenApiParser.Settings
         /// <summary>
         /// The example values to use
         /// </summary>
-        public WireMockOpenApiParserExampleValues ExampleValues { get; } = new WireMockOpenApiParserExampleValues();
+        public IWireMockOpenApiParserExampleValues ExampleValues { get; set; } = new WireMockOpenApiParserExampleValues();
+
+        /// <summary>
+        /// Are examples generated dynamically?
+        /// </summary>
+        public bool DynamicExamples { get; set; } = false;
     }
 }

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

@@ -13,6 +13,14 @@ namespace WireMock.Net.OpenApiParser.Utils
         public ExampleValueGenerator(WireMockOpenApiParserSettings settings)
         {
             _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            if (_settings.DynamicExamples)
+            {
+                _settings.ExampleValues = new WireMockOpenApiParserDynamicExampleValues();
+            }
+            else
+            {
+                _settings.ExampleValues = new WireMockOpenApiParserExampleValues();
+            }
         }
 
         public object GetExampleValue(OpenApiSchema schema)

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

@@ -25,6 +25,7 @@
 		<PackageReference Include="RamlToOpenApiConverter" Version="0.1.1" />
 		<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" />
 	</ItemGroup>
 

src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs

@@ -62,7 +62,7 @@ namespace WireMock.Net.OpenApiParser
         [PublicAPI]
         public IEnumerable<MappingModel> FromDocument(OpenApiDocument openApiDocument, WireMockOpenApiParserSettings settings = null)
         {
-            return new OpenApiPathsMapper(settings).ToMappingModels(openApiDocument.Paths);
+            return new OpenApiPathsMapper(settings).ToMappingModels(openApiDocument.Paths, openApiDocument.Servers);
         }
     }
 }

src/WireMock.Net/WireMock.Net.csproj

@@ -50,19 +50,19 @@
         <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
     </PropertyGroup>
 
-	<ItemGroup>
+    <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
+        <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
-    <!--<PackageReference Include="Stef.Validation" Version="0.0.3" />-->
+        <!--<PackageReference Include="Stef.Validation" Version="0.0.3" />-->
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
+        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
-    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.12" />
+        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.13" />
-    <PackageReference Include="JmesPath.Net" Version="1.0.125" />
+        <PackageReference Include="JmesPath.Net" Version="1.0.125" />
-    <PackageReference Include="AnyOf" Version="0.2.0" />
+        <PackageReference Include="AnyOf" Version="0.2.0" />
-    <!--<PackageReference Include="TinyMapper" Version="3.0.3" />-->
+        <!--<PackageReference Include="TinyMapper" Version="3.0.3" />-->
-    <!--<PackageReference Include="Mapster" Version="7.2.0" />-->
+        <!--<PackageReference Include="Mapster" Version="7.2.0" />-->
-  </ItemGroup>
+    </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
         <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
@@ -71,10 +71,10 @@
         </PackageReference>
     </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
+    <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <PackageReference Include="XPath2.Extensions" Version="1.1.0" />
+        <PackageReference Include="XPath2.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.12.2" />
+        <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.12.2" />
-  </ItemGroup>
+    </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
         <!-- Required for WebRequestHandler -->

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -52,7 +52,7 @@
         <PackageReference Include="Moq" Version="4.16.0" />
         <PackageReference Include="System.Threading" Version="4.3.0" />
         <PackageReference Include="RestEase" Version="1.5.5" />
-        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.12" />
+        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.13" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
         <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
         <PackageReference Include="NFluent" Version="2.7.1" />