Remove the Services class, just create the RestClientFactory instead

Activout.RestClient.Json.Test/SimpleValueObjectTest.cs

@@ -26,7 +26,7 @@ public class SimpleValueObjectTest
 {
     private const string BaseUri = "https://example.com/api/";
 
-    private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+    private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
     private readonly MockHttpMessageHandler _mockHttp = new();
 
     [Fact]

Activout.RestClient.Json.Test/SystemTextJsonDeserializerTest.cs

@@ -21,7 +21,7 @@ public class SystemTextJsonDeserializerTest
 {
     private const string BaseUri = "https://example.com/api/";
 
-    private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+    private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
     private readonly MockHttpMessageHandler _mockHttp = new();
 
     [Fact]

Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DefaultDomainExceptionErrorObjectTests.cs

@@ -41,7 +41,7 @@ public DefaultDomainExceptionErrorObjectTests()
         {
             _mockHttp = new MockHttpMessageHandler();
 
-            _defaultMapperApiClient = Services.CreateRestClientFactory()
+            _defaultMapperApiClient = new RestClientFactory()
                 .CreateBuilder()
                 .WithNewtonsoftJson()
                 .With(_mockHttp.ToHttpClient())

Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DomainExceptionErrorEnumTests.cs

@@ -44,7 +44,7 @@ public DomainExceptionErrorEnumTests()
         {
             _mockHttp = new MockHttpMessageHandler();
 
-            _myApiClient = Services.CreateRestClientFactory()
+            _myApiClient = new RestClientFactory()
                 .CreateBuilder()
                 .With(_mockHttp.ToHttpClient())
                 .WithNewtonsoftJson()

Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DomainExceptionErrorObjectTests.cs

@@ -76,7 +76,7 @@ public DomainExceptionErrorObjectTests()
         {
             _mockHttp = new MockHttpMessageHandler();
 
-            _myApiClient = Services.CreateRestClientFactory()
+            _myApiClient = new RestClientFactory()
                 .CreateBuilder()
                 .WithNewtonsoftJson()
                 .With(_mockHttp.ToHttpClient())

Activout.RestClient.Newtonsoft.Json.Test/NewtonsoftJsonDeserializerTest.cs

@@ -26,7 +26,7 @@ public class NewtonsoftJsonDeserializerTest
     {
         public NewtonsoftJsonDeserializerTest()
         {
-            _restClientFactory = Services.CreateRestClientFactory();
+            _restClientFactory = new RestClientFactory();
             _mockHttp = new MockHttpMessageHandler();
         }
 

Activout.RestClient.Newtonsoft.Json.Test/RestClientTests.cs

@@ -18,7 +18,7 @@ public class RestClientTests
     {
         public RestClientTests(ITestOutputHelper outputHelper)
         {
-            _restClientFactory = Services.CreateRestClientFactory();
+            _restClientFactory = new RestClientFactory();
             _mockHttp = new MockHttpMessageHandler();
             _loggerFactory = LoggerFactoryHelpers.CreateLoggerFactory(outputHelper);
         }

Activout.RestClient.Newtonsoft.Json.Test/SerializationOrderTest.cs

@@ -20,7 +20,7 @@ public class SerializationOrderTest
 
         public SerializationOrderTest()
         {
-            _restClientFactory = Services.CreateRestClientFactory();
+            _restClientFactory = new RestClientFactory();
             _mockHttp = new MockHttpMessageHandler();
         }
 

Activout.RestClient.Newtonsoft.Json.Test/SimpleValueObjectTest.cs

@@ -38,7 +38,7 @@ public class SimpleValueObjectTest
     {
         private const string BaseUri = "https://example.com/api/";
 
-        private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+        private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
         private readonly MockHttpMessageHandler _mockHttp = new();
 
         [Fact]

Activout.RestClient.Test.Json/RestClientTests.cs

@@ -32,7 +32,7 @@
     private const string MovieId = "*MOVIE_ID*";
     private const string ReviewId = "*REVIEW_ID*";
 
-    private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+    private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
     private readonly MockHttpMessageHandler _mockHttp = new();
     private readonly ILoggerFactory _loggerFactory = LoggerFactoryHelpers.CreateLoggerFactory(outputHelper);
 
@@ -104,7 +104,7 @@
         var reviewSvc = CreateRestClientBuilder(jsonImplementation)
             .Accept("application/json")
             .ContentType("application/json")
             .With(new TaskConverterFactory())
             .With(_loggerFactory.CreateLogger<RestClientTests>())
             .With(_mockHttp.ToHttpClient())
             .BaseUri(BaseUri)

Activout.RestClient.Test.Json/SerializationOrderTest.cs

@@ -16,7 +16,7 @@ public class SerializationOrderTest
     private const int OrderFirst = -1000;
     private const int OrderLast = 1000;
 
-    private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+    private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
     private readonly MockHttpMessageHandler _mockHttp = new();
 
     [Theory]

Activout.RestClient.Test.Json/SimpleValueObjectTest.cs

@@ -28,7 +28,7 @@ public class SimpleValueObjectTest
 {
     private const string BaseUri = "https://example.com/api/";
 
-    private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+    private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
     private readonly MockHttpMessageHandler _mockHttp = new();
 
     [Theory]

Activout.RestClient.Test/BodyArgumentFormPostTest.cs

@@ -39,7 +39,7 @@ public class BodyArgumentFormPostTest
 
         public BodyArgumentFormPostTest()
         {
-            _restClientFactory = Services.CreateRestClientFactory();
+            _restClientFactory = new RestClientFactory();
             _mockHttp = new MockHttpMessageHandler();
         }
 

Activout.RestClient.Test/CancellationTokenBodyTest.cs

@@ -37,7 +37,7 @@ public class CancellationTokenBodyTest
 
     public CancellationTokenBodyTest()
     {
-        _restClientFactory = Services.CreateRestClientFactory();
+        _restClientFactory = new RestClientFactory();
         _mockHttp = new MockHttpMessageHandler();
     }
 

Activout.RestClient.Test/DictionaryParameterTests.cs

@@ -14,7 +14,7 @@ public class DictionaryParameterTests(ITestOutputHelper outputHelper)
 {
     private const string BaseUri = "https://example.com/api";
 
-    private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+    private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
     private readonly MockHttpMessageHandler _mockHttp = new MockHttpMessageHandler();
     private readonly ILoggerFactory _loggerFactory = LoggerFactoryHelpers.CreateLoggerFactory(outputHelper);
 

Activout.RestClient.Test/ErrorResponseTextPlainTest.cs

@@ -12,7 +12,7 @@ public class ErrorResponseTextPlainTest(ITestOutputHelper outputHelper)
 {
     private const string BaseUri = "https://example.com/api";
 
-    private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+    private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
     private readonly MockHttpMessageHandler _mockHttp = new();
     private readonly ILoggerFactory _loggerFactory = LoggerFactoryHelpers.CreateLoggerFactory(outputHelper);
 

Activout.RestClient.Test/HttpResponseMessageTest.cs

@@ -16,7 +16,7 @@ public class HttpResponseMessageTest
 
         public HttpResponseMessageTest()
         {
-            _restClientFactory = Services.CreateRestClientFactory();
+            _restClientFactory = new RestClientFactory();
             _mockHttp = new MockHttpMessageHandler();
         }
 

Activout.RestClient.Test/HttpStatusCodeTest.cs

@@ -16,7 +16,7 @@ public class HttpStatusCodeTest
 
         public HttpStatusCodeTest()
         {
-            _restClientFactory = Services.CreateRestClientFactory();
+            _restClientFactory = new RestClientFactory();
             _mockHttp = new MockHttpMessageHandler();
         }
 

Activout.RestClient.Test/MultipartFormDataContentTest.cs

@@ -20,7 +20,7 @@ public class MultipartFormDataContentTest
 
         public MultipartFormDataContentTest(ITestOutputHelper outputHelper)
         {
-            _restClientFactory = Services.CreateRestClientFactory();
+            _restClientFactory = new RestClientFactory();
             _mockHttp = new MockHttpMessageHandler();
             _loggerFactory = LoggerFactoryHelpers.CreateLoggerFactory(outputHelper);
         }

Activout.RestClient.Test/NonJsonRestClientTests.cs

@@ -20,7 +20,7 @@ public class NonJsonRestClientTests(ITestOutputHelper outputHelper)
     private const string MovieId = "*MOVIE_ID*";
     private const string ReviewId = "*REVIEW_ID*";
 
-    private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+    private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
     private readonly MockHttpMessageHandler _mockHttp = new MockHttpMessageHandler();
     private readonly ILoggerFactory _loggerFactory = LoggerFactoryHelpers.CreateLoggerFactory(outputHelper);
 

Activout.RestClient.Test/NullParameterTests.cs

@@ -12,7 +12,7 @@ public class NullParameterTests(ITestOutputHelper outputHelper)
 {
     private const string BaseUri = "https://example.com/api";
 
-    private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+    private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
     private readonly MockHttpMessageHandler _mockHttp = new MockHttpMessageHandler();
     private readonly ILoggerFactory _loggerFactory = LoggerFactoryHelpers.CreateLoggerFactory(outputHelper);
 

Activout.RestClient.Xml.Test/ErrorResponseXmlTest.cs

@@ -10,7 +10,7 @@ public class ErrorResponseXmlTest(ITestOutputHelper outputHelper)
 {
     private const string BaseUri = "https://example.com/api";
 
-    private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+    private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
     private readonly MockHttpMessageHandler _mockHttp = new();
     private readonly ILoggerFactory _loggerFactory = LoggerFactoryHelpers.CreateLoggerFactory(outputHelper);
 

Activout.RestClient.Xml.Test/XmlTests.cs

@@ -9,7 +9,7 @@ public class XmlTests(ITestOutputHelper outputHelper)
 {
     private const string BaseUri = "https://example.com/xml";
 
-    private readonly IRestClientFactory _restClientFactory = Services.CreateRestClientFactory();
+    private readonly IRestClientFactory _restClientFactory = new RestClientFactory();
     private readonly MockHttpMessageHandler _mockHttp = new MockHttpMessageHandler();
     private readonly ILoggerFactory _loggerFactory = LoggerFactoryHelpers.CreateLoggerFactory(outputHelper);
 

Activout.RestClient/Helpers/ITaskConverterFactory.cs

@@ -1,10 +1,8 @@
-#nullable disable
 using System;
 
-namespace Activout.RestClient.Helpers
+namespace Activout.RestClient.Helpers;
+
+public interface ITaskConverterFactory
 {
-    public interface ITaskConverterFactory
-    {
-        ITaskConverter CreateTaskConverter(Type actualReturnType);
-    }
+    ITaskConverter? CreateTaskConverter(Type actualReturnType);
 }

Activout.RestClient/Helpers/Implementation/DuckTyping.cs

@@ -1,13 +1,13 @@
-#nullable disable
 using ImpromptuInterface;
 
-namespace Activout.RestClient.Helpers.Implementation
+namespace Activout.RestClient.Helpers.Implementation;
+
+public class DuckTyping : IDuckTyping
 {
-    public class DuckTyping : IDuckTyping
+    public static IDuckTyping Instance { get; } = new DuckTyping();
+
+    public TInterface DuckType<TInterface>(object originalDynamic) where TInterface : class
     {
-        public TInterface DuckType<TInterface>(object originalDynamic) where TInterface : class
-        {
-            return originalDynamic.ActLike<TInterface>();
-        }
+        return originalDynamic.ActLike<TInterface>();
     }
 }

Activout.RestClient/Helpers/Implementation/TaskConverter3Factory.cs

@@ -1,13 +1,15 @@
-#nullable disable
 using System;
 
 namespace Activout.RestClient.Helpers.Implementation;
 
 public class TaskConverter3Factory : ITaskConverterFactory
 {
-    public ITaskConverter CreateTaskConverter(Type actualReturnType)
+    public static ITaskConverterFactory Instance { get; } = new TaskConverter3Factory();
+
+    public ITaskConverter? CreateTaskConverter(Type actualReturnType)
     {
-        return actualReturnType == typeof(void) ? null : 
-            (ITaskConverter) Activator.CreateInstance(typeof(TaskConverter3<>).MakeGenericType(actualReturnType));
+        return actualReturnType == typeof(void)
+            ? null
+            : (ITaskConverter?)Activator.CreateInstance(typeof(TaskConverter3<>).MakeGenericType(actualReturnType));
     }
 }

Activout.RestClient/Implementation/RestClientBuilder.cs

@@ -5,7 +5,9 @@
 using System.Net.Http;
 using Activout.RestClient.DomainExceptions;
 using Activout.RestClient.Helpers;
+using Activout.RestClient.Helpers.Implementation;
 using Activout.RestClient.ParamConverter;
+using Activout.RestClient.ParamConverter.Implementation;
 using Activout.RestClient.Serialization;
 using Activout.RestClient.Serialization.Implementation;
 using Microsoft.Extensions.Logging;
@@ -14,27 +16,15 @@ namespace Activout.RestClient.Implementation
 {
     internal class RestClientBuilder : IRestClientBuilder
     {
-        private readonly IDuckTyping _duckTyping;
-        private readonly RestClientContext _context;
-        private readonly List<ISerializer> _serializers = SerializationManager.DefaultSerializers.ToList();
-        private readonly List<IDeserializer> _deserializers = SerializationManager.DefaultDeserializers.ToList();
+        private IDuckTyping _duckTyping = DuckTyping.Instance;
 
-        public RestClientBuilder(
-            IDuckTyping duckTyping,
-            IParamConverterManager paramConverterManager,
-            ITaskConverterFactory taskConverterFactory)
+        private readonly RestClientContext _context = new RestClientContext()
         {
-            _duckTyping = duckTyping ?? throw new ArgumentNullException(nameof(duckTyping));
-
-            _context = new RestClientContext
-            {
-                TaskConverterFactory = taskConverterFactory ??
-                                       throw new ArgumentNullException(nameof(taskConverterFactory)),
-                ParamConverterManager = paramConverterManager ??
-                                        throw new ArgumentNullException(nameof(paramConverterManager))
-            };
-        }
-
+            ParamConverterManager = ParamConverterManager.Instance,
+            TaskConverterFactory = TaskConverter3Factory.Instance
+        };
+        private readonly List<ISerializer> _serializers = SerializationManager.DefaultSerializers.ToList();
+        private readonly List<IDeserializer> _deserializers = SerializationManager.DefaultDeserializers.ToList();
 
         public IRestClientBuilder BaseUri(Uri apiUri)
         {
@@ -54,6 +44,12 @@ public IRestClientBuilder Header(string name, object value)
             return this;
         }
 
+        public IRestClientBuilder With(IDuckTyping duckTyping)
+        {
+            _duckTyping = duckTyping;
+            return this;
+        }
+
         public IRestClientBuilder With(ILogger logger)
         {
             _context.Logger = logger;

Activout.RestClient/ParamConverter/IParamConverterManager.cs

@@ -1,11 +1,9 @@
-#nullable disable
 using System;
 using System.Reflection;
 
-namespace Activout.RestClient.ParamConverter
+namespace Activout.RestClient.ParamConverter;
+
+public interface IParamConverterManager
 {
-    public interface IParamConverterManager
-    {
-        IParamConverter GetConverter(Type type, ParameterInfo parameterInfo);
-    }
+    IParamConverter? GetConverter(Type type, ParameterInfo parameterInfo);
 }