Fix #100

CHANGELOG.md

@@ -1,3 +1,17 @@
+# 1.0.3.12 (24 March 2018)
+
+ - [#100](https://github.com/WireMock-Net/WireMock.Net/issues/100) - Issue: JsonPathMatcher - not working for rootless jsons?
+
+Commits: ...
+
+
+# 1.0.3.11 (20 March 2018)
+
+ - [#110](https://github.com/WireMock-Net/WireMock.Net/issues/110) - Fix: remove `Func[]` from MappingModel
+
+Commits: a4a9f2c862...a4a9f2c862
+
+
 # 1.0.3.10 (17 March 2018)
 
  - [#109](https://github.com/WireMock-Net/WireMock.Net/issues/109) - Issue: When proxying, MimeType is wrong for StringContent

GitReleaseNotes.txt

@@ -1,5 +1,5 @@
 https://github.com/GitTools/GitReleaseNotes
 
-GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.3.10
+GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.3.11
 
 GitReleaseNotes.exe . /OutputFile CHANGELOG.md /allTags

WireMock.Net Solution.sln

@@ -49,6 +49,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net461", "examples\WireMock.Net.StandAlone.Net461\WireMock.Net.StandAlone.Net461.csproj", "{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Service", "examples\Wiremock.Net.Service\WireMock.Net.Service.csproj", "{7F0B2446-0363-4720-AF46-F47F83B557DC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -107,6 +109,10 @@ Global
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -125,6 +131,7 @@ Global
 		{26433A8F-BF01-4962-97EB-81BFFBB61096} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BF428BCC-C837-433B-87D2-15C7014B73E9}

examples/WireMock.Net.Service/App.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

examples/WireMock.Net.Service/InstallUtil.InstallLog

@@ -0,0 +1,28 @@
+
+
+The uninstall is beginning.
+See the contents of the log file for the C:\Users\azureuser\Documents\Github\WireMock.Net\examples\Wiremock.Net.Service\bin\debug\Wiremock.Net.Service.exe assembly's progress.
+The file is located at C:\Users\azureuser\Documents\Github\WireMock.Net\examples\Wiremock.Net.Service\bin\debug\Wiremock.Net.Service.InstallLog.
+
+The uninstall has completed.
+
+
+The uninstall is beginning.
+See the contents of the log file for the C:\Users\azureuser\Documents\Github\WireMock.Net\examples\Wiremock.Net.Service\bin\debug\Wiremock.Net.Service.exe assembly's progress.
+The file is located at C:\Users\azureuser\Documents\Github\WireMock.Net\examples\Wiremock.Net.Service\bin\debug\Wiremock.Net.Service.InstallLog.
+
+The uninstall has completed.
+
+
+The uninstall is beginning.
+See the contents of the log file for the C:\Users\azureuser\Documents\Github\WireMock.Net\examples\Wiremock.Net.Service\bin\debug\Wiremock.Net.Service.exe assembly's progress.
+The file is located at C:\Users\azureuser\Documents\Github\WireMock.Net\examples\Wiremock.Net.Service\bin\debug\Wiremock.Net.Service.InstallLog.
+
+The uninstall has completed.
+
+
+The uninstall is beginning.
+See the contents of the log file for the C:\Users\azureuser\Documents\Github\WireMock.Net\examples\Wiremock.Net.Service\bin\debug\WireMock.Net.Service.exe assembly's progress.
+The file is located at C:\Users\azureuser\Documents\Github\WireMock.Net\examples\Wiremock.Net.Service\bin\debug\WireMock.Net.Service.InstallLog.
+
+The uninstall has completed.

examples/WireMock.Net.Service/Installer.Designer.cs

@@ -0,0 +1,59 @@
+namespace Wiremock.Net.Service
+{
+    partial class Installer
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.serviceProcessInstaller1 = new System.ServiceProcess.ServiceProcessInstaller();
+            this.serviceInstaller1 = new System.ServiceProcess.ServiceInstaller();
+            // 
+            // serviceProcessInstaller1
+            // 
+            this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.LocalSystem;
+            this.serviceProcessInstaller1.Password = null;
+            this.serviceProcessInstaller1.Username = null;
+            // 
+            // serviceInstaller1
+            // 
+            this.serviceInstaller1.Description = "WireMock.Net Service";
+            this.serviceInstaller1.DisplayName = "WireMock.Net.Service";
+            this.serviceInstaller1.ServiceName = "WireMock.Net.Service";
+            this.serviceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic;
+            // 
+            // ProjectInstaller
+            // 
+            this.Installers.AddRange(new System.Configuration.Install.Installer[] {
+                this.serviceProcessInstaller1,
+                this.serviceInstaller1});
+        }
+
+        #endregion
+
+        private System.ServiceProcess.ServiceProcessInstaller serviceProcessInstaller1;
+        private System.ServiceProcess.ServiceInstaller serviceInstaller1;
+    }
+}

examples/WireMock.Net.Service/Installer.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration.Install;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Wiremock.Net.Service
+{
+    [RunInstaller(true)]
+    public partial class Installer : System.Configuration.Install.Installer
+    {
+        public Installer()
+        {
+            InitializeComponent();
+        }
+    }
+}

examples/WireMock.Net.Service/Program.cs

@@ -0,0 +1,74 @@
+using System;
+using System.ServiceProcess;
+using WireMock.Logging;
+using WireMock.Net.StandAlone;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace Wiremock.Net.Service
+{
+    public static class Program
+    {
+        #region Nested classes to support running as service
+        public const string ServiceName = "Wiremock.Net.Service";
+
+        public class Service : ServiceBase
+        {
+            public Service()
+            {
+                ServiceName = Program.ServiceName;
+            }
+
+            protected override void OnStart(string[] args)
+            {
+                Start();
+            }
+
+            protected override void OnStop()
+            {
+                Program.Stop();
+            }
+        }
+        #endregion
+
+        private static FluentMockServer _server;
+
+        static void Main(string[] args)
+        {
+            // running as service
+            if (!Environment.UserInteractive)
+            {
+                using (var service = new Service())
+                {
+                    ServiceBase.Run(service);
+                }
+            }
+            else
+            {
+                // running as console app
+                Start();
+
+                Console.WriteLine("Press any key to stop...");
+                Console.ReadKey(true);
+
+                Stop();
+            }
+        }
+
+        private static void Start()
+        {
+            _server = StandAloneApp.Start(new FluentMockServerSettings
+            {
+                Urls = new[] { "http://*:9091/" },
+                StartAdminInterface = true,
+                ReadStaticMappings = true,
+                Logger = new WireMockConsoleLogger()
+            });
+        }
+
+        private static void Stop()
+        {
+            _server.Stop();
+        }
+    }
+}

examples/WireMock.Net.Service/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Wiremock.Net.Service")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Wiremock.Net.Service")]
+[assembly: AssemblyCopyright("Copyright © Stef Heyenrath 2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7f0b2446-0363-4720-af46-f47f83b557dc")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

examples/WireMock.Net.Service/Service-Install.bat

@@ -0,0 +1,11 @@
+@echo off
+call uninstall.bat
+
+SET mypath=%~dp0
+SET targetpath=C:\Services\WireMock.Net.Service\
+
+mkdir "%targetpath%"
+xcopy "%mypath%*" "%targetpath%*"
+
+C:\Windows\Microsoft.NET\Framework\v4.0.30319\InstallUtil.exe "%targetpath%WireMock.Net.Service.exe"
+net start "WireMock.Net.Service"

examples/WireMock.Net.Service/Service-Start.bat

@@ -0,0 +1,3 @@
+@echo off
+
+net start "WireMock.Net.Service"

examples/WireMock.Net.Service/Service-Stop.bat

@@ -0,0 +1,3 @@
+@echo off
+
+net stop "WireMock.Net.Service"

examples/WireMock.Net.Service/Service-Uninstall.bat

@@ -0,0 +1,9 @@
+@echo off
+SET mypath=%~dp0
+SET targetpath=C:\Services\WireMock.Net.Service\
+
+net stop "WireMock.Net.Service"
+C:\Windows\Microsoft.NET\Framework\v4.0.30319\InstallUtil.exe /u "%mypath%WireMock.Net.Service.exe"
+sc delete "WireMock.Net.Service"
+
+rmdir /S /Q "%targetpath%"

examples/WireMock.Net.Service/WireMock.Net.Service.csproj

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7F0B2446-0363-4720-AF46-F47F83B557DC}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WireMock.Net.Service</RootNamespace>
+    <AssemblyName>WireMock.Net.Service</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Handlebars, Version=1.8.1.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.1.9.0\lib\net40\Handlebars.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.2.0.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Hosting, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
+    </Reference>
+    <Reference Include="MimeKitLite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MimeKitLite.2.0.1\lib\net45\MimeKitLite.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="RestEase, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RestEase.1.4.4\lib\net45\RestEase.dll</HintPath>
+    </Reference>
+    <Reference Include="SimMetrics.Net, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SimMetrics.Net.1.0.4\lib\net45\SimMetrics.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration.Install" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http.Owin, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="XPath2, Version=1.0.5.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XPath2.1.0.5.1\lib\net40\XPath2.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Installer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Installer.Designer.cs">
+      <DependentUpon>Installer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="Service-Start.bat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Service-Stop.bat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Service-Uninstall.bat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Service-Install.bat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
+      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
+      <Name>WireMock.Net.StandAlone</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
+      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
+      <Name>WireMock.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

