Formatting and copyright comments fixes

Author: AlexUstinov

Orm/Xtensive.Orm/Orm/Linq/Expressions/EntityExpression.cs

@@ -1,15 +1,13 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2020 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alexis Kochetov
 // Created:    2009.05.05
 
 using System;
-using System.Diagnostics;
 using System.Linq;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Xtensive.Core;
 using Xtensive.Orm.Model;
 
 namespace Xtensive.Orm.Linq.Expressions
@@ -71,7 +69,7 @@ public Expression Remap(int[] map, Dictionary<Expression, Expression> processedE
       }
 
       var keyExpression = (KeyExpression) Key.Remap(map, processedExpressions);
-      if (keyExpression==null) {
+      if (keyExpression == null) {
         return null;
       }
 
@@ -139,9 +137,10 @@ public static void Fill(EntityExpression entityExpression, int offset)
       var typeInfo = entityExpression.PersistentType;
       foreach (var nestedField in typeInfo.Fields.Except(entityExpression.Fields.OfType<FieldExpression>().Select(field=>field.Field))) {
         var nestedFieldExpression = BuildNestedFieldExpression(nestedField, offset);
-        var fieldExpression = nestedFieldExpression as FieldExpression;
-        if (fieldExpression!=null)
+        if (nestedFieldExpression is FieldExpression fieldExpression) {
           fieldExpression.Owner = entityExpression;
+        }
+
         entityExpression.fields.Add(nestedFieldExpression);
       }
     }
