...

src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs

@@ -1,6 +1,7 @@
 // Copyright © WireMock.Net
 
 using System.Collections.Generic;
+using WireMock.Matchers.Request;
 
 namespace WireMock.Admin.Requests;
 
@@ -47,5 +48,5 @@ public class LogRequestMatchModel
     /// <value>
     /// The match details.
     /// </value>
-    public IList<object> MatchDetails { get; set; } = [];
+    public IList<MatchDetail> MatchDetails { get; set; } = [];
 }

src/WireMock.Net.Abstractions/Matchers/Request/IRequestMatchResult.cs

@@ -55,4 +55,11 @@ public interface IRequestMatchResult : IComparable
     /// <param name="exception">The exception [Optional].</param>
     /// <returns>The score.</returns>
     double AddScore(Type matcherType, double score, Exception? exception);
+
+    /// <summary>
+    /// Adds the score.
+    /// </summary>
+    /// <param name="matchDetail">The matchDetail.</param>
+    /// <returns>The score.</returns>
+    double AddMatchDetail(MatchDetail matchDetail);
 }

src/WireMock.Net.Abstractions/Matchers/Request/MatchDetail.cs

@@ -14,6 +14,11 @@ public class MatchDetail
     /// </summary>
     public required Type MatcherType { get; set; }
 
+    /// <summary>
+    /// Gets or sets the type of the matcher.
+    /// </summary>
+    public required string Name { get; set; }
+
     /// <summary>
     /// Gets or sets the score between 0.0 and 1.0
     /// </summary>
@@ -24,4 +29,9 @@ public class MatchDetail
     /// [Optional]
     /// </summary>
     public Exception? Exception { get; set; }
+
+    /// <summary>
+    /// The child MatchResults in case of multiple matchers.
+    /// </summary>
+    public MatchDetail[]? MatchDetails { get; set; }
 }

src/WireMock.Net.Minimal/Logging/WireMockConsoleLogger.cs

@@ -69,7 +69,7 @@ public class WireMockConsoleLogger : IWireMockLogger
     /// <see cref="IWireMockLogger.DebugRequestResponse"/>
     public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
     {
-        string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+        string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
         Console.WriteLine(Format("DebugRequestResponse", "Admin[{0}] {1}", isAdminRequest, message));
     }
 

src/WireMock.Net.Minimal/Matchers/Request/RequestMatchResult.cs