examples/WireMock.Net.Service/packages.config

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Handlebars.Net" version="1.9.0" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.3" targetFramework="net452" />
+  <package id="Microsoft.Owin" version="2.0.2" targetFramework="net452" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
+  <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
+  <package id="MimeKitLite" version="2.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
+  <package id="Owin" version="1.0" targetFramework="net452" />
+  <package id="RestEase" version="1.4.4" targetFramework="net452" />
+  <package id="SimMetrics.Net" version="1.0.4" targetFramework="net452" />
+  <package id="System.Net.Http" version="4.3.3" targetFramework="net452" />
+  <package id="XPath2" version="1.0.5.1" targetFramework="net452" />
+</packages>

src/WireMock.Net.StandAlone/StandAloneApp.cs

@@ -21,7 +21,11 @@ namespace WireMock.Net.StandAlone
         {
             Check.NotNull(settings, nameof(settings));
 
-            return FluentMockServer.Start(settings);
+            var server = FluentMockServer.Start(settings);
+
+            settings.Logger.Info("WireMock.Net server listening at {0}", string.Join(",", server.Urls));
+
+            return server;
         }
 
         /// <summary>
@@ -80,8 +84,6 @@ namespace WireMock.Net.StandAlone
 
             FluentMockServer server = Start(settings);
 
