Replace object.Equals with Type equals operator (#656)

hazzik · web-flow · commit 2c9a5a97c1af · 2024-03-11T15:22:15.000+01:00
+semver:patch
diff --git a/src/FluentNHibernate/Diagnostics/SkippedAutomappingType.cs b/src/FluentNHibernate/Diagnostics/SkippedAutomappingType.cs
@@ -11,7 +11,7 @@ public bool Equals(SkippedAutomappingType other)
     {
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
-        return Equals(other.Type, Type) && Equals(other.Reason, Reason);
+        return other.Type == Type && Equals(other.Reason, Reason);
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/AnyMapping.cs b/src/FluentNHibernate/MappingModel/AnyMapping.cs
@@ -85,7 +85,7 @@ public bool Equals(AnyMapping other)
                other.typeColumns.ContentEquals(typeColumns) &&
                other.identifierColumns.ContentEquals(identifierColumns) &&
                other.metaValues.ContentEquals(metaValues) &&
-               Equals(other.ContainingEntityType, ContainingEntityType);
+               other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/CacheMapping.cs b/src/FluentNHibernate/MappingModel/CacheMapping.cs
@@ -36,7 +36,7 @@ public bool Equals(CacheMapping other)
     {
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
-        return Equals(other.attributes, attributes) && Equals(other.ContainedEntityType, ContainedEntityType);
+        return Equals(other.attributes, attributes) && other.ContainedEntityType == ContainedEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/ClassBased/ComponentMappingBase.cs b/src/FluentNHibernate/MappingModel/ClassBased/ComponentMappingBase.cs
@@ -47,7 +47,7 @@ public bool Equals(ComponentMappingBase other)
         if (ReferenceEquals(this, other)) return true;
         return base.Equals(other) &&
                Equals(other.attributes, attributes) &&
-               Equals(other.ContainingEntityType, ContainingEntityType) &&
+               other.ContainingEntityType == ContainingEntityType &&
                Equals(other.Member, Member);
     }
 
diff --git a/src/FluentNHibernate/MappingModel/ClassBased/ReferenceComponentMapping.cs b/src/FluentNHibernate/MappingModel/ClassBased/ReferenceComponentMapping.cs
@@ -139,9 +139,9 @@ public bool Equals(ReferenceComponentMapping other)
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.property, property) &&
-               Equals(other.componentType, componentType) &&
+               other.componentType == componentType &&
                Equals(other.mergedComponent, mergedComponent) &&
-               Equals(other.containingEntityType, containingEntityType);
+               other.containingEntityType == containingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/Collections/CollectionMapping.cs b/src/FluentNHibernate/MappingModel/Collections/CollectionMapping.cs
@@ -116,7 +116,7 @@ public bool Equals(CollectionMapping other)
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.attributes, attributes) &&
                other.filters.ContentEquals(filters) &&
-               Equals(other.ContainingEntityType, ContainingEntityType)
+               other.ContainingEntityType == ContainingEntityType
                && Equals(other.Member, Member);
     }
 
diff --git a/src/FluentNHibernate/MappingModel/Collections/CompositeElementMapping.cs b/src/FluentNHibernate/MappingModel/Collections/CompositeElementMapping.cs
@@ -67,7 +67,7 @@ public bool Equals(CompositeElementMapping other)
     {
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
-        return Equals(other.mappedMembers, mappedMembers) && Equals(other.attributes, attributes) && Equals(other.ContainingEntityType, ContainingEntityType);
+        return Equals(other.mappedMembers, mappedMembers) && Equals(other.attributes, attributes) && other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/Collections/ElementMapping.cs b/src/FluentNHibernate/MappingModel/Collections/ElementMapping.cs
@@ -53,7 +53,7 @@ public bool Equals(ElementMapping other)
         if (ReferenceEquals(this, other)) return true;
         return other.columns.ContentEquals(columns) &&
                Equals(other.attributes, attributes) &&
-               Equals(other.ContainingEntityType, ContainingEntityType);
+               other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/Collections/IndexManyToManyMapping.cs b/src/FluentNHibernate/MappingModel/Collections/IndexManyToManyMapping.cs
@@ -55,7 +55,7 @@ public bool Equals(IndexManyToManyMapping other)
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.attributes, attributes) &&
                other.columns.ContentEquals(columns) &&
