Skip to content

Commit 10a84e4

Browse files
committed
resolves issue #6
1 parent 64ec068 commit 10a84e4

5 files changed

Lines changed: 12 additions & 7 deletions

File tree

src/AuthApp/AuthApp.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
14-
<PackageReference Include="Bet.Extensions.Options" />
15-
<PackageReference Include="Bet.Extensions.Hosting" />
1613
<PackageReference Include="Bet.Extensions.AzureVault" />
14+
<PackageReference Include="Bet.Extensions.Hosting" />
1715
<PackageReference Include="Bet.Extensions.Logging" />
18-
16+
<PackageReference Include="Bet.Extensions.Options" />
1917
<PackageReference Include="Colorful.Console" />
2018
<PackageReference Include="McMaster.Extensions.CommandLineUtils" />
2119
<PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" />

src/CometD.NetCore.Salesforce/ForceClient/AuthenticationClientProxy.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ namespace CometD.NetCore.Salesforce.ForceClient
1010
/// the functionality of <see cref="NetCoreForce.Client.ForceClient"/>
1111
/// library <see cref="NetCoreForce.Client.AuthenticationClient"/> class
1212
/// </summary>
13+
[Obsolete("Use " + nameof(ResilientStreamingClient) + "class instead.")]
14+
1315
public class AuthenticationClientProxy : IAuthenticationClientProxy
1416
{
1517
private readonly SalesforceConfiguration _options;

src/CometD.NetCore.Salesforce/ForceClient/IAuthenticationClientProxy.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
using System.Threading.Tasks;
1+
using System;
2+
using System.Threading.Tasks;
3+
using CometD.NetCore.Salesforce.Resilience;
24
using NetCoreForce.Client;
35

46
namespace CometD.NetCore.Salesforce.ForceClient
57
{
68
/// <summary>
79
/// A wrapper interface around <see cref="NetCoreForce.Client.AuthenticationClient"/>
810
/// </summary>
11+
[Obsolete("Use " + nameof(IResilientForceClient) + "extension method instead.")]
912
public interface IAuthenticationClientProxy
1013
{
1114
/// <summary>

src/CometD.NetCore.Salesforce/ResilientStreamingClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ private void ErrorExtension_ConnectionError(
235235
}
236236
else
237237
{
238-
_logger.LogError("{name} failed with the following message: {message}", nameof(StreamingClient), e);
238+
_logger.LogError("{name} failed with the following message: {message}", nameof(ResilientStreamingClient), e);
239239
}
240240
}
241241

src/CometD.NetCore.Salesforce/StreamingClient.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ namespace CometD.NetCore.Salesforce
1515
/// <summary>
1616
/// CometD implementation of <see cref="IStreamingClient"/>.
1717
/// </summary>
18+
[Obsolete("Use " + nameof(ResilientStreamingClient) + "class instead.")]
19+
1820
public class StreamingClient : IStreamingClient
1921
{
2022
private AccessTokenResponse _tokenInfo;
@@ -172,7 +174,7 @@ private void InitBayeuxClient()
172174
_tokenInfo = _authenticationClient.AuthenticationClient.AccessInfo;
173175

174176
// Salesforce socket timeout during connection(CometD session) = 110 seconds
175-
IDictionary<string, object> options = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
177+
var options = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
176178
{
177179
{ClientTransport.TIMEOUT_OPTION, _options.ReadTimeOut ?? ReadTimeOut },
178180
{ClientTransport.MAX_NETWORK_DELAY_OPTION, _options.ReadTimeOut ?? ReadTimeOut }

0 commit comments

Comments
 (0)