mapping

src/WireMock.Net.Abstractions/Models/IBodyData.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Text;
 using WireMock.Types;
@@ -75,7 +76,7 @@ public interface IBodyData
     /// <summary>
     /// Gets or sets the proto definition.
     /// </summary>
-    public string? ProtoDefinition { get; set; }
+    public Func<string?>? ProtoDefinition { get; set; }
 
     /// <summary>
     /// Gets or sets the full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".

src/WireMock.Net/IMapping.cs

@@ -69,12 +69,12 @@ public interface IMapping
     int? StateTimes { get; }
 
     /// <summary>
-    /// The Request matcher.
+    /// The RequestMatcher.
     /// </summary>
     IRequestMatcher RequestMatcher { get; }
 
     /// <summary>
-    /// The Provider.
+    /// The ResponseProvider.
     /// </summary>
     IResponseProvider Provider { get; }
 
@@ -136,6 +136,11 @@ public interface IMapping
     /// </summary>
     double? Probability { get; }
 
+    /// <summary>
+    /// The Grpc ProtoDefinition which is used for this mapping (request and response). [Optional]
+    /// </summary>
+    string? ProtoDefinition { get; }
+
     /// <summary>
     /// ProvideResponseAsync
     /// </summary>
@@ -150,4 +155,44 @@ public interface IMapping
     /// <param name="nextState">The Next State.</param>
     /// <returns>The <see cref="IRequestMatchResult"/>.</returns>
     IRequestMatchResult GetRequestMatchResult(IRequestMessage requestMessage, string? nextState);
-}
+
+    /// <summary>
+    /// Define a Grpc ProtoDefinition which is used for this mapping (request and response).
+    /// </summary>
+    /// <param name="protoDefinition">The proto definition as a string.</param>
+    /// <returns>The <see cref="IMapping"/>.</returns>
+    IMapping WithProtoDefinition(string protoDefinition);
+
+    /// <summary>
+    /// Define the scenario.
+    /// </summary>
+    /// <param name="scenario">The scenario.</param>
+    /// <returns>The <see cref="IMapping"/>.</returns>
+    IMapping WithScenario(string scenario);
+
+    /// <summary>
+    /// Define the probability when this request should be matched. [Optional]
+    /// </summary>
+    /// <param name="probability">The probability.</param>
+    /// <returns>The <see cref="IMapping"/>.</returns>
+    IMapping WithProbability(double probability);
+}
+
+/*
+    executionConditionState">State in which the current mapping can occur. [Optional]
+    nextState">The next state which will occur after the current mapping execution. [Optional]
+    stateTimes">Only when the current state is executed this number, the next state which will occur. [Optional]
+    webhooks">The Webhooks. [Optional]
+    useWebhooksFireAndForget">Use Fire and Forget for the defined webhook(s). [Optional]
+    timeSettings">The TimeSettings. [Optional]
+    data">The data object. [Optional]
+    
+ 
+    string? executionConditionState,
+    string? nextState,
+    int? stateTimes,
+    IWebhook[]? webhooks,
+    bool? useWebhooksFireAndForget,
+    ITimeSettings? timeSettings,
+    object? data,
+*/

src/WireMock.Net/Mapping.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using Stef.Validation;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.ResponseProviders;
@@ -31,7 +32,7 @@ public class Mapping : IMapping
     public int Priority { get; }
 
     /// <inheritdoc />
-    public string? Scenario { get; }
+    public string? Scenario { get; private set; }
 
     /// <inheritdoc />
     public string? ExecutionConditionState { get; }
@@ -76,7 +77,10 @@ public class Mapping : IMapping
     public object? Data { get; }
 
     /// <inheritdoc />
