From 0e690d636fb74bc7adf8745194c2f7c4012aeb90 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Wed, 2 Nov 2016 22:17:03 -0700 Subject: [PATCH] Remove casts where possible --- .../RedisHubLifetimeManager.cs | 2 +- .../DefaultHubLifetimeManager.cs | 6 +++--- src/Microsoft.AspNetCore.SignalR/RpcEndpoint.cs | 2 +- .../HttpConnectionDispatcher.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.AspNetCore.SignalR.Redis/RedisHubLifetimeManager.cs b/src/Microsoft.AspNetCore.SignalR.Redis/RedisHubLifetimeManager.cs index 3f3059c5fa..18a1bc245e 100644 --- a/src/Microsoft.AspNetCore.SignalR.Redis/RedisHubLifetimeManager.cs +++ b/src/Microsoft.AspNetCore.SignalR.Redis/RedisHubLifetimeManager.cs @@ -127,7 +127,7 @@ namespace Microsoft.AspNetCore.SignalR.Redis private Task SubscribeAsync(string channel, Connection connection) { - var redisConnection = connection.Metadata.GetOrAdd("redis", k => + var redisConnection = connection.Metadata.GetOrAdd("redis", _ => { var logger = _loggerFactory.CreateLogger("REDIS_" + connection.ConnectionId); // TODO: Async diff --git a/src/Microsoft.AspNetCore.SignalR/DefaultHubLifetimeManager.cs b/src/Microsoft.AspNetCore.SignalR/DefaultHubLifetimeManager.cs index 2aca17d8c7..f90b818059 100644 --- a/src/Microsoft.AspNetCore.SignalR/DefaultHubLifetimeManager.cs +++ b/src/Microsoft.AspNetCore.SignalR/DefaultHubLifetimeManager.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.SignalR public override Task AddGroupAsync(Connection connection, string groupName) { - var groups = connection.Metadata.GetOrAdd("groups", k => new HashSet()); + var groups = connection.Metadata.GetOrAdd("groups", _ => new HashSet()); lock (groups) { @@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.SignalR continue; } - var invocationAdapter = _registry.GetInvocationAdapter((string)connection.Metadata["formatType"]); + var invocationAdapter = _registry.GetInvocationAdapter(connection.Metadata.Get("formatType")); tasks.Add(invocationAdapter.WriteInvocationDescriptorAsync(message, connection.Channel.GetStream())); } @@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.SignalR { var connection = _connections[connectionId]; - var invocationAdapter = _registry.GetInvocationAdapter((string)connection.Metadata["formatType"]); + var invocationAdapter = _registry.GetInvocationAdapter(connection.Metadata.Get("formatType")); var message = new InvocationDescriptor { diff --git a/src/Microsoft.AspNetCore.SignalR/RpcEndpoint.cs b/src/Microsoft.AspNetCore.SignalR/RpcEndpoint.cs index c4ae7a8eca..a35b1b87e5 100644 --- a/src/Microsoft.AspNetCore.SignalR/RpcEndpoint.cs +++ b/src/Microsoft.AspNetCore.SignalR/RpcEndpoint.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.SignalR await Task.Yield(); var stream = connection.Channel.GetStream(); - var invocationAdapter = _registry.GetInvocationAdapter((string)connection.Metadata["formatType"]); + var invocationAdapter = _registry.GetInvocationAdapter(connection.Metadata.Get("formatType")); while (true) { diff --git a/src/Microsoft.AspNetCore.Sockets/HttpConnectionDispatcher.cs b/src/Microsoft.AspNetCore.Sockets/HttpConnectionDispatcher.cs index 9086b61d70..e97507840d 100644 --- a/src/Microsoft.AspNetCore.Sockets/HttpConnectionDispatcher.cs +++ b/src/Microsoft.AspNetCore.Sockets/HttpConnectionDispatcher.cs @@ -116,7 +116,7 @@ namespace Microsoft.AspNetCore.Sockets else { // Get the endpoint task from connection state - endpointTask = (Task)state.Connection.Metadata["endpoint"]; + endpointTask = state.Connection.Metadata.Get("endpoint"); } var resultTask = await Task.WhenAny(endpointTask, transportTask);