Cleanup #9

linq2db · May 20, 2024 · 1f59841 · 1f59841
1 parent 8ac4558
commit 1f59841
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 34 deletions.
diff --git a/Source/LinqToDB/DataProvider/AssemblyResolver.cs b/Source/LinqToDB/DataProvider/AssemblyResolver.cs
@@ -5,7 +5,7 @@
 
 namespace LinqToDB.DataProvider
 {
-	using LinqToDB.Common;
+	using Common;
 
 	sealed class AssemblyResolver
 	{

diff --git a/Source/LinqToDB/DataProvider/DataProviderBase.cs b/Source/LinqToDB/DataProvider/DataProviderBase.cs
@@ -4,7 +4,6 @@
 using System.Data;
 using System.Data.Common;
 using System.Data.Linq;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq.Expressions;
@@ -19,11 +18,11 @@ namespace LinqToDB.DataProvider
 	using Common.Internal;
 	using Data;
 	using Expressions;
+	using Infrastructure;
+	using Linq.Translation;
 	using Mapping;
 	using SchemaProvider;
 	using SqlProvider;
-	using Linq.Translation;
-	using Infrastructure;
 
 	public abstract class DataProviderBase : IDataProvider, IInfrastructure<IServiceProvider>
 	{

diff --git a/Source/LinqToDB/DataProvider/DynamicDataProviderBase.cs b/Source/LinqToDB/DataProvider/DynamicDataProviderBase.cs
@@ -5,12 +5,11 @@
 
 namespace LinqToDB.DataProvider
 {
-	using Common;
 	using Data.RetryPolicy;
 	using Extensions;
+	using Interceptors;
 	using Mapping;
 	using Tools;
-	using Interceptors;
 
 	public abstract class DynamicDataProviderBase<TProviderMappings> : DataProviderBase
 		where TProviderMappings : IDynamicProviderAdapter

diff --git a/Source/LinqToDB/DataProvider/MultipleRowsHelper.cs b/Source/LinqToDB/DataProvider/MultipleRowsHelper.cs
@@ -7,12 +7,12 @@
 
 namespace LinqToDB.DataProvider
 {
+	using Common;
 	using Data;
 	using Extensions;
 	using Mapping;
 	using SqlProvider;
 	using SqlQuery;
-	using Common;
 
 	public class MultipleRowsHelper<T> : MultipleRowsHelper
 		where T : notnull

diff --git a/Source/LinqToDB/Expressions/ConvertFromDataReaderExpression.cs b/Source/LinqToDB/Expressions/ConvertFromDataReaderExpression.cs
@@ -5,8 +5,8 @@
 
 namespace LinqToDB.Expressions
 {
-	using Common.Internal;
 	using Common;
+	using Common.Internal;
 	using Extensions;
 	using Interceptors;
 	using Linq;

diff --git a/Source/LinqToDB/Expressions/DefaultValueExpression.cs b/Source/LinqToDB/Expressions/DefaultValueExpression.cs
@@ -64,7 +64,9 @@ public override int GetHashCode()
 		{
 			unchecked
 			{
-				return ((_mappingSchema != null ? _mappingSchema.GetHashCode() : 0) * 397) ^ _type.GetHashCode();
+				var hashCode = _mappingSchema?.GetHashCode() ?? 0;
+				hashCode = (hashCode * 397) ^ _type.GetHashCode();
+				return hashCode;
 			}
 		}
 

diff --git a/Source/LinqToDB/Expressions/ExpressionEqualityComparer.cs b/Source/LinqToDB/Expressions/ExpressionEqualityComparer.cs
@@ -15,13 +15,9 @@
 // ReSharper disable LoopCanBeConvertedToQuery
 namespace LinqToDB.Expressions
 {
-	using Common;
-
 	using Extensions;
-
 	using Linq;
-
-	using LinqToDB.Reflection;
+	using Reflection;
 
 	/// <summary>
 	///     This API supports the linq2db infrastructure and is not intended to be used
@@ -119,7 +115,8 @@ public int GetHashCode(Expression? obj)
 						var constantExpression = (ConstantExpression)obj;
 
 						if (constantExpression.Value != null
-							&& !(constantExpression.Value is IQueryable) && !(constantExpression.Value is not string && constantExpression.Value is IEnumerable))
+							&& constantExpression.Value is not IQueryable 
+							&& (constantExpression.Value is string or not IEnumerable))
 						{
 							hashCode += (hashCode * 397) ^ constantExpression.Value.GetHashCode();
 						}
@@ -478,10 +475,10 @@ bool CompareIndex(IndexExpression a, IndexExpression b)
 
 			bool CompareSwitch(SwitchExpression a, SwitchExpression b)
 			{
-				if (! (Equals(a.SwitchValue, b.SwitchValue) &&
-				       Equals(a.DefaultBody, b.DefaultBody) &&
-				       Equals(a.Comparison, b.Comparison) &&
-					   a.Cases.Count != b.Cases.Count))
+				if (! (Equals(a.SwitchValue, b.SwitchValue)
+						&& Equals(a.DefaultBody, b.DefaultBody)
+						&& Equals(a.Comparison, b.Comparison)
+						&& a.Cases.Count != b.Cases.Count))
 				{
 					return false;
 				}

diff --git a/Source/LinqToDB/Expressions/ExpressionEvaluator.cs b/Source/LinqToDB/Expressions/ExpressionEvaluator.cs
@@ -6,8 +6,8 @@
 
 namespace LinqToDB.Expressions
 {
-	using Extensions;
 	using Common;
+	using Extensions;
 
 	/// <summary>
 	/// Internal API.

diff --git a/Source/LinqToDB/Expressions/ExpressionPrinter.cs b/Source/LinqToDB/Expressions/ExpressionPrinter.cs
@@ -16,8 +16,6 @@
 
 namespace LinqToDB.Expressions
 {
-	using System.Globalization;
-
 	using Common;
 	using Infrastructure;
 

diff --git a/Source/LinqToDB/Expressions/ExpressionVisitors/EqualsToVisitor.cs b/Source/LinqToDB/Expressions/ExpressionVisitors/EqualsToVisitor.cs
@@ -5,8 +5,8 @@
 
 namespace LinqToDB.Expressions
 {
-	using Mapping;
 	using Extensions;
+	using Mapping;
 
 	static class EqualsToVisitor
 	{

diff --git a/Source/LinqToDB/Expressions/ExpressionVisitors/PathVisitor.cs b/Source/LinqToDB/Expressions/ExpressionVisitors/PathVisitor.cs
@@ -7,7 +7,7 @@
 
 namespace LinqToDB.Expressions
 {
-	using LinqToDB.Linq;
+	using Linq;
 
 	// PathVisitor cannot be shared/reused due to _visited state field
 	internal sealed class PathVisitor<TContext>

diff --git a/Source/LinqToDB/Expressions/ExpressionVisitors/VisitActionVisitor.cs b/Source/LinqToDB/Expressions/ExpressionVisitors/VisitActionVisitor.cs
@@ -305,19 +305,23 @@ private void VisitXE(Expression expr)
 			{
 				Visit(generic.Assignments.Select(a => a.Expression));
 				Visit(generic.Parameters.Select(p => p.Expression));
-			} else if (expr is SqlGenericParamAccessExpression paramAccess)
+			}
+			else if (expr is SqlGenericParamAccessExpression paramAccess)
 			{
 				Visit(paramAccess.Constructor);
-			} else if (expr is SqlReaderIsNullExpression isNullExpression)
+			}
+			else if (expr is SqlReaderIsNullExpression isNullExpression)
 			{
 				Visit(isNullExpression.Placeholder);
-			} else if (expr is SqlAdjustTypeExpression adjustType)
+			}
+			else if (expr is SqlAdjustTypeExpression adjustType)
 			{
 				Visit(adjustType.Expression);
 			}
 			else if (expr.CanReduce)
+			{
 				Visit(expr.Reduce());
+			}	
 		}
-
 	}
 }
diff --git a/Source/LinqToDB/Expressions/ExpressionVisitors/VisitFuncVisitor.cs b/Source/LinqToDB/Expressions/ExpressionVisitors/VisitFuncVisitor.cs
@@ -300,20 +300,26 @@ private void VisitXE(Expression expr)
 			{
 				Visit(generic.Assignments.Select(a => a.Expression));
 				Visit(generic.Parameters.Select(p => p.Expression));
-			} else if (expr is SqlGenericParamAccessExpression paramAccess)
+			}
+			else if (expr is SqlGenericParamAccessExpression paramAccess)
 			{
 				Visit(paramAccess.Constructor);
-			} else if (expr is SqlReaderIsNullExpression isNullExpression)
+			}
+			else if (expr is SqlReaderIsNullExpression isNullExpression)
 			{
 				Visit(isNullExpression.Placeholder);
-			} else if (expr is SqlAdjustTypeExpression adjustType)
+			}
+			else if (expr is SqlAdjustTypeExpression adjustType)
 			{
 				Visit(adjustType.Expression);
-			} else if (expr is SqlPathExpression keyHolder)
+			}
+			else if (expr is SqlPathExpression keyHolder)
 			{
 			}
 			else if (expr.CanReduce)
+			{
 				Visit(expr.Reduce());
+			}
 		}
 
 	}

diff --git a/Source/LinqToDB/Expressions/TypeMapper/TypeWrapper.cs b/Source/LinqToDB/Expressions/TypeMapper/TypeWrapper.cs
@@ -4,7 +4,7 @@
 
 namespace LinqToDB.Expressions
 {
-	using LinqToDB.Common;
+	using Common;
 
 	/// <summary>
 	/// Implements base class for typed wrappers over provider-specific type.

diff --git a/Source/LinqToDB/Expressions/TypeMapper/ValueTaskToTaskMapper.cs b/Source/LinqToDB/Expressions/TypeMapper/ValueTaskToTaskMapper.cs
@@ -4,7 +4,7 @@
 
 namespace LinqToDB.Expressions
 {
-	using LinqToDB.Common;
+	using Common;
 
 	public class ValueTaskToTaskMapper : ICustomMapper
 	{