Fixed a bug where multiword exclusions wouldn't be applied

Author: niemyjski

src/Exceptionless.Tests/Serializer/SerializerTests.cs

@@ -66,6 +66,26 @@ public void CanExcludeNestedProperties() {
             Assert.Equal(@"{""message"":""Testing"",""nested"":{""message"":""Nested""}}", json);
         }
 
+        [Fact]
+        public void CanExcludeMultiwordProperties() {
+            var user = new User {
+                FirstName = "John",
+                LastName = "Doe",
+                PasswordHash = "1234567890",
+                Billing = new BillingInfo {
+                    ExpirationMonth = 10,
+                    ExpirationYear = 2020,
+                    CardNumberRedacted = "1xxxxxxxx89",
+                    EncryptedCardNumber = "9876543210"
+                }
+            };
+
+            var exclusions = new[] { nameof(user.PasswordHash), nameof(user.Billing.CardNumberRedacted), nameof(user.Billing.EncryptedCardNumber) };
+            IJsonSerializer serializer = GetSerializer();
+            string json = serializer.Serialize(user, exclusions, maxDepth: 2);
+            Assert.Equal(@"{""first_name"":""John"",""last_name"":""Doe"",""billing"":{""expiration_month"":10,""expiration_year"":2020}}", json);
+        }
+
         [Fact]
         public void WillIgnoreDefaultValues() {
             var data = new SampleModel {
@@ -183,4 +203,18 @@ public class SampleModel {
         public ICollection<string> Collection { get; set; } 
         public SampleModel Nested { get; set; }
     }
+
+    public class User {
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public string PasswordHash { get; set; }
+        public BillingInfo Billing { get; set; }
+    }
+
+    public class BillingInfo {
+        public string CardNumberRedacted { get; set; }
+        public string EncryptedCardNumber { get; set; }
+        public int ExpirationMonth { get; set; }
+        public int ExpirationYear { get; set; }
+    }
 }

src/Exceptionless.Tests/project.json

@@ -13,7 +13,6 @@
             "target": "project"
         },
         "Moq": "4.6.25-alpha",
-        "NLog": "4.4.0-beta12",
         "dotnet-test-xunit": "2.2.0-preview2-build1029",
         "xunit": "2.2.0-beta2-build3300",
         "xunit.extensibility.core": "2.2.0-beta2-build3300",

src/Exceptionless/Serializer/DefaultJsonSerializer.cs

@@ -60,7 +60,7 @@ public virtual object Deserialize(string json, Type type) {
 
         private bool ShouldSerialize(JsonTextWriterWithDepth jw, JsonProperty property, object obj, int maxDepth, IEnumerable<string> excludedPropertyNames) {
             try {
-                if (excludedPropertyNames != null && property.PropertyName.AnyWildcardMatches(excludedPropertyNames, true))
+                if (excludedPropertyNames != null && (property.UnderlyingName.AnyWildcardMatches(excludedPropertyNames, true) || property.PropertyName.AnyWildcardMatches(excludedPropertyNames, true)))
                     return false;
 
                 bool isPrimitiveType = DefaultContractResolver.IsJsonPrimitiveType(property.PropertyType);

src/Exceptionless/project.json

@@ -271,8 +271,8 @@
                 "System.Threading": "4.0.11",
                 "System.Threading.AccessControl": "4.0.0",
                 "System.Threading.Tasks": "4.0.11",
-                "System.Threading.Timer": "4.0.1",
                 "System.Threading.Thread": "4.0.0",
+                "System.Threading.Timer": "4.0.1",
                 "System.Xml.ReaderWriter": "4.0.11",
                 "System.Xml.XDocument": "4.0.11",
                 "System.Xml.XmlDocument": "4.0.1",

src/Platforms/Exceptionless.NLog/project.json

@@ -48,7 +48,7 @@
                 "define": [ "NET45" ]
             },
             "dependencies": {
-                "NLog": "4.3.5"
+                "NLog": "4.3.6"
             }
         }
     }

src/Samples/Exceptionless.SampleMvc/Exceptionless.SampleMvc.csproj

@@ -55,10 +55,6 @@
       <HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NLog.4.4.0-beta12\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />

src/Samples/Exceptionless.SampleMvc/Global.asax.cs

@@ -1,20 +1,16 @@
 using System;
-using System.Diagnostics;
 using System.Web;
 using System.Web.Http;
 using System.Web.Mvc;
 using System.Web.Routing;
 using Exceptionless.SampleMvc.App_Start;
-using NLog;
 
 namespace Exceptionless.SampleMvc {
     // Note: For instructions on enabling IIS6 or IIS7 classic mode, 
     // visit http://go.microsoft.com/?LinkId=9394801
 
     public class MvcApplication : HttpApplication {
         protected void Application_Start() {
-            Trace.Listeners.Add(new NLogTraceListener());
-            //ExceptionlessClient.Default.Log = new NLogExceptionlessLog();
             ExceptionlessClient.Default.Configuration.DefaultData["FirstName"] = "Blake";
             ExceptionlessClient.Default.Configuration.DefaultData["IgnoredProperty"] = "Some random data";
 

src/Samples/Exceptionless.SampleMvc/packages.config

@@ -14,5 +14,4 @@
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net452" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.4.0-beta12" targetFramework="net45" />
 </packages>