api update

Author: KSemenenko

ManagedCode.Orleans.Graph.Tests/Cluster/TestSiloConfigurations.cs

@@ -11,9 +11,9 @@ public void Configure(ISiloBuilder siloBuilder)
         siloBuilder.AddOrleansGraph()
             .CreateGraph(graph =>
             {
-                graph.AddGrainTransition<IGrainA, IGrainB>().WithReentrancy().AllMethods();
-                graph.AddGrainTransition<IGrainB, IGrainC>().WithReentrancy().AllMethods();
-                graph.AddGrainTransition<IGrainC, IGrainD>().WithReentrancy().AllMethods();
+                graph.AddGrainTransition<IGrainA, IGrainB>().AllMethods().WithReentrancy();
+                graph.AddGrainTransition<IGrainB, IGrainC>().AllMethods().WithReentrancy();
+                graph.AddGrainTransition<IGrainC, IGrainD>().AllMethods().WithReentrancy();
             });
     }
 }

ManagedCode.Orleans.Graph.Tests/GrainGraphManagerTests.cs

@@ -15,6 +15,7 @@ public void IsTransitionAllowed_SingleValidTransition_ReturnsTrue()
         .From<IGrainA>()
         .To<IGrainB>()
         .AllMethods()
+        .And()
         .Build();
 
     var callHistory = new CallHistory();
@@ -48,6 +49,7 @@ public void IsTransitionAllowed_EmptyCallHistory_ReturnsFalse()
         .From<IGrainA>()
         .To<IGrainB>()
         .AllMethods()
+        .And()
         .Build();
 
     var callHistory = new CallHistory();
@@ -116,6 +118,7 @@ public void IsTransitionAllowed_DisallowedTransition_ReturnsFalse()
         .From<IGrainA>()
         .To<IGrainB>()
         .AllMethods()
+        .And()
         .Build();
 
     var callHistory = new CallHistory();
@@ -136,6 +139,7 @@ public void IsTransitionAllowed_MultipleValidTransitions_ReturnsTrue()
         .From<IGrainB>()
         .To<IGrainC>()
         .AllMethods()
+        .And()
         .Build();
 
     var callHistory = new CallHistory();
@@ -186,6 +190,7 @@ public void IsTransitionAllowed_DetectsComplexLoop_ThrowsExceptionOnBuild()
             .From<IGrainD>()
             .To<IGrainA>()
             .AllMethods()
+            .And()
             .Build();
     });
 
@@ -203,6 +208,7 @@ public void IsTransitionAllowed_DetectsSimpleLoop_ReturnsFalse()
         .From<IGrainB>()
         .To<IGrainC>()
         .AllMethods()
+        .And()
         .Build();
 
     var callHistory = new CallHistory();
@@ -227,6 +233,7 @@ public void IsTransitionAllowed_NoLoop_ReturnsTrue()
         .From<IGrainB>()
         .To<IGrainC>()
         .AllMethods()
+        .And()
         .Build();
 
     var callHistory = new CallHistory();

ManagedCode.Orleans.Graph/Builder/Interfaces/IMethodBuilder.cs

@@ -62,8 +62,8 @@ public interface IMethodBuilder<TSource, TTarget> where TSource : IGrain where T
     /// <summary>
     /// Specifies that all methods should be included.
     /// </summary>
-    /// <returns>An instance of <see cref="IGrainCallsBuilder"/>.</returns>
-    IGrainCallsBuilder AllMethods();
+    /// <returns>The current instance of <see cref="IMethodBuilder{TSource, TTarget}"/>.</returns>
+    IMethodBuilder<TSource, TTarget> AllMethods();
 
 
     /// <summary>

ManagedCode.Orleans.Graph/Builder/MethodBuilder.cs

@@ -42,10 +42,10 @@ public IMethodBuilder<TSource, TTarget> WithReentrancy()
         return this;
     }
 
-    public IGrainCallsBuilder AllMethods()
+    public IMethodBuilder<TSource, TTarget> AllMethods()
     {
         _parent.AddMethodRule(_sourceType, _targetType, "*", "*");
-        return _parent;
+        return this;
     }
 
     public IGrainCallsBuilder And() => _parent;

ManagedCode.Orleans.Graph/Common/DirectedGraph.cs

@@ -35,11 +35,17 @@ public void AddTransition(string source, string target, GrainTransition transiti
         AddVertex(source);
         AddVertex(target);
 
+        // Remove existing transitions between the same source and target
+        if (_adjacencyList[source].ContainsKey(target))
+        {
+            _adjacencyList[source][target].Clear();
+        }
+
         if (!_adjacencyList[source].ContainsKey(target))
         {
             _adjacencyList[source][target] = new HashSet<GrainTransition>();
         }
-        
+
         _adjacencyList[source][target].Add(transition);
 
         if (!transition.IsReentrant && HasCycle())