Merge branch 'master' into upstream/buildDomains

Author: SergeiPavlov

ChangeLog/7.1.0-Beta-2-dev.txt

@@ -9,6 +9,7 @@
 [main] Obsolete FieldInfo.IsDynalicallyDefined property's been removed (FieldInfo.IsDynamicallyDefined is still there)
 [main] Some EventArgs inheritors that were sealed classes transformed to read-only structures
 [main] DbCommandEventArgs became read-only structure
+[main] Xtensive.Sql.Dml.Extensions.IsNullReference() extension method is marked obsolete, use 'is null' operator instead
 [main] BitFaster.Caching package reference is updated to 1.0.7
 [main] No error caused by ambiguity due to new IQueryable extension methods of .Net 6
 [reprocessing] DomainBuildErrorEventArgs (not sealed) became read-only structure

Extensions/Xtensive.Orm.BulkOperations/Internals/QueryOperation.cs

@@ -142,14 +142,14 @@ private void JoinViaIn(SqlStatement statement, SqlSelect select)
         var s = (SqlSelect) select.Clone();
         foreach (var column in columns) {
           var ex = SqlDml.Equals(s.From.Columns[column.Name], table.Columns[column.Name]);
-          s.Where = s.Where.IsNullReference() ? ex : SqlDml.And(s.Where, ex);
+          s.Where = s.Where is null ? ex : SqlDml.And(s.Where, ex);
         }
         var existingColumns = s.Columns.ToChainedBuffer();
         s.Columns.Clear();
         var columnToAdd = existingColumns.First(c => c.Name.Equals(columnInfo.Name, StringComparison.Ordinal));
         s.Columns.Add(columnToAdd);
         var @in = SqlDml.In(SqlDml.TableColumn(table, columnInfo.Name), s);
-        where = where.IsNullReference() ? @in : SqlDml.And(where, @in);
+        where = where is null ? @in : SqlDml.And(where, @in);
         columns.Add(columnInfo);
       }
 

Extensions/Xtensive.Orm.Logging.NLog/Log.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2020 Xtensive LLC.
+// Copyright (C) 2013-2022 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Dmitri Maximov
@@ -17,22 +17,6 @@ public class Log : BaseLog
   {
     private readonly Logger target;
 
-    private static NLogLevel ConvertLevel(LogLevel level)
-    {
-      switch (level) {
-      case LogLevel.Debug:
-        return NLogLevel.Debug;
-      case LogLevel.Error:
-        return NLogLevel.Error;
-      case LogLevel.FatalError:
-        return NLogLevel.Fatal;
-      case LogLevel.Warning:
-        return NLogLevel.Warn;
-      default:
-        return NLogLevel.Info;
-      }
-    }
-
     /// <inheritdoc/>
     public override bool IsLogged(LogLevel level)
     {
@@ -48,6 +32,22 @@ public override void Write(in LogEventInfo info)
         target.Log(ConvertLevel(info.Level), info.FormattedMessage);
     }
 
+    private static NLogLevel ConvertLevel(in LogLevel level)
+    {
+      switch (level) {
+        case LogLevel.Debug:
+          return NLogLevel.Debug;
+        case LogLevel.Error:
+          return NLogLevel.Error;
+        case LogLevel.FatalError:
+          return NLogLevel.Fatal;
+        case LogLevel.Warning:
+          return NLogLevel.Warn;
+        default:
+          return NLogLevel.Info;
+      }
+    }
+
     /// <summary>
     /// Creates instance of <see cref="Log"/> class.
     /// </summary>

Extensions/Xtensive.Orm.Logging.log4net/Log.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020 Xtensive LLC.
+// Copyright (C) 2014-2022 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alexey Kulakov
@@ -16,25 +16,7 @@ namespace Xtensive.Orm.Logging.log4net
   /// </summary>
   public class Log : BaseLog
   {
-    private log4netLog target;
-
-    private Level ConvertLevel(LogLevel level)
-    {
-      switch (level) {
-      case LogLevel.Debug:
-        return Level.Debug;
-      case LogLevel.Info:
-        return Level.Info;
-      case LogLevel.Warning:
-        return Level.Warn;
-      case LogLevel.Error:
-        return Level.Error;
-      case LogLevel.FatalError:
-        return Level.Fatal;
-      default:
-        return Level.Info;
-      }
-    }
+    private readonly log4netLog target;
 
     /// <inheritdoc />
     public override bool IsLogged(LogLevel level)
@@ -48,6 +30,24 @@ public override void Write(in LogEventInfo info)
       target.Logger.Log(target.Logger.GetType(), ConvertLevel(info.Level), info.FormattedMessage, info.Exception);
     }
 
+    private Level ConvertLevel(in LogLevel level)
+    {
+      switch (level) {
+        case LogLevel.Debug:
+          return Level.Debug;
+        case LogLevel.Info:
+          return Level.Info;
+        case LogLevel.Warning:
+          return Level.Warn;
+        case LogLevel.Error:
+          return Level.Error;
+        case LogLevel.FatalError:
+          return Level.Fatal;
+        default:
+          return Level.Info;
+      }
+    }
+
     /// <summary>
     /// Creates instance of <see cref="Log"/> class.
     /// </summary>
@@ -57,6 +57,7 @@ public override void Write(in LogEventInfo info)
     public Log(Assembly repositoryAssembly, string name)
     {
       target = log4netLogManager.GetLogger(repositoryAssembly, name);
+
     }
   }
 }