-            settings.Logger.Info("WireMock.Net server listening at {0}", string.Join(",", server.Urls));
-
             return server;
         }
     }

src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
     <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Version>1.0.3.10</Version>
+    <Version>1.0.3.12</Version>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/WireMock.Net/Admin/Mappings/BodyModel.cs

@@ -8,25 +8,16 @@
         /// <summary>
         /// Gets or sets the matcher.
         /// </summary>
-        /// <value>
-        /// The matcher.
-        /// </value>
         public MatcherModel Matcher { get; set; }
 
-        /// <summary>
-        /// Gets or sets the function.
-        /// </summary>
-        /// <value>
-        /// The function.
-        /// </value>
-        public string Func { get; set; }
+        ///// <summary>
+        ///// Gets or sets the function.
+        ///// </summary>
+        //public string Func { get; set; }
 
-        /// <summary>
-        /// Gets or sets the data function.
-        /// </summary>
-        /// <value>
-        /// The data function.
-        /// </value>
-        public string DataFunc { get; set; }
+        ///// <summary>
+        ///// Gets or sets the data function.
+        ///// </summary>
+        //public string DataFunc { get; set; }
     }
 }

src/WireMock.Net/Admin/Mappings/ClientIPModel.cs

@@ -8,17 +8,11 @@
         /// <summary>
         /// Gets or sets the matchers.
         /// </summary>
-        /// <value>
-        /// The matchers.
-        /// </value>
         public MatcherModel[] Matchers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the functions.
-        /// </summary>
-        /// <value>
-        /// The functions.
-        /// </value>
-        public string[] Funcs { get; set; }
+        ///// <summary>
+        ///// Gets or sets the functions.
+        ///// </summary>
+        //public string[] Funcs { get; set; }
     }
 }

src/WireMock.Net/Admin/Mappings/CookieModel.cs

@@ -10,25 +10,16 @@ namespace WireMock.Admin.Mappings
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
-        /// <value>
-        /// The name.
-        /// </value>
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the matchers.
         /// </summary>
-        /// <value>
-        /// The matchers.
-        /// </value>
         public IList<MatcherModel> Matchers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the functions.
-        /// </summary>
-        /// <value>
-        /// The functions.
-        /// </value>
-        public string[] Funcs { get; set; }
+        ///// <summary>
+        ///// Gets or sets the functions.
+        ///// </summary>
+        //public string[] Funcs { get; set; }
     }
 }

src/WireMock.Net/Admin/Mappings/HeaderModel.cs

