New SessionBoundRegistry class + its ancestrors moved to separate folder

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Internals/EntityChangeRegistry.cs renamed to Orm/Xtensive.Orm/Orm/Internals/SessionBoundRegistries/EntityChangeRegistry.cs

@@ -14,15 +14,13 @@ namespace Xtensive.Orm.Internals
   /// <summary>
   /// Registers <see cref="EntityState"/> changes.
   /// </summary>
-  public sealed class EntityChangeRegistry : SessionBound
+  public sealed class EntityChangeRegistry : SessionBoundRegistry
   {
     private readonly HashSet<EntityState> @new = new();
     private readonly HashSet<EntityState> modified = new();
     private readonly HashSet<EntityState> removed = new();
     private int count;
 
-    private bool changesDisabled;
-
     /// <summary>
     /// Gets the number of registered entities.
     /// </summary>
@@ -86,33 +84,15 @@ public void Clear()
       removed.Clear();
     }
 
-    internal Core.Disposable PreventChanges()
-    {
-      changesDisabled = true;
-      return new Core.Disposable((a) => changesDisabled = false);
-    }
-
     /// <exception cref="ArgumentOutOfRangeException"><paramref name="state"/> is out of range.</exception>
     private HashSet<EntityState> GetContainer(PersistenceState state)
     {
-      switch (state) {
-        case PersistenceState.New:
-          return @new;
-        case PersistenceState.Modified:
-          return modified;
-        case PersistenceState.Removed:
-          return removed;
-        default:
-          throw new ArgumentOutOfRangeException(nameof(state));
-      }
-    }
-
-    private void EnsureRegistrationsAllowed()
-    {
-      if (changesDisabled) {
-        throw new InvalidOperationException(
-          string.Format(Strings.ExSessionXIsActivelyPersistingChangesNoPersistentChangesAllowed, Session.Guid));
-      }
+      return state switch {
+        PersistenceState.New => @new,
+        PersistenceState.Modified => modified,
+        PersistenceState.Removed => removed,
+        _ => throw new ArgumentOutOfRangeException(nameof(state)),
+      };
     }
 
 

Orm/Xtensive.Orm/Orm/Internals/EntitySetChangeRegistry.cs renamed to Orm/Xtensive.Orm/Orm/Internals/SessionBoundRegistries/EntitySetChangeRegistry.cs

@@ -12,12 +12,10 @@ namespace Xtensive.Orm.Internals
   /// <summary>
   /// Contains <see cref="EntitySetState"/>s which modified during the bounded session.
   /// </summary>
