From 3ef7d01bb6116dc1da23b92e58f737b57a9f28bf Mon Sep 17 00:00:00 2001
From: Vladislav Karamfilov <vladislav.karamfilov@gmail.com>
Date: Tue, 18 Oct 2016 06:45:47 +0300
Subject: [PATCH] Small code cleanup (#5388)

* Removed unused private GetUrlHelper method in LocalRedirectResult class.

* Minor code formatting improvements.

* Fixed white space and casing of 'URL' in comment in RedirectResultExecutor.
---
 .../ModelBinding/BindingSource.cs                   |  2 +-
 .../MvcCoreMvcBuilderExtensions.cs                  |  2 +-
 .../Internal/RedirectResultExecutor.cs              |  2 +-
 .../LocalRedirectResult.cs                          | 13 -------------
 src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs   |  4 ++--
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs b/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs
index ce93735339..dc08b98db8 100644
--- a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs
@@ -203,7 +203,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
         {
             if (object.ReferenceEquals(s1, null))
             {
-                return object.ReferenceEquals(s2, null); ;
+                return object.ReferenceEquals(s2, null);
             }
 
             return s1.Equals(s2);
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
index 9603a89083..bba1278a96 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
@@ -120,7 +120,7 @@ namespace Microsoft.Extensions.DependencyInjection
             builder.PartManager.PopulateFeature(feature);
 
             foreach (var controller in feature.Controllers.Select(c => c.AsType()))
-        {
+            {
                 builder.Services.TryAddTransient(controller, controller);
             }
 
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/RedirectResultExecutor.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/RedirectResultExecutor.cs
index 6862e0e9f2..8251f191da 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/RedirectResultExecutor.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/Internal/RedirectResultExecutor.cs
@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
         {
             var urlHelper = result.UrlHelper ?? _urlHelperFactory.GetUrlHelper(context);
 
-            // IsLocalUrl is called to handle  Urls starting with '~/'.
+            // IsLocalUrl is called to handle URLs starting with '~/'.
             var destinationUrl = result.Url;
             if (urlHelper.IsLocalUrl(destinationUrl))
             {
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs
index 84be69bb76..626a1b3b30 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs
@@ -4,7 +4,6 @@
 using System;
 using Microsoft.AspNetCore.Mvc.Core;
 using Microsoft.AspNetCore.Mvc.Internal;
-using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Mvc
@@ -84,17 +83,5 @@ namespace Microsoft.AspNetCore.Mvc
             var executor = context.HttpContext.RequestServices.GetRequiredService<LocalRedirectResultExecutor>();
             executor.Execute(context, this);
         }
-
-        private IUrlHelper GetUrlHelper(ActionContext context)
-        {
-            var urlHelper = UrlHelper;
-            if (urlHelper == null)
-            {
-                var services = context.HttpContext.RequestServices;
-                urlHelper = services.GetRequiredService<IUrlHelperFactory>().GetUrlHelper(context);
-            }
-
-            return urlHelper;
-        }
     }
 }
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs
index afa9e77006..a1718ace00 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs
@@ -34,8 +34,8 @@ namespace Microsoft.AspNetCore.Mvc
         public override Task ExecuteResultAsync(ActionContext context)
         {
             var executor = context.HttpContext.RequestServices.GetRequiredService<ObjectResultExecutor>();
-            var result =  executor.ExecuteAsync(context, this);
-            
+            var result = executor.ExecuteAsync(context, this);
+
             return result;
         }