@@ -10,25 +10,16 @@ namespace WireMock.Admin.Mappings
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
-        /// <value>
-        /// The name.
-        /// </value>
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the matchers.
         /// </summary>
-        /// <value>
-        /// The matchers.
-        /// </value>
         public IList<MatcherModel> Matchers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the functions.
-        /// </summary>
-        /// <value>
-        /// The functions.
-        /// </value>
-        public string[] Funcs { get; set; }
+        ///// <summary>
+        ///// Gets or sets the functions.
+        ///// </summary>
+        //public string[] Funcs { get; set; }
     }
 }

src/WireMock.Net/Admin/Mappings/ParamModel.cs

@@ -10,25 +10,16 @@ namespace WireMock.Admin.Mappings
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
-        /// <value>
-        /// The name.
-        /// </value>
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the values.
         /// </summary>
-        /// <value>
-        /// The values.
-        /// </value>
         public IList<string> Values { get; set; }
 
-        /// <summary>
-        /// Gets or sets the functions.
-        /// </summary>
-        /// <value>
-        /// The functions.
-        /// </value>
-        public string[] Funcs { get; set; }
+        ///// <summary>
+        ///// Gets or sets the functions.
+        ///// </summary>
+        //public string[] Funcs { get; set; }
     }
 }

src/WireMock.Net/Admin/Mappings/PathModel.cs

@@ -8,17 +8,11 @@
         /// <summary>
         /// Gets or sets the matchers.
         /// </summary>
-        /// <value>
-        /// The matchers.
-        /// </value>
         public MatcherModel[] Matchers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the functions.
-        /// </summary>
-        /// <value>
-        /// The functions.
-        /// </value>
-        public string[] Funcs { get; set; }
+        ///// <summary>
+        ///// Gets or sets the functions.
+        ///// </summary>
+        //public string[] Funcs { get; set; }
     }
 }

src/WireMock.Net/Admin/Mappings/RequestModel.cs

@@ -10,25 +10,16 @@ namespace WireMock.Admin.Mappings
         /// <summary>
         /// Gets or sets the ClientIP. (Can be a string or a ClientIPModel)
         /// </summary>
-        /// <value>
-        /// The ClientIP.
-        /// </value>
         public object ClientIP { get; set; }
 
         /// <summary>
         /// Gets or sets the Path. (Can be a string or a PathModel)
         /// </summary>
-        /// <value>
-        /// The Path.
-        /// </value>
         public object Path { get; set; }
 
         /// <summary>
         /// Gets or sets the Url. (Can be a string or a UrlModel)
         /// </summary>
-        /// <value>
-        /// The URL.
-        /// </value>
         public object Url { get; set; }
 
         /// <summary>
@@ -39,33 +30,21 @@ namespace WireMock.Admin.Mappings
         /// <summary>
         /// Gets or sets the Headers.
         /// </summary>
-        /// <value>
-        /// The Headers.
-        /// </value>
         public IList<HeaderModel> Headers { get; set; }
 
         /// <summary>
         /// Gets or sets the Cookies.
         /// </summary>
-        /// <value>
-        /// The Cookies.
-        /// </value>
         public IList<CookieModel> Cookies { get; set; }
 
         /// <summary>
         /// Gets or sets the Params.
         /// </summary>
-        /// <value>
-        /// The Headers.
-        /// </value>
         public IList<ParamModel> Params { get; set; }
         
         /// <summary>
         /// Gets or sets the body.
         /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
         public BodyModel Body { get; set; }
     }
 }

src/WireMock.Net/Admin/Mappings/UrlModel.cs

@@ -8,17 +8,11 @@
         /// <summary>
         /// Gets or sets the matchers.
         /// </summary>
-        /// <value>
-        /// The matchers.
-        /// </value>
         public MatcherModel[] Matchers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the functions.
