Fixed a few issues with hashcode checking

niemyjski · niemyjski · commit 438c4c2fa091 · 2016-04-11T15:58:14.000-05:00
diff --git a/Source/Shared/Models/Client/Data/EnvironmentInfo.cs b/Source/Shared/Models/Client/Data/EnvironmentInfo.cs
@@ -128,7 +128,7 @@ public override int GetHashCode() {
                 hashCode = (hashCode * 397) ^ (MachineName == null ? 0 : MachineName.GetHashCode());
                 hashCode = (hashCode * 397) ^ (InstallId == null ? 0 : InstallId.GetHashCode());
                 hashCode = (hashCode * 397) ^ (RuntimeVersion == null ? 0 : RuntimeVersion.GetHashCode());
-                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());
+                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());
                 return hashCode;
             }
         }
diff --git a/Source/Shared/Models/Client/Data/InnerError.cs b/Source/Shared/Models/Client/Data/InnerError.cs
@@ -61,7 +61,7 @@ public override int GetHashCode() {
                 var hashCode = Message == null ? 0 : Message.GetHashCode();
                 hashCode = (hashCode * 397) ^ (Type == null ? 0 : Type.GetHashCode());
                 hashCode = (hashCode * 397) ^ (Code == null ? 0 : Code.GetHashCode());
-                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());
+                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());
                 hashCode = (hashCode * 397) ^ (Inner == null ? 0 : Inner.GetHashCode());
                 hashCode = (hashCode * 397) ^ (StackTrace == null ? 0 : StackTrace.GetCollectionHashCode());
                 hashCode = (hashCode * 397) ^ (TargetMethod == null ? 0 : TargetMethod.GetHashCode());
diff --git a/Source/Shared/Models/Client/Data/Method.cs b/Source/Shared/Models/Client/Data/Method.cs
@@ -39,7 +39,7 @@ public override int GetHashCode() {
                 hashCode = (hashCode * 397) ^ (DeclaringNamespace == null ? 0 : DeclaringNamespace.GetHashCode());
                 hashCode = (hashCode * 397) ^ (DeclaringType == null ? 0 : DeclaringType.GetHashCode());
                 hashCode = (hashCode * 397) ^ (Name == null ? 0 : Name.GetHashCode());
-                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());
+                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode(new[] { "ILOffset" }));
                 hashCode = (hashCode * 397) ^ (GenericArguments == null ? 0 : GenericArguments.GetCollectionHashCode());
                 hashCode = (hashCode * 397) ^ (Parameters == null ? 0 : Parameters.GetCollectionHashCode());
                 return hashCode;
diff --git a/Source/Shared/Models/Client/Data/Module.cs b/Source/Shared/Models/Client/Data/Module.cs
@@ -48,7 +48,7 @@ public override int GetHashCode() {
                 hashCode = (hashCode * 397) ^ IsEntry.GetHashCode();
                 hashCode = (hashCode * 397) ^ CreatedDate.GetHashCode();
                 hashCode = (hashCode * 397) ^ ModifiedDate.GetHashCode();
-                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());
+                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());
                 return hashCode;
             }
         }
diff --git a/Source/Shared/Models/Client/Data/Parameter.cs b/Source/Shared/Models/Client/Data/Parameter.cs
@@ -33,7 +33,7 @@ public override int GetHashCode() {
                 var hashCode = Name == null ? 0 : Name.GetHashCode();
                 hashCode = (hashCode * 397) ^ (Type == null ? 0 : Type.GetHashCode());
                 hashCode = (hashCode * 397) ^ (TypeNamespace == null ? 0 : TypeNamespace.GetHashCode());
-                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());
+                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());
                 hashCode = (hashCode * 397) ^ (GenericArguments == null ? 0 : GenericArguments.GetCollectionHashCode());
                 return hashCode;
             }
diff --git a/Source/Shared/Models/Client/Data/RequestInfo.cs b/Source/Shared/Models/Client/Data/RequestInfo.cs
@@ -97,7 +97,7 @@ public override int GetHashCode() {
                 hashCode = (hashCode * 397) ^ (ClientIpAddress == null ? 0 : ClientIpAddress.GetHashCode());
                 hashCode = (hashCode * 397) ^ (Cookies == null ? 0 : Cookies.GetCollectionHashCode(_cookieHashCodeExclusions));
                 hashCode = (hashCode * 397) ^ (QueryString == null ? 0 : QueryString.GetCollectionHashCode());
-                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());
+                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());
                 return hashCode;
             }
         }