Extensions/Xtensive.Orm.Security/Permission.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2011 Xtensive LLC.
+// Copyright (C) 2011 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Dmitri Maximov
@@ -41,15 +41,15 @@ public abstract class Permission
     /// <inheritdoc/>
     public bool Equals(Permission other)
     {
-      if (ReferenceEquals(null, other)) return false;
+      if (other is null) return false;
       if (ReferenceEquals(this, other)) return true;
       return Equals(other.Type, Type) && other.CanRead.Equals(CanRead) && other.CanWrite.Equals(CanWrite) && Equals(other.Query, Query);
     }
 
     /// <inheritdoc/>
     public override bool Equals(object obj)
     {
-      if (ReferenceEquals(null, obj)) return false;
+      if (obj is null) return false;
       if (ReferenceEquals(this, obj)) return true;
       if (obj.GetType() != typeof (Permission)) return false;
       return Equals((Permission) obj);

Extensions/Xtensive.Orm.Web/ApplicationBuilderExtensions.cs

@@ -0,0 +1,54 @@
+// Copyright (C) 2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
+
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Xtensive.Orm.Web.Filters;
+using Xtensive.Orm.Web.Middleware;
+
+namespace Xtensive.Orm.Web
+{
+  /// <summary>
+  /// Contains extensions which are used in Startup.cs to configure application
+  /// </summary>
+  public static class StartupConfigurationExtensions
+  {
+    /// <summary>
+    /// Adds <see cref="OpenSessionMiddleware"/> to ASP.NET Core middleware pipeline.
+    /// </summary>
+    /// <param name="builder"><see cref="IApplicationBuilder"/> instance.</param>
+    /// <returns><paramref name="builder"/> with <see cref="OpenSessionMiddleware"/>.</returns>
+    public static IApplicationBuilder UseDataObjectsSessionOpener(this IApplicationBuilder builder) =>
+      builder.UseMiddleware<OpenSessionMiddleware>();
+
+    /// <summary>
+    /// Registers a <see cref="SessionAccessor"/> as scoped service to be able to
+    /// have access to session/transaction as parameter in either MVC controllers' actions or
+    /// constuctors, and in Razor Pages.
+    /// </summary>
+    /// <param name="services">A service collection to add <see cref="SessionAccessor"/>.</param>
+    /// <returns>The same collection instance with registered accessor.</returns>
+    public static IServiceCollection AddDataObjectsSessionAccessor(this IServiceCollection services) =>
+      services.AddScoped<SessionAccessor>();
+
+    /// <summary>
+    /// Adds <see cref="SessionActionFilter"/> to action filters.
+    /// </summary>
+    /// <param name="filters">The filter collection to add the filter.</param>
+    /// <returns>A <see cref="IFilterMetadata"/> representing added filter.</returns>
+    public static IFilterMetadata AddDataObjectsSessionActionFilter(this FilterCollection filters) =>
+      AddDataObjectsSessionActionFilter(filters, 0);
+
+    /// <summary>
+    /// Adds <see cref="SessionActionFilter"/> to action filters.
+    /// </summary>
+    /// <param name="filters">The filter collection to add the filter.</param>
+    /// <param name="order">The order of the added filter.</param>
+    /// <returns>A <see cref="IFilterMetadata"/> representing added filter.</returns>
+    public static IFilterMetadata AddDataObjectsSessionActionFilter(this FilterCollection filters, int order) =>
+      filters.Add(typeof(SessionActionFilter), order);
+  }
+}

Extensions/Xtensive.Orm.Web/StartupConfigurationExtensions.cs

@@ -190,12 +190,12 @@ public override void Visit(SqlFunctionCall node)
     /// <inheritdoc/>
     protected override void VisitSelectLimitOffset(SqlSelect node)
     {
-      if (!node.Limit.IsNullReference()) {
+      if (node.Limit is not null) {
         AppendTranslated(node, SelectSection.Limit);
         node.Limit.AcceptVisitor(this);
       }
-      if (!node.Offset.IsNullReference()) {
-        if (node.Limit.IsNullReference()) {
+      if (node.Offset is not null) {
+        if (node.Limit is null) {
           AppendTranslated(node, SelectSection.Limit);
           _ = context.Output.Append(" 18446744073709551615 "); // magic number from http://dev.mysql.com/doc/refman/5.0/en/select.html
         }

Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_0/Compiler.cs

@@ -31,7 +31,7 @@ public override void Visit(SqlDeclareCursor node)
     public override void Visit(SqlBinary node)
     {
       var right = node.Right as SqlArray;
-      if (!right.IsNullReference() && (node.NodeType is SqlNodeType.In or SqlNodeType.NotIn)) {
+      if (right is not null && (node.NodeType is SqlNodeType.In or SqlNodeType.NotIn)) {
         var row = SqlDml.Row(right.GetValues().Select(value => SqlDml.Literal(value)).ToArray());
         base.Visit(node.NodeType == SqlNodeType.In ? SqlDml.In(node.Left, row) : SqlDml.NotIn(node.Left, row));
       }

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v8_0/Compiler.cs

@@ -75,7 +75,7 @@ public override void Visit(SqlUpdate node)
     /// <inheritdoc/>
     protected override void VisitUpdateLimit(SqlUpdate node)
     {
-      if (!node.Limit.IsNullReference()) {
+      if (node.Limit is not null) {
         if (!Driver.ServerInfo.Query.Features.Supports(QueryFeatures.UpdateLimit)) {
           throw new NotSupportedException(Strings.ExStorageDoesNotSupportLimitationOfRowCountToUpdate);
         }
@@ -104,7 +104,7 @@ public override void Visit(SqlDelete node)
     /// <inheritdoc/>
     protected override void VisitDeleteLimit(SqlDelete node)
     {
-      if (!node.Limit.IsNullReference()) {
+      if (node.Limit is not null) {
         if (!Driver.ServerInfo.Query.Features.Supports(QueryFeatures.DeleteLimit)) {
           throw new NotSupportedException(Strings.ExStorageDoesNotSupportLimitationOfRowCountToDelete);
         }
@@ -287,12 +287,12 @@ public override void Visit(SqlRound node)
       var shouldCastToDecimal = node.Type==TypeCode.Decimal;
       switch (node.Mode) {
         case MidpointRounding.ToEven:
-          result = node.Length.IsNullReference()
+          result = node.Length is null
             ? BankersRound(node.Argument, shouldCastToDecimal)
             : BankersRound(node.Argument, node.Length, shouldCastToDecimal);
           break;
         case MidpointRounding.AwayFromZero:
-          result = node.Length.IsNullReference()
+          result = node.Length is null
             ? RegularRound(node.Argument, shouldCastToDecimal)
             : RegularRound(node.Argument, node.Length, shouldCastToDecimal);
           break;