-  public sealed class EntitySetChangeRegistry : SessionBound
+  public sealed class EntitySetChangeRegistry : SessionBoundRegistry
   {
     private readonly HashSet<EntitySetState> modifiedEntitySets = new();
 
-    private bool changesDisabled;
-
     /// <summary>
     /// Count of registered <see cref="EntitySetState"/>.
     /// </summary>
@@ -44,19 +42,6 @@ public void Register(EntitySetState entitySetState)
     /// </summary>
     public void Clear() => modifiedEntitySets.Clear();
 
-    internal Core.Disposable PreventChanges()
-    {
-      changesDisabled = true;
-      return new Core.Disposable((a) => changesDisabled = false);
-    }
-
-    private void EnsureRegistrationsAllowed()
-    {
-      if (changesDisabled) {
-        throw new InvalidOperationException(
-          string.Format(Strings.ExSessionXIsActivelyPersistingChangesNoPersistentChangesAllowed, Session.Guid));
-      }
-    }
 
     /// <summary>
     /// Initializes a new instance of this class.

Orm/Xtensive.Orm/Orm/Internals/NonPairedReferenceChangesRegistry.cs renamed to Orm/Xtensive.Orm/Orm/Internals/SessionBoundRegistries/NonPairedReferenceChangesRegistry.cs

@@ -13,7 +13,7 @@
 
 namespace Xtensive.Orm.Internals
 {
-  internal sealed class NonPairedReferenceChangesRegistry : SessionBound
+  internal sealed class NonPairedReferenceChangesRegistry : SessionBoundRegistry
   {
     private readonly struct Identifier : IEquatable<Identifier>
     {
@@ -54,8 +54,6 @@ public Identifier(EntityState entityState, AssociationInfo association)
     private readonly IDictionary<Identifier, HashSet<EntityState>> addedReferences = new Dictionary<Identifier, HashSet<EntityState>>();
     private readonly object accessGuard = new();
 
-    private bool changesDisabled;
-
     public int RemovedReferencesCount => removedReferences.Values.Sum(el => el.Count);
 
     public int AddedReferencesCount => addedReferences.Values.Sum(el => el.Count);
@@ -100,12 +98,6 @@ public void Clear()
       }
     }
 
-    internal Core.Disposable PreventChanges()
-    {
-      changesDisabled = true;
-      return new Core.Disposable((a) => changesDisabled = false);
-    }
-
     private void RegisterChange(EntityState referencedState, EntityState referencingState, EntityState noLongerReferencedState, AssociationInfo association)
     {
       ArgumentValidator.EnsureArgumentNotNull(association, "association");
@@ -284,13 +276,6 @@ private EntityState GetStructureFieldValue(FieldInfo fieldOfStructure, Structure
     private string BuildNameOfEntityField(FieldInfo fieldOfOwner, FieldInfo referenceFieldOfStructure) =>
       $"{fieldOfOwner.Name}.{referenceFieldOfStructure.Name}";
 
-    private void EnsureRegistrationsAllowed()
-    {
-      if (changesDisabled) {
-        throw new InvalidOperationException(
-          string.Format(Strings.ExSessionXIsActivelyPersistingChangesNoPersistentChangesAllowed, Session.Guid));
-      }
-    }
 
     internal NonPairedReferenceChangesRegistry(Session session)
       : base(session)

Orm/Xtensive.Orm/Orm/Internals/ReferenceFieldsChangesRegistry.cs renamed to Orm/Xtensive.Orm/Orm/Internals/SessionBoundRegistries/ReferenceFieldsChangesRegistry.cs

@@ -14,12 +14,10 @@ namespace Xtensive.Orm.Internals
   /// <summary>
   /// Registrates information about changed reference fields.
   /// </summary>
-  internal sealed class ReferenceFieldsChangesRegistry : SessionBound
+  internal sealed class ReferenceFieldsChangesRegistry : SessionBoundRegistry
   {
     private readonly HashSet<ReferenceFieldChangeInfo> changes = new();
 
-    private bool changesDisabled;
-
     /// <summary>
     /// Registrates information about field which value was set.
     /// </summary>
@@ -67,25 +65,12 @@ public void Clear()
       changes.Clear();
     }
 
-    internal Core.Disposable PreventChanges()
-    {
-      changesDisabled = true;
-      return new Core.Disposable((a) => changesDisabled = false);
-    }
-
     private void Register(ReferenceFieldChangeInfo fieldChangeInfo)
     {
       EnsureRegistrationsAllowed();
       _ = changes.Add(fieldChangeInfo);
     }
 
-    private void EnsureRegistrationsAllowed()
-    {
-      if (changesDisabled) {
-        throw new System.InvalidOperationException(
-          string.Format(Strings.ExSessionXIsActivelyPersistingChangesNoPersistentChangesAllowed, Session.Guid));
-      }
-    }
 
     public ReferenceFieldsChangesRegistry(Session session)
       : base(session)

Orm/Xtensive.Orm/Orm/Internals/SessionBoundRegistries/SessionBoundRegistry.cs

@@ -0,0 +1,38 @@
+// Copyright (C) 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
+// Created:    2022.06.14
+
+using System;
+
+
+namespace Xtensive.Orm.Internals
+{
+  /// <summary>
+  /// Base type for <see cref="SessionBound"/> registries.
+  /// </summary>
+  public abstract class SessionBoundRegistry : SessionBound
+  {
+    private bool changesDisabled;
+
+    internal Core.Disposable PreventChanges()
+    {
+      changesDisabled = true;
+      return new Core.Disposable((a) => changesDisabled = false);
+    }
+
+    protected void EnsureRegistrationsAllowed()
+    {
+      if (changesDisabled) {
+        throw new InvalidOperationException(
+          string.Format(Strings.ExSessionXIsActivelyPersistingChangesNoPersistentChangesAllowed, Session.Guid));
+      }
+    }
+
+    public SessionBoundRegistry(Session session)
+      : base(session)
+    {
+    }
+  }
+}