[WIP] - Riok.Mapperly

Directory.Build.props

@@ -45,7 +45,7 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">

src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj

@@ -37,7 +37,6 @@
 
     <ItemGroup>
         <PackageReference Include="Aspire.Hosting" Version="8.0.0" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>

src/WireMock.Net/Matchers/FormUrlEncodedMatcher.cs

@@ -1,6 +1,7 @@
 // Copyright © WireMock.Net
 
 using System.Collections.Generic;
+using System.Linq;
 using AnyOfTypes;
 using Stef.Validation;
 using WireMock.Models;
@@ -27,7 +28,7 @@ public class FormUrlEncodedMatcher : IStringMatcher, IIgnoreCaseMatcher
     /// </summary>
     /// <param name="pattern">The pattern.</param>
     /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
     public FormUrlEncodedMatcher(
         AnyOf<string, StringPattern> pattern,
         bool ignoreCase = false,
@@ -42,7 +43,7 @@ public class FormUrlEncodedMatcher : IStringMatcher, IIgnoreCaseMatcher
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="pattern">The pattern.</param>
     /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
     public FormUrlEncodedMatcher(
         MatchBehaviour matchBehaviour,
         AnyOf<string, StringPattern> pattern,
@@ -57,7 +58,7 @@ public class FormUrlEncodedMatcher : IStringMatcher, IIgnoreCaseMatcher
     /// </summary>
     /// <param name="patterns">The patterns.</param>
     /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
     public FormUrlEncodedMatcher(
         AnyOf<string, StringPattern>[] patterns,
         bool ignoreCase = false,
@@ -72,7 +73,7 @@ public class FormUrlEncodedMatcher : IStringMatcher, IIgnoreCaseMatcher
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="patterns">The patterns.</param>
     /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
     public FormUrlEncodedMatcher(
         MatchBehaviour matchBehaviour,
         AnyOf<string, StringPattern>[] patterns,
@@ -112,7 +113,20 @@ public class FormUrlEncodedMatcher : IStringMatcher, IIgnoreCaseMatcher
             return new MatchResult(MatchScores.Mismatch);
         }
 
+        var matches = GetMatches(inputNameValueCollection);
+
+        var score = MatchScores.ToScore(matches, MatchOperator);
+        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score));
+    }
+
+    private bool[] GetMatches(IDictionary<string, string> inputNameValueCollection)
+    {
         var matches = new List<bool>();
+        if (_pairs.Count > inputNameValueCollection.Count)
+        {
+            matches.AddRange(Enumerable.Repeat(false, _pairs.Count - inputNameValueCollection.Count));
+        }
+
         foreach (var inputKeyValuePair in inputNameValueCollection)
         {
             var match = false;
@@ -132,8 +146,7 @@ public class FormUrlEncodedMatcher : IStringMatcher, IIgnoreCaseMatcher
             matches.Add(match);
         }
 
-        var score = MatchScores.ToScore(matches.ToArray(), MatchOperator);
+        return matches.ToArray();
-        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score));
     }
 
     /// <inheritdoc />

src/WireMock.Net/Serialization/MappingFileNameSanitizer.cs

@@ -10,22 +10,28 @@ namespace WireMock.Serialization;
 /// <summary>
 /// Creates sanitized file names for mappings
 /// </summary>
-internal class MappingFileNameSanitizer
+public class MappingFileNameSanitizer
 {
-    private const string SpaceChar = " ";
     private const char ReplaceChar = '_';
 
+    private readonly WireMockServerSettings _settings;
+
+    public MappingFileNameSanitizer(WireMockServerSettings settings)
+    {
+        _settings = Guard.NotNull(settings);
+    }
+
     /// <summary>
     /// Creates sanitized file names for mappings
     /// </summary>
-    public string BuildSanitizedFileName(IMapping mapping, ProxyAndRecordSettings? proxyAndRecordSettings)
+    public string BuildSanitizedFileName(IMapping mapping)
     {
         string name;
         if (!string.IsNullOrEmpty(mapping.Title))
         {
             // remove 'Proxy Mapping for ' and an extra space character after the HTTP request method
-            name = mapping.Title!.Replace(ProxyAndRecordSettings.DefaultPrefixForSavedMappingFile, string.Empty).Replace(SpaceChar, string.Empty);
+            name = mapping.Title.Replace(ProxyAndRecordSettings.DefaultPrefixForSavedMappingFile, "").Replace(' '.ToString(), string.Empty);
-            if (proxyAndRecordSettings?.AppendGuidToSavedMappingFile == true)
+            if (_settings.ProxyAndRecordSettings?.AppendGuidToSavedMappingFile == true)
             {
                 name += $"{ReplaceChar}{mapping.Guid}";
             }
@@ -35,11 +41,10 @@ internal class MappingFileNameSanitizer
             name = mapping.Guid.ToString();
         }
 
-        if (!string.IsNullOrEmpty(proxyAndRecordSettings?.PrefixForSavedMappingFile))
+        if (!string.IsNullOrEmpty(_settings.ProxyAndRecordSettings?.PrefixForSavedMappingFile))
         {
-            name = $"{proxyAndRecordSettings.PrefixForSavedMappingFile}{ReplaceChar}{name}";
+            name = $"{_settings.ProxyAndRecordSettings.PrefixForSavedMappingFile}{ReplaceChar}{name}";
         }
-
         return $"{Path.GetInvalidFileNameChars().Aggregate(name, (current, c) => current.Replace(c, ReplaceChar))}.json";
     }
 }

