Skip to content

Make RestClientContext a record and move logic to RestClientBuilder #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twogood merged 4 commits into from
Oct 25, 2025
Merged

Make RestClientContext a record and move logic to RestClientBuilder #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f98349
Make RestClientContext a `record` and move logic to RestClientBuilder
twogood Oct 25, 2025
7395441
Coderabbit nitpicking
twogood Oct 25, 2025
7d3450e
Fix more Coderabbit feedback
twogood Oct 25, 2025
38f2b4f
Handle more good feedback from Coderabbit
twogood Oct 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions Activout.RestClient.Json/RestClientBuilderJsonExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Text.Json;
using static Activout.RestClient.Json.SystemTextJsonDefaults;

namespace Activout.RestClient.Json;

Expand All @@ -12,15 +13,18 @@ public static class RestClientBuilderJsonExtensions
/// </summary>
/// <param name="builder">The REST client builder instance.</param>
/// <param name="jsonSerializerOptions">Optional custom JSON serializer options. If not provided, default options will be used.</param>
/// <param name="supportedMediaTypes">Optional list of content types to support. If not provided, defaults will be used.</param>
/// <param name="mediaTypes">Optional list of content types to support. If not provided, defaults will be used.</param>
/// <returns>The REST client builder instance.</returns>
public static IRestClientBuilder WithSystemTextJson(this IRestClientBuilder builder,
JsonSerializerOptions? jsonSerializerOptions = null,
MediaType[]? supportedMediaTypes = null)
MediaType[]? mediaTypes = null)
{
// Register the serializer and deserializer
builder.With(new SystemTextJsonSerializer(jsonSerializerOptions, supportedMediaTypes));
builder.With(new SystemTextJsonDeserializer(jsonSerializerOptions, supportedMediaTypes));
mediaTypes ??= MediaTypes;

builder.With(new SystemTextJsonSerializer(jsonSerializerOptions, mediaTypes));
builder.With(new SystemTextJsonDeserializer(jsonSerializerOptions, mediaTypes));
builder.Accept(string.Join(", ", mediaTypes.Select(type => type.Value)));
builder.ContentType(mediaTypes.First());

return builder;
}
Expand Down
30 changes: 11 additions & 19 deletions Activout.RestClient.Newtonsoft.Json.Test/NewtonsoftJsonDeserializerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ public void TestDefaultSettingsPascalCase()
// Arrange
_mockHttp.Expect(BaseUri)
.Respond(new StringContent(JsonConvert.SerializeObject(new
{
Value = "PascalCase"
}),
{
Value = "PascalCase"
}),
Encoding.UTF8,
"application/json"));

Expand All @@ -62,9 +62,9 @@ private void MockCamelCaseResponse()
{
_mockHttp.Expect(BaseUri)
.Respond(new StringContent(JsonConvert.SerializeObject(new
{
value = "CamelCase"
}),
{
value = "CamelCase"
}),
Encoding.UTF8,
"application/json"));
}
Expand All @@ -91,20 +91,12 @@ public void TestCamelCaseWithDeserializer()
}

[Fact]
public void TestCamelCaseWithSerializationManager()
public void TestCamelCaseSerializerSettings()
{
// Arrange
MockCamelCaseResponse();

var deserializers = SerializationManager.DefaultDeserializers.ToList();
deserializers.Add(new NewtonsoftJsonDeserializer(new JsonSerializerSettings
{
ContractResolver = new CamelCasePropertyNamesContractResolver()
}));
var serializationManager = new SerializationManager(deserializers: deserializers);

var client = CreateRestClientBuilder()
.With(serializationManager)
var client = CreateRestClientBuilder(NewtonsoftJsonDefaults.CamelCaseSerializerSettings)
.Build<IClient>();

// Act
Expand All @@ -115,12 +107,12 @@ public void TestCamelCaseWithSerializationManager()
Assert.Equal("CamelCase", data.Value);
}

