Fixed review comments

Author: marklagendijk

…harp.Web/Commands/PresetRequestParser.cs …resetOnlyQueryCollectionRequestParser.cssrc/ImageSharp.Web/Commands/PresetRequestParser.cs renamed to src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs src/ImageSharp.Web/Commands/PresetRequestParser.cs renamed to src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Http;
@@ -13,35 +14,40 @@ namespace SixLabors.ImageSharp.Web.Commands
     /// <summary>
     /// Parses preset name from the request querystring and returns the commands configured for that preset.
     /// </summary>
-    public class PresetRequestParser : IRequestParser
+    public class PresetOnlyQueryCollectionRequestParser : IRequestParser
     {
         private readonly IDictionary<string, IDictionary<string, string>> presets;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PresetRequestParser"/> class.
+        /// Initializes a new instance of the <see cref="PresetOnlyQueryCollectionRequestParser"/> class.
         /// </summary>
         /// <param name="presetOptions">The preset options.</param>
-        public PresetRequestParser(IOptions<PresetRequestParserOptions> presetOptions) =>
+        public PresetOnlyQueryCollectionRequestParser(IOptions<PresetOnlyQueryCollectionRequestParserOptions> presetOptions) =>
             this.presets = ParsePresets(presetOptions.Value.Presets);
 
         /// <inheritdoc/>
         public IDictionary<string, string> ParseRequestCommands(HttpContext context)
         {
-            var requestedPreset = context.Request.Query["preset"].ToString();
-            return this.presets.GetValueOrDefault(requestedPreset) ?? new Dictionary<string, string>();
+            if (context.Request.Query.Count == 0)
+            {
+                return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            }
+
+            var requestedPreset = context.Request.Query["preset"][0];
+            return this.presets.GetValueOrDefault(requestedPreset) ?? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         }
 
         private static IDictionary<string, IDictionary<string, string>> ParsePresets(
             IDictionary<string, string> unparsedPresets) =>
             unparsedPresets
                 .Select(keyValue =>
                     new KeyValuePair<string, IDictionary<string, string>>(keyValue.Key, ParsePreset(keyValue.Value)))
-                .ToDictionary(keyValue => keyValue.Key, keyValue => keyValue.Value);
+                .ToDictionary(keyValue => keyValue.Key, keyValue => keyValue.Value, StringComparer.OrdinalIgnoreCase);
 
         private static IDictionary<string, string> ParsePreset(string unparsedPresetValue)
         {
             Dictionary<string, StringValues> parsed = QueryHelpers.ParseQuery(unparsedPresetValue);
-            var transformed = new Dictionary<string, string>(parsed.Count);
+            var transformed = new Dictionary<string, string>(parsed.Count, StringComparer.OrdinalIgnoreCase);
             foreach (KeyValuePair<string, StringValues> keyValue in parsed)
             {
                 transformed[keyValue.Key] = keyValue.Value.ToString();

…b/Commands/PresetRequestParserOptions.cs …lyQueryCollectionRequestParserOptions.cssrc/ImageSharp.Web/Commands/PresetRequestParserOptions.cs renamed to src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParserOptions.cs src/ImageSharp.Web/Commands/PresetRequestParserOptions.cs renamed to src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParserOptions.cs

@@ -6,9 +6,9 @@
 namespace SixLabors.ImageSharp.Web.Commands
 {
     /// <summary>
-    /// Configuration options for the <see cref="PresetRequestParser"/>.
+    /// Configuration options for the <see cref="PresetOnlyQueryCollectionRequestParser"/>.
     /// </summary>
-    public class PresetRequestParserOptions
+    public class PresetOnlyQueryCollectionRequestParserOptions
     {
         /// <summary>
         /// Gets or sets the presets, which is a Dictionary of preset names to command query strings.

…sts/Commands/PresetRequestParserTests.cs …OnlyQueryCollectionRequestParserTests.cstests/ImageSharp.Web.Tests/Commands/PresetRequestParserTests.cs renamed to tests/ImageSharp.Web.Tests/Commands/PresetOnlyQueryCollectionRequestParserTests.cs tests/ImageSharp.Web.Tests/Commands/PresetRequestParserTests.cs renamed to tests/ImageSharp.Web.Tests/Commands/PresetOnlyQueryCollectionRequestParserTests.cs

@@ -10,10 +10,10 @@
 
 namespace SixLabors.ImageSharp.Web.Tests.Commands
 {
-    public class PresetRequestParserTests
+    public class PresetOnlyQueryCollectionRequestParserTests
     {
         [Fact]
-        public void PresetRequestParserExtractsCommands()
+        public void PresetOnlyQueryCollectionRequestParserExtractsCommands()
         {
             IDictionary<string, string> expected = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
@@ -22,7 +22,7 @@ public void PresetRequestParserExtractsCommands()
             };
 
             HttpContext context = CreateHttpContext("?preset=Preset1");
-            IDictionary<string, string> actual = new PresetRequestParser(Options.Create(new PresetRequestParserOptions
+            IDictionary<string, string> actual = new PresetOnlyQueryCollectionRequestParser(Options.Create(new PresetOnlyQueryCollectionRequestParserOptions
             {
                 Presets = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
                 {
@@ -34,12 +34,12 @@ public void PresetRequestParserExtractsCommands()
         }
 
         [Fact]
-        public void PresetRequestParserCommandsWithoutPresetParam()
+        public void PresetOnlyQueryCollectionRequestParserCommandsWithoutPresetParam()
         {
             IDictionary<string, string> expected = new Dictionary<string, string>();
 
             HttpContext context = CreateHttpContext("?test=test");
-            IDictionary<string, string> actual = new PresetRequestParser(Options.Create(new PresetRequestParserOptions
+            IDictionary<string, string> actual = new PresetOnlyQueryCollectionRequestParser(Options.Create(new PresetOnlyQueryCollectionRequestParserOptions
             {
                 Presets = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
                 {
@@ -51,12 +51,12 @@ public void PresetRequestParserCommandsWithoutPresetParam()
         }
 
         [Fact]
-        public void PresetRequestParserCommandsWithoutMatchingPreset()
+        public void PresetOnlyQueryCollectionRequestParserCommandsWithoutMatchingPreset()
         {
             IDictionary<string, string> expected = new Dictionary<string, string>();
 
             HttpContext context = CreateHttpContext("?preset=Preset2");
-            IDictionary<string, string> actual = new PresetRequestParser(Options.Create(new PresetRequestParserOptions
+            IDictionary<string, string> actual = new PresetOnlyQueryCollectionRequestParser(Options.Create(new PresetOnlyQueryCollectionRequestParserOptions
             {
                 Presets = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
                 {