#175

examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj

@@ -6,16 +6,12 @@
  <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>
 
- <ItemGroup>
- <None Remove="__admin\mappings\826aff7c-6208-4a3c-923d-575248907db4.json" />
- </ItemGroup>
-
  <ItemGroup>
  <Compile Include="..\WireMock.Net.ConsoleApplication\MainApp.cs" Link="MainApp.cs" />
  </ItemGroup>
 
  <ItemGroup>
- <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
+ <Content Include="__admin\mappings\*.json">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </Content>
  </ItemGroup>

examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json

@@ -0,0 +1,19 @@
+{
+ "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
+ "Priority": 4,
+ "Request": {
+ "Path": {},
+ "Methods": [
+ "get"
+ ]
+ },
+ "Response": {
+ "StatusCode": 200,
+ "BodyDestination": "SameAsSource",
+ "Body": "NO PATH OR URL",
+ "UseTransformer": false,
+ "Headers": {
+ "Content-Type": "application/json"
+ }
+ }
+}

examples/WireMock.Net.ConsoleApplication/WireMock.Net.Console.NET452.csproj

@@ -71,6 +71,9 @@
  <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </Content>
+ <None Include="__admin\mappings\873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">

examples/WireMock.Net.ConsoleApplication/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json

@@ -0,0 +1,19 @@
+{
+ "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
+ "Priority": 4,
+ "Request": {
+ "Path": {},
+ "Methods": [
+ "get"
+ ]
+ },
+ "Response": {
+ "StatusCode": 200,
+ "BodyDestination": "SameAsSource",
+ "Body": "NO PATH OR URL",
+ "UseTransformer": false,
+ "Headers": {
+ "Content-Type": "application/json"
+ }
+ }
+}

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -21,7 +21,7 @@ public static IMatcher Map([CanBeNull] MatcherModel matcher)
  string matcherName = parts[0];
  string matcherType = parts.Length > 1 ? parts[1] : null;
 
- string[] stringPatterns = matcher.Patterns != null ? matcher.Patterns.Cast<string>().ToArray() : new [] { matcher.Pattern as string };
+ string[] stringPatterns = matcher.Patterns != null ? matcher.Patterns.Cast<string>().ToArray() : new[] { matcher.Pattern as string };
  MatchBehaviour matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
 
  switch (matcherName)
@@ -39,7 +39,7 @@ public static IMatcher Map([CanBeNull] MatcherModel matcher)
  return new JsonPathMatcher(matchBehaviour, stringPatterns);
 
  case "XPathMatcher":
- return new XPathMatcher(matchBehaviour, (string) matcher.Pattern);
+ return new XPathMatcher(matchBehaviour, (string)matcher.Pattern);
 
  case "WildcardMatcher":
  return new WildcardMatcher(matchBehaviour, stringPatterns, matcher.IgnoreCase == true);
@@ -51,7 +51,7 @@ public static IMatcher Map([CanBeNull] MatcherModel matcher)
  throw new NotSupportedException($"Matcher '{matcherName}' with Type '{matcherType}' is not supported.");
  }
 
- return new SimMetricsMatcher(matchBehaviour, (string) matcher.Pattern, type);
+ return new SimMetricsMatcher(matchBehaviour, (string)matcher.Pattern, type);
 
  default:
  throw new NotSupportedException($"Matcher '{matcherName}' is not supported.");

src/WireMock.Net/Server/FluentMockServer.Admin.cs

@@ -316,9 +316,9 @@ private ResponseMessage MappingPut(RequestMessage requestMessage)
  Guid guid = Guid.Parse(requestMessage.Path.TrimStart(AdminMappings.ToCharArray()));
 
  var mappingModel = DeserializeObject<MappingModel>(requestMessage);
- DeserializeAndAddOrUpdateMapping(mappingModel, guid);
+ Guid? guidFromPut = DeserializeAndAddOrUpdateMapping(mappingModel, guid);
 
- return ResponseMessageBuilder.Create("Mapping added or updated", 200, guid);
+ return ResponseMessageBuilder.Create("Mapping added or updated", 200, guidFromPut);
  }
 
  private ResponseMessage MappingDelete(RequestMessage requestMessage)
@@ -401,13 +401,18 @@ private ResponseMessage MappingsPost(RequestMessage requestMessage)
  return ResponseMessageBuilder.Create("Mapping added", 201, guid);
  }
 
- private Guid DeserializeAndAddOrUpdateMapping(MappingModel mappingModel, Guid? guid = null, string path = null)
+ private Guid? DeserializeAndAddOrUpdateMapping(MappingModel mappingModel, Guid? guid = null, string path = null)
  {
  Check.NotNull(mappingModel, nameof(mappingModel));
  Check.NotNull(mappingModel.Request, nameof(mappingModel.Request));
  Check.NotNull(mappingModel.Response, nameof(mappingModel.Response));
 
- var requestBuilder = InitRequestBuilder(mappingModel.Request);
+ var requestBuilder = InitRequestBuilder(mappingModel.Request, true);
+ if (requestBuilder == null)
+ {
+ return null;
+ }
+
  var responseBuilder = InitResponseBuilder(mappingModel.Response);
 
  var respondProvider = Given(requestBuilder);
@@ -511,7 +516,7 @@ private ResponseMessage RequestsFind(RequestMessage requestMessage)
  {
  var requestModel = DeserializeObject<RequestModel>(requestMessage);
 
- var request = (Request)InitRequestBuilder(requestModel);
+ var request = (Request)InitRequestBuilder(requestModel, false);
 
  var dict = new Dictionary<LogEntry, RequestMatchResult>();
  foreach (var logEntry in LogEntries.Where(le => !le.RequestMessage.Path.StartsWith("/__admin/")))
@@ -551,7 +556,7 @@ private ResponseMessage ScenariosReset(RequestMessage requestMessage)
  }
  #endregion
 
- private IRequestBuilder InitRequestBuilder(RequestModel requestModel)
+ private IRequestBuilder InitRequestBuilder(RequestModel requestModel, bool pathOrUrlRequired)
  {
  IRequestBuilder requestBuilder = Request.Create();
 
@@ -571,38 +576,48 @@ private IRequestBuilder InitRequestBuilder(RequestModel requestModel)
  }
  }
 
+ bool pathOrUrlmatchersValid = false;
  if (requestModel.Path != null)
  {
  if (requestModel.Path is string path)
  {
  requestBuilder = requestBuilder.WithPath(path);
+ pathOrUrlmatchersValid = true;
  }
  else
  {
  var pathModel = JsonUtils.ParseJTokenToObject<PathModel>(requestModel.Path);
  if (pathModel?.Matchers != null)
  {
  requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
+ pathOrUrlmatchersValid = true;
  }
  }
  }
-
- if (requestModel.Url != null)
+ else if (requestModel.Url != null)
  {
  if (requestModel.Url is string url)
  {
  requestBuilder = requestBuilder.WithUrl(url);
+ pathOrUrlmatchersValid = true;
  }
  else
  {
  var urlModel = JsonUtils.ParseJTokenToObject<UrlModel>(requestModel.Url);
  if (urlModel?.Matchers != null)
  {
  requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
+ pathOrUrlmatchersValid = true;
  }
  }
  }
 
+ if (pathOrUrlRequired && !pathOrUrlmatchersValid)
+ {
+ _logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
+ return null;
+ }
+
  if (requestModel.Methods != null)
  {
  requestBuilder = requestBuilder.UsingMethod(requestModel.Methods);