Avoid Trim().Length as empty check and ToLowerInvariant() in string comparison (#1567)

* Trim().Length replaced with IsNullOrWhiteSpace
* StartsWith and Equals ordinal where applicable
* Get rid of ToLowerInvariant calls where applicable
* Hbm2DDLKeyWords ignore case comparision

Author: bahusoid

src/NHibernate.DomainModel/NHSpecific/NullableInt32.cs

@@ -214,7 +214,7 @@ public int CompareTo(object obj)
 
 		public static NullableInt32 Parse(string s)
 		{
-			if ((s == null) || (s.Trim().Length == 0))
+			if (string.IsNullOrWhiteSpace(s))
 			{
 				return new NullableInt32();
 			}
@@ -235,4 +235,4 @@ public static NullableInt32 Parse(string s)
 
 		#endregion
 	}
-}
+}

src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs

@@ -37,7 +37,6 @@ public partial class SchemaExport
 			dialect = Dialect.Dialect.GetDialect(configProperties);
 
 			string autoKeyWordsImport = PropertiesHelper.GetString(Environment.Hbm2ddlKeyWords, configProperties, "not-defined");
-			autoKeyWordsImport = autoKeyWordsImport.ToLowerInvariant();
 			if (autoKeyWordsImport == Hbm2DDLKeyWords.AutoQuote)
 			{
 				await (SchemaMetadataUpdater.UpdateAsync(cfg, dialect, cancellationToken)).ConfigureAwait(false);

src/NHibernate/Async/Tool/hbm2ddl/SchemaUpdate.cs

@@ -32,7 +32,6 @@ public partial class SchemaUpdate
 			}
 
 			string autoKeyWordsImport = PropertiesHelper.GetString(Environment.Hbm2ddlKeyWords, configuration.Properties, "not-defined");
