Cleanups

Author: javiercn

src/Components/Endpoints/src/Binding/Converters/DictionaryAdapters/DictionaryBufferAdapter.cs

@@ -4,7 +4,7 @@
 namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
 
 // Uses a concrete type that implements IDictionary<TKey, TValue> as a buffer.
-internal class DictionaryBufferAdapter<TDictionaryType, TKey, TValue>
+internal sealed class DictionaryBufferAdapter<TDictionaryType, TKey, TValue>
     : IDictionaryBufferAdapter<TDictionaryType, TDictionaryType, TKey, TValue>
     where TDictionaryType : IDictionary<TKey, TValue>, new()
     where TKey : IParsable<TKey>

src/Components/Endpoints/src/Binding/Converters/DictionaryAdapters/DictionaryStaticCastAdapter.cs

@@ -4,7 +4,7 @@
 namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
 
 // Adapts a concrete dictionary type into an interface.
-internal class DictionaryStaticCastAdapter<TDictionaryInterface, TDictionaryImplementation, TDictionaryAdapter, TBuffer, TKey, TValue>
+internal sealed class DictionaryStaticCastAdapter<TDictionaryInterface, TDictionaryImplementation, TDictionaryAdapter, TBuffer, TKey, TValue>
     : IDictionaryBufferAdapter<TDictionaryInterface, TBuffer, TKey, TValue>
     where TDictionaryAdapter : IDictionaryBufferAdapter<TDictionaryImplementation, TBuffer, TKey, TValue>
     where TDictionaryImplementation : TDictionaryInterface

src/Components/Endpoints/src/Binding/Converters/DictionaryAdapters/ImmutableDictionaryBufferAdapter.cs

@@ -1,11 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Immutable;
 
 namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
 