@@ -200,14 +199,22 @@ public static EntityExpression Create(EntityFieldExpression entityFieldExpressio
 
     private static PersistentFieldExpression BuildNestedFieldExpression(FieldInfo nestedField, int offset)
     {
-      if (nestedField.IsPrimitive)
+      if (nestedField.IsPrimitive) {
         return FieldExpression.CreateField(nestedField, offset);
-      if (nestedField.IsStructure)
+      }
+
+      if (nestedField.IsStructure) {
         return StructureFieldExpression.CreateStructure(nestedField, offset);
-      if (nestedField.IsEntity)
+      }
+
+      if (nestedField.IsEntity) {
         return EntityFieldExpression.CreateEntityField(nestedField, offset);
-      if (nestedField.IsEntitySet)
-          return EntitySetExpression.CreateEntitySet(nestedField);
+      }
+
+      if (nestedField.IsEntitySet) {
+        return EntitySetExpression.CreateEntitySet(nestedField);
+      }
+
       throw new NotSupportedException(string.Format(Strings.ExNestedFieldXIsNotSupported, nestedField.Attributes));
     }
 

Orm/Xtensive.Orm/Orm/Linq/Expressions/EntityFieldExpression.cs

@@ -1,12 +1,11 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2020 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alexis Kochetov
 // Created:    2009.05.06
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using Xtensive.Core;
 using Xtensive.Orm.Model;
@@ -51,7 +50,7 @@ public override Expression Remap(int offset, Dictionary<Expression, Expression>
       var entity = (EntityExpression) Entity?.Remap(offset, processedExpressions);
       result = new EntityFieldExpression(
         PersistentType, Field, newFields, keyExpression.Mapping, keyExpression, entity, OuterParameter, DefaultIfEmpty);
-      if (Owner==null) {
+      if (Owner == null) {
         return result;
       }
 
@@ -83,7 +82,7 @@ public override Expression Remap(int[] map, Dictionary<Expression, Expression> p
         }
       }
 
-      if (newFields.Count!=Fields.Count) {
+      if (newFields.Count != Fields.Count) {
         processedExpressions.Add(this, null);
         return null;
       }
@@ -96,7 +95,7 @@ public override Expression Remap(int[] map, Dictionary<Expression, Expression> p
 
       result = new EntityFieldExpression(
         PersistentType, Field, newFields, keyExpression.Mapping, keyExpression, entity, OuterParameter, DefaultIfEmpty);
-      if (Owner==null) {
+      if (Owner == null) {
         return result;
       }
 
@@ -121,7 +120,7 @@ public override Expression BindParameter(
       var entity = (EntityExpression) Entity?.BindParameter(parameter, processedExpressions);
       result = new EntityFieldExpression(
         PersistentType, Field, newFields, Mapping, keyExpression, entity, parameter, DefaultIfEmpty);
-      if (Owner==null) {
+      if (Owner == null) {
         return result;
       }
 
@@ -145,7 +144,7 @@ public override Expression RemoveOuterParameter(Dictionary<Expression, Expressio
       var entity = (EntityExpression) Entity?.RemoveOuterParameter(processedExpressions);
       result = new EntityFieldExpression(
         PersistentType, Field, newFields, Mapping, keyExpression, entity, null, DefaultIfEmpty);
-      if (Owner==null) {
+      if (Owner == null) {
         return result;
       }
 
@@ -154,10 +153,8 @@ public override Expression RemoveOuterParameter(Dictionary<Expression, Expressio
       return result;
     }
 
-    public override FieldExpression RemoveOwner()
-    {
-      return new EntityFieldExpression(PersistentType, Field, Fields, Mapping, Key, Entity, OuterParameter, DefaultIfEmpty);
-    }
+    public override FieldExpression RemoveOwner() =>
+      new EntityFieldExpression(PersistentType, Field, Fields, Mapping, Key, Entity, OuterParameter, DefaultIfEmpty);
 
     public static EntityFieldExpression CreateEntityField(FieldInfo entityField, int offset)
     {
@@ -174,6 +171,7 @@ public static EntityFieldExpression CreateEntityField(FieldInfo entityField, int
       var keyExpression = KeyExpression.Create(persistentType, offset + mappingInfo.Offset);
       var fields = new List<PersistentFieldExpression>(keyFields.Count + 1) {keyExpression};
       foreach (var field in keyFields) {
+        // Do not convert to LINQ. We want to avoid a closure creation here.
         fields.Add(BuildNestedFieldExpression(field, offset + mappingInfo.Offset));
       }
 
@@ -182,10 +180,14 @@ public static EntityFieldExpression CreateEntityField(FieldInfo entityField, int
 
     private static PersistentFieldExpression BuildNestedFieldExpression(FieldInfo nestedField, int offset)
     {
-      if (nestedField.IsPrimitive)
+      if (nestedField.IsPrimitive) {
         return CreateField(nestedField, offset);
-      if (nestedField.IsEntity)
+      }
+
+      if (nestedField.IsEntity) {
         return CreateEntityField(nestedField, offset);
+      }
+
       throw new NotSupportedException(string.Format(Strings.ExNestedFieldXIsNotSupported, nestedField.Attributes));
     }
 

Orm/Xtensive.Orm/Orm/Linq/Expressions/FieldExpression.cs

@@ -1,16 +1,14 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2020 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alexis Kochetov
 // Created:    2009.05.05
 
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using System.Reflection;
 using Xtensive.Core;
 using FieldInfo=Xtensive.Orm.Model.FieldInfo;
-using Xtensive.Collections;
 
 namespace Xtensive.Orm.Linq.Expressions
 {
@@ -23,9 +21,8 @@ internal class FieldExpression : PersistentFieldExpression
     public virtual IPersistentExpression Owner
     {
       get => owner;
-      internal set
-      {
-        if (owner!=null) {
+      internal set {
+        if (owner != null) {
           throw Exceptions.AlreadyInitialized("Owner");
         }
 
@@ -56,26 +53,32 @@ public override Expression Remap(int offset, Dictionary<Expression, Expression>
 
     public override Expression Remap(int[] map, Dictionary<Expression, Expression> processedExpressions)
     {
-      if (!CanRemap)
+      if (!CanRemap) {
         return this;
+      }
 
-      Expression result;
-      if (processedExpressions.TryGetValue(this, out result))
+      if (processedExpressions.TryGetValue(this, out var result)) {
         return result;
+      }
 
       var offset = map.IndexOf(Mapping.Offset);
       if (offset < 0) {
-        if (owner == null && !SkipOwnerCheckScope.IsActive)
+        if (owner == null && !SkipOwnerCheckScope.IsActive) {
           throw new InvalidOperationException(Strings.ExUnableToRemapFieldExpression);
+        }
+
         processedExpressions.Add(this, null);
-        if (owner != null)
+        if (owner != null) {
           Owner.Remap(map, processedExpressions);
+        }
+
         return null;
       }
       var newMapping = new Segment<int>(offset, Mapping.Length);
       result = new FieldExpression(ExtendedExpressionType.Field, Field, newMapping, OuterParameter, DefaultIfEmpty);
-      if (owner == null)
+      if (owner == null) {
         return result;
+      }
 
       processedExpressions.Add(this, result);
       Owner.Remap(map, processedExpressions);
@@ -84,13 +87,14 @@ public override Expression Remap(int[] map, Dictionary<Expression, Expression> p
 
     public override Expression BindParameter(ParameterExpression parameter, Dictionary<Expression, Expression> processedExpressions)
     {
-      Expression result;
-      if (processedExpressions.TryGetValue(this, out result))
+      if (processedExpressions.TryGetValue(this, out var result)) {
         return result;
+      }
 
       result = new FieldExpression(ExtendedExpressionType.Field, Field, Mapping, parameter, DefaultIfEmpty);
-      if (owner == null)
+      if (owner == null) {
         return result;
+      }
 
       processedExpressions.Add(this, result);
       Owner.BindParameter(parameter, processedExpressions);
@@ -99,28 +103,27 @@ public override Expression BindParameter(ParameterExpression parameter, Dictiona
 
     public override Expression RemoveOuterParameter(Dictionary<Expression, Expression> processedExpressions)
     {
-      Expression result;
-      if (processedExpressions.TryGetValue(this, out result))
+      if (processedExpressions.TryGetValue(this, out var result)) {
         return result;
+      }
 
       result = new FieldExpression(ExtendedExpressionType.Field, Field, Mapping, null, DefaultIfEmpty);
-      if (owner == null)
+      if (owner == null) {
         return result;
+      }
 
       processedExpressions.Add(this, result);
       Owner.RemoveOuterParameter(processedExpressions);
       return result;
     }
 
-    public virtual FieldExpression RemoveOwner()
-    {
-      return new FieldExpression(ExtendedExpressionType.Field, Field, Mapping, OuterParameter, DefaultIfEmpty);
-    }
+    public virtual FieldExpression RemoveOwner() =>
+      new FieldExpression(ExtendedExpressionType.Field, Field, Mapping, OuterParameter, DefaultIfEmpty);
 
     public static FieldExpression CreateField(FieldInfo field, int offset)
     {
       if (!field.IsPrimitive) {
-        throw new ArgumentException(string.Format(Strings.ExFieldXIsNotPrimitive, field.Name), "field");
+        throw new ArgumentException(string.Format(Strings.ExFieldXIsNotPrimitive, field.Name), nameof(field));
       }
 
       ref var mappingInfo = ref field.mappingInfo;