[Server] Make SubscriptionManagement Methods Async & Fix Publishing of GoodSubscriptionTransferred Message

Libraries/Opc.Ua.Server/NodeManager/MasterNodeManager.cs

@@ -414,9 +414,9 @@ await nodeManager.SessionClosingAsync(context, sessionId, deleteSubscriptions, c
         /// <summary>
         /// Shuts down the node managers.
         /// </summary>
-        public virtual async ValueTask ShutdownAsync()
+        public virtual async ValueTask ShutdownAsync(CancellationToken cancellationToken = default)
         {
-            await m_startupShutdownSemaphoreSlim.WaitAsync().ConfigureAwait(false);
+            await m_startupShutdownSemaphoreSlim.WaitAsync(cancellationToken).ConfigureAwait(false);
 
             try
             {
@@ -427,7 +427,7 @@ public virtual async ValueTask ShutdownAsync()
 
                 foreach (IAsyncNodeManager nodeManager in m_nodeManagers)
                 {
-                    await nodeManager.DeleteAddressSpaceAsync()
+                    await nodeManager.DeleteAddressSpaceAsync(cancellationToken)
                         .ConfigureAwait(false);
                 }
             }
@@ -2406,20 +2406,6 @@ await nodeManager.HistoryUpdateAsync(
             return (results, diagnosticInfos);
         }
 
-        /// <summary>
-        /// Calls a method defined on an object.
-        /// </summary>
-        public virtual void Call(
-            OperationContext context,
-            CallMethodRequestCollection methodsToCall,
-            out CallMethodResultCollection results,
-            out DiagnosticInfoCollection diagnosticInfos)
-        {
-            (results, diagnosticInfos) = CallAsync(
-                context,
-                methodsToCall).AsTask().GetAwaiter().GetResult();
-        }
-
         /// <summary>
         /// Calls a method defined on an object.
         /// </summary>
@@ -2537,18 +2523,6 @@ await nodeManager.CallAsync(
             return (results, diagnosticInfos);
         }
 
-        /// <summary>
-        /// Calls a method defined on an object.
-        /// </summary>
-        public virtual void ConditionRefresh(
-            OperationContext context,
-            IList<IEventMonitoredItem> monitoredItems)
-        {
-            ConditionRefreshAsync(
-                context,
-                monitoredItems).AsTask().GetAwaiter().GetResult();
-        }
-
         /// <summary>
         /// Handles condition refresh request.
         /// </summary>
@@ -2880,22 +2854,6 @@ await manager.SubscribeToAllEventsAsync(
             }
         }
 
-        /// <summary>
-        /// Restore a set of monitored items after a Server Restart.
-        /// </summary>
-        /// <exception cref="ArgumentNullException"><paramref name="itemsToRestore"/> is <c>null</c>.</exception>
-        /// <exception cref="InvalidOperationException"></exception>
-        public virtual void RestoreMonitoredItems(
-            IList<IStoredMonitoredItem> itemsToRestore,
-            IList<IMonitoredItem> monitoredItems,
-            IUserIdentity savedOwnerIdentity)
-        {
-            RestoreMonitoredItemsAsync(
-                itemsToRestore,
-                monitoredItems,
-                savedOwnerIdentity).AsTask().GetAwaiter().GetResult();
-        }
-
         /// <summary>
         /// Restore a set of monitored items after a Server Restart.
         /// </summary>
@@ -3448,23 +3406,6 @@ await nodeManager.SubscribeToAllEventsAsync(
             }
         }
 
-        /// <summary>
-        /// Changes the monitoring mode for a set of items.
-        /// </summary>
-        /// <exception cref="ArgumentNullException"><paramref name="context"/> is <c>null</c>.</exception>
-        public virtual void SetMonitoringMode(
-            OperationContext context,
-            MonitoringMode monitoringMode,
-            IList<IMonitoredItem> itemsToModify,
-            IList<ServiceResult> errors)
-        {
-            SetMonitoringModeAsync(
-                context,
-                monitoringMode,
-                itemsToModify,
-                errors).AsTask().GetAwaiter().GetResult();
-        }
-
         /// <summary>
         /// Changes the monitoring mode for a set of items.
         /// </summary>