Code Cleanup | null == x to x == null (dotnet#2749)

- With one approval and CI success, I think that's enough to move ahead on this one. * `null == x` to `x == null` * Update src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs Co-authored-by: David Engel <[email protected]> --------- Co-authored-by: David Engel <[email protected]>
arellegue · Aug 3, 2024 · 6fbbb78 · 6fbbb78
1 parent 6f177e3
commit 6fbbb78
Show file tree

Hide file tree

Showing 88 changed files with 444 additions and 417 deletions.
diff --git a/....Data.SqlClient/add-ons/AzureKeyVaultProvider/SqlColumnEncryptionAzureKeyVaultProvider.cs b/....Data.SqlClient/add-ons/AzureKeyVaultProvider/SqlColumnEncryptionAzureKeyVaultProvider.cs
@@ -241,7 +241,7 @@ byte[] DecryptEncryptionKey()
                 byte[] message = new byte[encryptedColumnEncryptionKey.Length - signatureLength];
                 Buffer.BlockCopy(encryptedColumnEncryptionKey, 0, message, 0, encryptedColumnEncryptionKey.Length - signatureLength);
 
-                if (null == message)
+                if (message == null)
                 {
                     throw ADP.NullHashFound();
                 }

diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Utils.cs b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Utils.cs
@@ -45,7 +45,7 @@ internal static void ValidateNotNullOrWhitespaceForEach(string[] parameters, str
         internal static void ValidateEncryptionAlgorithm(string encryptionAlgorithm, bool isSystemOp)
         {
             // This validates that the encryption algorithm is RSA_OAEP
-            if (null == encryptionAlgorithm)
+            if (encryptionAlgorithm == null)
             {
                 throw ADP.NullAlgorithm(isSystemOp);
             }
@@ -124,8 +124,9 @@ internal static ArgumentException InvalidSignatureTemplate(string masterKeyPath)
 
         internal static ArgumentException InvalidAKVPath(string masterKeyPath, bool isSystemOp)
         {
-            string errorMessage = null == masterKeyPath ? Strings.NullAkvPath
-                                                        : string.Format(CultureInfo.InvariantCulture, Strings.InvalidAkvPathTemplate, masterKeyPath);
+            string errorMessage = masterKeyPath == null
+                ? Strings.NullAkvPath
+                : string.Format(CultureInfo.InvariantCulture, Strings.InvalidAkvPathTemplate, masterKeyPath);
             if (isSystemOp)
             {
                 return new ArgumentNullException(Constants.AeParamMasterKeyPath, errorMessage);

diff --git a/...t.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs b/...t.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
@@ -102,7 +102,7 @@ internal override bool TryOpenConnection(DbConnection outerConnection, DbConnect
             // we are completing an asynchronous open
             Debug.Assert(retry.Task.Status == TaskStatus.RanToCompletion, "retry task must be completed successfully");
             DbConnectionInternal openConnection = retry.Task.Result;
-            if (null == openConnection)
+            if (openConnection == null)
             {
                 connectionFactory.SetInnerConnectionTo(outerConnection, this);
                 throw ADP.InternalConnectionError(ADP.ConnectionError.GetConnectionReturnsNull);

diff --git a/....Data.SqlClient/netcore/src/Common/src/Microsoft/Data/ProviderBase/DbConnectionFactory.cs b/....Data.SqlClient/netcore/src/Common/src/Microsoft/Data/ProviderBase/DbConnectionFactory.cs
@@ -214,12 +214,12 @@ internal DbConnectionPoolGroup GetConnectionPoolGroup(DbConnectionPoolKey key, D
                 // new pool entry and add it to our collection.
 
                 DbConnectionOptions connectionOptions = CreateConnectionOptions(key.ConnectionString, userConnectionOptions);
-                if (null == connectionOptions)
+                if (connectionOptions == null)
                 {
                     throw ADP.InternalConnectionError(ADP.ConnectionError.ConnectionOptionsMissing);
                 }
 
-                if (null == userConnectionOptions)
+                if (userConnectionOptions == null)
                 { // we only allow one expansion on the connection string
 
                     userConnectionOptions = connectionOptions;
@@ -236,7 +236,7 @@ internal DbConnectionPoolGroup GetConnectionPoolGroup(DbConnectionPoolKey key, D
                 }
 
                 // We don't support connection pooling on Win9x
-                if (null == poolOptions)
+                if (poolOptions == null)
                 {
                     if (null != connectionPoolGroup)
                     {
@@ -279,7 +279,7 @@ internal DbConnectionPoolGroup GetConnectionPoolGroup(DbConnectionPoolKey key, D
                 Debug.Assert(null != connectionPoolGroup, "how did we not create a pool entry?");
                 Debug.Assert(null != userConnectionOptions, "how did we not have user connection options?");
             }
-            else if (null == userConnectionOptions)
+            else if (userConnectionOptions == null)
             {
                 userConnectionOptions = connectionPoolGroup.ConnectionOptions;
             }

diff --git a/...Data.SqlClient/netcore/src/Common/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/...Data.SqlClient/netcore/src/Common/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -178,10 +178,10 @@ public ConnectionState State
 
         internal void AddWeakReference(object value, int tag)
         {
-            if (null == _referenceCollection)
+            if (_referenceCollection == null)
             {
                 _referenceCollection = CreateReferenceCollection();
-                if (null == _referenceCollection)
+                if (_referenceCollection == null)
                 {
                     throw ADP.InternalError(ADP.InternalErrorCode.CreateReferenceCollectionReturnedNull);
                 }
@@ -349,7 +349,7 @@ protected bool TryOpenConnectionInternal(DbConnection outerConnection, DbConnect
                     connectionFactory.SetInnerConnectionTo(outerConnection, this);
                     throw;
                 }
-                if (null == openConnection)
+                if (openConnection == null)
                 {
                     connectionFactory.SetInnerConnectionTo(outerConnection, this);
                     throw ADP.InternalConnectionError(ADP.ConnectionError.GetConnectionReturnsNull);

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionOptions.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionOptions.cs
@@ -43,7 +43,7 @@ internal static string ExpandDataDirectory(string keyword, string value)
                 // find the replacement path
                 object rootFolderObject = AppDomain.CurrentDomain.GetData("DataDirectory");
                 var rootFolderPath = (rootFolderObject as string);
-                if ((null != rootFolderObject) && (null == rootFolderPath))
+                if ((null != rootFolderObject) && rootFolderPath == null)
                 {
                     throw ADP.InvalidDataDirectory();
                 }

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionFactory.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionFactory.cs
@@ -43,7 +43,7 @@ internal bool TryGetConnection(DbConnection owningConnection, TaskCompletionSour
                 poolGroup = GetConnectionPoolGroup(owningConnection);
                 // Doing this on the callers thread is important because it looks up the WindowsIdentity from the thread.
                 connectionPool = GetConnectionPool(owningConnection, poolGroup);
-                if (null == connectionPool)
+                if (connectionPool == null)
                 {
                     // If GetConnectionPool returns null, we can be certain that
                     // this connection should not be pooled via DbConnectionPool

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -37,7 +37,7 @@ protected internal Transaction EnlistedTransaction
             set
             {
                 Transaction currentEnlistedTransaction = _enlistedTransaction;
-                if (((null == currentEnlistedTransaction) && (null != value))
+                if ((currentEnlistedTransaction == null && (null != value))
                     || ((null != currentEnlistedTransaction) && !currentEnlistedTransaction.Equals(value)))
                 {  // WebData 20000024
 
@@ -354,7 +354,7 @@ virtual internal void DelegatedTransactionEnded()
 
                 DbConnectionPool pool = Pool;
 
-                if (null == pool)
+                if (pool == null)
                 {
                     throw ADP.InternalError(ADP.InternalErrorCode.PooledObjectWithoutPool);      // pooled connection does not have a pool
                 }

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.cs
@@ -729,7 +729,7 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
             try
             {
                 newObj = _connectionFactory.CreatePooledConnection(this, owningObject, _connectionPoolGroup.ConnectionOptions, _connectionPoolGroup.PoolKey, userOptions);
-                if (null == newObj)
+                if (newObj == null)
                 {
                     throw ADP.InternalError(ADP.InternalErrorCode.CreateObjectReturnedNull);    // CreateObject succeeded, but null object
                 }
@@ -1172,7 +1172,7 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
                 obj = GetFromTransactedPool(out transaction);
             }
 
-            if (null == obj)
+            if (obj == null)
             {
                 Interlocked.Increment(ref _waitCount);
 
@@ -1217,7 +1217,7 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
                                 }
                                 catch
                                 {
-                                    if (null == obj)
+                                    if (obj == null)
                                     {
                                         Interlocked.Decrement(ref _waitCount);
                                     }
@@ -1233,7 +1233,7 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
                                     }
                                 }
 
-                                if (null == obj)
+                                if (obj == null)
                                 {
                                     // If we were not able to create an object, check to see if
                                     // we reached MaxPoolSize.  If so, we will no longer wait on
@@ -1309,7 +1309,7 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
                         DestroyObject(obj);
                         obj = null;
                     }
-                } while (null == obj);
+                } while (obj == null);
             }
 
             if (null != obj)

diff --git a/...lient/netcore/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.NetCoreApp.cs b/...lient/netcore/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.NetCoreApp.cs
@@ -21,7 +21,7 @@ static SqlAuthenticationProviderManager()
             {
                 // New configuration section "SqlClientAuthenticationProviders" for Microsoft.Data.SqlClient accepted to avoid conflicts with older one.
                 configurationSection = FetchConfigurationSection<SqlClientAuthenticationProviderConfigurationSection>(SqlClientAuthenticationProviderConfigurationSection.Name);
-                if (null == configurationSection)
+                if (configurationSection == null)
                 {
                     // If configuration section is not yet found, try with old Configuration Section name for backwards compatibility
                     configurationSection = FetchConfigurationSection<SqlAuthenticationProviderConfigurationSection>(SqlAuthenticationProviderConfigurationSection.Name);

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -540,7 +540,7 @@ private string AnalyzeTargetAndCreateUpdateBulkCommand(BulkCopySimpleResultSet i
 
             isInTransaction = _connection.HasLocalTransaction;
             // Throw if there is a transaction but no flag is set
-            if (isInTransaction && null == _externalTransaction && null == _internalTransaction && (_connection.Parser != null && _connection.Parser.CurrentTransaction != null && _connection.Parser.CurrentTransaction.IsLocal))
+            if (isInTransaction && _externalTransaction == null && _internalTransaction == null && (_connection.Parser != null && _connection.Parser.CurrentTransaction != null && _connection.Parser.CurrentTransaction.IsLocal))
             {
                 throw SQL.BulkLoadExistingTransaction();
             }
@@ -1281,7 +1281,7 @@ private SourceColumnMetadata GetColumnMetadata(int ordinal)
 
         private void CreateOrValidateConnection(string method)
         {
-            if (null == _connection)
+            if (_connection == null)
             {
                 throw ADP.ConnectionRequired(method);
             }

diff --git a/....SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.Windows.cs b/....SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.Windows.cs
@@ -32,7 +32,7 @@ public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string e
             // Validate the input parameters
             ValidateNonEmptyKeyPath(masterKeyPath, isSystemOp: true);
 
-            if (null == encryptedColumnEncryptionKey)
+            if (encryptedColumnEncryptionKey == null)
             {
                 throw SQL.NullEncryptedColumnEncryptionKey();
             }
@@ -126,7 +126,7 @@ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string e
             // Validate the input parameters
             ValidateNonEmptyKeyPath(masterKeyPath, isSystemOp: false);
 
-            if (null == columnEncryptionKey)
+            if (columnEncryptionKey == null)
             {
                 throw SQL.NullColumnEncryptionKey();
             }
@@ -231,7 +231,7 @@ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool al
         private void ValidateEncryptionAlgorithm(string encryptionAlgorithm, bool isSystemOp)
         {
             // This validates that the encryption algorithm is RSA_OAEP
-            if (null == encryptionAlgorithm)
+            if (encryptionAlgorithm == null)
             {
                 throw SQL.NullKeyEncryptionAlgorithm(isSystemOp);
             }
@@ -251,7 +251,7 @@ private void ValidateNonEmptyKeyPath(string masterKeyPath, bool isSystemOp)
         {
             if (string.IsNullOrWhiteSpace(masterKeyPath))
             {
-                if (null == masterKeyPath)
+                if (masterKeyPath == null)
                 {
                     throw SQL.NullCngKeyPath(isSystemOp);
                 }

diff --git a/....SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.Windows.cs b/....SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.Windows.cs
@@ -40,7 +40,7 @@ public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string e
             // Validate the input parameters
             ValidateNonEmptyCSPKeyPath(masterKeyPath, isSystemOp: true);
 
-            if (null == encryptedColumnEncryptionKey)
+            if (encryptedColumnEncryptionKey == null)
             {
                 throw SQL.NullEncryptedColumnEncryptionKey();
             }
@@ -134,7 +134,7 @@ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string e
             // Validate the input parameters
             ValidateNonEmptyCSPKeyPath(masterKeyPath, isSystemOp: false);
 
-            if (null == columnEncryptionKey)
+            if (columnEncryptionKey == null)
             {
                 throw SQL.NullColumnEncryptionKey();
             }
@@ -239,7 +239,7 @@ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool al
         private void ValidateEncryptionAlgorithm(string encryptionAlgorithm, bool isSystemOp)
         {
             // This validates that the encryption algorithm is RSA_OAEP
-            if (null == encryptionAlgorithm)
+            if (encryptionAlgorithm == null)
             {
                 throw SQL.NullKeyEncryptionAlgorithm(isSystemOp);
             }
@@ -260,7 +260,7 @@ private void ValidateNonEmptyCSPKeyPath(string masterKeyPath, bool isSystemOp)
         {
             if (string.IsNullOrWhiteSpace(masterKeyPath))
             {
-                if (null == masterKeyPath)
+                if (masterKeyPath == null)
                 {
                     throw SQL.NullCspKeyPath(isSystemOp);
                 }