-               Equals(other.ContainingEntityType, ContainingEntityType);
+               other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/Collections/IndexMapping.cs b/src/FluentNHibernate/MappingModel/Collections/IndexMapping.cs
@@ -53,7 +53,7 @@ public bool Equals(IndexMapping other)
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.attributes, attributes) &&
                other.columns.ContentEquals(columns) &&
-               Equals(other.ContainingEntityType, ContainingEntityType);
+               other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/Collections/ManyToManyMapping.cs b/src/FluentNHibernate/MappingModel/Collections/ManyToManyMapping.cs
@@ -76,7 +76,7 @@ public bool Equals(ManyToManyMapping other)
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.attributes, attributes) &&
                other.columns.ContentEquals(columns) &&
-               Equals(other.ContainingEntityType, ContainingEntityType);
+               other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/Collections/OneToManyMapping.cs b/src/FluentNHibernate/MappingModel/Collections/OneToManyMapping.cs
@@ -38,7 +38,7 @@ public bool Equals(OneToManyMapping other)
     {
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
-        return Equals(other.attributes, attributes) && Equals(other.ContainingEntityType, ContainingEntityType);
+        return Equals(other.attributes, attributes) && other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/DiscriminatorMapping.cs b/src/FluentNHibernate/MappingModel/DiscriminatorMapping.cs
@@ -37,7 +37,7 @@ public bool Equals(DiscriminatorMapping other)
     {
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
-        return Equals(other.ContainingEntityType, ContainingEntityType) &&
+        return other.ContainingEntityType == ContainingEntityType &&
                other.Columns.ContentEquals(Columns) &&
                Equals(other.attributes, attributes);
     }
diff --git a/src/FluentNHibernate/MappingModel/Identity/CompositeIdMapping.cs b/src/FluentNHibernate/MappingModel/Identity/CompositeIdMapping.cs
@@ -59,7 +59,7 @@ public bool Equals(CompositeIdMapping other)
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.attributes, attributes) &&
                other.keys.ContentEquals(keys) &&
-               Equals(other.ContainingEntityType, ContainingEntityType);
+               other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/Identity/GeneratorMapping.cs b/src/FluentNHibernate/MappingModel/Identity/GeneratorMapping.cs
@@ -32,7 +32,7 @@ public bool Equals(GeneratorMapping other)
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.attributes, attributes) &&
                other.Params.ContentEquals(Params) &&
-               Equals(other.ContainingEntityType, ContainingEntityType);
+               other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/Identity/IdMapping.cs b/src/FluentNHibernate/MappingModel/Identity/IdMapping.cs
@@ -55,7 +55,7 @@ public bool Equals(IdMapping other)
     {
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
-        return base.Equals(other) && Equals(other.Member, Member) && Equals(other.ContainingEntityType, ContainingEntityType);
+        return base.Equals(other) && Equals(other.Member, Member) && other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/Identity/KeyManyToOneMapping.cs b/src/FluentNHibernate/MappingModel/Identity/KeyManyToOneMapping.cs
@@ -49,7 +49,7 @@ public bool Equals(KeyManyToOneMapping other)
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.attributes, attributes) &&
                other.columns.ContentEquals(columns) &&
-               Equals(other.ContainingEntityType, ContainingEntityType);
+               other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/Identity/KeyPropertyMapping.cs b/src/FluentNHibernate/MappingModel/Identity/KeyPropertyMapping.cs
@@ -43,7 +43,7 @@ public bool Equals(KeyPropertyMapping other)
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.attributes, attributes) &&
                other.columns.ContentEquals(columns) &&
