From 70efb8e086be581ef7bc71fd960b7ad4cef237b9 Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Wed, 31 Jan 2024 10:50:55 +0000
Subject: [PATCH] Seal classes in `RemotingProtocol2`

Seal internal classes in file `src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs`
---
 .../remoting/client/RemotingProtocol2.cs      | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
index ed01bc7ad1b..b32e1196ac5 100644
--- a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
@@ -19,7 +19,7 @@ namespace System.Management.Automation.Internal
     /// Handles all PowerShell data structure handler communication with the
     /// server side RunspacePool.
     /// </summary>
-    internal class ClientRunspacePoolDataStructureHandler : IDisposable
+    internal sealed class ClientRunspacePoolDataStructureHandler : IDisposable
     {
         private bool _reconnecting = false;
 
@@ -826,7 +826,7 @@ private void StartDisconnectAsync(object state)
             {
                 remoteSession?.DisconnectAsync();
             }
-            catch 
+            catch
             {
                 // remoteSession may have already been disposed resulting in unexpected exceptions.
             }
@@ -984,7 +984,7 @@ public void Dispose(bool disposing)
     /// Base class for ClientPowerShellDataStructureHandler to handle all
     /// references.
     /// </summary>
-    internal class ClientPowerShellDataStructureHandler
+    internal sealed class ClientPowerShellDataStructureHandler
     {
         #region Data Structure Handler events
 
@@ -1155,8 +1155,8 @@ internal void SendHostResponseToServer(RemoteHostResponse hostResponse)
             RemoteDataObject<PSObject> dataToBeSent =
                 RemoteDataObject<PSObject>.CreateFrom(RemotingDestination.Server,
                 RemotingDataType.RemotePowerShellHostResponseData,
-                clientRunspacePoolId,
-                clientPowerShellId,
+                _clientRunspacePoolId,
+                _clientPowerShellId,
                 hostResponse.Encode());
 
             TransportManager.DataToBeSentCollection.Add<PSObject>(dataToBeSent,
@@ -1178,7 +1178,7 @@ internal void SendInput(ObjectStreamBase inputstream)
                 {
                     // send input closed information to server
                     SendDataAsync(RemotingEncoder.GeneratePowerShellInputEnd(
-                        clientRunspacePoolId, clientPowerShellId));
+                        _clientRunspacePoolId, _clientPowerShellId));
                 }
             }
             else
@@ -1207,10 +1207,10 @@ internal void SendInput(ObjectStreamBase inputstream)
         internal void ProcessReceivedData(RemoteDataObject<PSObject> receivedData)
         {
             // verify if this data structure handler is the intended recipient
-            if (receivedData.PowerShellId != clientPowerShellId)
+            if (receivedData.PowerShellId != _clientPowerShellId)
             {
                 throw new PSRemotingDataStructureException(RemotingErrorIdStrings.PipelineIdsDoNotMatch,
-                                receivedData.PowerShellId, clientPowerShellId);
+                                receivedData.PowerShellId, _clientPowerShellId);
             }
 
             // decode the message and take appropriate action
@@ -1473,13 +1473,6 @@ internal void ProcessRobustConnectionNotification(
 
         #endregion Data Structure Handler Methods
 
-        #region Protected Members
-
-        protected Guid clientRunspacePoolId;
-        protected Guid clientPowerShellId;
-
-        #endregion Protected Members
-
         #region Constructors
 
         /// <summary>
@@ -1496,8 +1489,8 @@ internal ClientPowerShellDataStructureHandler(BaseClientCommandTransportManager
                     Guid clientRunspacePoolId, Guid clientPowerShellId)
         {
             TransportManager = transportManager;
-            this.clientRunspacePoolId = clientRunspacePoolId;
-            this.clientPowerShellId = clientPowerShellId;
+            _clientRunspacePoolId = clientRunspacePoolId;
+            _clientPowerShellId = clientPowerShellId;
             transportManager.SignalCompleted += OnSignalCompleted;
         }
 
@@ -1513,7 +1506,7 @@ internal Guid PowerShellId
         {
             get
             {
-                return clientPowerShellId;
+                return _clientPowerShellId;
             }
         }
 
@@ -1566,7 +1559,7 @@ private void WriteInput(ObjectStreamBase inputstream)
             foreach (object inputObject in inputObjects)
             {
                 SendDataAsync(RemotingEncoder.GeneratePowerShellInput(inputObject,
-                    clientRunspacePoolId, clientPowerShellId));
+                    _clientRunspacePoolId, _clientPowerShellId));
             }
 
             if (!inputstream.IsOpen)
@@ -1577,7 +1570,7 @@ private void WriteInput(ObjectStreamBase inputstream)
                 foreach (object inputObject in inputObjects)
                 {
                     SendDataAsync(RemotingEncoder.GeneratePowerShellInput(inputObject,
-                        clientRunspacePoolId, clientPowerShellId));
+                        _clientRunspacePoolId, _clientPowerShellId));
                 }
 
                 // we are sending input end to the server. Ignore the future
@@ -1586,7 +1579,7 @@ private void WriteInput(ObjectStreamBase inputstream)
                 inputstream.DataReady -= HandleInputDataReady;
                 // stream close: send end of input
                 SendDataAsync(RemotingEncoder.GeneratePowerShellInputEnd(
-                    clientRunspacePoolId, clientPowerShellId));
+                    _clientRunspacePoolId, _clientPowerShellId));
             }
         }
 
@@ -1608,6 +1601,9 @@ private void SetupTransportManager(bool inDisconnectMode)
 
         #region Private Members
 
+        private readonly Guid _clientRunspacePoolId;
+        private readonly Guid _clientPowerShellId;
+
         // object for synchronizing input to be sent
         // to server powershell
         private readonly object _inputSyncObject = new object();
@@ -1626,7 +1622,7 @@ private enum connectionStates
         #endregion Private Members
     }
 
-    internal class InformationalMessage
+    internal sealed class InformationalMessage
     {
         internal object Message { get; }