Replace null checks with is null / is not null

src/FluentNHibernate.Specs/Automapping/Fixtures/AutomappingSpecExtensions.cs

@@ -51,15 +51,15 @@ public XmlElementTester(XmlDocument doc, string path)
 
         public XmlElementTester ShouldExist()
         {
-            if (currentElement == null)
+            if (currentElement is null)
                 throw new SpecificationException(string.Format("Should exist at {0} but does not.", currentPath));
 
             return this;
         }
 
         public XmlElementTester ShouldNotExist()
         {
-            if (currentElement != null)
+            if (currentElement is not null)
                 throw new SpecificationException(string.Format("Should not exist at {0} but does.", currentPath));
 
             return this;

src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs

@@ -330,7 +330,7 @@ public System.Type ReturnedClass
         public new bool Equals(object x, object y)
         {
             if (x == y) return true;
-            if (x == null || y == null) return false;
+            if (x is null || y is null) return false;
 
             DoubleString lhs = (DoubleString)x;
             DoubleString rhs = (DoubleString)y;
@@ -349,7 +349,7 @@ public int GetHashCode(object x)
 
         public Object DeepCopy(Object x)
         {
-            if (x == null) return null;
+            if (x is null) return null;
             DoubleString result = new DoubleString();
             DoubleString input = (DoubleString)x;
             result.s1 = input.s1;
@@ -367,7 +367,7 @@ public object NullSafeGet(DbDataReader dr, string[] names, ISessionImplementor s
             string first = (string)NHibernateUtil.String.NullSafeGet(dr, names[0], session, owner);
             string second = (string)NHibernateUtil.String.NullSafeGet(dr, names[1], session, owner);
 
-            return (first == null && second == null) ? null : new string[] { first, second };
+            return (first is null && second is null) ? null : new string[] { first, second };
         }
 
         public void NullSafeSet(DbCommand cmd, object value, int index, bool[] settable, ISessionImplementor session)

src/FluentNHibernate.Testing/Cfg/Db/PersistenceConfigurationTester.cs

@@ -20,7 +20,7 @@ public void SetUp()
 
     public string ValueOf(string key)
     {
-        if( _nhibConfig == null )
+        if( _nhibConfig is null )
         {
             _nhibConfig = new Configuration();
             _config.ConfigureProperties(_nhibConfig);

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/ArrayConventionTests.cs

@@ -185,7 +185,7 @@ private void VerifyModel(Action<CollectionMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleParentClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleParentClass)) is not null)
             .Classes.First()
             .Collections.First();
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/ClassConventionTests.cs

@@ -148,7 +148,7 @@ private void VerifyModel(Action<ClassMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First();
 
         modelVerification(modelInstance);

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/ComponentConventionTests.cs

@@ -77,7 +77,7 @@ private void VerifyModel(Action<ComponentMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = (ComponentMapping)generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(PropertyTarget)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(PropertyTarget)) is not null)
             .Classes.First()
             .Components.First(x => x is ComponentMapping);
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/CompositeIdConventionTests.cs

@@ -60,7 +60,7 @@ private void VerifyModel(Action<CompositeIdMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .Id;
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/DynamicComponentConventionTests.cs

@@ -82,7 +82,7 @@ private void VerifyModel(Action<ComponentMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = (ComponentMapping)generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(PropertyTarget)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(PropertyTarget)) is not null)
             .Classes.First()
             .Components.First(x => x is ComponentMapping);
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyCollectionConventionTests.cs

@@ -257,7 +257,7 @@ private void VerifyModel(Action<CollectionMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleInheritedClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleInheritedClass)) is not null)
             .Classes.First()
             .Collections.First();
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyConventionTests.cs

@@ -239,7 +239,7 @@ private void VerifyModel(Action<CollectionMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleInheritedClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleInheritedClass)) is not null)
             .Classes.First()
             .Collections.First();
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyToManyCollectionConventionTests.cs

@@ -198,7 +198,7 @@ private void VerifyModel(Action<CollectionMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleInheritedClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleInheritedClass)) is not null)
             .Classes.First()
             .Collections.First();
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyToManyConventionTests.cs

@@ -245,7 +245,7 @@ private void VerifyModel(Action<CollectionMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleInheritedClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleInheritedClass)) is not null)
             .Classes.First()
             .Collections.First();
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasOneConventionTests.cs

@@ -101,7 +101,7 @@ private void VerifyModel(Action<OneToOneMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .OneToOnes.First();
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HibernateMappingConventionTests.cs

@@ -84,7 +84,7 @@ private void VerifyModel(Action<HibernateMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null);
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null);
 
         modelVerification(modelInstance);
     }

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/IdConventionTests.cs

