upgrade nuget packages and light refactoring

Author: kdcllc

src/AuthApp/AuthApp.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.1" />
-		<PackageReference Include="NetCoreForce.Client" Version="2.2.0" />
+		<PackageReference Include="NetCoreForce.Client" Version="2.5.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<Content Include="appsettings*.json" CopyToOutputDirectory="PreserveNewest" />

src/CometD.NetCore.Salesforce/CometD.NetCore.Salesforce.csproj

@@ -3,7 +3,6 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<RootNamespace>CometD.NetCore2.Salesforce</RootNamespace>
-
 		<Description>Event Bus for Salesforce Platform events.</Description>
 		<PackageLicenseUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce/blob/master/LICENSE</PackageLicenseUrl>
 		<PackageProjectUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce</PackageProjectUrl>
@@ -13,7 +12,6 @@
 		<PackageTags>salesforce, cometd, bayeux</PackageTags>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -28,12 +26,12 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CometD.NetCore2" Version="1.0.2" />
+		<PackageReference Include="CometD.NetCore2" Version="1.0.3" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
-		<PackageReference Include="NetCoreForce.Client" Version="2.2.0" />
-		<PackageReference Include="Polly" Version="6.1.0" />
+		<PackageReference Include="NetCoreForce.Client" Version="2.5.0" />
+		<PackageReference Include="Polly" Version="6.1.2" />
 	</ItemGroup>
 
 </Project>

src/CometD.NetCore.Salesforce/SalesforceConfiguration.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace CometD.NetCore.Salesforce
+namespace CometD.NetCore.Salesforce
 {
     /// <summary>
     /// Represents the config settings in appsettings.json
@@ -19,7 +17,7 @@ public sealed class SalesforceConfiguration
 
         /// <summary>
         /// Url to login to Salesforce
-        ///  https://test.salesforce.com/services/oauth2/authorize or https://login.salesforce.com/services/oauth2/authorize 
+        ///  https://test.salesforce.com/services/oauth2/authorize or https://login.salesforce.com/services/oauth2/authorize
         /// </summary>
         public string LoginUrl { get; set; }
 
@@ -43,9 +41,11 @@ public sealed class SalesforceConfiguration
         /// </summary>
         public string CometDUri { get; set; }
 
+        /// <summary>
+        /// Topic or Event Uri
+        /// </summary>
         public string EventOrTopicUri { get; set; }
 
-
         /// <summary>
         /// Salesforce uri for oauth authentication.
         /// </summary>
@@ -61,6 +61,9 @@ public sealed class SalesforceConfiguration
         /// </summary>
         public string CustomEvent { get; set; }
 
+        /// <summary>
+        /// Salesforce ReplayId for specific message.
+        /// </summary>
         public int ReplayId { get; set; }
     }
 }

src/CometD.NetCore.Salesforce/StreamingClient.cs

@@ -26,7 +26,7 @@ public class StreamingClient : IStreamingClient
         private readonly ILogger<StreamingClient> _logger;
         private readonly IAuthenticationClientProxy _authenticationClient;
         private readonly SalesforceConfiguration _options;
-        
+
         // long polling duration
         private const int ReadTimeOut = 120 * 1000;
 
@@ -80,16 +80,18 @@ public void SubscribeTopic(string topicName, IMessageListener listener, long rep
         {
             #region ArgumentNullExeption
             if (null == topicName || (topicName = topicName.Trim()).Length == 0)
+            {
                 throw new ArgumentNullException(nameof(topicName));
+            }
+
             if (null == listener)
+            {
                 throw new ArgumentNullException(nameof(listener));
+            }
             #endregion
 
             var channel = _bayeuxClient.GetChannel(topicName,replayId);
-            if (null != channel)
-            {
-                channel.Subscribe(listener);
-            }
+            channel?.Subscribe(listener);
         }
 
         ///<inheritdoc/>
@@ -219,17 +221,15 @@ private void ErrorExtension_ConnectionException(object sender, Exception ex)
         /// <param name="message"></param>
         private void ErrorExtension_ConnectionError(object sender, string message)
         {
-
             // authentication failure
             if (message.ToLower() == "403::Handshake denied" ||
                 message.ToLower() == "403:denied_by_security_policy:create_denied" ||
                 message.ToLower() == "403::unknown client"
                 )
             {
-
                 _logger.LogError($"Handled CometD Exception: {message}");
                 _logger.LogDebug($"Re-authenticating BayeuxClient...");
-                // 1. Disconnect 
+                // 1. Disconnect
                 Disconnect();
                 _logger.LogDebug($"Disconnecting {nameof(BayeuxClient)}...");
                 // 2. try (x) times to re-authenticate
@@ -252,12 +252,19 @@ private void ErrorExtension_ConnectionError(object sender, string message)
         private bool _isDisposed = false;
         private ReplayExtension _replayIdExtension;
 
+        /// <summary>
+        /// Disposing of the resources
+        /// </summary>
         public void Dispose()
         {
             Dispose(true);
             GC.SuppressFinalize(this);
         }
 
+        /// <summary>
+        /// Disposing of the resources
+        /// </summary>
+        /// <param name="disposing"></param>
         protected virtual void Dispose(bool disposing)
         {
             if (disposing && !_isDisposed)
@@ -267,6 +274,9 @@ protected virtual void Dispose(bool disposing)
             }
         }
 
+        /// <summary>
+        /// Destructor
+        /// </summary>
         ~StreamingClient()
         {
             Dispose(false);

src/TestApp/TestApp.csproj

@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CometD.NetCore2" Version="1.0.2" />
+		<PackageReference Include="CometD.NetCore2" Version="1.0.3" />
 		<PackageReference Include="KDCLLC.BuildingBlocks.SalesforceEventBus" Version="1.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" />