Improve DI configuration

Author: wbtoms

Applications/ConsoleReferenceServer/IUAServer.cs

@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Opc.Ua;
+using Opc.Ua.Configuration;
+using Opc.Ua.Server;
+
+namespace Quickstarts
+{
+    public interface IUAServer<T> where T : IStandardServer
+    {
+        IApplicationInstance Application { get; }
+
+        ApplicationConfiguration Configuration { get; }
+
+        bool AutoAccept { get; set; }
+
+        string Password { get; set; }
+
+        ExitCode ExitCode { get; }
+
+        T Server { get; }
+
+        /// <summary>
+        /// Load the application configuration.
+        /// </summary>
+        Task LoadAsync(string applicationName, string configSectionName);
+
+        /// <summary>
+        /// Load the application configuration.
+        /// </summary>
+        Task CheckCertificateAsync(bool renewCertificate);
+
+        /// <summary>
+        /// Create server instance and add node managers.
+        /// </summary>
+        void Create(IList<INodeManagerFactory> nodeManagerFactories);
+
+        /// <summary>
+        /// Start the server.
+        /// </summary>
+        Task StartAsync();
+
+        /// <summary>
+        /// Stops the server.
+        /// </summary>
+        Task StopAsync();
+    }
+}

Applications/ConsoleReferenceServer/Program.cs

@@ -2,7 +2,7 @@
  * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
- * 
+ *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without
@@ -11,7 +11,7 @@
  * copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following
  * conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
@@ -87,7 +87,9 @@ public static async Task<int> Main(string[] args)
             IServiceCollection services = new ServiceCollection()
                 .AddConfigurationServices()
                 .AddServerServices()
-                .AddScoped<IReferenceServer, ReferenceServer>();
+                .AddScoped<IReferenceServer, ReferenceServer>()
+                .AddScoped(sp => new LogWriter())
+                .AddScoped<IUAServer<IReferenceServer>, UAServer<IReferenceServer>>();
 
             IServiceProvider serviceProvider = services.BuildServiceProvider();
 
@@ -98,17 +100,13 @@ public static async Task<int> Main(string[] args)
 
                 if (logConsole && appLog)
                 {
-                    output = new LogWriter();
+                    output = serviceProvider.GetRequiredService<LogWriter>();
                 }
 
                 // create the UA server
-                var server = new UAServer<IReferenceServer>(
-                    serviceProvider.GetRequiredService<IApplicationInstance>(),
-                    serviceProvider.GetRequiredService<IReferenceServer>(),
-                    output) {
-                    AutoAccept = autoAccept,
-                    Password = password
-                };
+                IUAServer<IReferenceServer> server = serviceProvider.GetRequiredService<IUAServer<IReferenceServer>>();
+                server.AutoAccept = autoAccept;
+                server.Password = password;
 
                 // load the server configuration, validate certificates
                 output.WriteLine("Loading configuration from {0}.", configSectionName);

Applications/ConsoleReferenceServer/UAServer.cs

@@ -36,11 +36,10 @@
 using Opc.Ua;
 using Opc.Ua.Configuration;
 using Opc.Ua.Server;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace Quickstarts
 {
-    public class UAServer<T> where T : IStandardServer
+    public class UAServer<T> : IUAServer<T> where T : IStandardServer
     {
         /// <summary>
         /// Constructor of the server.
@@ -51,7 +50,7 @@ public class UAServer<T> where T : IStandardServer
         public UAServer(
             IApplicationInstance applicationInstance,
             T server,
-            TextWriter writer)
+            LogWriter writer)
         {
             m_application = applicationInstance;
             m_server = server;