-			autoKeyWordsImport = autoKeyWordsImport.ToLowerInvariant();
 			if (autoKeyWordsImport == Hbm2DDLKeyWords.AutoQuote)
 			{
 				await (SchemaMetadataUpdater.UpdateAsync(configuration, dialect, cancellationToken)).ConfigureAwait(false);
@@ -56,26 +55,26 @@ public partial class SchemaUpdate
 
 				for (int i = 0; i < args.Length; i++)
 				{
-					if (args[i].StartsWith("--"))
+					if (args[i].StartsWith("--", StringComparison.Ordinal))
 					{
 						if (args[i].Equals("--quiet"))
 						{
 							script = false;
 						}
-						else if (args[i].StartsWith("--properties="))
+						else if (args[i].StartsWith("--properties=", StringComparison.Ordinal))
 						{
 							throw new NotSupportedException("No properties file for .NET, use app.config instead");
 							//propFile = args[i].Substring( 13 );
 						}
-						else if (args[i].StartsWith("--config="))
+						else if (args[i].StartsWith("--config=", StringComparison.Ordinal))
 						{
 							cfg.Configure(args[i].Substring(9));
 						}
-						else if (args[i].StartsWith("--text"))
+						else if (args[i].StartsWith("--text", StringComparison.Ordinal))
 						{
 							doUpdate = false;
 						}
-						else if (args[i].StartsWith("--naming="))
+						else if (args[i].StartsWith("--naming=", StringComparison.Ordinal))
 						{
 							cfg.SetNamingStrategy(
 								(INamingStrategy)

src/NHibernate/Async/Tool/hbm2ddl/SchemaValidator.cs

@@ -33,18 +33,18 @@ public partial class SchemaValidator
 
 				for (int i = 0; i < args.Length; i++)
 				{
-					if (args[i].StartsWith("--"))
+					if (args[i].StartsWith("--", StringComparison.Ordinal))
 					{
 						//if (args[i].StartsWith("--properties="))
 						//{
 						//  propFile = args[i].Substring(13);
 						//}
 						//else 
-						if (args[i].StartsWith("--config="))
+						if (args[i].StartsWith("--config=", StringComparison.Ordinal))
 						{
 							cfg.Configure(args[i].Substring(9));
 						}
-						else if (args[i].StartsWith("--naming="))
+						else if (args[i].StartsWith("--naming=", StringComparison.Ordinal))
 						{
 							cfg.SetNamingStrategy(
 								(INamingStrategy)
@@ -113,4 +113,4 @@ public partial class SchemaValidator
 			}
 		}
 	}
-}
+}

src/NHibernate/Cfg/ConfigurationSchema/ClassCacheConfiguration.cs

@@ -89,7 +89,7 @@ private void Parse(XPathNavigator classCacheElement)
 					switch (classCacheElement.Name)
 					{
 						case "class":
-							if (classCacheElement.Value.Trim().Length == 0)
+							if (string.IsNullOrWhiteSpace(classCacheElement.Value))
 								throw new HibernateConfigException("Invalid class-cache element; the attribute <class> must be assigned with no empty value");
 							clazz = classCacheElement.Value;
 							break;

src/NHibernate/Cfg/ConfigurationSchema/CollectionCacheConfiguration.cs

@@ -49,7 +49,7 @@ private void Parse(XPathNavigator collectionCacheElement)
 					switch (collectionCacheElement.Name)
 					{
 						case "collection":
-							if (collectionCacheElement.Value.Trim().Length == 0)
+							if (string.IsNullOrWhiteSpace(collectionCacheElement.Value))
 								throw new HibernateConfigException("Invalid collection-cache element; the attribute <collection> must be assigned with no empty value");
 							collection = collectionCacheElement.Value;
 							break;

src/NHibernate/Cfg/ConfigurationSchema/ListenerConfiguration.cs

@@ -53,7 +53,7 @@ private void Parse(XPathNavigator listenerElement)
 					switch (listenerElement.Name)
 					{
 						case "class":
-							if (listenerElement.Value.Trim().Length == 0)
+							if (string.IsNullOrWhiteSpace(listenerElement.Value))
 								throw new HibernateConfigException("Invalid listener element; the attribute <class> must be assigned with no empty value");
 							clazz = listenerElement.Value;
 							break;

src/NHibernate/Cfg/Hbm2ddlKeyWords.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace NHibernate.Cfg
 {
 	public class Hbm2DDLKeyWords
@@ -33,7 +35,7 @@ public override bool Equals(object obj)
 
 		public bool Equals(string other)
 		{
-			return value.Equals(other);
+			return value.Equals(other, StringComparison.OrdinalIgnoreCase);
 		}
 
 		public bool Equals(Hbm2DDLKeyWords other)
@@ -82,4 +84,4 @@ public override int GetHashCode()
 		public static Hbm2DDLKeyWords Keywords = new Hbm2DDLKeyWords("keywords");
 		public static Hbm2DDLKeyWords AutoQuote = new Hbm2DDLKeyWords("auto-quote");
 	}
-}
+}

src/NHibernate/Cfg/Mappings.cs

@@ -19,7 +19,7 @@ public class Mappings
 		[Serializable]
 		public class ColumnNames
 		{
-			public readonly IDictionary<string, string> logicalToPhysical = new Dictionary<string, string>();
+			public readonly IDictionary<string, string> logicalToPhysical = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 			public readonly IDictionary<string, string> physicalToLogical = new Dictionary<string, string>();
 		}
 
@@ -536,8 +536,8 @@ public void AddColumnBinding(string logicalName, Column finalColumn, Table table
 			}
 
 			string oldFinalName;
-			binding.logicalToPhysical.TryGetValue(logicalName.ToLowerInvariant(), out oldFinalName);
-			binding.logicalToPhysical[logicalName.ToLowerInvariant()] = finalColumn.GetQuotedName();
+			binding.logicalToPhysical.TryGetValue(logicalName, out oldFinalName);
+			binding.logicalToPhysical[logicalName] = finalColumn.GetQuotedName();
 			if (oldFinalName != null &&
 					!(finalColumn.IsQuoted
 							? oldFinalName.Equals(finalColumn.GetQuotedName())
@@ -584,7 +584,6 @@ public string GetLogicalColumnName(string physicalName, Table table)
 
 		public string GetPhysicalColumnName(string logicalName, Table table)
 		{
-			logicalName = logicalName.ToLowerInvariant();
 			string finalName = null;
 			Table currentTable = table;
 			do

src/NHibernate/Cfg/SettingsFactory.cs

@@ -167,7 +167,6 @@ public Settings BuildSettings(IDictionary<string, string> properties)
 			}
 
 			string autoKeyWordsImport = PropertiesHelper.GetString(Environment.Hbm2ddlKeyWords, properties, "not-defined");
-			autoKeyWordsImport = autoKeyWordsImport.ToLowerInvariant();
 			if (autoKeyWordsImport == Hbm2DDLKeyWords.None)
 			{
 				settings.IsKeywordsImportEnabled = false;