Returns old api for StorageNodeManager

Author: alex-kulakov

Orm/Xtensive.Orm.Tests/Storage/Multinode/ConnectionOverrideTest.cs

@@ -61,7 +61,8 @@ void commandValidator(object sender, DbCommandEventArgs args)
           session.Events.DbCommandExecuted -= commandValidator;
         }
 
-        var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfig);
+        _ = domain.StorageNodeManager.AddNode(nodeConfig);
+        var selectedNode = domain.StorageNodeManager.GetNode(nodeConfig.NodeId);
         using (var session = selectedNode.OpenSession())
           using (var tx = session.OpenTransaction()){
           var connection = ((SqlSessionHandler) session.Handler).Connection;
@@ -113,7 +114,8 @@ void commandValidator(object sender, DbCommandEventArgs args)
           session.Events.DbCommandExecuted -= commandValidator;
         }
 
-        var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfig);
+        _ = domain.StorageNodeManager.AddNode(nodeConfig);
+        var selectedNode = domain.StorageNodeManager.GetNode(nodeConfig.NodeId);
         using (var session = selectedNode.OpenSession())
         using (var tx = session.OpenTransaction()) {
           var connection = ((SqlSessionHandler) session.Handler).Connection;

Orm/Xtensive.Orm.Tests/Storage/Multinode/DynamicTypeIdTest.cs

@@ -343,7 +343,8 @@ public void TypeIdExtractionTest()
           }
         }
 
-        var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfiguration);
+        _ = domain.StorageNodeManager.AddNode(nodeConfiguration);
+        var selectedNode = domain.StorageNodeManager.GetNode(nodeConfiguration.NodeId);
         using (var session = selectedNode.OpenSession()) {
           var types = new[] { typeof(BaseEntity), typeof(Entity1), typeof(Entity2) };
           foreach (var type in types) {

Orm/Xtensive.Orm.Tests/Storage/Multinode/InitializationSqlOverrideTest.cs

@@ -51,7 +51,8 @@ public void NullNodeInitSql()
           }
         }
 
-        var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfig);
+        _ = domain.StorageNodeManager.AddNode(nodeConfig);
+        var selectedNode = domain.StorageNodeManager.GetNode(nodeConfig.NodeId);
         using (var session = selectedNode.OpenSession())
         using (var tx = session.OpenTransaction()) {
           var service = session.Services.Get<DirectSqlAccessor>();
@@ -92,7 +93,8 @@ public void EmptyStringIninSql()
           }
         }
 
-        var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfig);
+        _ = domain.StorageNodeManager.AddNode(nodeConfig);
+        var selectedNode = domain.StorageNodeManager.GetNode(nodeConfig.NodeId);
         using (var session = selectedNode.OpenSession())
         using (var tx = session.OpenTransaction()) {
           var service = session.Services.Get<DirectSqlAccessor>();
@@ -133,7 +135,8 @@ public void ValidInitSql()
           }
         }
 
-        var selectedNode = domain.StorageNodeManager.GetOrAddNode(nodeConfig);
+        _ = domain.StorageNodeManager.AddNode(nodeConfig);
+        var selectedNode = domain.StorageNodeManager.GetNode(nodeConfig.NodeId);
         using (var session = selectedNode.OpenSession())
         using (var tx = session.OpenTransaction()) {
           var service = session.Services.Get<DirectSqlAccessor>();

Orm/Xtensive.Orm.Tests/Storage/Multinode/StorageNodeManagerTest.cs

@@ -162,47 +162,6 @@ public void RemoveExistingNode()
       Assert.That(result, Is.True);
     }
 
-    [Test]
-    public void GetOrAddByConfigWithNullNameTest()
-    {
-      var nodeConfiguration = new NodeConfiguration() { UpgradeMode = DomainUpgradeMode.Recreate };
-      nodeConfiguration.SchemaMapping.Add("dbo", "Model1");
-      _ = Assert.Throws<InvalidOperationException>(() => Domain.StorageNodeManager.GetOrAddNode(nodeConfiguration));
-    }
-
-    [Test]
-    public void GetOrAddByConfigWithEmptyNameTest()
-    {
-      var nodeConfiguration = new NodeConfiguration(string.Empty) { UpgradeMode = DomainUpgradeMode.Recreate };
-      nodeConfiguration.SchemaMapping.Add("dbo", "Model1");
-      _ = Assert.Throws<InvalidOperationException>(() => Domain.StorageNodeManager.GetOrAddNode(nodeConfiguration));
-    }
-
-    [Test]
-    public void GetOrAddByConfigOfExistingNodeTest()
-    {
-      var nodeConfiguration = GetBaseNodeConfig();
-      nodeConfiguration.SchemaMapping.Add("dbo", "Model1");
-      var result = Domain.StorageNodeManager.AddNode(nodeConfiguration);
-      Assert.That(result, Is.True);
-      var existingNode = Domain.StorageNodeManager.GetNode(nodeConfiguration.NodeId);
-
-      var node = Domain.StorageNodeManager.GetOrAddNode((NodeConfiguration)nodeConfiguration.Clone());
-      Assert.That(node, Is.EqualTo(existingNode));
-    }
-
-    [Test]
-    public void GetOrAddByConfigOfAbsentNodeTest()
-    {
-      var nodeConfiguration = GetBaseNodeConfig();
-      nodeConfiguration.SchemaMapping.Add("dbo", "Model1");
-      var existingNode = Domain.StorageNodeManager.GetNode(nodeConfiguration.NodeId);
-      Assert.That(existingNode, Is.Null);
-
-      var node = Domain.StorageNodeManager.GetOrAddNode((NodeConfiguration) nodeConfiguration.Clone());
-      Assert.That(node, Is.Not.Null);
-    }
-
     private NodeConfiguration GetBaseNodeConfig()
     {
       var nodeConfiguration = new NodeConfiguration(Guid.NewGuid().ToString()) {

Orm/Xtensive.Orm/Orm/StorageNodeManager.cs

@@ -52,31 +52,6 @@ public StorageNode GetNode([NotNull] string nodeId)
       return handlers.StorageNodeRegistry.TryGet(nodeId);
     }
 
-    /// <summary>
-    /// Gets node with <paramref name="configuration"/>.NodeId if it exists, otherwise,
-    /// adds node with the specified <paramref name="configuration"/> and performs required upgrade actions
-    /// and return added node.
-    /// </summary>
-    /// <param name="configuration">Node configuration.</param>
-    /// <exception cref="InvalidOperationException">Given configurations has no <see cref="NodeConfiguration.NodeId"/> specified.</exception>
-    /// <exception cref="InvalidOperationException">New node cannot be registered.</exception>
-    [NotNull]
-    public StorageNode GetOrAddNode([NotNull] NodeConfiguration configuration)
-    {
-      if (string.IsNullOrEmpty(configuration.NodeId)) {
-        throw new InvalidOperationException(Strings.ExInvalidNodeIdentifier);
-      }
-      var node = GetNode(configuration.NodeId);
-      if (node != null) {
-        return node;
-      }
-      node = UpgradingDomainBuilder.BuildNode(handlers.Domain, configuration);
-      return handlers.StorageNodeRegistry.Add(node)
-        ? node
-        : throw new InvalidOperationException("Node was build but couldn't be registered.");
-    }
-
-
     // Constructors
 
     internal StorageNodeManager(HandlerAccessor handlers)