src/WireMock.Net/Util/TinyMapperUtils.cs

@@ -1,56 +1,24 @@
 // Copyright © WireMock.Net
 
-using Nelibur.ObjectMapper;
+using Riok.Mapperly.Abstractions;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Settings;
 using WireMock.Settings;
 
 namespace WireMock.Util;
 
-internal sealed class TinyMapperUtils
+[Mapper]
+internal static partial class TinyMapperUtils
 {
-    public static TinyMapperUtils Instance { get; } = new();
+    public static partial ProxyAndRecordSettingsModel? Map(ProxyAndRecordSettings? instance);
 
-    private TinyMapperUtils()
+    public static partial ProxyAndRecordSettings? Map(ProxyAndRecordSettingsModel? model);
-    {
-        TinyMapper.Bind<ProxyAndRecordSettings, ProxyAndRecordSettingsModel>();
-        TinyMapper.Bind<WebProxySettings, WebProxySettingsModel>();
-        TinyMapper.Bind<WebProxySettings, WebProxyModel>();
-        TinyMapper.Bind<ProxyUrlReplaceSettings, ProxyUrlReplaceSettingsModel>();
 
-        TinyMapper.Bind<ProxyAndRecordSettingsModel, ProxyAndRecordSettings>();
+    public static partial ProxyUrlReplaceSettingsModel? Map(ProxyUrlReplaceSettings? instance);
-        TinyMapper.Bind<WebProxySettingsModel, WebProxySettings>();
-        TinyMapper.Bind<WebProxyModel, WebProxySettings>();
-        TinyMapper.Bind<ProxyUrlReplaceSettingsModel, ProxyUrlReplaceSettings>();
-    }
 
-    public ProxyAndRecordSettingsModel? Map(ProxyAndRecordSettings? instance)
+    public static partial ProxyUrlReplaceSettings? Map(ProxyUrlReplaceSettingsModel? model);
-    {
-        return instance == null ? null : TinyMapper.Map<ProxyAndRecordSettingsModel>(instance);
-    }
 
-    public ProxyAndRecordSettings? Map(ProxyAndRecordSettingsModel? model)
+    public static partial WebProxyModel? Map(WebProxySettings? instance);
-    {
-        return model == null ? null : TinyMapper.Map<ProxyAndRecordSettings>(model);
-    }
 
-    public ProxyUrlReplaceSettingsModel? Map(ProxyUrlReplaceSettings? instance)
+    public static partial WebProxySettings? Map(WebProxyModel? model);
-    {
-        return instance == null ? null : TinyMapper.Map<ProxyUrlReplaceSettingsModel>(instance);
-    }
-
-    public ProxyUrlReplaceSettings? Map(ProxyUrlReplaceSettingsModel? model)
-    {
-        return model == null ? null : TinyMapper.Map<ProxyUrlReplaceSettings>(model);
-    }
-
-    public WebProxyModel? Map(WebProxySettings? instance)
-    {
-        return instance == null ? null : TinyMapper.Map<WebProxyModel>(instance);
-    }
-
-    public WebProxySettings? Map(WebProxyModel? model)
-    {
-        return model == null ? null : TinyMapper.Map<WebProxySettings>(model);
-    }
 }

src/WireMock.Net/WireMock.Net.csproj

@@ -63,10 +63,10 @@
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="NJsonSchema.Extensions" Version="0.1.0" />
         <PackageReference Include="NSwag.Core" Version="13.16.1" />
+        <PackageReference Include="Riok.Mapperly" Version="3.6.0" />
         <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
         <PackageReference Include="JmesPath.Net" Version="1.0.125" />
         <PackageReference Include="AnyOf" Version="0.3.0" />
-        <PackageReference Include="TinyMapper" Version="3.0.3" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">

test/WireMock.Net.Tests/Matchers/FormUrlEncodedMatcherTests.cs

@@ -75,4 +75,25 @@ public class FormUrlEncodedMatcherTest
         // Assert
         score.Should().Be(expected);
     }
+
+    [Fact]
+    public async Task FormUrlEncodedMatcher_IsMatch_And_MatchAllProperties()
+    {
+        // Arrange
+        var content = new FormUrlEncodedContent(new[]
+        {
+            new KeyValuePair<string, string>("name", "John Doe"),
+            new KeyValuePair<string, string>("email", "johndoe@example.com")
+        });
+        var contentAsString = await content.ReadAsStringAsync();
+
+        // The expectation is that the matcher requires all properties to be present in the content.
+        var matcher = new FormUrlEncodedMatcher(["name=*", "email=*", "required=*"], matchOperator: MatchOperator.And);
+
+        // Act
+        var score = matcher.IsMatch(contentAsString).IsPerfect();
+
+        // Assert
+        score.Should().BeFalse();
+    }
 }