Refactor sources

Author: YevgeniyShunevych

src/Atata.Configuration.Json/JsonConfigContractResolver.cs

@@ -2,7 +2,7 @@
 
 namespace Atata.Configuration.Json;
 
-internal class JsonConfigContractResolver : DefaultContractResolver
+internal sealed class JsonConfigContractResolver : DefaultContractResolver
 {
     public static JsonConfigContractResolver Instance { get; } = new JsonConfigContractResolver();
 

src/Atata.Configuration.Json/Mapping/AttributeMapper.cs

@@ -10,18 +10,18 @@ public class AttributeMapper
 
     private readonly Assembly[] _assembliesToFindAttributeTypes;
 
-    private readonly IObjectCreator _objectCreator;
+    private readonly ObjectCreator _objectCreator;
 
     public AttributeMapper(string assemblyNamePatternToFindAttributeTypes, string defaultAssemblyNamePatternToFindTypes)
     {
         _assembliesToFindAttributeTypes = AssemblyFinder.FindAllByPattern(assemblyNamePatternToFindAttributeTypes);
 
-        IObjectConverter objectConverter = new ObjectConverter
+        ObjectConverter objectConverter = new()
         {
             AssemblyNamePatternToFindTypes = defaultAssemblyNamePatternToFindTypes
         };
-        IObjectMapper objectMapper = new ObjectMapper(objectConverter);
-        _objectCreator = new ObjectCreator(objectConverter, objectMapper);
+        ObjectMapper objectMapper = new(objectConverter);
+        _objectCreator = new(objectConverter, objectMapper);
     }
 
     public Attribute Map(AttributeJsonSection section)

src/Atata.Configuration.Json/Mapping/ChromiumDriverJsonMapper`3.cs

@@ -11,19 +11,19 @@ protected override void MapOptions(DriverOptionsJsonSection section, TOptions op
     {
         base.MapOptions(section, options);
 
-        if (section.Arguments?.Any() ?? false)
+        if (section.Arguments is { Length: > 0 })
             options.AddArguments(section.Arguments);
 
-        if (section.ExcludedArguments?.Any() ?? false)
+        if (section.ExcludedArguments is { Length: > 0 })
             options.AddExcludedArguments(section.ExcludedArguments);
 
-        if (section.Extensions?.Any() ?? false)
+        if (section.Extensions is { Length: > 0 })
             options.AddExtensions(section.Extensions);
 
-        if (section.EncodedExtensions?.Any() ?? false)
+        if (section.EncodedExtensions is { Length: > 0 })
             options.AddEncodedExtensions(section.EncodedExtensions);
 
-        if (section.WindowTypes?.Any() ?? false)
+        if (section.WindowTypes is { Length: > 0 })
             options.AddWindowTypes(section.WindowTypes);
 
         if (section.PerformanceLoggingPreferences != null)
@@ -58,7 +58,7 @@ private void MapPerformanceLoggingPreferences(DriverPerformanceLoggingPreference
     {
         ObjectMapper.Map(section.ExtraPropertiesMap, preferences);
 
-        if (section.TracingCategories?.Any() ?? false)
+        if (section.TracingCategories is { Length: > 0 })
             preferences.AddTracingCategories(section.TracingCategories);
     }
 

src/Atata.Configuration.Json/Mapping/DriverJsonMapper`3.cs

@@ -46,7 +46,7 @@ protected virtual void Map(DriverJsonSection section, TBuilder builder)
         if (section.CommandTimeout != null)
             builder.WithCommandTimeout(TimeSpan.FromSeconds(section.CommandTimeout.Value));
 
-        if (section.PortsToIgnore?.Any() ?? false)
+        if (section.PortsToIgnore is { Length: > 0 })
             builder.WithPortsToIgnore(section.PortsToIgnore);
 
         if (!string.IsNullOrWhiteSpace(section.Service?.DriverPath))
@@ -66,7 +66,7 @@ protected virtual void MapOptions(DriverOptionsJsonSection section, TOptions opt
     {
         var properties = section.ExtraPropertiesMap;
 
-        if (properties?.Any() ?? false)
+        if (properties is { Count: > 0 })
             ObjectMapper.Map(properties, options);
 
         if (section.Proxy != null)
@@ -81,7 +81,7 @@ protected virtual void MapOptions(DriverOptionsJsonSection section, TOptions opt
                 options.AddAdditionalOption(item.Key, FillTemplateVariables(item.Value));
         }
 
-        if (section.LoggingPreferences?.Any() ?? false)
+        if (section.LoggingPreferences is { Count: > 0 })
         {
             foreach (var item in section.LoggingPreferences)
                 options.SetLoggingPreference(item.Key, item.Value);
@@ -92,15 +92,15 @@ private void MapProxy(ProxyJsonSection section, Proxy proxy)
     {
         ObjectMapper.Map(section.ExtraPropertiesMap, proxy);
 
-        if (section.BypassAddresses?.Any() ?? false)
+        if (section.BypassAddresses is { Length: > 0 })
             proxy.AddBypassAddresses(section.BypassAddresses);
     }
 
     protected virtual void MapService(DriverServiceJsonSection section, TService service)
     {
         var properties = section.ExtraPropertiesMap;
 
-        if (properties?.Any() ?? false)
+        if (properties is { Count: > 0 })
             ObjectMapper.Map(properties, service);
     }
 

src/Atata.Configuration.Json/Mapping/EventSubscriptionMapper.cs

@@ -6,7 +6,7 @@ public sealed class EventSubscriptionMapper
 
     private readonly Assembly[] _assembliesToFindEventHandlerTypes;
 
-    private readonly IObjectCreator _objectCreator;
+    private readonly ObjectCreator _objectCreator;
 
     public EventSubscriptionMapper(
         string assemblyNamePatternToFindEventTypes,

src/Atata.Configuration.Json/Mapping/FirefoxDriverJsonMapper.cs

@@ -17,7 +17,7 @@ protected override void MapOptions(DriverOptionsJsonSection section, FirefoxOpti
                 options.AddAdditionalFirefoxOption(item.Key, FillTemplateVariables(item.Value));
         }
 
-        if (section.Arguments?.Any() ?? false)
+        if (section.Arguments is { Length: > 0 })
             options.AddArguments(section.Arguments);
 
         if (section.Profile != null)

src/Atata.Configuration.Json/Mapping/JsonConfigMapper.cs

@@ -294,12 +294,12 @@ private static void MapBrowserLogs(BrowserLogsJsonSection section, AtataContextB
 
     private static object CreateObject(string typeName, Dictionary<string, object> valuesMap, string assemblyNamePatternToFindType)
     {
-        IObjectConverter objectConverter = new ObjectConverter
+        ObjectConverter objectConverter = new()
         {
             AssemblyNamePatternToFindTypes = assemblyNamePatternToFindType
         };
-        IObjectMapper objectMapper = new ObjectMapper(objectConverter);
-        IObjectCreator objectCreator = new ObjectCreator(objectConverter, objectMapper);
+        ObjectMapper objectMapper = new(objectConverter);
+        ObjectCreator objectCreator = new(objectConverter, objectMapper);
 
         var assembliesToFindTypes = AssemblyFinder.FindAllByPattern(assemblyNamePatternToFindType);
         Type strategyType = TypeFinder.FindInAssemblies(typeName, assembliesToFindTypes);

test/Atata.Configuration.Json.Tests/Overrides/RemoteDriverContext.cs

@@ -23,7 +23,7 @@ public IDisposable UseNullDriver()
         return new DriverContextNullableSession(this);
     }
 
-    private class DriverContextNullableSession : IDisposable
+    private sealed class DriverContextNullableSession : IDisposable
     {
         private readonly RemoteDriverContext _context;