Merge pull request #1 from TsuyoshiUshio/refactoring/tictactoe

Refactoring/tictactoe Done

Author: TsuyoshiUshio

Chapter04/ActorTicTacToeApplication/ActorTicTacToeApplication/ApplicationPackageRoot/ApplicationManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ApplicationManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ApplicationTypeName="ActorTicTacToeApplicationType" ApplicationTypeVersion="1.0.1" xmlns="http://schemas.microsoft.com/2011/01/fabric">
+<ApplicationManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ApplicationTypeName="ActorTicTacToeApplicationType" ApplicationTypeVersion="1.0.2" xmlns="http://schemas.microsoft.com/2011/01/fabric">
   <Parameters>
     <Parameter Name="GameActorService_PartitionCount" DefaultValue="10" />
     <Parameter Name="GameActorService_MinReplicaSetSize" DefaultValue="3" />
@@ -12,7 +12,7 @@
        should match the Name and Version attributes of the ServiceManifest element defined in the 
        ServiceManifest.xml file. -->
   <ServiceManifestImport>
-    <ServiceManifestRef ServiceManifestName="GamePkg" ServiceManifestVersion="1.0.1" />
+    <ServiceManifestRef ServiceManifestName="GamePkg" ServiceManifestVersion="1.0.2" />
   </ServiceManifestImport>
   <ServiceManifestImport>
     <ServiceManifestRef ServiceManifestName="PlayerPkg" ServiceManifestVersion="1.0.0" />

Chapter04/ActorTicTacToeApplication/ActorTicTacToeApplication/PublishProfiles/Cloud.xml

@@ -28,7 +28,7 @@
                                StoreLocation="CurrentUser"
                                StoreName="My" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
-  <UpgradeDeployment Mode="Monitored" Enabled="true">
+  <UpgradeDeployment Mode="Monitored" Enabled="false">
     <Parameters FailureAction="Rollback" Force="True" />
   </UpgradeDeployment>
 </PublishProfile>

Chapter04/ActorTicTacToeApplication/ActorTicTacToeApplication/PublishProfiles/Local.xml

@@ -8,7 +8,7 @@
   -->
   <ClusterConnectionParameters />
   <ApplicationParameterFile Path="..\ApplicationParameters\Local.xml" />
-  <UpgradeDeployment Mode="UnmonitoredAuto" Enabled="false">
+  <UpgradeDeployment Mode="UnmonitoredAuto" Enabled="true">
     <Parameters UpgradeReplicaSetCheckTimeoutSec="1" Force="True" />
   </UpgradeDeployment>
 </PublishProfile>

Chapter04/ActorTicTacToeApplication/Game/Game.cs

@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.ServiceFabric.Actors;
 using Microsoft.ServiceFabric.Actors.Runtime;
-using Microsoft.ServiceFabric.Actors.Client;
 using Game.Interfaces;
 using System.Runtime.Serialization;
 using Microsoft.ServiceFabric.Data;
