Merge pull request #42 from benaadams/patch-5

DamianEdwards · DamianEdwards · commit 0ac3574b0ed5 · 2016-01-26T16:04:01.000-08:00
OrdinalIgnoreCase is unnecessary
diff --git a/src/Benchmarks/FortunesDapperMiddleware.cs b/src/Benchmarks/FortunesDapperMiddleware.cs
@@ -30,9 +30,7 @@ public FortunesDapperMiddleware(RequestDelegate next, string connectionString, D
 
         public async Task Invoke(HttpContext httpContext, HtmlEncoder htmlEncoder)
         {
-            // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase
-            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) ||
-                httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))
+            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))
             {
                 var rows = await LoadRows(_connectionString, _dbProviderFactory);
 
diff --git a/src/Benchmarks/FortunesEfMiddleware.cs b/src/Benchmarks/FortunesEfMiddleware.cs
@@ -25,9 +25,7 @@ public FortunesEfMiddleware(RequestDelegate next)
 
         public async Task Invoke(HttpContext httpContext, HtmlEncoder htmlEncoder)
         {
-            // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase
-            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) ||
-                httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))
+            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))
             {
                 var db = (ApplicationDbContext)httpContext.RequestServices.GetService(typeof(ApplicationDbContext));
                 db.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
diff --git a/src/Benchmarks/FortunesRawMiddleware.cs b/src/Benchmarks/FortunesRawMiddleware.cs
@@ -30,9 +30,7 @@ public FortunesRawMiddleware(RequestDelegate next, string connectionString, DbPr
 
         public async Task Invoke(HttpContext httpContext, HtmlEncoder htmlEncoder)
         {
-            // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase
-            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) ||
-                httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))
+            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))
             {
                 var rows = await LoadRows(_connectionString, _dbProviderFactory);
 
diff --git a/src/Benchmarks/JsonMiddleware.cs b/src/Benchmarks/JsonMiddleware.cs
@@ -26,9 +26,7 @@ public JsonMiddleware(RequestDelegate next)
 
         public Task Invoke(HttpContext httpContext)
         {
-            // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase
-            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) ||
-                httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))
+            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))
             {
                 httpContext.Response.StatusCode = 200;
                 httpContext.Response.ContentType = "application/json";
diff --git a/src/Benchmarks/MultipleQueriesDapperMiddleware.cs b/src/Benchmarks/MultipleQueriesDapperMiddleware.cs
@@ -36,8 +36,7 @@ public MultipleQueriesDapperMiddleware(RequestDelegate next, string connectionSt
         public async Task Invoke(HttpContext httpContext)
         {
             // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase
-            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) ||
-                httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))
+            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))
             {
                 var count = GetQueryCount(httpContext);
                 var rows = await LoadRows(count, _connectionString, _dbProviderFactory);
diff --git a/src/Benchmarks/MultipleQueriesEfMiddleware.cs b/src/Benchmarks/MultipleQueriesEfMiddleware.cs
@@ -29,9 +29,7 @@ public MultipleQueriesEfMiddleware(RequestDelegate next)
 
         public async Task Invoke(HttpContext httpContext)
         {
-            // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase
-            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) ||
-                httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))
+            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))
             {
                 var db = (ApplicationDbContext)httpContext.RequestServices.GetService(typeof(ApplicationDbContext));
                 db.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
diff --git a/src/Benchmarks/MultipleQueriesRawMiddleware.cs b/src/Benchmarks/MultipleQueriesRawMiddleware.cs
@@ -35,9 +35,7 @@ public MultipleQueriesRawMiddleware(RequestDelegate next, string connectionStrin
 
         public async Task Invoke(HttpContext httpContext)
         {
-            // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase
-            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) ||
-                httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))
+            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))
             {
                 var count = GetQueryCount(httpContext);
                 var rows = await LoadRows(count, _connectionString, _dbProviderFactory);
diff --git a/src/Benchmarks/PlaintextMiddleware.cs b/src/Benchmarks/PlaintextMiddleware.cs
@@ -23,9 +23,7 @@ public PlaintextMiddleware(RequestDelegate next)
 
         public Task Invoke(HttpContext httpContext)
         {
-            // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase
-            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) ||
-                httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))
+            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))
             {
                 httpContext.Response.StatusCode = 200;
                 httpContext.Response.ContentType = "text/plain";
diff --git a/src/Benchmarks/SingleQueryDapperMiddleware.cs b/src/Benchmarks/SingleQueryDapperMiddleware.cs
@@ -36,9 +36,7 @@ public SingleQueryDapperMiddleware(RequestDelegate next, string connectionString
 
         public async Task Invoke(HttpContext httpContext)
         {
-            // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase
-            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) ||
-                httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))
+            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))
             {
                 var row = await LoadRow(_connectionString, _dbProviderFactory);
 
diff --git a/src/Benchmarks/SingleQueryEfMiddleware.cs b/src/Benchmarks/SingleQueryEfMiddleware.cs
@@ -29,9 +29,7 @@ public SingleQueryEfMiddleware(RequestDelegate next)
 
         public async Task Invoke(HttpContext httpContext)
         {
-            // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase
-            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) ||
-                httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))
+            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))
             {
                 var db = (ApplicationDbContext)httpContext.RequestServices.GetService(typeof(ApplicationDbContext));
 
diff --git a/src/Benchmarks/SingleQueryRawMiddleware.cs b/src/Benchmarks/SingleQueryRawMiddleware.cs
@@ -35,9 +35,7 @@ public SingleQueryRawMiddleware(RequestDelegate next, string connectionString, D
 
         public async Task Invoke(HttpContext httpContext)
         {
-            // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase
-            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) ||
-                httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))
+            if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))
             {
                 var row = await LoadRow(_connectionString, _dbProviderFactory);
 

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,7 @@ public FortunesDapperMiddleware(RequestDelegate next, string connectionString, D`
`30`	`30`
`31`	`31`	`public async Task Invoke(HttpContext httpContext, HtmlEncoder htmlEncoder)`
`32`	`32`	`{`
`33`		`- // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase`
`34`		`- if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) \|\|`
`35`		`- httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))`
	`33`	`+ if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))`
`36`	`34`	`{`
`37`	`35`	`var rows = await LoadRows(_connectionString, _dbProviderFactory);`
`38`	`36`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,7 @@ public FortunesEfMiddleware(RequestDelegate next)`
`25`	`25`
`26`	`26`	`public async Task Invoke(HttpContext httpContext, HtmlEncoder htmlEncoder)`
`27`	`27`	`{`
`28`		`- // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase`
`29`		`- if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) \|\|`
`30`		`- httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))`
	`28`	`+ if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))`
`31`	`29`	`{`
`32`	`30`	`var db = (ApplicationDbContext)httpContext.RequestServices.GetService(typeof(ApplicationDbContext));`
`33`	`31`	`db.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,7 @@ public FortunesRawMiddleware(RequestDelegate next, string connectionString, DbPr`
`30`	`30`
`31`	`31`	`public async Task Invoke(HttpContext httpContext, HtmlEncoder htmlEncoder)`
`32`	`32`	`{`
`33`		`- // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase`
`34`		`- if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) \|\|`
`35`		`- httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))`
	`33`	`+ if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))`
`36`	`34`	`{`
`37`	`35`	`var rows = await LoadRows(_connectionString, _dbProviderFactory);`
`38`	`36`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@ public JsonMiddleware(RequestDelegate next)`
`26`	`26`
`27`	`27`	`public Task Invoke(HttpContext httpContext)`
`28`	`28`	`{`
`29`		`- // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase`
`30`		`- if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) \|\|`
`31`		`- httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))`
	`29`	`+ if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))`
`32`	`30`	`{`
`33`	`31`	`httpContext.Response.StatusCode = 200;`
`34`	`32`	`httpContext.Response.ContentType = "application/json";`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@ public MultipleQueriesDapperMiddleware(RequestDelegate next, string connectionSt`
`36`	`36`	`public async Task Invoke(HttpContext httpContext)`
`37`	`37`	`{`
`38`	`38`	`// We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase`
`39`		`- if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) \|\|`
`40`		`- httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))`
	`39`	`+ if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))`
`41`	`40`	`{`
`42`	`41`	`var count = GetQueryCount(httpContext);`
`43`	`42`	`var rows = await LoadRows(count, _connectionString, _dbProviderFactory);`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,7 @@ public MultipleQueriesEfMiddleware(RequestDelegate next)`
`29`	`29`
`30`	`30`	`public async Task Invoke(HttpContext httpContext)`
`31`	`31`	`{`
`32`		`- // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase`
`33`		`- if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) \|\|`
`34`		`- httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))`
	`32`	`+ if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))`
`35`	`33`	`{`
`36`	`34`	`var db = (ApplicationDbContext)httpContext.RequestServices.GetService(typeof(ApplicationDbContext));`
`37`	`35`	`db.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,7 @@ public MultipleQueriesRawMiddleware(RequestDelegate next, string connectionStrin`
`35`	`35`
`36`	`36`	`public async Task Invoke(HttpContext httpContext)`
`37`	`37`	`{`
`38`		`- // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase`
`39`		`- if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) \|\|`
`40`		`- httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))`
	`38`	`+ if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))`
`41`	`39`	`{`
`42`	`40`	`var count = GetQueryCount(httpContext);`
`43`	`41`	`var rows = await LoadRows(count, _connectionString, _dbProviderFactory);`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,7 @@ public PlaintextMiddleware(RequestDelegate next)`
`23`	`23`
`24`	`24`	`public Task Invoke(HttpContext httpContext)`
`25`	`25`	`{`
`26`		`- // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase`
`27`		`- if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) \|\|`
`28`		`- httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))`
	`26`	`+ if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))`
`29`	`27`	`{`
`30`	`28`	`httpContext.Response.StatusCode = 200;`
`31`	`29`	`httpContext.Response.ContentType = "text/plain";`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,7 @@ public SingleQueryDapperMiddleware(RequestDelegate next, string connectionString`
`36`	`36`
`37`	`37`	`public async Task Invoke(HttpContext httpContext)`
`38`	`38`	`{`
`39`		`- // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase`
`40`		`- if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) \|\|`
`41`		`- httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))`
	`39`	`+ if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))`
`42`	`40`	`{`
`43`	`41`	`var row = await LoadRow(_connectionString, _dbProviderFactory);`
`44`	`42`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,7 @@ public SingleQueryEfMiddleware(RequestDelegate next)`
`29`	`29`
`30`	`30`	`public async Task Invoke(HttpContext httpContext)`
`31`	`31`	`{`
`32`		`- // We check Ordinal explicitly first because it's faster than OrdinalIgnoreCase`
`33`		`- if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal) \|\|`
`34`		`- httpContext.Request.Path.StartsWithSegments(_path, StringComparison.OrdinalIgnoreCase))`
	`32`	`+ if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal))`
`35`	`33`	`{`
`36`	`34`	`var db = (ApplicationDbContext)httpContext.RequestServices.GetService(typeof(ApplicationDbContext));`
`37`	`35`