-internal class ImmutableDictionaryBufferAdapter<TKey, TValue>
+internal sealed class ImmutableDictionaryBufferAdapter<TKey, TValue>
     : IDictionaryBufferAdapter<ImmutableDictionary<TKey, TValue>, ImmutableDictionary<TKey, TValue>.Builder, TKey, TValue>
     where TKey : IParsable<TKey>
 {

src/Components/Endpoints/src/Binding/Converters/DictionaryAdapters/ImmutableSortedDictionaryBufferAdapter.cs

@@ -1,11 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Immutable;
 
 namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
 
-internal class ImmutableSortedDictionaryBufferAdapter<TKey, TValue>
+internal sealed class ImmutableSortedDictionaryBufferAdapter<TKey, TValue>
     : IDictionaryBufferAdapter<ImmutableSortedDictionary<TKey, TValue>, ImmutableSortedDictionary<TKey, TValue>.Builder, TKey, TValue>
     where TKey : IParsable<TKey>
 {

src/Components/Endpoints/src/Binding/Converters/DictionaryAdapters/ReadOnlyDictionaryBufferAdapter.cs

@@ -1,11 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.ObjectModel;
 
 namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
 
-internal class ReadOnlyDictionaryBufferAdapter<TKey, TValue>
+internal sealed class ReadOnlyDictionaryBufferAdapter<TKey, TValue>
     : IDictionaryBufferAdapter<ReadOnlyDictionary<TKey, TValue>, Dictionary<TKey, TValue>, TKey, TValue>
     where TKey : IParsable<TKey>
 {

src/Components/Endpoints/src/Binding/Converters/DictionaryConverter.cs

@@ -9,7 +9,7 @@ internal abstract class DictionaryConverter<TDictionary> : FormDataConverter<TDi
 {
 }
 
-internal class DictionaryConverter<TDictionary, TDictionaryPolicy, TBuffer, TKey, TValue> : DictionaryConverter<TDictionary>
+internal sealed class DictionaryConverter<TDictionary, TDictionaryPolicy, TBuffer, TKey, TValue> : DictionaryConverter<TDictionary>
     where TKey : IParsable<TKey>
     where TDictionaryPolicy : IDictionaryBufferAdapter<TDictionary, TBuffer, TKey, TValue>
 {
@@ -25,7 +25,7 @@ public DictionaryConverter(FormDataConverter<TValue> elementConverter)
     internal override bool TryRead(
         ref FormDataReader context,
         Type type,
-        FormDataSerializerOptions options,
+        FormDataMapperOptions options,
         [NotNullWhen(true)] out TDictionary? result,
         out bool found)
     {

src/Components/Endpoints/src/Binding/Factories/Collections/ConcreteTypeCollectionConverterFactory.cs

@@ -9,9 +9,9 @@ internal class ConcreteTypeCollectionConverterFactory<TCollection, TElement>
     public static readonly ConcreteTypeCollectionConverterFactory<TCollection, TElement> Instance =
         new();
 
-    public bool CanConvert(Type _, FormDataSerializerOptions options) => true;
+    public bool CanConvert(Type _, FormDataMapperOptions options) => true;
 
-    public FormDataConverter CreateConverter(Type _, FormDataSerializerOptions options)
+    public FormDataConverter CreateConverter(Type _, FormDataMapperOptions options)
     {
         // Resolve the element type converter
         var elementTypeConverter = options.ResolveConverter<TElement>() ??

src/Components/Endpoints/src/Binding/Factories/Dictionary/ConcreteTypeDictionaryConverterFactory.cs

@@ -3,14 +3,14 @@
 
 namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
 
-internal class ConcreteTypeDictionaryConverterFactory<TDictionary, TKey, TValue> : IFormDataConverterFactory
+internal sealed class ConcreteTypeDictionaryConverterFactory<TDictionary, TKey, TValue> : IFormDataConverterFactory
     where TKey : IParsable<TKey>
 {
     public static readonly ConcreteTypeDictionaryConverterFactory<TDictionary, TKey, TValue> Instance = new();
 
-    public bool CanConvert(Type type, FormDataSerializerOptions options) => true;
+    public bool CanConvert(Type type, FormDataMapperOptions options) => true;
 
-    public FormDataConverter CreateConverter(Type type, FormDataSerializerOptions options)
+    public FormDataConverter CreateConverter(Type type, FormDataMapperOptions options)
     {
         // Resolve the element type converter
         var keyConverter = options.ResolveConverter<TKey>() ??

src/Components/Endpoints/src/Binding/Factories/Dictionary/TypedDictionaryConverterFactory.cs

@@ -7,10 +7,10 @@
 
 namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
 
-internal class TypedDictionaryConverterFactory<TDictionaryType, TKey, TValue> : IFormDataConverterFactory
+internal sealed class TypedDictionaryConverterFactory<TDictionaryType, TKey, TValue> : IFormDataConverterFactory
     where TKey : IParsable<TKey>
 {
-    public bool CanConvert(Type type, FormDataSerializerOptions options)
+    public bool CanConvert(Type type, FormDataMapperOptions options)
     {
         // Resolve the value type converter
         var valueTypeConverter = options.ResolveConverter<TValue>();
@@ -70,7 +70,7 @@ var _ when type.IsAssignableTo(typeof(IDictionary<TKey, TValue>)) && type.GetCon
         return false;
     }
 
-    public FormDataConverter CreateConverter(Type type, FormDataSerializerOptions options)
+    public FormDataConverter CreateConverter(Type type, FormDataMapperOptions options)
     {
         // Resolve the value type converter
         var valueTypeConverter = options.ResolveConverter<TValue>();

src/Components/Endpoints/src/Binding/Factories/DictionaryConverterFactory.cs

@@ -9,7 +9,7 @@ internal class DictionaryConverterFactory : IFormDataConverterFactory
 {
     internal static readonly DictionaryConverterFactory Instance = new();
 
-    public bool CanConvert(Type type, FormDataSerializerOptions options)
+    public bool CanConvert(Type type, FormDataMapperOptions options)
     {
         // Well-known dictionary types
         // IDictionary<TKey, TValue>
@@ -68,7 +68,7 @@ public bool CanConvert(Type type, FormDataSerializerOptions options)
         return factory.CanConvert(type, options);
     }
 
-    public FormDataConverter CreateConverter(Type type, FormDataSerializerOptions options)
+    public FormDataConverter CreateConverter(Type type, FormDataMapperOptions options)
     {
         // Type must implement IDictionary<TKey, TValue> IReadOnlyDictionary<TKey, TValue>
         // Note that IDictionary doesn't extend IReadOnlyDictionary, hence the need for two checks

src/Components/Endpoints/test/Binding/FormDataMapperTests.cs

@@ -4,7 +4,6 @@
 using System.Buffers;
 using System.Collections;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
@@ -540,10 +539,10 @@ public void CanDeserialize_Dictionary_IImmutableDictionary()
             ["[9]"] = "19",
         };
         var reader = new FormDataReader(collection, CultureInfo.InvariantCulture);
-        var options = new FormDataSerializerOptions();
+        var options = new FormDataMapperOptions();
 
         // Act
-        var result = FormDataDeserializer.Deserialize<IImmutableDictionary<int, int>>(reader, options);
+        var result = FormDataMapper.Map<IImmutableDictionary<int, int>>(reader, options);
 
         // Assert
         var dictionary = Assert.IsType<ImmutableDictionary<int, int>>(result);
@@ -594,10 +593,10 @@ public void CanDeserialize_Dictionary_IReadOnlyDictionary()
             ["[9]"] = "19",
         };
         var reader = new FormDataReader(collection, CultureInfo.InvariantCulture);
-        var options = new FormDataSerializerOptions();
+        var options = new FormDataMapperOptions();
 
         // Act
-        var result = FormDataDeserializer.Deserialize<IReadOnlyDictionary<int, int>>(reader, options);
+        var result = FormDataMapper.Map<IReadOnlyDictionary<int, int>>(reader, options);
 
         // Assert
         var dictionary = Assert.IsType<ReadOnlyDictionary<int, int>>(result);
@@ -624,10 +623,10 @@ public void CanDeserialize_Dictionary_ReadOnlyDictionary()
             ["[9]"] = "19",
         };
         var reader = new FormDataReader(collection, CultureInfo.InvariantCulture);
-        var options = new FormDataSerializerOptions();
+        var options = new FormDataMapperOptions();
 
         // Act
-        var result = FormDataDeserializer.Deserialize<ReadOnlyDictionary<int, int>>(reader, options);
+        var result = FormDataMapper.Map<ReadOnlyDictionary<int, int>>(reader, options);
 
         // Assert
         var dictionary = Assert.IsType<ReadOnlyDictionary<int, int>>(result);
@@ -641,10 +640,10 @@ public void Deserialize_EmptyDictionary_ReturnsNull()
         // Arrange
         var collection = new Dictionary<string, StringValues>() { };
         var reader = new FormDataReader(collection, CultureInfo.InvariantCulture);
-        var options = new FormDataSerializerOptions();
+        var options = new FormDataMapperOptions();
 
         // Act
-        var result = FormDataDeserializer.Deserialize<IReadOnlyDictionary<int, int>>(reader, options);
+        var result = FormDataMapper.Map<IReadOnlyDictionary<int, int>>(reader, options);
 
         // Assert
         Assert.Null(result);
@@ -656,10 +655,10 @@ public void Deserialize_Dictionary_RespectsMaxCollectionSize()
         // Arrange
         var collection = new Dictionary<string, StringValues>() { };
         var reader = new FormDataReader(collection, CultureInfo.InvariantCulture);
-        var options = new FormDataSerializerOptions();
+        var options = new FormDataMapperOptions();
 
         // Act
-        var result = FormDataDeserializer.Deserialize<IReadOnlyDictionary<int, int>>(reader, options);
+        var result = FormDataMapper.Map<IReadOnlyDictionary<int, int>>(reader, options);
 
         // Assert
         Assert.Null(result);
@@ -684,7 +683,7 @@ private void CanDeserialize_Dictionary<TDictionary, TImplementation, TKey, TValu
             ["[9]"] = "19",
         };
         var reader = new FormDataReader(collection, CultureInfo.InvariantCulture);
-        var options = new FormDataSerializerOptions();
+        var options = new FormDataMapperOptions();
 
         // Act
         var result = CallDeserialize(reader, options, typeof(TDictionary));