@@ -24,6 +21,7 @@ namespace Game
     [StatePersistence(StatePersistence.Persisted)]
     internal class Game : Actor, IGame
     {
+        private static readonly string STATE_KEY = "MyState";
         [DataContract]
         public class ActorState
         {
@@ -43,9 +41,9 @@ public class ActorState
         /// This method is called whenever an actor is activated.
         /// An actor is activated the first time any of its methods are invoked.
         /// </summary>
-        protected override Task OnActivateAsync()
+        protected override async Task OnActivateAsync()
         {
-            ConditionalValue<ActorState> state = this.StateManager.TryGetStateAsync<ActorState>("MyState").GetAwaiter().GetResult();
+            ConditionalValue<ActorState> state = await this.StateManager.TryGetStateAsync<ActorState>(STATE_KEY);
             if (!state.HasValue)
             {
                 var actorState = new ActorState()
@@ -56,57 +54,54 @@ protected override Task OnActivateAsync()
                     NextPlayerIndex = 0,
                     NumberOfMoves = 0
                 };
-                this.StateManager.SetStateAsync<ActorState>("MyState", actorState);
+                await this.StateManager.SetStateAsync<ActorState>(STATE_KEY, actorState);
             }
-            return Task.FromResult(true);
         }
-        
-        private ActorState State
+        private async Task<ActorState> GetActorState()
         {
-            get
-            {
-                return this.StateManager.TryGetStateAsync<ActorState>("MyState").GetAwaiter().GetResult().Value;
-            }
-
-            set
-            {
-                this.StateManager.AddOrUpdateStateAsync<ActorState>("MyState", value, (ke, v) => value);
-            }
-            
+            ConditionalValue<ActorState> stateValue = await this.StateManager.TryGetStateAsync<ActorState>(STATE_KEY);
+            return await Task.FromResult<ActorState>(stateValue.Value);
+        }
+        private async Task SetActorState(ActorState state)
+        {
+            await this.StateManager.AddOrUpdateStateAsync<ActorState>(STATE_KEY, state, (ke, v) => state);
+            return;
         }
 
-        public Task<bool> JoinGameAsync(long playerId, string playerName)
+        public async Task<bool> JoinGameAsync(long playerId, string playerName)
         {
-            var state = this.State;
-           if (state.Players.Count >= 2 || state.Players.FirstOrDefault(p => p.Item2 == playerName) != null)
+            var state = await GetActorState();
+            if (state.Players.Count >= 2 || state.Players.FirstOrDefault(p => p.Item2 == playerName) != null)
             {
-                return Task.FromResult<bool>(false);
+                return await Task.FromResult<bool>(false);
             }
 
             state.Players.Add(new Tuple<long, string>(playerId, playerName));
-            this.State = state;
-            return Task.FromResult<bool>(true);
+            await SetActorState(state);
+            return await Task.FromResult<bool>(true);
         }
 
         [ReadOnly(true)]
-        public Task<int[]> GetGameBoardAsync()
+        public async Task<int[]> GetGameBoardAsync()
         {
-            return Task.FromResult<int[]>(this.State.Board);
+            var state = await GetActorState();
+            return await Task.FromResult<int[]>(state.Board);
         }
         [ReadOnly(true)]
-        public Task<string> GetWinnerAsync()
+        public async Task<string> GetWinnerAsync()
         {
-            return Task.FromResult<string>(this.State.Winner);
+            var state = await GetActorState();
+            return await Task.FromResult<string>(state.Winner);
         }
 
-        public Task<bool> MakeMoveAsync(long playerId, int x, int y)
+        public async Task<bool> MakeMoveAsync(long playerId, int x, int y)
         {
-            var state = this.State;
+            var state = await GetActorState();
             if (x < 0 || x > 2 || y < 0 || y > 2
                 || state.Players.Count != 2
                 || state.NumberOfMoves >= 9
                 || state.Winner != "")
-                return Task.FromResult<bool>(false);
+                return await Task.FromResult<bool>(false);
 
             int index = state.Players.FindIndex(p => p.Item1 == playerId);
             if (index == state.NextPlayerIndex)
@@ -116,33 +111,34 @@ public Task<bool> MakeMoveAsync(long playerId, int x, int y)
                     int piece = index * 2 - 1;
                     state.Board[y * 3 + x] = piece;
                     state.NumberOfMoves++;
-                    if (HasWon(piece * 3))
+                    if (await HasWonAsync(piece * 3))
                         state.Winner = state.Players[index].Item2 + " (" +
                             (piece == -1 ? "X" : "0") + ")";
                     else if (state.Winner == "" && state.NumberOfMoves >= 9)
                         state.Winner = "TIE";
                     state.NextPlayerIndex = (state.NextPlayerIndex + 1) % 2;
-                    this.State = state;
-                    return Task.FromResult<bool>(true);
+                    await SetActorState(state);
+                    return await Task.FromResult<bool>(true);
                 }
                 else
-                    return Task.FromResult<bool>(false);
+                    return await Task.FromResult<bool>(false);
             }
             else
-                return Task.FromResult<bool>(false);
+                return await Task.FromResult<bool>(false);
         }
 
