[Feature] Address PR Feedback

markekraus · markekraus · commit e31d601dd663 · 2018-01-09T15:58:53.000-06:00
diff --git a/test/tools/WebListener/Controllers/LinkController.cs b/test/tools/WebListener/Controllers/LinkController.cs
@@ -15,32 +15,27 @@ public class LinkController : Controller
     {
         public JsonResult Index()
         {
-            StringValues maxLinksSV;
-            int maxLinks;
-            if(!Request.Query.TryGetValue("maxlinks", out maxLinksSV) || !Int32.TryParse(maxLinksSV.FirstOrDefault(), out maxLinks) || maxLinks < 1)
+            if (!Request.Query.TryGetValue("maxlinks", out StringValues maxLinksSV) || !Int32.TryParse(maxLinksSV.FirstOrDefault(), out int maxLinks) || maxLinks < 1)
             {
                 maxLinks = 3;
             }
 
-            StringValues linkNumberSV;
-            int linkNumber;
-            if(!Request.Query.TryGetValue("linknumber", out linkNumberSV) || !Int32.TryParse(linkNumberSV.FirstOrDefault(), out linkNumber) || linkNumber < 1)
+            if (!Request.Query.TryGetValue("linknumber", out StringValues linkNumberSV) || !Int32.TryParse(linkNumberSV.FirstOrDefault(), out int linkNumber) || linkNumber < 1)
             {
                 linkNumber = 1;
             }
 
             string baseUri = Regex.Replace(UriHelper.GetDisplayUrl(Request), "\\?.*", String.Empty);
 
-            StringValues typeSV;
-            string type = Request.Query.TryGetValue("type",out typeSV) ? typeSV.FirstOrDefault() : "default";
+            string type = Request.Query.TryGetValue("type", out StringValues typeSV) ? typeSV.FirstOrDefault() : "default";
 
             var linkList = new List<String>();
             if (maxLinks > 1 && linkNumber > 1)
             {
                 linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: linkNumber - 1, type: type, rel: "prev"));
             }
             linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: maxLinks, type: type, rel: "last"));
-            linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: 1, type: type, rel:"first"));
+            linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: 1, type: type, rel: "first"));
             linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: linkNumber, type: type, rel: "self"));
 
             bool sendMultipleHeaders = false;
@@ -87,9 +82,9 @@ public JsonResult Index()
             getController.ControllerContext = this.ControllerContext;
             var result = getController.Index();
             var output = result.Value as Hashtable;
-            output.Add("linknumber",linkNumber);
-            output.Add("maxlinks",maxLinks);
-            output.Add("type",type.FirstOrDefault());
+            output.Add("linknumber", linkNumber);
+            output.Add("maxlinks", maxLinks);
+            output.Add("type", type.FirstOrDefault());
 
             return result;
         }

Original file line number	Diff line number	Diff line change
`@@ -15,32 +15,27 @@ public class LinkController : Controller`
`15`	`15`	`{`
`16`	`16`	`public JsonResult Index()`
`17`	`17`	`{`
`18`		`- StringValues maxLinksSV;`
`19`		`- int maxLinks;`
`20`		`- if(!Request.Query.TryGetValue("maxlinks", out maxLinksSV) \|\| !Int32.TryParse(maxLinksSV.FirstOrDefault(), out maxLinks) \|\| maxLinks < 1)`
	`18`	`+ if (!Request.Query.TryGetValue("maxlinks", out StringValues maxLinksSV) \|\| !Int32.TryParse(maxLinksSV.FirstOrDefault(), out int maxLinks) \|\| maxLinks < 1)`
`21`	`19`	`{`
`22`	`20`	`maxLinks = 3;`
`23`	`21`	`}`
`24`	`22`
`25`		`- StringValues linkNumberSV;`
`26`		`- int linkNumber;`
`27`		`- if(!Request.Query.TryGetValue("linknumber", out linkNumberSV) \|\| !Int32.TryParse(linkNumberSV.FirstOrDefault(), out linkNumber) \|\| linkNumber < 1)`
	`23`	`+ if (!Request.Query.TryGetValue("linknumber", out StringValues linkNumberSV) \|\| !Int32.TryParse(linkNumberSV.FirstOrDefault(), out int linkNumber) \|\| linkNumber < 1)`
`28`	`24`	`{`
`29`	`25`	`linkNumber = 1;`
`30`	`26`	`}`
`31`	`27`
`32`	`28`	`string baseUri = Regex.Replace(UriHelper.GetDisplayUrl(Request), "\\?.*", String.Empty);`
`33`	`29`
`34`		`- StringValues typeSV;`
`35`		`- string type = Request.Query.TryGetValue("type",out typeSV) ? typeSV.FirstOrDefault() : "default";`
	`30`	`+ string type = Request.Query.TryGetValue("type", out StringValues typeSV) ? typeSV.FirstOrDefault() : "default";`
`36`	`31`
`37`	`32`	`var linkList = new List<String>();`
`38`	`33`	`if (maxLinks > 1 && linkNumber > 1)`
`39`	`34`	`{`
`40`	`35`	`linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: linkNumber - 1, type: type, rel: "prev"));`
`41`	`36`	`}`
`42`	`37`	`linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: maxLinks, type: type, rel: "last"));`
`43`		`- linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: 1, type: type, rel:"first"));`
	`38`	`+ linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: 1, type: type, rel: "first"));`
`44`	`39`	`linkList.Add(GetLink(baseUri: baseUri, maxLinks: maxLinks, linkNumber: linkNumber, type: type, rel: "self"));`
`45`	`40`
`46`	`41`	`bool sendMultipleHeaders = false;`
`@@ -87,9 +82,9 @@ public JsonResult Index()`
`87`	`82`	`getController.ControllerContext = this.ControllerContext;`
`88`	`83`	`var result = getController.Index();`
`89`	`84`	`var output = result.Value as Hashtable;`
`90`		`- output.Add("linknumber",linkNumber);`
`91`		`- output.Add("maxlinks",maxLinks);`
`92`		`- output.Add("type",type.FirstOrDefault());`
	`85`	`+ output.Add("linknumber", linkNumber);`
	`86`	`+ output.Add("maxlinks", maxLinks);`
	`87`	`+ output.Add("type", type.FirstOrDefault());`
`93`	`88`
`94`	`89`	`return result;`
`95`	`90`	`}`