Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 7e7d37f

Browse files
committed
Small naming corrections
1 parent 767d1c3 commit 7e7d37f

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

‎src/MongoDB.Driver/ClusterRegistry.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ private TcpStreamSettings ConfigureTcp(TcpStreamSettings settings, ClusterKey cl
175175
writeTimeout: clusterKey.SocketTimeout);
176176
}
177177

178-
private ProxyStreamSettings ConfigureSocks5Proxy(ProxyStreamSettings settings, ClusterKey clusterKey)
178+
private Socks5ProxyStreamSettings ConfigureSocks5Proxy(Socks5ProxyStreamSettings settings, ClusterKey clusterKey)
179179
{
180180
return settings.With(
181181
clusterKey.Socks5ProxySettings);

‎src/MongoDB.Driver/Core/Configuration/ClusterBuilder.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class ClusterBuilder
4343
private SslStreamSettings _sslStreamSettings;
4444
private Func<IStreamFactory, IStreamFactory> _streamFactoryWrapper;
4545
private TcpStreamSettings _tcpStreamSettings;
46-
private ProxyStreamSettings_proxyStreamSettings;
46+
private Socks5ProxyStreamSettings_socks5ProxyStreamSettings;
4747

4848
// constructors
4949
/// <summary>
@@ -166,11 +166,11 @@ public ClusterBuilder ConfigureTcp(Func<TcpStreamSettings, TcpStreamSettings> co
166166
/// </summary>
167167
/// <param name="configurator"> The SOCKS5 proxy settings configurator delegate.</param>
168168
/// <returns> A reconfigured cluster builder.</returns>
169-
public ClusterBuilder ConfigureSocks5Proxy(Func<ProxyStreamSettings,ProxyStreamSettings> configurator)
169+
public ClusterBuilder ConfigureSocks5Proxy(Func<Socks5ProxyStreamSettings,Socks5ProxyStreamSettings> configurator)
170170
{
171171
Ensure.IsNotNull(configurator, nameof(configurator));
172172

173-
_proxyStreamSettings = configurator(_proxyStreamSettings ?? new ProxyStreamSettings());
173+
_socks5ProxyStreamSettings = configurator(_socks5ProxyStreamSettings ?? new Socks5ProxyStreamSettings());
174174
return this;
175175
}
176176

@@ -303,9 +303,9 @@ private IStreamFactory CreateTcpStreamFactory(TcpStreamSettings tcpStreamSetting
303303
{
304304
var streamFactory = (IStreamFactory)new TcpStreamFactory(tcpStreamSettings);
305305

306-
if (_proxyStreamSettings != null)
306+
if (_socks5ProxyStreamSettings != null)
307307
{
308-
streamFactory = new ProxyStreamFactory(_proxyStreamSettings, streamFactory);
308+
streamFactory = new Socks5ProxyStreamFactory(_socks5ProxyStreamSettings, streamFactory);
309309
}
310310

311311
if (_sslStreamSettings != null)

‎src/MongoDB.Driver/Core/Configuration/ProxyStreamSettings.cs renamed to ‎src/MongoDB.Driver/Core/Configuration/Socks5ProxyStreamSettings.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,21 @@
1414
*/
1515

1616
using MongoDB.Driver.Core.Connections;
17-
using MongoDB.Driver.Core.Misc;
1817

1918
namespace MongoDB.Driver.Core.Configuration;
2019

21-
//TODO Add docs
2220
/// <summary>
23-
///
21+
/// Represents settings for a SOCKS5 proxy stream.
2422
/// </summary>
25-
public class ProxyStreamSettings
23+
public class Socks5ProxyStreamSettings
2624
{
2725
private Socks5ProxySettings _socks5ProxySettings;
2826

2927
/// <summary>
30-
/// Initializes a new instance of the <see cref="ProxyStreamSettings"/> class.
28+
/// Initializes a new instance of the <see cref="Socks5ProxyStreamSettings"/> class.
3129
/// </summary>
3230
/// <param name="socks5ProxySettings"> The settings for the SOCKS5 proxy.</param>
33-
public ProxyStreamSettings(Optional<Socks5ProxySettings> socks5ProxySettings = default)
31+
public Socks5ProxyStreamSettings(Optional<Socks5ProxySettings> socks5ProxySettings = default)
3432
{
3533
_socks5ProxySettings = socks5ProxySettings.WithDefault(null);
3634
}
@@ -41,12 +39,12 @@ public ProxyStreamSettings(Optional<Socks5ProxySettings> socks5ProxySettings = d
4139
public Socks5ProxySettings Socks5ProxySettings => _socks5ProxySettings;
4240

4341
/// <summary>
44-
/// Creates a new instance of <see cref="ProxyStreamSettings"/> with the specified SOCKS5 proxy settings.
42+
/// Creates a new instance of <see cref="Socks5ProxyStreamSettings"/> with the specified SOCKS5 proxy settings.
4543
/// </summary>
4644
/// <param name="socks5ProxySettings"></param>
4745
/// <returns></returns>
48-
public ProxyStreamSettings With(Socks5ProxySettings socks5ProxySettings)
46+
public Socks5ProxyStreamSettings With(Socks5ProxySettings socks5ProxySettings)
4947
{
50-
return new ProxyStreamSettings(socks5ProxySettings);
48+
return new Socks5ProxyStreamSettings(socks5ProxySettings);
5149
}
5250
}

‎src/MongoDB.Driver/Core/Connections/ProxyStreamFactory.cs renamed to ‎src/MongoDB.Driver/Core/Connections/Socks5ProxyStreamFactory.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222

2323
namespace MongoDB.Driver.Core.Connections;
2424

25-
internal class ProxyStreamFactory: IStreamFactory
25+
internal class Socks5ProxyStreamFactory: IStreamFactory
2626
{
27-
private readonly ProxyStreamSettings _settings;
27+
private readonly Socks5ProxyStreamSettings _settings;
2828
private readonly IStreamFactory _wrapped;
2929

30-
public ProxyStreamFactory(ProxyStreamSettings settings, IStreamFactory wrapped)
30+
public Socks5ProxyStreamFactory(Socks5ProxyStreamSettings settings, IStreamFactory wrapped)
3131
{
3232
_settings = Ensure.IsNotNull(settings, nameof(settings));
3333
_wrapped = Ensure.IsNotNull(wrapped, nameof(wrapped));

‎tests/MongoDB.Driver.Tests/Core/Connections/Socks5ProxySettingsTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void ToString_should_return_expected_string_for_no_auth()
107107
public void ToString_should_return_expected_string_for_username_password_auth()
108108
{
109109
var s = new Socks5ProxySettings("host", 1234, Socks5AuthenticationSettings.UsernamePassword("u", "p"));
110-
var expected = "{ Host : host, Port : 1234, Authentication : UsernamePassword (Username: u, Password: p) }";
110+
var expected = "{ Host : host, Port : 1234, Authentication : UsernamePassword }";
111111
s.ToString().Should().Be(expected);
112112
}
113113

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /