cleanup IClientServicesConfig

Azure · May 8, 2020 · b6bbc48 · b6bbc48
1 parent 1384155
commit b6bbc48
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 165 deletions.
diff --git a/components/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Protocol/src/IClientServicesConfig.cs b/components/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Protocol/src/IClientServicesConfig.cs
diff --git a/...onents/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Protocol/src/Runtime/ClientServicesConfig.cs b/...onents/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Protocol/src/Runtime/ClientServicesConfig.cs
diff --git a/.../Runtime/Default/ClientServicesConfig2.cs → ...c/Runtime/Default/ClientServicesConfig.cs b/.../Runtime/Default/ClientServicesConfig2.cs → ...c/Runtime/Default/ClientServicesConfig.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Azure.IIoT.OpcUa.Protocol.Runtime {
     /// <summary>
     /// Default client configuration
     /// </summary>
-    public class ClientServicesConfig2 : ConfigBase, IClientServicesConfig2, ISecurityConfig, ITransportQuotaConfig {
+    public class ClientServicesConfig : ConfigBase, IClientServicesConfig, ISecurityConfig, ITransportQuotaConfig {
 
         /// <summary>
         /// Configuration
@@ -86,7 +86,7 @@ public class ClientServicesConfig2 : ConfigBase, IClientServicesConfig2, ISecuri
         public int SecurityTokenLifetime => _transport.SecurityTokenLifetime;
 
         /// <inheritdoc/>
-        public ClientServicesConfig2(IConfiguration configuration = null) : base(configuration) {
+        public ClientServicesConfig(IConfiguration configuration = null) : base(configuration) {
             _security = new SecurityConfig(configuration);
             _transport = new TransportQuotaConfig(configuration);
         }

diff --git a/...ents/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Protocol/src/Runtime/Extensions/OpcConfigEx.cs b/...ents/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Protocol/src/Runtime/Extensions/OpcConfigEx.cs
@@ -23,7 +23,7 @@ public static class OpcConfigEx {
         /// <param name="createSelfSignedCertIfNone"></param>
         /// <returns></returns>
         public static async Task<ApplicationConfiguration> ToApplicationConfigurationAsync(
-            this IClientServicesConfig2 opcConfig, bool createSelfSignedCertIfNone,
+            this IClientServicesConfig opcConfig, bool createSelfSignedCertIfNone,
             CertificateValidationEventHandler handler) {
             if (string.IsNullOrWhiteSpace(opcConfig.ApplicationName)) {
                 throw new ArgumentNullException(nameof(opcConfig.ApplicationName));

diff --git a/...col/src/Runtime/IClientServicesConfig2.cs → ...ocol/src/Runtime/IClientServicesConfig.cs b/...col/src/Runtime/IClientServicesConfig2.cs → ...ocol/src/Runtime/IClientServicesConfig.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Azure.IIoT.OpcUa.Protocol {
     /// <summary>
     /// Client services configuration
     /// </summary>
-    public interface IClientServicesConfig2 : ITransportQuotaConfig, ISecurityConfig {
+    public interface IClientServicesConfig : ITransportQuotaConfig, ISecurityConfig {
 
         /// <summary>
         /// Application name

diff --git a/components/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Protocol/src/Services/ClientServices.cs b/components/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Protocol/src/Services/ClientServices.cs
@@ -35,7 +35,7 @@ public class ClientServices : IClientHost, IEndpointServices, IEndpointDiscovery
         /// <param name="clientConfig"></param>
         /// <param name="logger"></param>
         /// <param name="maxOpTimeout"></param>
-        public ClientServices(ILogger logger, IClientServicesConfig2 clientConfig,
+        public ClientServices(ILogger logger, IClientServicesConfig clientConfig,
             TimeSpan? maxOpTimeout = null) {
 
             _logger = logger ??
@@ -520,7 +520,7 @@ public void Dispose() {
         private const int kMaxDiscoveryAttempts = 3;
         private readonly ILogger _logger;
         private readonly TimeSpan? _maxOpTimeout;
-        private readonly IClientServicesConfig2 _clientConfig;
+        private readonly IClientServicesConfig _clientConfig;
         private readonly ApplicationConfiguration _appConfig;
         private readonly Dictionary<ConnectionIdentifier, IClientSession> _clients =
             new Dictionary<ConnectionIdentifier, IClientSession>();

diff --git a/...ents/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Protocol/src/Services/DefaultSessionManager.cs b/...ents/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Protocol/src/Services/DefaultSessionManager.cs
@@ -32,7 +32,7 @@ public class DefaultSessionManager : ISessionManager {
         /// </summary>
         /// <param name="clientConfig"></param>
         /// <param name="logger"></param>
-        public DefaultSessionManager(IClientServicesConfig2 clientConfig, ILogger logger) {
+        public DefaultSessionManager(IClientServicesConfig clientConfig, ILogger logger) {
             _logger = logger;
             _clientConfig = clientConfig;
             _lock = new SemaphoreSlim(1, 1);
@@ -403,7 +403,7 @@ public static EndpointIdentifier GetEndpointId(SessionClient session) {
         }
 
         private readonly ILogger _logger;
-        private readonly IClientServicesConfig2 _clientConfig;
+        private readonly IClientServicesConfig _clientConfig;
         private readonly Dictionary<ConnectionIdentifier, SessionWrapper> _sessions =
             new Dictionary<ConnectionIdentifier, SessionWrapper>();
         private readonly SemaphoreSlim _lock;

diff --git a/...nts/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Testing/src/Runtime/TestClientServicesConfig.cs b/...nts/opc-ua/src/Microsoft.Azure.IIoT.OpcUa.Testing/src/Runtime/TestClientServicesConfig.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Azure.IIoT.OpcUa.Testing.Runtime {
     /// <summary>
     /// Client's application configuration implementation
     /// </summary>
-    public class TestClientServicesConfig : IClientServicesConfig2, IDisposable {
+    public class TestClientServicesConfig : IClientServicesConfig, IDisposable {
 
         /// <inheritdoc/>
         public string PkiRootPath { get;}
@@ -67,7 +67,7 @@ public TestClientServicesConfig(bool autoAccept = false) {
             AutoAcceptUntrustedCertificates = autoAccept;
             PkiRootPath = Path.Combine(Directory.GetCurrentDirectory(), "pki",
                 Guid.NewGuid().ToByteArray().ToBase16String());
-            _opc = new ClientServicesConfig2();
+            _opc = new ClientServicesConfig();
         }
 
         /// <inheritdoc/>
@@ -77,6 +77,6 @@ public void Dispose() {
             }
         }
 
-        private readonly ClientServicesConfig2 _opc;
+        private readonly ClientServicesConfig _opc;
     }
 }
diff --git a/modules/src/Microsoft.Azure.IIoT.Modules.Discovery/src/Runtime/Config.cs b/modules/src/Microsoft.Azure.IIoT.Modules.Discovery/src/Runtime/Config.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Azure.IIoT.Modules.Discovery.Runtime {
     /// <summary>
     /// Wraps a configuration root
     /// </summary>
-    public class Config : DiagnosticsConfig, IModuleConfig, IClientServicesConfig2{
+    public class Config : DiagnosticsConfig, IModuleConfig, IClientServicesConfig{
 
         /// <inheritdoc/>
         public string EdgeHubConnectionString => _module.EdgeHubConnectionString;
@@ -79,10 +79,10 @@ public class Config : DiagnosticsConfig, IModuleConfig, IClientServicesConfig2{
         public Config(IConfiguration configuration) :
             base(configuration) {
             _module = new ModuleConfig(configuration);
-            _opc = new ClientServicesConfig2(configuration);
+            _opc = new ClientServicesConfig(configuration);
         }
 
-        private readonly ClientServicesConfig2 _opc;
+        private readonly ClientServicesConfig _opc;
         private readonly ModuleConfig _module;
     }
 }
diff --git a/modules/src/Microsoft.Azure.IIoT.Modules.OpcUa.Publisher/src/Runtime/Config.cs b/modules/src/Microsoft.Azure.IIoT.Modules.OpcUa.Publisher/src/Runtime/Config.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Azure.IIoT.Modules.OpcUa.Publisher.Runtime {
     /// <summary>
     /// Wraps a configuration root
     /// </summary>
-    public class Config : DiagnosticsConfig, IModuleConfig, IClientServicesConfig2{
+    public class Config : DiagnosticsConfig, IModuleConfig, IClientServicesConfig{
 
         /// <inheritdoc/>
         public string EdgeHubConnectionString => _module.EdgeHubConnectionString;
@@ -78,11 +78,11 @@ public class Config : DiagnosticsConfig, IModuleConfig, IClientServicesConfig2{
         /// <param name="configuration"></param>
         public Config(IConfiguration configuration) :
             base(configuration) {
-            _opc = new ClientServicesConfig2(configuration);
+            _opc = new ClientServicesConfig(configuration);
             _module = new ModuleConfig(configuration);
         }
 
-        private readonly ClientServicesConfig2 _opc;
+        private readonly ClientServicesConfig _opc;
         private readonly ModuleConfig _module;
     }
 }
diff --git a/modules/src/Microsoft.Azure.IIoT.Modules.OpcUa.Publisher/src/Runtime/LegacyCliConfigKeys.cs b/modules/src/Microsoft.Azure.IIoT.Modules.OpcUa.Publisher/src/Runtime/LegacyCliConfigKeys.cs
@@ -115,17 +115,17 @@ public static class LegacyCliConfigKeys {
         /// <summary>
         /// Key for the OPC Session creation timeout in seconds.
         /// </summary>
-        public const string OpcSessionCreationTimeout = ClientServicesConfig2.DefaultSessionTimeoutKey;
+        public const string OpcSessionCreationTimeout = ClientServicesConfig.DefaultSessionTimeoutKey;
 
         /// <summary>
         /// Key for the OPC Keep Alive Interval in seconds.
         /// </summary>
-        public const string OpcKeepAliveIntervalInSec = ClientServicesConfig2.KeepAliveIntervalKey;
+        public const string OpcKeepAliveIntervalInSec = ClientServicesConfig.KeepAliveIntervalKey;
 
         /// <summary>
         /// Key for the disconnect thresholt for missed keep alive signals.
         /// </summary>
-        public const string OpcKeepAliveDisconnectThreshold = ClientServicesConfig2.MaxKeepAliveCountKey;
+        public const string OpcKeepAliveDisconnectThreshold = ClientServicesConfig.MaxKeepAliveCountKey;
 
         /// <summary>
         /// Key for the flag to trust own certificate.

diff --git a/modules/src/Microsoft.Azure.IIoT.Modules.OpcUa.Twin/src/Runtime/Config.cs b/modules/src/Microsoft.Azure.IIoT.Modules.OpcUa.Twin/src/Runtime/Config.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Azure.IIoT.Modules.OpcUa.Twin.Runtime {
     /// <summary>
     /// Wraps a configuration root
     /// </summary>
-    public class Config : DiagnosticsConfig, IModuleConfig, IClientServicesConfig2{
+    public class Config : DiagnosticsConfig, IModuleConfig, IClientServicesConfig{
 
         /// <inheritdoc/>
         public string EdgeHubConnectionString => _module.EdgeHubConnectionString;
@@ -79,10 +79,10 @@ public class Config : DiagnosticsConfig, IModuleConfig, IClientServicesConfig2{
         public Config(IConfiguration configuration) :
             base(configuration) {
             _module = new ModuleConfig(configuration);
-            _opc = new ClientServicesConfig2(configuration);
+            _opc = new ClientServicesConfig(configuration);
         }
 
-        private readonly ClientServicesConfig2 _opc;
+        private readonly ClientServicesConfig _opc;
         private readonly ModuleConfig _module;
     }
 }