-               Equals(other.ContainingEntityType, ContainingEntityType);
+               other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/JoinMapping.cs b/src/FluentNHibernate/MappingModel/JoinMapping.cs
@@ -99,7 +99,7 @@ public bool Equals(JoinMapping other)
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.attributes, attributes) &&
                Equals(other.mappedMembers, mappedMembers) &&
-               Equals(other.ContainingEntityType, ContainingEntityType);
+               other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/KeyMapping.cs b/src/FluentNHibernate/MappingModel/KeyMapping.cs
@@ -61,7 +61,7 @@ public bool Equals(KeyMapping other)
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.attributes, attributes) &&
                other.columns.ContentEquals(columns) &&
-               Equals(other.ContainingEntityType, ContainingEntityType);
+               other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/ManyToOneMapping.cs b/src/FluentNHibernate/MappingModel/ManyToOneMapping.cs
@@ -89,7 +89,7 @@ public bool Equals(ManyToOneMapping other)
         if (ReferenceEquals(this, other)) return true;
         return Equals(other.attributes, attributes) &&
                other.columns.ContentEquals(columns) &&
-               Equals(other.ContainingEntityType, ContainingEntityType) &&
+               other.ContainingEntityType == ContainingEntityType &&
                Equals(other.Member, Member);
     }
 
diff --git a/src/FluentNHibernate/MappingModel/MetaValueMapping.cs b/src/FluentNHibernate/MappingModel/MetaValueMapping.cs
@@ -32,7 +32,7 @@ public override void AcceptVisitor(IMappingModelVisitor visitor)
 
     public bool Equals(MetaValueMapping other)
     {
-        return Equals(other.attributes, attributes) && Equals(other.ContainingEntityType, ContainingEntityType);
+        return Equals(other.attributes, attributes) && other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/OneToOneMapping.cs b/src/FluentNHibernate/MappingModel/OneToOneMapping.cs
@@ -50,7 +50,7 @@ public bool Equals(OneToOneMapping other)
     {
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
-        return Equals(other.attributes, attributes) && Equals(other.ContainingEntityType, ContainingEntityType);
+        return Equals(other.attributes, attributes) && other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)
diff --git a/src/FluentNHibernate/MappingModel/ParentMapping.cs b/src/FluentNHibernate/MappingModel/ParentMapping.cs
@@ -39,7 +39,7 @@ public override bool Equals(object obj)
 
     public bool Equals(ParentMapping other)
     {
-        return Equals(other.attributes, attributes) && Equals(other.ContainingEntityType, ContainingEntityType);
+        return Equals(other.attributes, attributes) && other.ContainingEntityType == ContainingEntityType;
     }
 
     public override int GetHashCode()
diff --git a/src/FluentNHibernate/MappingModel/PropertyMapping.cs b/src/FluentNHibernate/MappingModel/PropertyMapping.cs
@@ -51,7 +51,7 @@ public bool Equals(PropertyMapping other)
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
         return base.Equals(other) &&
-               Equals(other.ContainingEntityType, ContainingEntityType) &&
+               other.ContainingEntityType == ContainingEntityType &&
                Equals(other.Member, Member);
     }
 