diff --git a/Source/Shared/Models/Client/Data/SimpleError.cs b/Source/Shared/Models/Client/Data/SimpleError.cs
@@ -50,7 +50,7 @@ public override int GetHashCode() {
                 var hashCode = Message == null ? 0 : Message.GetHashCode();
                 hashCode = (hashCode * 397) ^ (Type == null ? 0 : Type.GetHashCode());
                 hashCode = (hashCode * 397) ^ (StackTrace == null ? 0 : StackTrace.GetHashCode());
-                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());
+                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());
                 hashCode = (hashCode * 397) ^ (Inner == null ? 0 : Inner.GetHashCode());
                 return hashCode;
             }
diff --git a/Source/Shared/Models/Client/Data/UserDescription.cs b/Source/Shared/Models/Client/Data/UserDescription.cs
@@ -40,7 +40,7 @@ public override int GetHashCode() {
             unchecked {
                 var hashCode = EmailAddress == null ? 0 : EmailAddress.GetHashCode();
                 hashCode = (hashCode * 397) ^ (Description == null ? 0 : Description.GetHashCode());
-                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());
+                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());
                 return hashCode;
             }
         }
diff --git a/Source/Shared/Models/Client/Data/UserInfo.cs b/Source/Shared/Models/Client/Data/UserInfo.cs
@@ -49,7 +49,7 @@ public override int GetHashCode() {
             unchecked {
                 var hashCode = Identity == null ? 0 : Identity.GetHashCode();
                 hashCode = (hashCode * 397) ^ (Name == null ? 0 : Name.GetHashCode());
-                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());
+                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());
                 return hashCode;
             }
         }
diff --git a/Source/Shared/Models/Client/Event.cs b/Source/Shared/Models/Client/Event.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Generic;
 
 namespace Exceptionless.Models {
     public class Event : IData {
@@ -71,6 +72,7 @@ public override bool Equals(object obj) {
             return Equals((Event)obj);
         }
 
+        private static readonly List<string> _exclusions = new List<string> { KnownDataKeys.TraceLog }; 
         public override int GetHashCode() {
             unchecked {
                 var hashCode = Type == null ? 0 : Type.GetHashCode();
@@ -79,7 +81,7 @@ public override int GetHashCode() {
                 hashCode = (hashCode * 397) ^ (Message == null ? 0 : Message.GetHashCode());
                 hashCode = (hashCode * 397) ^ (Geo == null ? 0 : Geo.GetHashCode());
                 hashCode = (hashCode * 397) ^ Value.GetHashCode();
-                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());
+                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode(_exclusions));
                 return hashCode;
             }
         }
diff --git a/Source/Shared/Models/Collections/DataDictionary.cs b/Source/Shared/Models/Collections/DataDictionary.cs
@@ -40,63 +40,5 @@ public string GetString(string name, string @default) {
                 
             return String.Empty;
         }
-
-        protected bool ShouldBeExcludedFromHash(string key) {
-            switch (key) {
-                case Event.KnownDataKeys.TraceLog:
-                    return true;
-            }
-
-            return false;
-        }
-
-        protected bool Equals(DataDictionary other) {
-            foreach (var key in Keys) {
-                if (ShouldBeExcludedFromHash(key))
-                    continue;
-
-                object value = this[key];
-
-                object otherValue;
-                if (!other.TryGetValue(key, out otherValue))
-                    return false;
-
-                if (ReferenceEquals(null, value))
-                    return false;
-
-                if (!value.Equals(otherValue))
-                    return false;
-            }
-            return true;
-        }
-
-        public override bool Equals(object obj) {
-            if (ReferenceEquals(null, obj))
-                return false;
-            if (ReferenceEquals(this, obj))
-                return true;
-            if (obj.GetType() != this.GetType())
-                return false;
-            return Equals((DataDictionary)obj);
-        }
-
-        public override int GetHashCode() {
-            int hashCode = 0;
-            foreach (var key in Keys)
-            {
-                if (ShouldBeExcludedFromHash(key))
-                    continue;
-
-                object value = this[key];
-
-                unchecked {
-                    if (value != null) {
-                        hashCode = (hashCode * 397) ^ value.GetHashCode();
-                    }
-                }
-            }
-
-            return hashCode;
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public override int GetHashCode() {`
`128`	`128`	`hashCode = (hashCode * 397) ^ (MachineName == null ? 0 : MachineName.GetHashCode());`
`129`	`129`	`hashCode = (hashCode * 397) ^ (InstallId == null ? 0 : InstallId.GetHashCode());`
`130`	`130`	`hashCode = (hashCode * 397) ^ (RuntimeVersion == null ? 0 : RuntimeVersion.GetHashCode());`
`131`		`- hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());`
	`131`	`+ hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());`
`132`	`132`	`return hashCode;`
`133`	`133`	`}`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public override int GetHashCode() {`
`48`	`48`	`hashCode = (hashCode * 397) ^ IsEntry.GetHashCode();`
`49`	`49`	`hashCode = (hashCode * 397) ^ CreatedDate.GetHashCode();`
`50`	`50`	`hashCode = (hashCode * 397) ^ ModifiedDate.GetHashCode();`
`51`		`- hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());`
	`51`	`+ hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());`
