Adding base online state to reduce duplication

Author: LPLafontaineB

Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs

@@ -13,7 +13,7 @@ namespace Unity.Multiplayer.Samples.BossRoom
     /// entering. If successful, transitions to the ClientConnected state. If not, transitions to the Offline state. If
     /// given a disconnect reason first, transitions to the DisconnectingWithReason state.
     /// </summary>
-    class ClientConnectingState : ConnectionState
+    class ClientConnectingState : OnlineState
     {
         [Inject]
         protected LobbyServiceFacade m_LobbyServiceFacade;
@@ -39,12 +39,6 @@ public override void OnClientDisconnect(ulong _)
             m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
         }
 
-        public override void OnUserRequestedShutdown()
-        {
-            m_ConnectStatusPublisher.Publish(ConnectStatus.UserRequestedDisconnect);
-            m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
-        }
-
         public override void OnDisconnectReasonReceived(ConnectStatus disconnectReason)
         {
             m_ConnectStatusPublisher.Publish(disconnectReason);

Assets/Scripts/ConnectionManagement/ConnectionState/ClientReconnectingState.cs

@@ -59,12 +59,6 @@ public override void OnClientDisconnect(ulong _)
             }
         }
 
-        public override void OnUserRequestedShutdown()
-        {
-            m_ConnectStatusPublisher.Publish(ConnectStatus.UserRequestedDisconnect);
-            m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
-        }
-
         public override void OnDisconnectReasonReceived(ConnectStatus disconnectReason)
         {
             m_ConnectStatusPublisher.Publish(disconnectReason);

Assets/Scripts/ConnectionManagement/ConnectionState/ConnectionState.cs

@@ -7,7 +7,7 @@
 namespace Unity.Multiplayer.Samples.BossRoom
 {
     /// <summary>
-    /// Base class representing a connection state. Contains a static member for each possible state.
+    /// Base class representing a connection state.
     /// </summary>
     abstract class ConnectionState
     {
@@ -40,9 +40,6 @@ public virtual void OnDisconnectReasonReceived(ConnectStatus disconnectReason) {
 
         public virtual void ApprovalCheck(NetworkManager.ConnectionApprovalRequest request, NetworkManager.ConnectionApprovalResponse response) { }
 
-        public virtual void OnTransportFailure()
-        {
-            m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
-        }
+        public virtual void OnTransportFailure() { }
     }
 }

Assets/Scripts/ConnectionManagement/ConnectionState/DisconnectingWithReasonState.cs

@@ -5,7 +5,7 @@ namespace Unity.Multiplayer.Samples.BossRoom
     /// Since our disconnect process runs in multiple steps host side, this state is the first step client side. This
     /// state simply waits for the actual disconnect, then transitions to the offline state.
     /// </summary>
-    class DisconnectingWithReasonState : ConnectionState
+    class DisconnectingWithReasonState : OnlineState
     {
         public override void Enter() { }
 
@@ -15,10 +15,5 @@ public override void OnClientDisconnect(ulong _)
         {
             m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
         }
-
-        public override void OnUserRequestedShutdown()
-        {
-            m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
-        }
     }
 }

Assets/Scripts/ConnectionManagement/ConnectionState/HostingState.cs

@@ -13,7 +13,7 @@ namespace Unity.Multiplayer.Samples.BossRoom
     /// Connection state corresponding to a listening host. Handles incoming client connections. When shutting down or
     /// being timed out, transitions to the Offline state.
     /// </summary>
-    class HostingState : ConnectionState
+    class HostingState : OnlineState
     {
         [Inject]
         LobbyServiceFacade m_LobbyServiceFacade;

Assets/Scripts/ConnectionManagement/ConnectionState/OnlineState.cs

@@ -0,0 +1,20 @@
+namespace Unity.Multiplayer.Samples.BossRoom
+{
+    /// <summary>
+    /// Base class representing an online connection state.
+    /// </summary>
+    abstract class OnlineState : ConnectionState
+    {
+
+        public override void OnUserRequestedShutdown()
+        {
+            m_ConnectStatusPublisher.Publish(ConnectStatus.UserRequestedDisconnect);
+            m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
+        }
+
+        public override void OnTransportFailure()
+        {
+            m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
+        }
+    }
+}

Assets/Scripts/ConnectionManagement/ConnectionState/OnlineState.cs.meta

@@ -11,7 +11,7 @@ namespace Unity.Multiplayer.Samples.BossRoom
     /// Connection state corresponding to a host starting up. Starts the host when entering the state. If successful,
     /// transitions to the Hosting state, if not, transitions back to the Offline state.
     /// </summary>
-    class StartingHostState : ConnectionState
+    class StartingHostState : OnlineState
     {
         [Inject]
         LobbyServiceFacade m_LobbyServiceFacade;