diff --git a/src/FluentNHibernate/MappingModel/VersionMapping.cs b/src/FluentNHibernate/MappingModel/VersionMapping.cs
@@ -39,7 +39,7 @@ public bool Equals(VersionMapping other)
     {
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
-        return base.Equals(other) && Equals(other.ContainingEntityType, ContainingEntityType);
+        return base.Equals(other) && other.ContainingEntityType == ContainingEntityType;
     }
 
     public override bool Equals(object obj)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public bool Equals(SkippedAutomappingType other)`
`11`	`11`	`{`
`12`	`12`	`if (ReferenceEquals(null, other)) return false;`
`13`	`13`	`if (ReferenceEquals(this, other)) return true;`
`14`		`- return Equals(other.Type, Type) && Equals(other.Reason, Reason);`
	`14`	`+ return other.Type == Type && Equals(other.Reason, Reason);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public override bool Equals(object obj)`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public bool Equals(AnyMapping other)`
`85`	`85`	`other.typeColumns.ContentEquals(typeColumns) &&`
`86`	`86`	`other.identifierColumns.ContentEquals(identifierColumns) &&`
`87`	`87`	`other.metaValues.ContentEquals(metaValues) &&`
`88`		`- Equals(other.ContainingEntityType, ContainingEntityType);`
	`88`	`+ other.ContainingEntityType == ContainingEntityType;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`public override bool Equals(object obj)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public bool Equals(CacheMapping other)`
`36`	`36`	`{`
`37`	`37`	`if (ReferenceEquals(null, other)) return false;`
`38`	`38`	`if (ReferenceEquals(this, other)) return true;`
`39`		`- return Equals(other.attributes, attributes) && Equals(other.ContainedEntityType, ContainedEntityType);`
	`39`	`+ return Equals(other.attributes, attributes) && other.ContainedEntityType == ContainedEntityType;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public override bool Equals(object obj)`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public bool Equals(ComponentMappingBase other)`
`47`	`47`	`if (ReferenceEquals(this, other)) return true;`
`48`	`48`	`return base.Equals(other) &&`
`49`	`49`	`Equals(other.attributes, attributes) &&`
`50`		`- Equals(other.ContainingEntityType, ContainingEntityType) &&`
	`50`	`+ other.ContainingEntityType == ContainingEntityType &&`
`51`	`51`	`Equals(other.Member, Member);`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public bool Equals(CollectionMapping other)`
`116`	`116`	`if (ReferenceEquals(this, other)) return true;`
`117`	`117`	`return Equals(other.attributes, attributes) &&`
`118`	`118`	`other.filters.ContentEquals(filters) &&`
`119`		`- Equals(other.ContainingEntityType, ContainingEntityType)`
	`119`	`+ other.ContainingEntityType == ContainingEntityType`
`120`	`120`	`&& Equals(other.Member, Member);`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public bool Equals(CompositeElementMapping other)`
`67`	`67`	`{`
`68`	`68`	`if (ReferenceEquals(null, other)) return false;`
`69`	`69`	`if (ReferenceEquals(this, other)) return true;`
`70`		`- return Equals(other.mappedMembers, mappedMembers) && Equals(other.attributes, attributes) && Equals(other.ContainingEntityType, ContainingEntityType);`
	`70`	`+ return Equals(other.mappedMembers, mappedMembers) && Equals(other.attributes, attributes) && other.ContainingEntityType == ContainingEntityType;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public override bool Equals(object obj)`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public bool Equals(ElementMapping other)`
`53`	`53`	`if (ReferenceEquals(this, other)) return true;`
`54`	`54`	`return other.columns.ContentEquals(columns) &&`
`55`	`55`	`Equals(other.attributes, attributes) &&`
`56`		`- Equals(other.ContainingEntityType, ContainingEntityType);`
	`56`	`+ other.ContainingEntityType == ContainingEntityType;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public override bool Equals(object obj)`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public bool Equals(IndexManyToManyMapping other)`
`55`	`55`	`if (ReferenceEquals(this, other)) return true;`
`56`	`56`	`return Equals(other.attributes, attributes) &&`
`57`	`57`	`other.columns.ContentEquals(columns) &&`
`58`		`- Equals(other.ContainingEntityType, ContainingEntityType);`
	`58`	`+ other.ContainingEntityType == ContainingEntityType;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public override bool Equals(object obj)`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public bool Equals(IndexMapping other)`
`53`	`53`	`if (ReferenceEquals(this, other)) return true;`
`54`	`54`	`return Equals(other.attributes, attributes) &&`
`55`	`55`	`other.columns.ContentEquals(columns) &&`
`56`		`- Equals(other.ContainingEntityType, ContainingEntityType);`
	`56`	`+ other.ContainingEntityType == ContainingEntityType;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public override bool Equals(object obj)`