Skip to content

Commit ba0131a

Browse files
mikaelm12mikaelm12
authored
Rename TransportTypes to HttpTransportTypes (#1839)
1 parent 5e38303 commit ba0131a

File tree

24 files changed

+223
-231
lines changed

24 files changed

+223
-231
lines changed

‎clients/ts/FunctionalTests/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
9191
app.UseSignalR(routes =>
9292
{
9393
routes.MapHub<TestHub>("/testhub");
94-
routes.MapHub<TestHub>("/testhub-nowebsockets", options => options.Transports = TransportType.ServerSentEvents | TransportType.LongPolling);
94+
routes.MapHub<TestHub>("/testhub-nowebsockets", options => options.Transports = HttpTransportType.ServerSentEvents | HttpTransportType.LongPolling);
9595
routes.MapHub<UncreatableHub>("/uncreatable");
9696
routes.MapHub<HubWithAuthorization>("/authorizedhub");
9797
});

‎samples/JwtClientSample/Program.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ static async Task Main(string[] args)
1616
{
1717
var app = new Program();
1818
await Task.WhenAll(
19-
app.RunConnection(TransportType.WebSockets),
20-
app.RunConnection(TransportType.ServerSentEvents),
21-
app.RunConnection(TransportType.LongPolling));
19+
app.RunConnection(HttpTransportType.WebSockets),
20+
app.RunConnection(HttpTransportType.ServerSentEvents),
21+
app.RunConnection(HttpTransportType.LongPolling));
2222
}
2323

2424
private const string ServerUrl = "http://localhost:54543";
2525

2626
private readonly ConcurrentDictionary<string, string> _tokens = new ConcurrentDictionary<string, string>();
2727
private readonly Random _random = new Random();
2828

