Made changes as per code review feedback

#1908
SignalR · Apr 29, 2013 · cd3b955 · cd3b955
1 parent e09aa3c
commit cd3b955
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 19 deletions.
diff --git a/samples/Microsoft.AspNet.SignalR.Client.Silverlight.Sample/MainPage.xaml.cs b/samples/Microsoft.AspNet.SignalR.Client.Silverlight.Sample/MainPage.xaml.cs
@@ -47,7 +47,7 @@ public MainPage()
             };
 
             var scheduler = TaskScheduler.FromCurrentSynchronizationContext();
-            connection.TraceWriter = new Writer(val =>
+            connection.TraceWriter = new ActionBasedWriter(val =>
             {
                 Dispatcher.BeginInvoke(() =>
                 {
@@ -72,10 +72,10 @@ public MainPage()
             scheduler);
         }
 
-        private class Writer : TextWriter
+        private class ActionBasedWriter : TextWriter
         {
             private readonly Action<string> _log;
-            public Writer(Action<string> log)
+            public ActionBasedWriter(Action<string> log)
             {
                 _log = log;
             }

diff --git a/src/Microsoft.AspNet.SignalR.Client/Infrastructure/ErrorExtensions.cs b/src/Microsoft.AspNet.SignalR.Client/Infrastructure/ErrorExtensions.cs
@@ -21,10 +21,10 @@ public static SignalRError GetError(this Exception ex)
         {
             ex = ex.Unwrap();
 
-            var customEx = ex as HttpClientException;
+            var httpClientException = ex as HttpClientException;
             SignalRError error;
 
-            if (customEx != null)
+            if (httpClientException != null)
             {
                 error = GetHttpClientException(ex);
             }

diff --git a/src/Microsoft.AspNet.SignalR.Client/Infrastructure/StreamExtensions.cs b/src/Microsoft.AspNet.SignalR.Client/Infrastructure/StreamExtensions.cs
@@ -30,7 +30,6 @@ public static Task WriteAsync(this Stream stream, byte[] buffer)
         }
 
 #if !(NETFX_CORE || NET45)
-        [SuppressMessage("Microsoft.Performance", "CA1811:No upstream protected or public callers", Justification = "Keeping the method for future use")]
         private static Func<IAsyncResult, object> WrapEndWrite(Stream stream)
         {
             return ar =>

diff --git a/src/Microsoft.AspNet.SignalR.Client/Microsoft.AspNet.SignalR.Client.csproj b/src/Microsoft.AspNet.SignalR.Client/Microsoft.AspNet.SignalR.Client.csproj
@@ -135,7 +135,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />

diff --git a/src/Microsoft.AspNet.SignalR.Client/Transports/AutoTransport.cs b/src/Microsoft.AspNet.SignalR.Client/Transports/AutoTransport.cs
@@ -22,13 +22,13 @@ public class AutoTransport : IClientTransport
         // List of transports in fallback order
         private readonly IList<IClientTransport> _transports;
 
-        private static Type type = Type.GetType("System.Net.Browser.WebRequestCreator,System.Windows, Version=5.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", false);
+        private static Type _typeWebRequestCreator = Type.GetType("System.Net.Browser.WebRequestCreator,System.Windows, Version=5.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", false);
 
         public AutoTransport(IHttpClient httpClient)
         {
             _httpClient = httpClient;
 
-            if (type == null)
+            if (_typeWebRequestCreator == null)
             {
                 _transports = new IClientTransport[] { 
 #if NET45
@@ -38,7 +38,6 @@ public AutoTransport(IHttpClient httpClient)
                 new LongPollingTransport(httpClient) 
                 };
             }
-
             else
             {
                 _transports = new IClientTransport[] {

diff --git a/src/Microsoft.AspNet.SignalR.Client/app.config b/src/Microsoft.AspNet.SignalR.Client/app.config
diff --git a/src/Microsoft.AspNet.SignalR.Client45/Http/DefaultHttpClient.cs b/src/Microsoft.AspNet.SignalR.Client45/Http/DefaultHttpClient.cs
@@ -24,13 +24,13 @@ public class DefaultHttpClient : IHttpClient
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "Handler cannot be disposed before response is disposed")]
         public Task<IResponse> Get(string url, Action<IRequest> prepareRequest)
         {
-            var disposerResponse = new Disposer();
+            var responseDisposer = new Disposer();
             var cts = new CancellationTokenSource();
 
             var handler = new DefaultHttpHandler(prepareRequest, () =>
             {
                 cts.Cancel();
-                disposerResponse.Dispose();
+                responseDisposer.Dispose();
             });
 
             var client = new HttpClient(handler);
@@ -40,7 +40,7 @@ public Task<IResponse> Get(string url, Action<IRequest> prepareRequest)
                  {
                      if (responseMessage.IsSuccessStatusCode)
                      {
-                         disposerResponse.Set(responseMessage);
+                         responseDisposer.Set(responseMessage);
                      }
                      else
                      {
@@ -61,13 +61,13 @@ public Task<IResponse> Get(string url, Action<IRequest> prepareRequest)
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "Handler cannot be disposed before response is disposed")]
         public Task<IResponse> Post(string url, Action<IRequest> prepareRequest, IDictionary<string, string> postData)
         {
-            var disposerResponse = new Disposer();
+            var responseDisposer = new Disposer();
             var cts = new CancellationTokenSource();
 
             var handler = new DefaultHttpHandler(prepareRequest, () =>
             {
                 cts.Cancel();
-                disposerResponse.Dispose();
+                responseDisposer.Dispose();
             });
 
             var client = new HttpClient(handler);
@@ -87,7 +87,7 @@ public Task<IResponse> Post(string url, Action<IRequest> prepareRequest, IDictio
                 {
                     if (responseMessage.IsSuccessStatusCode)
                     {
-                        disposerResponse.Set(responseMessage);
+                        responseDisposer.Set(responseMessage);
                     }
                     else
                     {

diff --git a/src/Microsoft.AspNet.SignalR.Client45/Http/HttpResponseMessageWrapper.cs b/src/Microsoft.AspNet.SignalR.Client45/Http/HttpResponseMessageWrapper.cs
@@ -28,8 +28,8 @@ protected virtual void Dispose(bool disposing)
         {
             if (disposing)
             {
-                _httpResponseMessage.Dispose();
                 _httpResponseMessage.RequestMessage.Dispose();
+                _httpResponseMessage.Dispose();
                 _client.Dispose();
             }
         }