-    public double? Probability { get; }
+    public double? Probability { get; private set; }
+
+    /// <inheritdoc />
+    public string? ProtoDefinition { get; private set; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="Mapping"/> class.
@@ -98,7 +102,6 @@ public class Mapping : IMapping
     /// <param name="useWebhooksFireAndForget">Use Fire and Forget for the defined webhook(s). [Optional]</param>
     /// <param name="timeSettings">The TimeSettings. [Optional]</param>
     /// <param name="data">The data object. [Optional]</param>
-    /// <param name="probability">Define the probability when this request should be matched. [Optional]</param>
     public Mapping(
         Guid guid,
         DateTime updatedAt,
@@ -116,8 +119,8 @@ public Mapping(
         IWebhook[]? webhooks,
         bool? useWebhooksFireAndForget,
         ITimeSettings? timeSettings,
-        object? data,
-        double? probability)
+        object? data
+    )
     {
         Guid = guid;
         UpdatedAt = updatedAt;
@@ -136,9 +139,8 @@ public Mapping(
         UseWebhooksFireAndForget = useWebhooksFireAndForget;
         TimeSettings = timeSettings;
         Data = data;
-        Probability = probability;
     }
-
+    
     /// <inheritdoc />
     public Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IRequestMessage requestMessage)
     {
@@ -168,4 +170,25 @@ public IRequestMatchResult GetRequestMatchResult(IRequestMessage requestMessage,
 
         return result;
     }
+
+    /// <inheritdoc />
+    public IMapping WithProtoDefinition(string protoDefinition)
+    {
+        ProtoDefinition = Guard.NotNullOrWhiteSpace(protoDefinition);
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IMapping WithScenario(string scenario)
+    {
+        Scenario = Guard.NotNullOrWhiteSpace(scenario);
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IMapping WithProbability(double probability)
+    {
+        Probability = Guard.NotNull(probability);
+        return this;
+    }
 }

src/WireMock.Net/MappingBuilder.cs

@@ -6,6 +6,8 @@
 using WireMock.Admin.Mappings;
 using WireMock.Matchers.Request;
 using WireMock.Owin;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
 using WireMock.Serialization;
 using WireMock.Server;
 using WireMock.Settings;
@@ -146,6 +148,15 @@ private void RegisterMapping(IMapping mapping, bool saveToFile)
         {
             _mappingToFileSaver.SaveMappingToFile(mapping);
         }
+
+        // Link this mapping to the Request
+        ((Request)mapping.RequestMatcher).Mapping = mapping;
+
+        // Link this mapping to the Response
+        if (mapping.Provider is Response response)
+        {
+            response.Mapping = mapping;
+        }
     }
 
     private static string ToJson(object value)

src/WireMock.Net/Matchers/ProtoBufMatcher.cs

@@ -20,9 +20,9 @@ public class ProtoBufMatcher : IBytesMatcher
     public MatchBehaviour MatchBehaviour { get; }
 
     /// <summary>
-    /// The proto definition.
+    /// The Func to define the proto definition as a string.
     /// </summary>
-    public string ProtoDefinition { get; }
+    public Func<string> ProtoDefinition { get; }
 
     /// <summary>
     /// The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
@@ -44,13 +44,13 @@ public class ProtoBufMatcher : IBytesMatcher
     /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
     /// <param name="matcher">The optional jsonMatcher to use to match the ProtoBuf as (json) object.</param>
     public ProtoBufMatcher(
-        string protoDefinition,
+        Func<string> protoDefinition,
         string messageType,
         MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch,
         IObjectMatcher? matcher = null
     )
     {
-        ProtoDefinition = Guard.NotNullOrWhiteSpace(protoDefinition);
+        ProtoDefinition = Guard.NotNull(protoDefinition);
         MessageType = Guard.NotNullOrWhiteSpace(messageType);
         Matcher = matcher;
         MatchBehaviour = matchBehaviour;
@@ -63,7 +63,7 @@ public MatchResult IsMatch(byte[]? input)
 
         if (input != null)
         {
-            var request = new ConvertToObjectRequest(ProtoDefinition, MessageType, input);
+            var request = new ConvertToObjectRequest(ProtoDefinition(), MessageType, input);
 
             try
             {

src/WireMock.Net/Matchers/Request/RequestMessageProtoBufMatcher.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace WireMock.Matchers.Request;
 
 /// <summary>
@@ -14,10 +16,10 @@ public class RequestMessageProtoBufMatcher : IRequestMatcher
     /// Initializes a new instance of the <see cref="RequestMessageProtoBufMatcher"/> class.
     /// </summary>
     /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <param name="protoDefinition">The proto definition as a string.</param>
+    /// <param name="protoDefinition">The Func to define the proto definition as a string.</param>
     /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
     /// <param name="matcher">The optional matcher to use to match the ProtoBuf as (json) object.</param>
-    public RequestMessageProtoBufMatcher(MatchBehaviour matchBehaviour, string protoDefinition, string messageType, IObjectMatcher? matcher = null)
+    public RequestMessageProtoBufMatcher(MatchBehaviour matchBehaviour, Func<string> protoDefinition, string messageType, IObjectMatcher? matcher = null)
     {
 #if PROTOBUF
         Matcher = new ProtoBufMatcher(protoDefinition, messageType, matchBehaviour, matcher);

src/WireMock.Net/Models/BodyData.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Text;
 using WireMock.Types;
@@ -48,7 +49,7 @@ public class BodyData : IBodyData
 
     #region ProtoBuf
     /// <inheritdoc />
-    public string? ProtoDefinition { get; set; }
+    public Func<string?>? ProtoDefinition { get; set; }
 
     /// <inheritdoc />
     public string? ProtoBufMessageType { get; set; }

src/WireMock.Net/Owin/Mappers/IOwinResponseMapper.cs

@@ -5,18 +5,17 @@
 using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
 #endif
 
-namespace WireMock.Owin.Mappers
+namespace WireMock.Owin.Mappers;
+
+/// <summary>
+/// IOwinResponseMapper
+/// </summary>
+internal interface IOwinResponseMapper
 {
     /// <summary>
-    /// IOwinResponseMapper
+    /// Map ResponseMessage to IResponse.
     /// </summary>
-    internal interface IOwinResponseMapper
-    {
-        /// <summary>
-        /// Map ResponseMessage to IResponse.
-        /// </summary>
-        /// <param name="responseMessage">The ResponseMessage</param>
-        /// <param name="response">The OwinResponse/HttpResponse</param>
-        Task MapAsync(IResponseMessage? responseMessage, IResponse response);
-    }
-}
+    /// <param name="responseMessage">The ResponseMessage</param>
+    /// <param name="response">The OwinResponse/HttpResponse</param>
+    Task MapAsync(IResponseMessage? responseMessage, IResponse response);
+}

src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs

@@ -144,7 +144,8 @@ private bool IsFault(IResponseMessage responseMessage)
 
 #if PROTOBUF
                 case BodyType.ProtoBuf:
-                    return ProtoBufUtils.GetProtoBufMessageWithHeader(responseMessage.BodyData.ProtoDefinition, responseMessage.BodyData.ProtoBufMessageType, responseMessage.BodyData.BodyAsJson);
+                    var protoDefinition = responseMessage.BodyData.ProtoDefinition?.Invoke();
+                    return ProtoBufUtils.GetProtoBufMessageWithHeader(protoDefinition, responseMessage.BodyData.ProtoBufMessageType, responseMessage.BodyData.BodyAsJson);
 #endif
 
                 case BodyType.Bytes:

src/WireMock.Net/RequestBuilders/IProtoBufRequestBuilder.cs

@@ -25,4 +25,21 @@ public interface IProtoBufRequestBuilder : IGraphQLRequestBuilder
     /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
     IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+    /// <summary>
+    /// WithGrpcProto
+    /// </summary>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBodyAsProtoBuf(string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+    /// <summary>
+    /// WithGrpcProto
+    /// </summary>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBodyAsProtoBuf(string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 }

src/WireMock.Net/RequestBuilders/Request.WithGrpcProto.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 
@@ -8,14 +9,24 @@ public partial class Request
     /// <inheritdoc />
     public IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
-        _requestMatchers.Add(new RequestMessageProtoBufMatcher(matchBehaviour, protoDefinition, messageType));
-        return this;
+        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => protoDefinition, messageType));
     }
 
     /// <inheritdoc />
     public IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
-        _requestMatchers.Add(new RequestMessageProtoBufMatcher(matchBehaviour, protoDefinition, messageType, matcher));
-        return this;
+        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => protoDefinition, messageType, matcher));
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsProtoBuf(string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => Mapping.ProtoDefinition!, messageType));
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsProtoBuf(string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => Mapping.ProtoDefinition!, messageType, matcher));
     }
 }

src/WireMock.Net/RequestBuilders/Request.cs

@@ -16,6 +16,11 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
 {
     private readonly IList<IRequestMatcher> _requestMatchers;
 
+    /// <summary>
+    /// The link back to the Mapping.
+    /// </summary>
+    public IMapping Mapping { get; set; } = null!;
+
     /// <summary>
     /// Creates this instance.
     /// </summary>
@@ -63,4 +68,15 @@ public IList<T> GetRequestMessageMatchers<T>() where T : IRequestMatcher
     {
         return _requestMatchers.OfType<T>().FirstOrDefault(func);
     }
+
+    private IRequestBuilder Add<T>(T requestMatcher) where T : IRequestMatcher
+    {
+        foreach (var existing in _requestMatchers.OfType<T>().ToArray())
+        {
+            _requestMatchers.Remove(existing);
+        }
+
+        _requestMatchers.Add(requestMatcher);
+        return this;
+    }
 }