-        /// </summary>
-        /// <value>
-        /// The functions.
-        /// </value>
-        public string[] Funcs { get; set; }
+        ///// <summary>
+        ///// Gets or sets the functions.
+        ///// </summary>
+        //public string[] Funcs { get; set; }
     }
 }

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -7,12 +7,11 @@ using WireMock.Validation;
 namespace WireMock.Matchers
 {
     /// <summary>
-    /// JSONPathMatcher
+    /// JsonPathMatcher
     /// </summary>
     /// <seealso cref="IMatcher" />
     public class JsonPathMatcher : IStringMatcher, IObjectMatcher
     {
-        // private readonly object _jsonPattern;
         private readonly string[] _patterns;
 
         /// <summary>
@@ -26,13 +25,6 @@ namespace WireMock.Matchers
             _patterns = patterns;
         }
 
-        //public JsonPathMatcher([NotNull] object jsonPattern)
-        //{
-        //    Check.NotNull(jsonPattern, nameof(jsonPattern));
-
-        //    _jsonPattern = jsonPattern;
-        //}
-
         /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
@@ -43,9 +35,8 @@ namespace WireMock.Matchers
 
             try
             {
-                JObject o = JObject.Parse(input);
-
-                return MatchScores.ToScore(_patterns.Select(p => o.SelectToken(p) != null));
+                var jtoken = JToken.Parse(input);
+                return IsMatch(jtoken);
             }
             catch (Exception)
             {
@@ -63,9 +54,9 @@ namespace WireMock.Matchers
 
             try
             {
-                var o = input as JObject ?? JObject.FromObject(input);
-
-                return MatchScores.ToScore(_patterns.Select(p => o.SelectToken(p) != null));
+                // Check if JToken or object
+                JToken jtoken = input is JToken token ? token : JObject.FromObject(input);
+                return IsMatch(jtoken);
             }
             catch (Exception)
             {
@@ -84,5 +75,13 @@ namespace WireMock.Matchers
         {
             return "JsonPathMatcher";
         }
+
+        private double IsMatch(JToken jtoken)
+        {
+            // Wrap in array if needed
+            JToken jarray = jtoken is JArray ? jtoken : new JArray(jtoken);
+
+            return MatchScores.ToScore(_patterns.Select(pattern => jarray.SelectToken(pattern) != null));
+        }
     }
 }

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -38,20 +38,20 @@ namespace WireMock.Serialization
                 {
                     ClientIP = clientIPMatchers != null && clientIPMatchers.Any() ? new ClientIPModel
                     {
-                        Matchers = MatcherMapper.Map(clientIPMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers)),
-                        Funcs = Map(clientIPMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
+                        Matchers = MatcherMapper.Map(clientIPMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
+                        //Funcs = Map(clientIPMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
                     } : null,
 
                     Path = pathMatchers != null && pathMatchers.Any() ? new PathModel
                     {
-                        Matchers = MatcherMapper.Map(pathMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers)),
-                        Funcs = Map(pathMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
+                        Matchers = MatcherMapper.Map(pathMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
+                        //Funcs = Map(pathMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
                     } : null,
 
                     Url = urlMatchers != null && urlMatchers.Any() ? new UrlModel
                     {
-                        Matchers = MatcherMapper.Map(urlMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers)),
-                        Funcs = Map(urlMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
+                        Matchers = MatcherMapper.Map(urlMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
+                        //Funcs = Map(urlMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
                     } : null,
 
                     Methods = methodMatcher?.Methods,
@@ -59,29 +59,29 @@ namespace WireMock.Serialization
                     Headers = headerMatchers != null && headerMatchers.Any() ? headerMatchers.Select(hm => new HeaderModel
                     {
                         Name = hm.Name,
-                        Matchers = MatcherMapper.Map(hm.Matchers),
-                        Funcs = Map(hm.Funcs)
+                        Matchers = MatcherMapper.Map(hm.Matchers)
+                        //Funcs = Map(hm.Funcs)
                     }).ToList() : null,
 
                     Cookies = cookieMatchers != null && cookieMatchers.Any() ? cookieMatchers.Select(cm => new CookieModel
                     {
                         Name = cm.Name,
-                        Matchers = MatcherMapper.Map(cm.Matchers),
-                        Funcs = Map(cm.Funcs)
+                        Matchers = MatcherMapper.Map(cm.Matchers)
+                        //Funcs = Map(cm.Funcs)
                     }).ToList() : null,
 
                     Params = paramsMatchers != null && paramsMatchers.Any() ? paramsMatchers.Select(pm => new ParamModel
                     {
                         Name = pm.Key,
-                        Values = pm.Values?.ToList(),
-                        Funcs = Map(pm.Funcs)
+                        Values = pm.Values?.ToList()
+                        //Funcs = Map(pm.Funcs)
                     }).ToList() : null,
 
                     Body = methodMatcher?.Methods != null && methodMatcher.Methods.Any(m => m == "get") ? null : new BodyModel
                     {
-                        Matcher = bodyMatcher != null ? MatcherMapper.Map(bodyMatcher.Matcher) : null,
-                        Func = bodyMatcher != null ? Map(bodyMatcher.Func) : null,
-                        DataFunc = bodyMatcher != null ? Map(bodyMatcher.DataFunc) : null
+                        Matcher = bodyMatcher != null ? MatcherMapper.Map(bodyMatcher.Matcher) : null
+                        //Func = bodyMatcher != null ? Map(bodyMatcher.Func) : null,
+                        //DataFunc = bodyMatcher != null ? Map(bodyMatcher.DataFunc) : null
                     }
                 },
                 Response = new ResponseModel

src/WireMock.Net/WireMock.Net.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
     <AssemblyTitle>WireMock.Net</AssemblyTitle>
-    <Version>1.0.3.10</Version>
+    <Version>1.0.3.11</Version>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

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

@@ -1,4 +1,5 @@
-using NFluent;
+using Newtonsoft.Json.Linq;
+using NFluent;
 using WireMock.Matchers;
 using Xunit;
 
@@ -31,5 +32,104 @@ namespace WireMock.Net.Tests.Matchers
             // Assert
             Check.That(patterns).ContainsExactly("X");
         }
+
+        [Fact]
+        public void JsonPathMatcher_IsMatch_NullString()
+        {
+            // Assign
+            string s = null;
+            var matcher = new JsonPathMatcher("");
+
+            // Act 
+            double match = matcher.IsMatch(s);
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
+        [Fact]
+        public void JsonPathMatcher_IsMatch_NullObject()
+        {
+            // Assign
+            object o = null;
+            var matcher = new JsonPathMatcher("");
+
+            // Act 
+            double match = matcher.IsMatch(o);
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
+        [Fact]
+        public void JsonPathMatcher_IsMatch_String_Exception_Mismatch()
+        {
+            // Assign
+            var matcher = new JsonPathMatcher("xxx");
+
+            // Act 
+            double match = matcher.IsMatch("");
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
+        [Fact]
+        public void JsonPathMatcher_IsMatch_Object_Exception_Mismatch()
+        {
+            // Assign
+            var matcher = new JsonPathMatcher("xxx");
+
+            // Act 
+            double match = matcher.IsMatch("");
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
+        [Fact]
+        public void JsonPathMatcher_IsMatch_AnonymousObject()
+        {
+            // Assign 
+            var matcher = new JsonPathMatcher("$..[?(@.Id == 1)]");
+
+            // Act 
+            double match = matcher.IsMatch(new { Id = 1, Name = "Test" });
+
+            // Assert 
+            Check.That(match).IsEqualTo(1);
+        }
+
+        [Fact]
+        public void JsonPathMatcher_IsMatch_JObject()
+        {
+            // Assign 
+            string[] patterns = { "$..[?(@.Id == 1)]" };
+            var matcher = new JsonPathMatcher(patterns);
+
+            // Act 
+            var jobject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jobject);
+
+            // Assert 
+            Check.That(match).IsEqualTo(1);
+        }
+
+        [Fact]
+        public void JsonPathMatcher_IsMatch_JObject_Parsed()
+        {
+            // Assign 
+            var matcher = new JsonPathMatcher("$..[?(@.Id == 1)]");
+
+            // Act 
+            double match = matcher.IsMatch(JObject.Parse("{\"Id\":1,\"Name\":\"Test\"}"));
+
+            // Assert 
+            Check.That(match).IsEqualTo(1);
+        }
     }
 }

test/WireMock.Net.Tests/RequestWithBodyTests.cs

@@ -147,7 +147,7 @@ namespace WireMock.Net.Tests
         public void Request_WithBodyJsonPathMatcher_true()
         {
             // given
-            var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]"));
+            var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$..things[?(@.name == 'RequiredThing')]"));
 
             // when
             string bodyAsString = "{ \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"Wiremock\" } ] }";
@@ -179,7 +179,7 @@ namespace WireMock.Net.Tests
         public void Request_WithBodyAsJson_Object_JsonPathMatcher_true()
         {
             // given
-            var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]"));
+            var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$..things[?(@.name == 'RequiredThing')]"));
 
             // when
             string jsonString = "{ \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"Wiremock\" } ] }";
@@ -199,7 +199,7 @@ namespace WireMock.Net.Tests
         public void Request_WithBodyAsJson_Array_JsonPathMatcher_1()
         {
             // given
-            var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$.books[?(@.price < 10)]"));
+            var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$..books[?(@.price < 10)]"));
 
             // when
             string jsonString = "{ \"books\": [ { \"category\": \"test1\", \"price\": 8.95 }, { \"category\": \"test2\", \"price\": 20 } ] }";