`52`	`52`	`return hashCode;`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public override int GetHashCode() {`
`33`	`33`	`var hashCode = Name == null ? 0 : Name.GetHashCode();`
`34`	`34`	`hashCode = (hashCode * 397) ^ (Type == null ? 0 : Type.GetHashCode());`
`35`	`35`	`hashCode = (hashCode * 397) ^ (TypeNamespace == null ? 0 : TypeNamespace.GetHashCode());`
`36`		`- hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());`
	`36`	`+ hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());`
`37`	`37`	`hashCode = (hashCode * 397) ^ (GenericArguments == null ? 0 : GenericArguments.GetCollectionHashCode());`
`38`	`38`	`return hashCode;`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public override int GetHashCode() {`
`97`	`97`	`hashCode = (hashCode * 397) ^ (ClientIpAddress == null ? 0 : ClientIpAddress.GetHashCode());`
`98`	`98`	`hashCode = (hashCode * 397) ^ (Cookies == null ? 0 : Cookies.GetCollectionHashCode(_cookieHashCodeExclusions));`
`99`	`99`	`hashCode = (hashCode * 397) ^ (QueryString == null ? 0 : QueryString.GetCollectionHashCode());`
`100`		`- hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());`
	`100`	`+ hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());`
`101`	`101`	`return hashCode;`
`102`	`102`	`}`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public override int GetHashCode() {`
`50`	`50`	`var hashCode = Message == null ? 0 : Message.GetHashCode();`
`51`	`51`	`hashCode = (hashCode * 397) ^ (Type == null ? 0 : Type.GetHashCode());`
`52`	`52`	`hashCode = (hashCode * 397) ^ (StackTrace == null ? 0 : StackTrace.GetHashCode());`
`53`		`- hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());`
	`53`	`+ hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());`
`54`	`54`	`hashCode = (hashCode * 397) ^ (Inner == null ? 0 : Inner.GetHashCode());`
`55`	`55`	`return hashCode;`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public override int GetHashCode() {`
`40`	`40`	`unchecked {`
`41`	`41`	`var hashCode = EmailAddress == null ? 0 : EmailAddress.GetHashCode();`
`42`	`42`	`hashCode = (hashCode * 397) ^ (Description == null ? 0 : Description.GetHashCode());`
`43`		`- hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());`
	`43`	`+ hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());`
`44`	`44`	`return hashCode;`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public override int GetHashCode() {`
`49`	`49`	`unchecked {`
`50`	`50`	`var hashCode = Identity == null ? 0 : Identity.GetHashCode();`
`51`	`51`	`hashCode = (hashCode * 397) ^ (Name == null ? 0 : Name.GetHashCode());`
`52`		`- hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());`
	`52`	`+ hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode());`
`53`	`53`	`return hashCode;`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`
`3`	`4`	`namespace Exceptionless.Models {`
`4`	`5`	`public class Event : IData {`
`@@ -71,6 +72,7 @@ public override bool Equals(object obj) {`
`71`	`72`	`return Equals((Event)obj);`
`72`	`73`	`}`
`73`	`74`
	`75`	`+ private static readonly List<string> _exclusions = new List<string> { KnownDataKeys.TraceLog };`
`74`	`76`	`public override int GetHashCode() {`
`75`	`77`	`unchecked {`
`76`	`78`	`var hashCode = Type == null ? 0 : Type.GetHashCode();`
`@@ -79,7 +81,7 @@ public override int GetHashCode() {`
`79`	`81`	`hashCode = (hashCode * 397) ^ (Message == null ? 0 : Message.GetHashCode());`
`80`	`82`	`hashCode = (hashCode * 397) ^ (Geo == null ? 0 : Geo.GetHashCode());`
`81`	`83`	`hashCode = (hashCode * 397) ^ Value.GetHashCode();`
`82`		`- hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetHashCode());`
	`84`	`+ hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode(_exclusions));`
`83`	`85`	`return hashCode;`
`84`	`86`	`}`
`85`	`87`	`}`