@@ -176,7 +176,7 @@ private void VerifyModel(Action<IdMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .Id;
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/JoinConventionTests.cs

@@ -85,7 +85,7 @@ private void VerifyModel(Action<JoinMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .Joins.First();
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/JoinedSubclassConventionTests.cs

@@ -136,7 +136,7 @@ private void VerifyModel(Action<SubclassMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .Subclasses.First();
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/KeyManyToOneConventionTests.cs

@@ -70,7 +70,7 @@ private void VerifyModel(Action<KeyManyToOneMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .Id;
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/KeyPropertyConventionTests.cs

@@ -53,7 +53,7 @@ private void VerifyModel(Action<KeyPropertyMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .Id;
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/ManyToOneConventionTests.cs

@@ -185,7 +185,7 @@ private void VerifyModel(Action<ManyToOneMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .References.First();
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/PropertyConventionTests.cs

@@ -221,7 +221,7 @@ private void VerifyModel(Action<PropertyMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .Properties.First();
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/SubclassConventionTests.cs

@@ -89,7 +89,7 @@ private void VerifyModel(Action<SubclassMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .Subclasses.First();
 

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/VersionConventionTests.cs

@@ -157,7 +157,7 @@ private void VerifyModel(Action<VersionMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ValidVersionClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ValidVersionClass)) is not null)
             .Classes.First()
             .Version;
 

src/FluentNHibernate.Testing/ConventionsTests/ForeignKeyConventionTests.cs

@@ -109,7 +109,7 @@ private class TestForeignKeyConvention : ForeignKeyConvention
     {
         protected override string GetKeyName(Member property, Type type)
         {
-            return property == null ? type.Name + "!" : property.Name + "!";
+            return property is null ? type.Name + "!" : property.Name + "!";
         }
     }
 }

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/ArrayConventionTests.cs

@@ -221,7 +221,7 @@ private void VerifyModel(Action<CollectionMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .Collections.First();
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/ClassConventionTests.cs

@@ -179,7 +179,7 @@ private void VerifyModel(Action<ClassMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First();
 
         modelVerification(modelInstance);

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/ComponentConventionTests.cs

@@ -97,7 +97,7 @@ private void VerifyModel(Action<ComponentMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = (ComponentMapping)generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .Components.First(x => x is ComponentMapping);
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/CompositeIdConventionTests.cs

@@ -77,7 +77,7 @@ private void VerifyModel(Action<CompositeIdMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .Id;
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/DynamicComponentConventionTests.cs

@@ -103,7 +103,7 @@ private void VerifyModel(Action<ComponentMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = (ComponentMapping)generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .Components.First();
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyCollectionConventionTests.cs

@@ -270,7 +270,7 @@ private void VerifyModel(Action<CollectionMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .Collections.First();
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyConventionTests.cs

@@ -280,7 +280,7 @@ private void VerifyModel(Action<CollectionMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .Collections.First();
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyToManyCollectionConventionTests.cs

@@ -250,7 +250,7 @@ private void VerifyModel(Action<CollectionMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .Collections.First();
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyToManyConventionTests.cs

@@ -290,7 +290,7 @@ private void VerifyModel(Action<CollectionMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .Collections.First();
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasOneConventionTests.cs

@@ -127,7 +127,7 @@ private void VerifyModel(Action<OneToOneMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .OneToOnes.First();
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HibernateMappingConventionTests.cs

@@ -106,7 +106,7 @@ private void VerifyModel(Action<HibernateMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null);
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null);
 
         modelVerification(modelInstance);
     }

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/IdConventionTests.cs

@@ -197,7 +197,7 @@ private void VerifyModel(Action<IdMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .Id;
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/JoinConventionTests.cs

@@ -106,7 +106,7 @@ private void VerifyModel(Action<JoinMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .Joins.First();
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/JoinedSubclassConventionTests.cs

@@ -170,7 +170,7 @@ private void VerifyModel(Action<SubclassMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .Subclasses.First();
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/KeyManyToOneConventionTests.cs

@@ -84,7 +84,7 @@ private void VerifyModel(Action<KeyManyToOneMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .Id;
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/KeyPropertyConventionTests.cs

@@ -54,7 +54,7 @@ private void VerifyModel(Action<KeyPropertyMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(ExampleClass)) is not null)
             .Classes.First()
             .Id;
 

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/ManyToOneConventionTests.cs

@@ -221,7 +221,7 @@ private void VerifyModel(Action<ManyToOneMapping> modelVerification)
 
         var generatedModels = model.BuildMappings();
         var modelInstance = generatedModels
-            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
+            .First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) is not null)
             .Classes.First()
             .References.First();