@@ -31,6 +31,7 @@ public class RequestMatchResult : IRequestMatchResult
     {
         MatchDetails.Add(new MatchDetail
         {
+            Name = matcherType.Name.Replace("RequestMessage", string.Empty),
             MatcherType = matcherType,
             Score = score,
             Exception = exception
@@ -39,6 +40,14 @@ public class RequestMatchResult : IRequestMatchResult
         return score;
     }
 
+    /// <inheritdoc />
+    public double AddMatchDetail(MatchDetail matchDetail)
+    {
+        MatchDetails.Add(matchDetail);
+
+        return matchDetail.Score;
+    }
+
     /// <summary>
     /// Compares the current instance with another object of the same type and returns an integer that indicates whether the current instance precedes, follows, or occurs in the same position in the sort order as the other object.
     /// </summary>

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageClientIPMatcher.cs

@@ -79,8 +79,8 @@ public class RequestMessageClientIPMatcher : IRequestMatcher
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {
-        var (score, exception) = GetMatchResult(requestMessage).Expand();
-        return requestMatchResult.AddScore(GetType(), score, exception);
+        var matchDetail = GetMatchResult(requestMessage).ToMatchDetail();
+        return requestMatchResult.AddMatchDetail(matchDetail);
     }
 
     private MatchResult GetMatchResult(IRequestMessage requestMessage)

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMultiPartMatcher.cs

@@ -15,7 +15,7 @@ public class RequestMessageMultiPartMatcher : IRequestMatcher
     /// <summary>
     /// The name of this matcher.
     /// </summary>
-    public const string MatcherName = "MultiPartMatcher";
+    public const string Name = "MultiPartMatcher";
 
     private readonly IMimeKitUtils _mimeKitUtils = LoadMimeKitUtils();
 
@@ -59,19 +59,20 @@ public class RequestMessageMultiPartMatcher : IRequestMatcher
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {
-        var score = MatchScores.Mismatch;
+        var matchDetail = MatchResult.From(Name).ToMatchDetail();
         Exception? exception = null;
 
         if (Matchers == null)
         {
-            return requestMatchResult.AddScore(GetType(), score, null);
+            return requestMatchResult.AddMatchDetail(matchDetail);
         }
 
         if (!_mimeKitUtils.TryGetMimeMessage(requestMessage, out var message))
         {
-            return requestMatchResult.AddScore(GetType(), score, null);
+            return requestMatchResult.AddMatchDetail(matchDetail);
         }
 
+        double score = MatchScores.Mismatch;
         try
         {
             foreach (var mimePartMatcher in Matchers.OfType<IMimePartMatcher>().ToArray())
@@ -99,7 +100,7 @@ public class RequestMessageMultiPartMatcher : IRequestMatcher
             exception = ex;
         }
 
-        return requestMatchResult.AddScore(GetType(), score, exception);
+        return requestMatchResult.AddMatchDetail(MatchResult.From(Name, score, exception).ToMatchDetail());
     }
 
     private static IMimeKitUtils LoadMimeKitUtils()

src/WireMock.Net.Minimal/Matchers/Request/RequestMessagePathMatcher.cs

@@ -77,8 +77,8 @@ public class RequestMessagePathMatcher : IRequestMatcher
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {
-        var (score, exception) = GetMatchResult(requestMessage).Expand();
-        return requestMatchResult.AddScore(GetType(), score, exception);
+        var matchDetail = GetMatchResult(requestMessage).ToMatchDetail();
+        return requestMatchResult.AddMatchDetail(matchDetail);
     }
 
     private MatchResult GetMatchResult(IRequestMessage requestMessage)

src/WireMock.Net.Minimal/Serialization/LogEntryMapper.cs

@@ -166,11 +166,12 @@ internal class LogEntryMapper
             TotalScore = matchResult.TotalScore,
             TotalNumber = matchResult.TotalNumber,
             AverageTotalScore = matchResult.AverageTotalScore,
-            MatchDetails = matchResult.MatchDetails.Select(md => new
-            {
-                Name = md.MatcherType.Name.Replace("RequestMessage", string.Empty),
-                md.Score
-            } as object).ToList()
+            MatchDetails = matchResult.MatchDetails
+            //MatchDetails = matchResult.MatchDetails.Select(md => new
+            //{
+            //    Name = md.MatcherType.Name.Replace("RequestMessage", string.Empty),
+            //    md.Score
+            //} as object).ToList()
         };
     }
 }

src/WireMock.Net.Minimal/Server/WireMockServer.ConvertMapping.cs

@@ -255,7 +255,7 @@ public partial class WireMockServer
         {
             var matchOperator = StringUtils.ParseMatchOperator(requestModel.Body.MatchOperator);
 
-            if (requestModel.Body.MatcherName == RequestMessageMultiPartMatcher.MatcherName)
+            if (requestModel.Body.MatcherName == RequestMessageMultiPartMatcher.Name)
             {
                 requestBuilder = requestBuilder.WithMultiPart(_matcherMapper.Map(requestModel.Body.Matchers), matchOperator: matchOperator);
             }

src/WireMock.Net.Shared/Matchers/MatchResult.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Stef.Validation;
 using WireMock.Extensions;
+using WireMock.Matchers.Request;
 
 namespace WireMock.Matchers;
 
@@ -30,7 +31,7 @@ public class MatchResult
     public required string Name { get; set; }
 
     /// <summary>
-    /// The sub MatchResults in case of multiple matchers.
+    /// The child MatchResults in case of multiple matchers.
     /// </summary>
     public MatchResult[]? MatchResults { get; set; }
 
@@ -99,4 +100,19 @@ public class MatchResult
     {
         return (Score, Exception);
     }
+
+    /// <summary>
+    /// Convert to <see cref="MatchResult"/>.
+    /// </summary>
+    public MatchDetail ToMatchDetail()
+    {
+        return new MatchDetail
+        {
+            Name = Name,
+            MatcherType = typeof(MatchResult),
+            Score = Score,
+            Exception = Exception,
+            MatchDetails = MatchResults?.Select(mr => mr.ToMatchDetail()).ToArray()
+        };
+    }
 }