-        private bool HasWon(int sum)
+        private async Task<bool> HasWonAsync(int sum)
         {
-            var state = this.State;
-            return state.Board[0] + state.Board[1] + state.Board[2] == sum
+            var state = await GetActorState();
+            bool result =  state.Board[0] + state.Board[1] + state.Board[2] == sum
                 || state.Board[3] + state.Board[4] + state.Board[5] == sum
                 || state.Board[6] + state.Board[7] + state.Board[8] == sum
                 || state.Board[0] + state.Board[3] + state.Board[6] == sum
                 || state.Board[1] + state.Board[4] + state.Board[7] == sum
                 || state.Board[2] + state.Board[5] + state.Board[8] == sum
                 || state.Board[0] + state.Board[4] + state.Board[8] == sum
                 || state.Board[2] + state.Board[4] + state.Board[6] == sum;
+            return await Task.FromResult<bool>(result);
         }
     }
 }

Chapter04/ActorTicTacToeApplication/Game/PackageRoot/ServiceManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ServiceManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="GamePkg" Version="1.0.1" xmlns="http://schemas.microsoft.com/2011/01/fabric">
+<ServiceManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="GamePkg" Version="1.0.2" xmlns="http://schemas.microsoft.com/2011/01/fabric">
   <ServiceTypes>
     <StatefulServiceType ServiceTypeName="GameActorServiceType" HasPersistedState="true">
       <Extensions>
@@ -16,7 +16,7 @@
       </Extensions>
     </StatefulServiceType>
   </ServiceTypes>
-  <CodePackage Name="Code" Version="1.0.1">
+  <CodePackage Name="Code" Version="1.0.2">
     <EntryPoint>
       <ExeHost>
         <Program>Game.exe</Program>

Chapter06/BadApplication/BadStateful/BadStateful.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Fabric;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.ServiceFabric.Data.Collections;

Chapter13/SensorAggregationApplication/SensorDataProcessor/SensorDataProcessor.cs

@@ -43,17 +43,17 @@ protected override IEnumerable<ServiceReplicaListener> CreateServiceReplicaListe
         /// <param name="cancellationToken">Canceled when Service Fabric needs to shut down this service replica.</param>
         protected override async Task RunAsync(CancellationToken cancellationToken)
         {
-
+            
             ServiceEventSource.Current.ServiceMessage(this, "********** Run Async! ******");
-            DateTime timeStamp = DateTime.Now;
+            var timeStamp = DateTime.UtcNow;
             var proxy = ActorProxy.Create<IIoTHubPartitionMap>(new ActorId(1),
                     "fabric:/SensorAggregationApplication");
             var eventHubClient = EventHubClient.CreateFromConnectionString("HostName=iote2e.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=Bsp4+D5at3lTacsNaZPvx0FhVvrdDa8LGFzKS/B6zzQ=", "messages/events");
 
             while (!cancellationToken.IsCancellationRequested)
             {
                 string partition = await proxy.LeaseTHubPartitionAsync();
-                timeStamp = DateTime.Now;
+                timeStamp = DateTime.UtcNow;
                 if (partition == "")
                 {
                     ServiceEventSource.Current.ServiceMessage(this, "********** Partition = '' ******");
@@ -70,16 +70,16 @@ protected override async Task RunAsync(CancellationToken cancellationToken)
                         if (eventData != null)
                         {
                             ServiceEventSource.Current.ServiceMessage(this, "********** the event data is coming! ******");
-                            string data = Encoding.UTF8.GetString(eventData.GetBytes());
+                            var data = Encoding.UTF8.GetString(eventData.GetBytes());
                             ServiceEventSource.Current.ServiceMessage(this, "Message: {0}", data);
 
                             string lease = await proxy.RenewIoTHubPartitionLeaseAsync(partition);
-                            if (DateTime.Now - timeStamp >= TimeSpan.FromSeconds(180)) break;
+                            if (DateTime.UtcNow - timeStamp >= TimeSpan.FromSeconds(180)) break;
                         }
                         else
                         {
 
-                            if (DateTime.Now - timeStamp > TimeSpan.FromSeconds(20))
+                            if (DateTime.UtcNow - timeStamp > TimeSpan.FromSeconds(20))
                             {
                                 ServiceEventSource.Current.ServiceMessage(this, "********** break! ******");
                                 break;