small facelifting in sample code

Author: lmagyar

Samples/src/Orleans.Activities.Samples.Arithmetical.GrainInterfaces/IAdder.cs Samples/src/Orleans.Activities.Samples.Arithmetical.GrainInterfaces/IAdderGrain.cs

@@ -3,7 +3,7 @@
 
 namespace Orleans.Activities.Samples.Arithmetical.GrainInterfaces
 {
-    public interface IAdder : IGrainWithGuidKey
+    public interface IAdderGrain : IGrainWithGuidKey
     {
         Task<int> AddAsync(int arg1, int arg2);
     }

Samples/src/Orleans.Activities.Samples.Arithmetical.GrainInterfaces/IMultiplier.cs Samples/src/Orleans.Activities.Samples.Arithmetical.GrainInterfaces/IMultiplierGrain.cs

@@ -5,7 +5,7 @@ namespace Orleans.Activities.Samples.Arithmetical.GrainInterfaces
 {
     // The IMultiplier will use a callback call to deliver the result.
     // This is a demonstration for a long running workflow. A real grain can use streams or callback other grains to deliver the result.
-    public interface IMultiplier : IGrainWithGuidKey
+    public interface IMultiplierGrain : IGrainWithGuidKey
     {
         Task MultiplyAsync(int arg1, int arg2);
 

Samples/src/Orleans.Activities.Samples.Arithmetical.GrainInterfaces/Orleans.Activities.Samples.Arithmetical.GrainInterfaces.csproj

@@ -118,8 +118,8 @@
     <Compile Include="..\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="IMultiplier.cs" />
-    <Compile Include="IAdder.cs" />
+    <Compile Include="IMultiplierGrain.cs" />
+    <Compile Include="IAdderGrain.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

Samples/src/Orleans.Activities.Samples.Arithmetical.Grains/AdderGrain.cs

@@ -17,7 +17,7 @@ namespace Orleans.Activities.Samples.Arithmetical.Grains
     // WorkflowGrain<TGrain, TGrainState> base type with the default WorkflowState as TGrainState. But this is optional, the full blown
     // WorkflowGrain<TGrain, TGrainState, TWorkflowInterface, TWorkflowCallbackInterface> base type can be used also if there are outgoing calls or incoming callbacks.
     [StorageProvider(ProviderName = "MemoryStore")]
-    public sealed class AdderGrain : WorkflowGrain<AdderGrain, WorkflowState>, IAdder
+    public sealed class AdderGrain : WorkflowGrain<AdderGrain, WorkflowState>, IAdderGrain
     {
         private static Activity workflowDefinition = new AdderActivity();
 
@@ -40,7 +40,7 @@ protected override Task OnUnhandledExceptionAsync(Exception exception, Activity
         // it is propagated back to the caller. If the workflow persist itself but due to a failure it aborts later and propagates the exception back to the caller,
         // it will be reloaded when the caller repeats the request or by a reactivation reminder. If the caller repeats the call only after the workflow is reloaded and completed,
         // this not a problem, it will get the same output arguments or OperationCanceledException or the exception that caused the workflow to terminate.
-        async Task<int> IAdder.AddAsync(int arg1, int arg2)
+        async Task<int> IAdderGrain.AddAsync(int arg1, int arg2)
         {
             // IMPORTANT: Do not copy values from the grain's state into the input arguments, because input arguments will be persisted by the workflow also.
             // Closure directly the necessary values from the incoming public grain method call's parameters into the delegate.

Samples/src/Orleans.Activities.Samples.Arithmetical.Grains/MultiplierGrain.cs

@@ -17,7 +17,7 @@ namespace Orleans.Activities.Samples.Arithmetical.Grains
     // WorkflowGrain<TGrain, TGrainState> base type with the default WorkflowState as TGrainState. But this is optional, the full blown
     // WorkflowGrain<TGrain, TGrainState, TWorkflowInterface, TWorkflowCallbackInterface> base type can be used also if there are outgoing calls or incoming callbacks.
     [StorageProvider(ProviderName = "MemoryStore")]
-    public sealed class MultiplierGrain : WorkflowGrain<MultiplierGrain, WorkflowState>, IMultiplier
+    public sealed class MultiplierGrain : WorkflowGrain<MultiplierGrain, WorkflowState>, IMultiplierGrain
     {
         private static Activity workflowDefinition = new MultiplierActivity();
 
@@ -34,9 +34,9 @@ public MultiplierGrain()
             // Don't use callbacks on Completed event when there is no implicit or explicit persistence before, because the incoming request that started the workflow will run
             // the workflow to the first idle moment, if the first idle is the completion, the callback will happen during the incoming request (usually also a problem),
             // and the exception during the callback will be propagated back to the caller and the caller has to repeat the incoming request to restart the workflow.
-            WorkflowControl.CompletedAsync = (ActivityInstanceState _activityInstanceState, IDictionary<string, object> _outputArguments, Exception _terminationException) =>
+            WorkflowControl.CompletedAsync = (activityInstanceState, outputArguments, terminationException) =>
             {
-                subsManager.Notify(_subscriber => _subscriber.ReceiveResult((int)_outputArguments["result"]));
+                subsManager.Notify(subscriber => subscriber.ReceiveResult((int)outputArguments["result"]));
                 return Task.CompletedTask;
             };
         }
@@ -48,7 +48,7 @@ protected override Task OnUnhandledExceptionAsync(Exception exception, Activity
         }
 
         // MultiplierGrain only executes the workflow until it gets idle, from that moment the workflow executes in the "background" and calls the Completed event when it completes.
-        async Task IMultiplier.MultiplyAsync(int arg1, int arg2)
+        async Task IMultiplierGrain.MultiplyAsync(int arg1, int arg2)
         {
             // IMPORTANT: Do not copy values from the grain's state into the input arguments, because input arguments will be persisted by the workflow also.
             // Closure directly the necessary values from the incoming public grain method call's parameters into the delegate.
@@ -71,13 +71,13 @@ public override async Task OnActivateAsync()
             subsManager = new ObserverSubscriptionManager<IMultiplierResultReceiver>();
         }
 
-        Task IMultiplier.SubscribeAsync(IMultiplierResultReceiver observer)
+        Task IMultiplierGrain.SubscribeAsync(IMultiplierResultReceiver observer)
         {
             subsManager.Subscribe(observer);
             return Task.CompletedTask;
         }
 
-        Task IMultiplier.UnsubscribeAsync(IMultiplierResultReceiver observer)
+        Task IMultiplierGrain.UnsubscribeAsync(IMultiplierResultReceiver observer)
         {
             subsManager.Unsubscribe(observer);
             return Task.CompletedTask;

Samples/src/Orleans.Activities.Samples.Arithmetical.SiloHost/Program.cs

@@ -78,8 +78,8 @@ static void Main(string[] args)
             //       This is the place your custom logic, for example calling client logic
             //       or initializing an HTTP front end for accepting incoming requests.
 
-            var adderGrain = GrainClient.GrainFactory.GetGrain<IAdder>(Guid.NewGuid());
-            var multiplierGrain = GrainClient.GrainFactory.GetGrain<IMultiplier>(Guid.NewGuid());
+            var adderGrain = GrainClient.GrainFactory.GetGrain<IAdderGrain>(Guid.NewGuid());
+            var multiplierGrain = GrainClient.GrainFactory.GetGrain<IMultiplierGrain>(Guid.NewGuid());
             try
             {
                 WriteLine("\n\nCalling Add...\n\n");

Samples/src/Orleans.Activities.Samples.HelloWorld.GrainInterfaces/IHello.cs Samples/src/Orleans.Activities.Samples.HelloWorld.GrainInterfaces/IHelloGrain.cs

@@ -3,7 +3,7 @@
 
 namespace Orleans.Activities.Samples.HelloWorld.GrainInterfaces
 {
-    public interface IHello : IGrainWithGuidKey
+    public interface IHelloGrain : IGrainWithGuidKey
     {
         Task<string> SayHelloAsync(string greeting);
         Task<string> SayByeAsync();

Samples/src/Orleans.Activities.Samples.HelloWorld.GrainInterfaces/Orleans.Activities.Samples.HelloWorld.GrainInterfaces.csproj

@@ -118,7 +118,7 @@
     <Compile Include="..\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="IHello.cs" />
+    <Compile Include="IHelloGrain.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

Samples/src/Orleans.Activities.Samples.HelloWorld.Grains/HelloActivity.xaml

@@ -62,15 +62,15 @@
       <AssemblyReference>Orleans.Activities.Samples.HelloWorld.Grains</AssemblyReference>
     </sco:Collection>
   </TextExpression.ReferencesForImplementation>
-  <oa:WorkflowActivity x:TypeArguments="local:IHelloWorkflowInterface, local:IHelloWorkflowCallbackInterface" sap2010:WorkflowViewState.IdRef="WorkflowActivity`2_1">
+  <oa:WorkflowActivity x:TypeArguments="local:IHelloWorkflow, local:IHelloWorkflowCallback" sap2010:WorkflowViewState.IdRef="WorkflowActivity`2_1">
     <Sequence sap2010:WorkflowViewState.IdRef="Sequence_6">
       <oa:ReceiveRequestSendResponseScope sap2010:WorkflowViewState.IdRef="ReceiveRequestSendResponseScope_3">
         <Sequence sap2010:WorkflowViewState.IdRef="Sequence_5">
           <Sequence.Variables>
             <Variable x:TypeArguments="x:String" Name="clientSaid" />
             <Variable x:TypeArguments="x:String" Name="iSay" />
           </Sequence.Variables>
-          <oa:ReceiveRequest x:TypeArguments="x:String" sap2010:WorkflowViewState.IdRef="ReceiveRequest`1_3" OperationName="IHelloWorkflowInterface.GreetClientAsync">
+          <oa:ReceiveRequest x:TypeArguments="x:String" sap2010:WorkflowViewState.IdRef="ReceiveRequest`1_3" OperationName="IHelloWorkflow.GreetClientAsync">
             <oa:ReceiveRequest.RequestResult>
               <OutArgument x:TypeArguments="x:String">
                 <mca:CSharpReference x:TypeArguments="x:String">clientSaid</mca:CSharpReference>
@@ -79,7 +79,7 @@
           </oa:ReceiveRequest>
           <oa:SendRequestReceiveResponseScope sap2010:WorkflowViewState.IdRef="SendRequestReceiveResponseScope_2">
             <Sequence sap2010:WorkflowViewState.IdRef="Sequence_4">
-              <oa:SendRequest x:TypeArguments="x:String" sap2010:WorkflowViewState.IdRef="SendRequest`1_2" OperationName="IHelloWorkflowCallbackInterface.WhatShouldISayAsync">
+              <oa:SendRequest x:TypeArguments="x:String" sap2010:WorkflowViewState.IdRef="SendRequest`1_2" OperationName="IHelloWorkflowCallback.WhatShouldISayAsync">
                 <oa:SendRequest.RequestParameter>
                   <InArgument x:TypeArguments="x:String">
                     <mca:CSharpValue x:TypeArguments="x:String">clientSaid</mca:CSharpValue>
@@ -108,7 +108,7 @@
         <Pick sap2010:WorkflowViewState.IdRef="Pick_1">
           <PickBranch DisplayName="Branch1" sap2010:WorkflowViewState.IdRef="PickBranch_1">
             <PickBranch.Trigger>
-              <oa:ReceiveRequest sap2010:WorkflowViewState.IdRef="ReceiveRequest_1" OperationName="IHelloWorkflowInterface.FarewellClientAsync" />
+              <oa:ReceiveRequest sap2010:WorkflowViewState.IdRef="ReceiveRequest_1" OperationName="IHelloWorkflow.FarewellClientAsync" />
             </PickBranch.Trigger>
             <oa:SendResponse x:TypeArguments="x:String" sap2010:WorkflowViewState.IdRef="SendResponse`1_4" Idempotent="True" ResponseParameter="Bye, my friend!" ThrowIfReloaded="False" />
           </PickBranch>

Samples/src/Orleans.Activities.Samples.HelloWorld.Grains/HelloGrain.cs

@@ -15,7 +15,7 @@ namespace Orleans.Activities.Samples.HelloWorld.Grains
     public class HelloGrainState : WorkflowState
     { }
 
-    public interface IHelloWorkflowInterface
+    public interface IHelloWorkflow
     {
         // These are the operations that the grain calls on the workflow, these shouldn't be the same as the IHello grain interface method!
         // There are 2 restrictions on the methods:
@@ -25,7 +25,7 @@ public interface IHelloWorkflowInterface
         Task<string> FarewellClientAsync(Func<Task> request);
     }
 
-    public interface IHelloWorkflowCallbackInterface
+    public interface IHelloWorkflowCallback
     {
         // This is the operation that the workflow calls back on the grain.
         // There are 2 restrictions on the methods:
@@ -35,7 +35,7 @@ public interface IHelloWorkflowCallbackInterface
     }
 
     [StorageProvider(ProviderName = "MemoryStore")]
-    public sealed class HelloGrain : WorkflowGrain<HelloGrain, HelloGrainState, IHelloWorkflowInterface, IHelloWorkflowCallbackInterface>, IHello, IHelloWorkflowCallbackInterface
+    public sealed class HelloGrain : WorkflowGrain<HelloGrain, HelloGrainState, IHelloWorkflow, IHelloWorkflowCallback>, IHelloGrain, IHelloWorkflowCallback
     {
         // Without DI and versioning, just directly create the singleton workflow definition.
         private static Activity workflowDefinition = new HelloActivity();
@@ -55,7 +55,7 @@ protected override Task OnUnhandledExceptionAsync(Exception exception, Activity
 
         // The parameter delegate executed when the workflow accepts the incoming call,
         // it can modify the grain's State or do nearly anything a normal grain method can (command pattern).
-        async Task<string> IHello.SayHelloAsync(string greeting)
+        async Task<string> IHelloGrain.SayHelloAsync(string greeting)
         {
             Task<string> ProcessRequestAsync(string _request) => Task.FromResult(_request);
             Task<string> CreateResponseAsync(string _responseParameter) => Task.FromResult(_responseParameter);
@@ -74,7 +74,7 @@ await WorkflowInterface.GreetClientAsync(
 
         // The parameter delegate executed when the workflow accepts the incoming call,
         // it can modify the grain's State or do nearly anything a normal grain method can (command pattern).
-        async Task<string> IHello.SayByeAsync()
+        async Task<string> IHelloGrain.SayByeAsync()
         {
             Task ProcessRequestAsync() => Task.CompletedTask;
             Task<string> CreateResponseAsync(string _responseParameter) => Task.FromResult(_responseParameter);
@@ -89,6 +89,10 @@ await WorkflowInterface.FarewellClientAsync(
             {
                 return await CreateResponseAsync(e.PreviousResponseParameter);
             }
+            catch (InvalidOperationException)
+            {
+                return "Sorry, you must say hello first, before farewell!";
+            }
             catch (OperationCanceledException)
             {
                 return "Sorry, we have waited for your farewell, but gave up!";
@@ -97,7 +101,7 @@ await WorkflowInterface.FarewellClientAsync(
 
         // The return value delegate executed when the workflow accepts the outgoing call's response,
         // it can modify the grain's State or do nearly anything a normal grain method can (command pattern).
-        async Task<Func<Task<string>>> IHelloWorkflowCallbackInterface.WhatShouldISayAsync(string clientSaid)
+        async Task<Func<Task<string>>> IHelloWorkflowCallback.WhatShouldISayAsync(string clientSaid)
         {
             Task<string> CreateRequestAsync(string _requestParameter) => Task.FromResult(_requestParameter);
             Task<string> SomeExternalStuffAsync(string _request) => Task.FromResult(string.IsNullOrEmpty(_request) ? "Who are you?" : "Hello!");

Samples/src/Orleans.Activities.Samples.HelloWorld.SiloHost/Program.cs

@@ -49,7 +49,7 @@ static void Main(string[] args)
             //       This is the place your custom logic, for example calling client logic
             //       or initializing an HTTP front end for accepting incoming requests.
 
-            var helloGrain = GrainClient.GrainFactory.GetGrain<IHello>(Guid.NewGuid());
+            var helloGrain = GrainClient.GrainFactory.GetGrain<IHelloGrain>(Guid.NewGuid());
             try
             {
                 WriteLine("\n\nCalling SayHello...\n\n");