29-
private async Task RunConnection(TransportType transportType)
29+
private async Task RunConnection(HttpTransportType transportType)
3030
{
3131
var userId = "C#" + transportType.ToString();
3232
_tokens[userId] = await GetJwtToken(userId);
@@ -56,7 +56,7 @@ private async Task RunConnection(TransportType transportType)
5656
if (ticks % 15 == 0)
5757
{
5858
// no need to refresh the token for websockets
59-
if (transportType != TransportType.WebSockets)
59+
if (transportType != HttpTransportType.WebSockets)
6060
{
6161
_tokens[userId] = await GetJwtToken(userId);
6262
Console.WriteLine($"[{userId}] Token refreshed");

‎src/Microsoft.AspNetCore.Http.Connections.Client/DefaultTransportFactory.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ public class DefaultTransportFactory : ITransportFactory
1414
{
1515
private readonly HttpClient _httpClient;
1616
private readonly HttpOptions _httpOptions;
17-
private readonly TransportType _requestedTransportType;
17+
private readonly HttpTransportType _requestedTransportType;
1818
private readonly ILoggerFactory _loggerFactory;
1919
private static volatile bool _websocketsSupported = true;
2020

21-
public DefaultTransportFactory(TransportType requestedTransportType, ILoggerFactory loggerFactory, HttpClient httpClient, HttpOptions httpOptions)
21+
public DefaultTransportFactory(HttpTransportType requestedTransportType, ILoggerFactory loggerFactory, HttpClient httpClient, HttpOptions httpOptions)
2222
{
23-
if (requestedTransportType <= 0 || requestedTransportType > TransportType.All)
23+
if (requestedTransportType <= 0 || requestedTransportType > HttpTransportType.All)
2424
{
2525
throw new ArgumentOutOfRangeException(nameof(requestedTransportType));
2626
}
2727

28-
if (httpClient == null && requestedTransportType != TransportType.WebSockets)
28+
if (httpClient == null && requestedTransportType != HttpTransportType.WebSockets)
2929
{
3030
throw new ArgumentNullException(nameof(httpClient));
3131
}
@@ -36,9 +36,9 @@ public DefaultTransportFactory(TransportType requestedTransportType, ILoggerFact
3636
_httpOptions = httpOptions;
3737
}
3838

39-
public ITransport CreateTransport(TransportType availableServerTransports)
39+
public ITransport CreateTransport(HttpTransportType availableServerTransports)
4040
{
41-
if (_websocketsSupported && (availableServerTransports & TransportType.WebSockets & _requestedTransportType) == TransportType.WebSockets)
41+
if (_websocketsSupported && (availableServerTransports & HttpTransportType.WebSockets & _requestedTransportType) == HttpTransportType.WebSockets)
4242
{
4343
try
4444
{
@@ -50,12 +50,12 @@ public ITransport CreateTransport(TransportType availableServerTransports)
5050
}
5151
}
5252

53-
if ((availableServerTransports & TransportType.ServerSentEvents & _requestedTransportType) == TransportType.ServerSentEvents)
53+
if ((availableServerTransports & HttpTransportType.ServerSentEvents & _requestedTransportType) == HttpTransportType.ServerSentEvents)
5454
{
5555
return new ServerSentEventsTransport(_httpClient, _loggerFactory);
5656
}
5757

58-
if ((availableServerTransports & TransportType.LongPolling & _requestedTransportType) == TransportType.LongPolling)
58+
if ((availableServerTransports & HttpTransportType.LongPolling & _requestedTransportType) == HttpTransportType.LongPolling)
5959
{
6060
return new LongPollingTransport(_httpClient, _loggerFactory);
6161
}

‎src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.Log.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static void Disposed(ILogger logger)
9595
_disposed(logger, null);
9696
}
9797

98-
public static void StartingTransport(ILogger logger, TransportType transportType, Uri url)
98+
public static void StartingTransport(ILogger logger, HttpTransportType transportType, Uri url)
9999
{
100100
if (logger.IsEnabled(LogLevel.Debug))
101101
{
@@ -131,23 +131,23 @@ public static void TransportNotSupported(ILogger logger, string transport)
131131
_transportNotSupported(logger, transport, null);
132132
}
133133

134-
public static void TransportDoesNotSupportTransferFormat(ILogger logger, TransportType transport, TransferFormat transferFormat)
134+
public static void TransportDoesNotSupportTransferFormat(ILogger logger, HttpTransportType transport, TransferFormat transferFormat)
135135
{
136136
if (logger.IsEnabled(LogLevel.Debug))
137137
{
138138
_transportDoesNotSupportTransferFormat(logger, transport.ToString(), transferFormat.ToString(), null);
139139
}
140140
}
141141

142-
public static void TransportDisabledByClient(ILogger logger, TransportType transport)
142+
public static void TransportDisabledByClient(ILogger logger, HttpTransportType transport)
143143
{
144144
if (logger.IsEnabled(LogLevel.Debug))
145145
{
146146
_transportDisabledByClient(logger, transport.ToString(), null);
147147
}
148148
}
149149

150-
public static void TransportFailed(ILogger logger, TransportType transport, Exception ex)
150+
public static void TransportFailed(ILogger logger, HttpTransportType transport, Exception ex)
151151
{
152152
if (logger.IsEnabled(LogLevel.Debug))
153153
{

‎src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public partial class HttpConnection : IConnection
3737
private ITransport _transport;
3838
private readonly ITransportFactory _transportFactory;
3939
private string _connectionId;
40-
private readonly TransportType _requestedTransportType = TransportType.All;
40+
private readonly HttpTransportType _requestedTransportType = HttpTransportType.All;
4141
private readonly ConnectionLogScope _logScope;
4242
private readonly IDisposable _scopeDisposable;
4343
private readonly ILoggerFactory _loggerFactory;
@@ -60,25 +60,25 @@ public IDuplexPipe Transport
6060
public IFeatureCollection Features { get; } = new FeatureCollection();
6161

6262
public HttpConnection(Uri url)
63-
: this(url, TransportType.All)
63+
: this(url, HttpTransportType.All)
6464
{ }
6565

66-
public HttpConnection(Uri url, TransportType transportType)
66+
public HttpConnection(Uri url, HttpTransportType transportType)
6767
: this(url, transportType, loggerFactory: null)
6868
{
6969
}
7070

7171
public HttpConnection(Uri url, ILoggerFactory loggerFactory)
72-
: this(url, TransportType.All, loggerFactory, httpOptions: null)
72+
: this(url, HttpTransportType.All, loggerFactory, httpOptions: null)
7373
{
7474
}
7575

76-
public HttpConnection(Uri url, TransportType transportType, ILoggerFactory loggerFactory)
76+
public HttpConnection(Uri url, HttpTransportType transportType, ILoggerFactory loggerFactory)
7777
: this(url, transportType, loggerFactory, httpOptions: null)
7878
{
7979
}
8080

81-
public HttpConnection(Uri url, TransportType transportType, ILoggerFactory loggerFactory, HttpOptions httpOptions)
81+
public HttpConnection(Uri url, HttpTransportType transportType, ILoggerFactory loggerFactory, HttpOptions httpOptions)
8282
{
8383
Url = url ?? throw new ArgumentNullException(nameof(url));
8484
_loggerFactory = loggerFactory ?? NullLoggerFactory.Instance;
@@ -87,7 +87,7 @@ public HttpConnection(Uri url, TransportType transportType, ILoggerFactory logge
8787
_httpOptions = httpOptions;
8888

8989
_requestedTransportType = transportType;
90-
if (_requestedTransportType != TransportType.WebSockets)
90+
if (_requestedTransportType != HttpTransportType.WebSockets)
9191
{
9292
_httpClient = CreateHttpClient();
9393
}
@@ -205,7 +205,7 @@ private async Task DisposeAsyncCore(Exception exception = null)
205205

206206
private async Task SelectAndStartTransport(TransferFormat transferFormat)
207207
{
208-
if (_requestedTransportType == TransportType.WebSockets)
208+
if (_requestedTransportType == HttpTransportType.WebSockets)
209209
{
210210
Log.StartingTransport(_logger, _requestedTransportType, Url);
211211
await StartTransport(Url, _requestedTransportType, transferFormat);
@@ -224,13 +224,13 @@ private async Task SelectAndStartTransport(TransferFormat transferFormat)
224224

225225
foreach (var transport in negotiationResponse.AvailableTransports)
226226
{
227-
if (!Enum.TryParse<TransportType>(transport.Transport, out var transportType))
227+
if (!Enum.TryParse<HttpTransportType>(transport.Transport, out var transportType))
228228
{
229229
Log.TransportNotSupported(_logger, transport.Transport);
230230
continue;
231231
}
232232

233-
if (transportType == TransportType.WebSockets && !IsWebSocketsSupported())
233+
if (transportType == HttpTransportType.WebSockets && !IsWebSocketsSupported())
234234
{
235235
Log.WebSocketsNotSupportedByOperatingSystem(_logger);
236236
continue;
@@ -328,7 +328,7 @@ private static Uri CreateConnectUrl(Uri url, string connectionId)
328328
return Utils.AppendQueryString(url, "id=" + connectionId);
329329
}
330330

331-
private async Task StartTransport(Uri connectUrl, TransportType transportType, TransferFormat transferFormat)
331+
private async Task StartTransport(Uri connectUrl, HttpTransportType transportType, TransferFormat transferFormat)
332332
{
333333
// Create the pipe pair (Application's writer is connected to Transport's reader, and vice versa)
334334
var options = new PipeOptions(writerScheduler: PipeScheduler.ThreadPool, readerScheduler: PipeScheduler.ThreadPool, useSynchronizationContext: false, pauseWriterThreshold: 0, resumeWriterThreshold: 0);

‎src/Microsoft.AspNetCore.Http.Connections.Client/ITransportFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
55
{
66
public interface ITransportFactory
77
{
8-
ITransport CreateTransport(TransportType availableServerTransports);
8+
ITransport CreateTransport(HttpTransportType availableServerTransports);
99
}
1010
}

‎src/Microsoft.AspNetCore.Http.Connections.Common/TransportType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Microsoft.AspNetCore.Http.Connections
77
{
88
[Flags]
9-
public enum TransportType
9+
public enum HttpTransportType
1010
{
1111
WebSockets = 1,
1212
ServerSentEvents = 2,

‎src/Microsoft.AspNetCore.Http.Connections/HttpConnectionDispatcher.Log.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ private static class Log
2828
private static readonly Action<ILogger, long, Exception> _receivedBytes =
2929
LoggerMessage.Define<long>(LogLevel.Trace, new EventId(6, "ReceivedBytes"), "Received {Count} bytes.");
3030

31-
private static readonly Action<ILogger, TransportType, Exception> _transportNotSupported =
32-
LoggerMessage.Define<TransportType>(LogLevel.Debug, new EventId(7, "TransportNotSupported"), "{TransportType} transport not supported by this connection handler.");
31+
private static readonly Action<ILogger, HttpTransportType, Exception> _transportNotSupported =
32+
LoggerMessage.Define<HttpTransportType>(LogLevel.Debug, new EventId(7, "TransportNotSupported"), "{TransportType} transport not supported by this connection handler.");
3333

34-
private static readonly Action<ILogger, TransportType, TransportType, Exception> _cannotChangeTransport =
35-
LoggerMessage.Define<TransportType, TransportType>(LogLevel.Error, new EventId(8, "CannotChangeTransport"), "Cannot change transports mid-connection; currently using {TransportType}, requesting {RequestedTransport}.");
34+
private static readonly Action<ILogger, HttpTransportType, HttpTransportType, Exception> _cannotChangeTransport =
35+
LoggerMessage.Define<HttpTransportType, HttpTransportType>(LogLevel.Error, new EventId(8, "CannotChangeTransport"), "Cannot change transports mid-connection; currently using {TransportType}, requesting {RequestedTransport}.");
3636

3737
private static readonly Action<ILogger, Exception> _postNotallowedForWebsockets =
3838
LoggerMessage.Define(LogLevel.Debug, new EventId(9, "PostNotAllowedForWebSockets"), "POST requests are not allowed for websocket connections.");
@@ -70,12 +70,12 @@ public static void ReceivedBytes(ILogger logger, long count)
7070
_receivedBytes(logger, count, null);
7171
}
7272

73-
public static void TransportNotSupported(ILogger logger, TransportType transport)
73+
public static void TransportNotSupported(ILogger logger, HttpTransportType transport)
7474
{
7575
_transportNotSupported(logger, transport, null);
7676
}
7777

78-
public static void CannotChangeTransport(ILogger logger, TransportType transport, TransportType requestTransport)
78+
public static void CannotChangeTransport(ILogger logger, HttpTransportType transport, HttpTransportType requestTransport)
7979
{
8080
_cannotChangeTransport(logger, transport, requestTransport, null);
8181
}

0 commit comments

Comments
 (0)