Adjustments after rebase

Author: wbtoms

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

@@ -230,7 +230,8 @@ void CreateMonitoredItems(
             IList<MonitoredItemCreateRequest> itemsToCreate,
             IList<ServiceResult> errors,
             IList<MonitoringFilterResult> filterResults,
-            IList<IMonitoredItem> monitoredItems);
+            IList<IMonitoredItem> monitoredItems,
+            bool createDurable);
 
         /// <summary>
         /// Modifies a set of monitored items.

Libraries/Opc.Ua.Server/Server/IServerInternal.cs

@@ -133,11 +133,6 @@ public interface IServerInternal : IAuditEventServer, IDisposable
         /// </summary>
         ISubscriptionManager SubscriptionManager { get; }
 
-        /// <summary>
-        /// The factory for (durable) monitored item queues
-        /// </summary>
-        IMonitoredItemQueueFactory MonitoredItemQueueFactory { get; }
-
         /// <summary>
         /// Whether the server is currently running.
         /// </summary>
@@ -204,6 +199,11 @@ public interface IServerInternal : IAuditEventServer, IDisposable
         /// <value>The aggregate manager.</value>
         AggregateManager AggregateManager { get; set; }
 
+        /// <summary>
+        /// The factory for durable monitored item queues
+        /// </summary>
+        IMonitoredItemQueueFactory MonitoredItemQueueFactory { get; }
+
         /// <summary>
         /// Initializes the server internal data object to be ready for usage.
         /// </summary>
@@ -296,5 +296,12 @@ public interface IServerInternal : IAuditEventServer, IDisposable
         /// </summary>
         /// <param name="action">Action to perform on the server status object.</param>
         void UpdateServerStatus(Action<ServerStatusValue> action);
+
+        /// <summary>
+        /// Stores the MonitoredItemQueueFactory in the datastore.
+        /// </summary>
+        /// <param name="monitoredItemQueueFactory">The MonitoredItemQueueFactory.</param>
+        void SetMonitoredItemQueueFactory(
+            IMonitoredItemQueueFactory monitoredItemQueueFactory);
     }
 }

Tests/Opc.Ua.Client.Tests/DurableSubscriptionTest.cs

@@ -40,7 +40,11 @@
 using System.Threading.Tasks;
 using BenchmarkDotNet.Configs;
 using CommandLine;
+using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
+using Opc.Ua.Configuration;
+using Opc.Ua.Configuration.Extensions.DependencyInjection;
+using Opc.Ua.Server.Extensions.DependencyInjection;
 using Opc.Ua.Server.Tests;
 using Quickstarts.ReferenceServer;
 using Assert = NUnit.Framework.Legacy.ClassicAssert;
@@ -80,8 +84,20 @@ override public async Task CreateReferenceServerFixture(
             TextWriter writer)
         {
             {
+
+                IServiceCollection services = new ServiceCollection()
+                    .AddConfigurationServices()
+                    .AddServerServices()
+                    .AddScoped<IReferenceServer, ReferenceServer>();
+
+                IServiceProvider serviceProvider = services.BuildServiceProvider();
+
                 // start Ref server
-                ServerFixture = new ServerFixture<ReferenceServer>(enableTracing, disableActivityLogging) {
+                ServerFixture = new ServerFixture<IReferenceServer>(
+                    serviceProvider.GetRequiredService<IReferenceServer>(),
+                    serviceProvider.GetRequiredService<IApplicationInstance>(),
+                    enableTracing,
+                    disableActivityLogging) {
                     UriScheme = UriScheme,
                     SecurityNone = securityNone,
                     AutoAccept = true,