private IRestClientBuilder CreateRestClientBuilder()
private IRestClientBuilder CreateRestClientBuilder(JsonSerializerSettings? jsonSerializerSettings = null)
{
return _restClientFactory.CreateBuilder()
.WithNewtonsoftJson()
.WithNewtonsoftJson(jsonSerializerSettings)
.With(_mockHttp.ToHttpClient())
.BaseUri(new Uri(BaseUri));
}
}
}
}
3 changes: 1 addition & 2 deletions Activout.RestClient.Newtonsoft.Json.Test/RestClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using Activout.RestClient.Helpers.Implementation;
using Activout.RestClient.Newtonsoft.Json.Test.MovieReviews;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
Expand Down Expand Up @@ -91,7 +90,7 @@ public void TestErrorSync()
// arrange
_mockHttp
.When(HttpMethod.Get, $"{BaseUri}/movies/{MovieId}/reviews/{ReviewId}")
.Respond(HttpStatusCode.NotFound, request => new StringContent(JsonConvert.SerializeObject(new
.Respond(HttpStatusCode.NotFound, _ => new StringContent(JsonConvert.SerializeObject(new
{
Errors = new object[]
{
Expand Down
5 changes: 4 additions & 1 deletion Activout.RestClient.Newtonsoft.Json/RestClientBuilderNewtonsoftJsonExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using static Activout.RestClient.Newtonsoft.Json.NewtonsoftJsonDefaults;

namespace Activout.RestClient.Newtonsoft.Json;

Expand All @@ -7,10 +8,12 @@ public static class RestClientBuilderNewtonsoftJsonExtensions
public static IRestClientBuilder WithNewtonsoftJson(this IRestClientBuilder builder,
JsonSerializerSettings? jsonSerializerSettings = null)
{
var settings = jsonSerializerSettings ?? NewtonsoftJsonDefaults.DefaultJsonSerializerSettings;
var settings = jsonSerializerSettings ?? DefaultJsonSerializerSettings;

builder.With(new NewtonsoftJsonSerializer(settings));
builder.With(new NewtonsoftJsonDeserializer(settings));
builder.Accept(string.Join(", ", SupportedMediaTypes.Select(type => type.Value)));
builder.ContentType(SupportedMediaTypes.First());

return builder;
}
Expand Down
35 changes: 18 additions & 17 deletions Activout.RestClient/IRestClientBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
#nullable disable
using System;
using System.Net.Http;
using Activout.RestClient.DomainExceptions;
using Activout.RestClient.Helpers;
using Activout.RestClient.ParamConverter;
using Activout.RestClient.Serialization;
using Microsoft.Extensions.Logging;

namespace Activout.RestClient
namespace Activout.RestClient;

public interface IRestClientBuilder
{
public interface IRestClientBuilder
{
IRestClientBuilder BaseUri(Uri apiUri);
IRestClientBuilder ContentType(MediaType contentType);
IRestClientBuilder Header(string name, object value);
IRestClientBuilder With(ILogger logger);
IRestClientBuilder With(HttpClient httpClient);
IRestClientBuilder With(IRequestLogger requestLogger);
IRestClientBuilder With(IDeserializer deserializer);
IRestClientBuilder With(ISerializer serializer);
IRestClientBuilder With(ISerializationManager serializationManager);
IRestClientBuilder With(ITaskConverterFactory taskConverterFactory);
IRestClientBuilder With(IDomainExceptionMapperFactory domainExceptionMapperFactory);
T Build<T>() where T : class;
}
IRestClientBuilder BaseUri(Uri apiUri);
IRestClientBuilder ContentType(MediaType contentType);
IRestClientBuilder Header(string name, object value, bool isReplace = true);
IRestClientBuilder With(IDuckTyping duckTyping);
IRestClientBuilder With(ILogger logger);
IRestClientBuilder With(HttpClient httpClient);
IRestClientBuilder With(IRequestLogger requestLogger);
IRestClientBuilder With(IDeserializer deserializer);
IRestClientBuilder With(ISerializer serializer);
IRestClientBuilder With(ISerializationManager serializationManager);
IRestClientBuilder With(ITaskConverterFactory taskConverterFactory);
IRestClientBuilder With(IDomainExceptionMapperFactory domainExceptionMapperFactory);
IRestClientBuilder With(IParamConverterManager paramConverterManager);
T Build<T>() where T : class;
}
19 changes: 19 additions & 0 deletions Activout.RestClient/Implementation/DummyRequestLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Net.Http;

namespace Activout.RestClient.Implementation;

internal sealed class DummyRequestLogger : IRequestLogger, IDisposable
{
public static IRequestLogger Instance { get; } = new DummyRequestLogger();

private DummyRequestLogger()
{
}

public IDisposable TimeOperation(HttpRequestMessage httpRequestMessage) => this;

public void Dispose()
{
}
}
21 changes: 10 additions & 11 deletions Activout.RestClient/Implementation/HeaderListExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
using System;
using System.Collections.Generic;

namespace Activout.RestClient.Implementation
namespace Activout.RestClient.Implementation;

public static class HeaderListExtensions
{
public static class HeaderListExtensions
public static void AddOrReplaceHeader<T>(this List<KeyValuePair<string, T>> headers, string name,
T value, bool replace)
{
public static void AddOrReplaceHeader(this List<KeyValuePair<string, object>> headers, string name,
string value, bool replace)
if (replace)
{
if (replace)
{
headers.RemoveAll(header =>
header.Key.Equals(name, StringComparison.InvariantCultureIgnoreCase));
}

headers.Add(new KeyValuePair<string, object>(name, value));
headers.RemoveAll(header =>
header.Key.Equals(name, StringComparison.OrdinalIgnoreCase));
}

headers.Add(new KeyValuePair<string, T>(name, value));
}
}
85 changes: 28 additions & 57 deletions Activout.RestClient/Implementation/RestClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,47 @@
#nullable disable
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Dynamic;
using System.Linq;
using System.Reflection;
using Activout.RestClient.DomainExceptions;

namespace Activout.RestClient.Implementation
namespace Activout.RestClient.Implementation;

internal class RestClient : DynamicObject
{
internal class RestClient<T> : DynamicObject where T : class
{
private readonly RestClientContext _context;
private readonly Type _type;
private readonly RestClientContext _context;
private readonly Type _type;

private readonly IDictionary<MethodInfo, RequestHandler> _requestHandlers =
new ConcurrentDictionary<MethodInfo, RequestHandler>();
private readonly IDictionary<MethodInfo, RequestHandler> _requestHandlers =
new ConcurrentDictionary<MethodInfo, RequestHandler>();

public RestClient(RestClientContext context)
{
_type = typeof(T);
_context = context;
HandleAttributes();
_context.DefaultSerializer = _context.SerializationManager.GetSerializer(_context.DefaultContentType);
}
public RestClient(Type type, RestClientContext context)
{
_type = type;
_context = context;
}

private void HandleAttributes()
{
var attributes = _type.GetCustomAttributes();
foreach (var attribute in attributes)
switch (attribute)
{
case ContentTypeAttribute contentTypeAttribute:
_context.DefaultContentType = MediaType.ValueOf(contentTypeAttribute.ContentType);
break;
case DomainExceptionAttribute domainExceptionAttribute:
_context.DomainExceptionType = domainExceptionAttribute.Type;
break;
case ErrorResponseAttribute errorResponseAttribute:
_context.ErrorResponseType = errorResponseAttribute.Type;
break;
case HeaderAttribute headerAttribute:
_context.DefaultHeaders.AddOrReplaceHeader(headerAttribute.Name, headerAttribute.Value, headerAttribute.Replace);
break;
case PathAttribute pathAttribute:
_context.BaseTemplate = pathAttribute.Template;
break;
}
}
public override IEnumerable<string> GetDynamicMemberNames()
{
return _type.GetMembers().Select(x => x.Name);
}

public override IEnumerable<string> GetDynamicMemberNames()
public override bool TryInvokeMember(InvokeMemberBinder binder, object?[]? args, out object? result)
{
var method = _type.GetMethod(binder.Name);
if (method == null)
{
return _type.GetMembers().Select(x => x.Name);
result = null;
return false;
}
Comment on lines +31 to 36
Copy link

@coderabbitai coderabbitai bot Oct 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Fix overload resolution to avoid AmbiguousMatchException and wrong method dispatch

_type.GetMethod(binder.Name) throws for overloaded methods and ignores argument shapes. Resolve by selecting the best candidate using argument count/types (and allowing a trailing CancellationToken).

Apply this diff to use a resolver:

-        var method = _type.GetMethod(binder.Name);
-        if (method == null)
+        var method = ResolveMethod(binder.Name, args);
+        if (method is null)
         {
             result = null;
             return false;
         }

Add this helper inside the class:

private MethodInfo? ResolveMethod(string name, object?[]? args)
{
    var candidates = _type.GetMethods(BindingFlags.Public | BindingFlags.Instance)
                          .Where(m => m.Name == name)
                          .ToArray();

    if (candidates.Length == 0) return null;

    var argArray = args as object[] ?? Array.Empty<object>();
    var argCount = argArray.Length;

    foreach (var m in candidates)
    {
        var ps = m.GetParameters();
        var hasCt = ps.Length > 0 && ps[^1].ParameterType == typeof(System.Threading.CancellationToken);
        var matchCount = hasCt ? ps.Length - 1 : ps.Length;
        if (matchCount != argCount) continue;

        var ok = true;
        for (var i = 0; i < matchCount; i++)
        {
            var a = argArray[i];
            if (a is null) continue; // null is acceptable for ref/nullable params
            if (!ps[i].ParameterType.IsInstanceOfType(a)) { ok = false; break; }
        }
        if (ok) return m;
    }

    // Fallback: first by name
    return candidates.FirstOrDefault();
}

And add the needed using:

 using System.Reflection;
+using System.Threading;
🤖 Prompt for AI Agents 
In Activout.RestClient/Implementation/RestClient.cs around lines 31 to 36, the
current call to _type.GetMethod(binder.Name) fails for overloaded methods and
ignores argument shapes; add a ResolveMethod helper (as described in the review)
inside the class to pick the correct MethodInfo by filtering candidates by name,
parameter count/types and allowing a trailing CancellationToken, replace the
direct GetMethod call with ResolveMethod(binder.Name, args) (or similar) so you
select the best overload, and add the required using for BindingFlags/Reflection
at the top of the file.


public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
if (!_requestHandlers.TryGetValue(method, out var requestHandler))
{
var method = _type.GetMethod(binder.Name);
if (method == null)
{
result = null;
return false;
}

if (!_requestHandlers.TryGetValue(method, out var requestHandler))
{
requestHandler = new RequestHandler(method, _context);
_requestHandlers[method] = requestHandler;
}

result = requestHandler.Send(args);
return true;
requestHandler = new RequestHandler(method, _context);
_requestHandlers[method] = requestHandler;
}

result = requestHandler.Send(args);
return true;
Comment on lines +44 to +45
Copy link

@coderabbitai coderabbitai bot Oct 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Null-safe handoff of args to RequestHandler.Send(object[])

TryInvokeMember receives object?[]?; RequestHandler.Send expects object[]. Coalesce to an empty array at the call site.

-        result = requestHandler.Send(args);
+        result = requestHandler.Send((args as object[]) ?? Array.Empty<object>());
         return true;
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
result = requestHandler.Send(args);
return true;
result = requestHandler.Send((args as object[]) ?? Array.Empty<object>());
return true;
🤖 Prompt for AI Agents 
In Activout.RestClient/Implementation/RestClient.cs around lines 44-45,
TryInvokeMember receives a nullable object?[]? named args but
RequestHandler.Send expects a non-null object[]; coalesce args to
Array.Empty<object>() (or new object[0]) at the call site so you pass a non-null
empty array when args is null, and then call requestHandler.Send with that
coalesced array.

}
}
Loading